Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"sdk": {
"rollForward": "latestFeature",
"version": "10.0.101"
"version": "10.0.102"
},
"test": {
"runner": "Microsoft.Testing.Platform"
Expand Down
2 changes: 1 addition & 1 deletion src/Cake.Generator.TestApp/Models/IntegrationTestData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public record IntegrationTestData(
public DirectoryPath CakeTemplateWithExample { get; } = BaseDirectory.Combine("cake.template").Combine("with-example");
public FilePath CakeTemplateWithExampleCs { get; } = BaseDirectory.Combine("cake.template").Combine("with-example").CombineWithFilePath("cake-with-example.cs");
public DirectoryPath CakeTemplateWithExampleSrc { get; } = BaseDirectory.Combine("cake.template").Combine("with-example").Combine("src");
public FilePath CakeTemplateWithExampleSln { get; } = BaseDirectory.Combine("cake.template").Combine("with-example").Combine("src").CombineWithFilePath("Example.sln");
public FilePath CakeTemplateWithExampleSlnx { get; } = BaseDirectory.Combine("cake.template").Combine("with-example").Combine("src").CombineWithFilePath("Example.slnx");

// New multi-file test properties
public FilePath CakeSdkFilesCs { get; } = BaseDirectory.CombineWithFilePath("cake.sdk.files.cs");
Expand Down
4 changes: 2 additions & 2 deletions src/Cake.Template/templates/cakefile/cake.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
.IsDependentOn("Clean")
.Does(() =>
{
DotNetBuild("./src/Example.sln", new DotNetBuildSettings
DotNetBuild("./src/Example.slnx", new DotNetBuildSettings
{
Configuration = configuration,
});
Expand All @@ -28,7 +28,7 @@
.IsDependentOn("Build")
.Does(() =>
{
DotNetTest("./src/Example.sln", new DotNetTestSettings
DotNetTest("./src/Example.slnx", new DotNetTestSettings
{
Configuration = configuration,
NoBuild = true,
Expand Down
47 changes: 0 additions & 47 deletions src/Cake.Template/templates/cakefile/src/Example.sln

This file was deleted.

9 changes: 9 additions & 0 deletions src/Cake.Template/templates/cakefile/src/Example.slnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<Solution>
<Configurations>
<Platform Name="Any CPU" />
<Platform Name="x64" />
<Platform Name="x86" />
</Configurations>
<Project Path="Example.Tests/Example.Tests.csproj" />
<Project Path="Example/Example.csproj" />
</Solution>
4 changes: 2 additions & 2 deletions src/Cake.Template/templates/cakemultifile/cake.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
.Does<BuildConfiguration>(static (context, config) =>
{
BuildUtilities.LogInfo($"Building {config.ProjectName} v{config.Version}");
DotNetBuild("./src/Example.sln", new DotNetBuildSettings
DotNetBuild("./src/Example.slnx", new DotNetBuildSettings
{
Configuration = config.Configuration,
});
Expand All @@ -38,7 +38,7 @@
.Does<BuildConfiguration>(static (context, config) =>
{
BuildUtilities.LogInfo("Running tests...");
DotNetTest("./src/Example.sln", new DotNetTestSettings
DotNetTest("./src/Example.slnx", new DotNetTestSettings
{
Configuration = config.Configuration,
NoBuild = true,
Expand Down
4 changes: 2 additions & 2 deletions src/Cake.Template/templates/cakeproj/cake.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
.IsDependentOn("Clean")
.Does(() =>
{
DotNetBuild("./src/Example.sln", new DotNetBuildSettings
DotNetBuild("./src/Example.slnx", new DotNetBuildSettings
{
Configuration = configuration,
});
Expand All @@ -26,7 +26,7 @@
.IsDependentOn("Build")
.Does(() =>
{
DotNetTest("./src/Example.sln", new DotNetTestSettings
DotNetTest("./src/Example.slnx", new DotNetTestSettings
{
Configuration = configuration,
NoBuild = true,
Expand Down