diff --git a/global.json b/global.json index 0eda35a..6942623 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { "rollForward": "latestFeature", - "version": "10.0.101" + "version": "10.0.102" }, "test": { "runner": "Microsoft.Testing.Platform" diff --git a/src/Cake.Generator.TestApp/Models/IntegrationTestData.cs b/src/Cake.Generator.TestApp/Models/IntegrationTestData.cs index 4fabf79..fd7c5d9 100644 --- a/src/Cake.Generator.TestApp/Models/IntegrationTestData.cs +++ b/src/Cake.Generator.TestApp/Models/IntegrationTestData.cs @@ -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"); diff --git a/src/Cake.Template/templates/cakefile/cake.cs b/src/Cake.Template/templates/cakefile/cake.cs index 1bb18c1..a07bcd6 100644 --- a/src/Cake.Template/templates/cakefile/cake.cs +++ b/src/Cake.Template/templates/cakefile/cake.cs @@ -18,7 +18,7 @@ .IsDependentOn("Clean") .Does(() => { - DotNetBuild("./src/Example.sln", new DotNetBuildSettings + DotNetBuild("./src/Example.slnx", new DotNetBuildSettings { Configuration = configuration, }); @@ -28,7 +28,7 @@ .IsDependentOn("Build") .Does(() => { - DotNetTest("./src/Example.sln", new DotNetTestSettings + DotNetTest("./src/Example.slnx", new DotNetTestSettings { Configuration = configuration, NoBuild = true, diff --git a/src/Cake.Template/templates/cakefile/src/Example.sln b/src/Cake.Template/templates/cakefile/src/Example.sln deleted file mode 100644 index 6257676..0000000 --- a/src/Cake.Template/templates/cakefile/src/Example.sln +++ /dev/null @@ -1,47 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Example", "Example\Example.csproj", "{6E7EAAE4-D096-4697-8C9C-50BF07337382}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Example.Tests", "Example.Tests\Example.Tests.csproj", "{616F0C9E-8DB5-4491-9F2D-C183E236C07E}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6E7EAAE4-D096-4697-8C9C-50BF07337382}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E7EAAE4-D096-4697-8C9C-50BF07337382}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E7EAAE4-D096-4697-8C9C-50BF07337382}.Debug|x64.ActiveCfg = Debug|Any CPU - {6E7EAAE4-D096-4697-8C9C-50BF07337382}.Debug|x64.Build.0 = Debug|Any CPU - {6E7EAAE4-D096-4697-8C9C-50BF07337382}.Debug|x86.ActiveCfg = Debug|Any CPU - {6E7EAAE4-D096-4697-8C9C-50BF07337382}.Debug|x86.Build.0 = Debug|Any CPU - {6E7EAAE4-D096-4697-8C9C-50BF07337382}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E7EAAE4-D096-4697-8C9C-50BF07337382}.Release|Any CPU.Build.0 = Release|Any CPU - {6E7EAAE4-D096-4697-8C9C-50BF07337382}.Release|x64.ActiveCfg = Release|Any CPU - {6E7EAAE4-D096-4697-8C9C-50BF07337382}.Release|x64.Build.0 = Release|Any CPU - {6E7EAAE4-D096-4697-8C9C-50BF07337382}.Release|x86.ActiveCfg = Release|Any CPU - {6E7EAAE4-D096-4697-8C9C-50BF07337382}.Release|x86.Build.0 = Release|Any CPU - {616F0C9E-8DB5-4491-9F2D-C183E236C07E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {616F0C9E-8DB5-4491-9F2D-C183E236C07E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {616F0C9E-8DB5-4491-9F2D-C183E236C07E}.Debug|x64.ActiveCfg = Debug|Any CPU - {616F0C9E-8DB5-4491-9F2D-C183E236C07E}.Debug|x64.Build.0 = Debug|Any CPU - {616F0C9E-8DB5-4491-9F2D-C183E236C07E}.Debug|x86.ActiveCfg = Debug|Any CPU - {616F0C9E-8DB5-4491-9F2D-C183E236C07E}.Debug|x86.Build.0 = Debug|Any CPU - {616F0C9E-8DB5-4491-9F2D-C183E236C07E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {616F0C9E-8DB5-4491-9F2D-C183E236C07E}.Release|Any CPU.Build.0 = Release|Any CPU - {616F0C9E-8DB5-4491-9F2D-C183E236C07E}.Release|x64.ActiveCfg = Release|Any CPU - {616F0C9E-8DB5-4491-9F2D-C183E236C07E}.Release|x64.Build.0 = Release|Any CPU - {616F0C9E-8DB5-4491-9F2D-C183E236C07E}.Release|x86.ActiveCfg = Release|Any CPU - {616F0C9E-8DB5-4491-9F2D-C183E236C07E}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal \ No newline at end of file diff --git a/src/Cake.Template/templates/cakefile/src/Example.slnx b/src/Cake.Template/templates/cakefile/src/Example.slnx new file mode 100644 index 0000000..b8c4757 --- /dev/null +++ b/src/Cake.Template/templates/cakefile/src/Example.slnx @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/Cake.Template/templates/cakemultifile/cake.cs b/src/Cake.Template/templates/cakemultifile/cake.cs index 6bb4c9a..0c7159a 100644 --- a/src/Cake.Template/templates/cakemultifile/cake.cs +++ b/src/Cake.Template/templates/cakemultifile/cake.cs @@ -27,7 +27,7 @@ .Does(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, }); @@ -38,7 +38,7 @@ .Does(static (context, config) => { BuildUtilities.LogInfo("Running tests..."); - DotNetTest("./src/Example.sln", new DotNetTestSettings + DotNetTest("./src/Example.slnx", new DotNetTestSettings { Configuration = config.Configuration, NoBuild = true, diff --git a/src/Cake.Template/templates/cakeproj/cake.cs b/src/Cake.Template/templates/cakeproj/cake.cs index 53e83a6..5e02d5c 100644 --- a/src/Cake.Template/templates/cakeproj/cake.cs +++ b/src/Cake.Template/templates/cakeproj/cake.cs @@ -16,7 +16,7 @@ .IsDependentOn("Clean") .Does(() => { - DotNetBuild("./src/Example.sln", new DotNetBuildSettings + DotNetBuild("./src/Example.slnx", new DotNetBuildSettings { Configuration = configuration, }); @@ -26,7 +26,7 @@ .IsDependentOn("Build") .Does(() => { - DotNetTest("./src/Example.sln", new DotNetTestSettings + DotNetTest("./src/Example.slnx", new DotNetTestSettings { Configuration = configuration, NoBuild = true,