Merge pull request #609 from Fody/GitHubSync/20251114-083521

GitHubSync update

Author: GeertvanHorrik

deployment/cake/generic-tasks.cake

@@ -127,7 +127,10 @@ Task("RestorePackages")
 
     //var csharpProjects = GetFiles("./**/*.csproj");
     // var cProjects = GetFiles("./**/*.vcxproj");
-    var solutions = GetFiles("./**/*.sln");
+    var solutions = new List<FilePath>();
+    solutions.AddRange(GetFiles("./**/*.sln"));
+    solutions.AddRange(GetFiles("./**/*.slnx"));
+    
     var csharpProjects = new List<FilePath>();
 
     foreach (var project in buildContext.AllProjects)

deployment/cake/generic-variables.cake

@@ -299,7 +299,7 @@ public class SolutionContext : BuildContextBase
 
     protected override void LogStateInfoForContext()
     {
-    
+        CakeContext.Information($"Solution filename: '{FileName}'");
     }
 }
 
@@ -520,11 +520,19 @@ private GeneralContext InitializeGeneralContext(BuildContext buildContext, IBuil
 
     var solutionName = buildContext.BuildServer.GetVariable("SolutionName", showValue: true);
 
+    var solutionExtension = "slnx";
+
+    var solutionFiles = GetFiles(string.Format("./src/{0}.{1}", solutionName, solutionExtension));
+    if (solutionFiles.Count == 0)
+    {
+        solutionExtension = "sln";
+    }
+    
     data.Solution = new SolutionContext(data)
     {
         Name = solutionName,
         AssemblyInfoFileName = "./src/SolutionAssemblyInfo.cs",
-        FileName = string.Format("./src/{0}", string.Format("{0}.sln", solutionName)),
+        FileName = string.Format("./src/{0}", string.Format("{0}.{1}", solutionName, solutionExtension)),
         PublishType = buildContext.BuildServer.GetVariable("PublishType", "Unknown", showValue: true),
         ConfigurationName = buildContext.BuildServer.GetVariable("ConfigurationName", "Release", showValue: true),
         BuildSolution = buildContext.BuildServer.GetVariableAsBool("BuildSolution", false, showValue: true)

deployment/cake/lib-msbuild.cake

@@ -76,7 +76,7 @@ private static void ConfigureMsBuild(BuildContext buildContext, MSBuildSettings
     // msBuildSettings.WithProperty("SolutionPath", System.IO.Path.GetFullPath(buildContext.General.Solution.FileName));
     // msBuildSettings.WithProperty("SolutionDir", System.IO.Path.GetFullPath(buildContext.General.Solution.Directory));
     // msBuildSettings.WithProperty("SolutionName", buildContext.General.Solution.Name);
-    // msBuildSettings.WithProperty("SolutionExt", ".sln");
+    // msBuildSettings.WithProperty("SolutionExt", ".slnx");
     // msBuildSettings.WithProperty("DefineExplicitDefaults", "true");
 
     // Path maps
@@ -160,7 +160,7 @@ private static void ConfigureMsBuildForDotNet(BuildContext buildContext, DotNetM
     // msBuildSettings.WithProperty("SolutionPath", System.IO.Path.GetFullPath(buildContext.General.Solution.FileName));
     // msBuildSettings.WithProperty("SolutionDir", System.IO.Path.GetFullPath(buildContext.General.Solution.Directory));
     // msBuildSettings.WithProperty("SolutionName", buildContext.General.Solution.Name);
-    // msBuildSettings.WithProperty("SolutionExt", ".sln");
+    // msBuildSettings.WithProperty("SolutionExt", ".slnx");
     // msBuildSettings.WithProperty("DefineExplicitDefaults", "true");
 
     // Path maps
@@ -349,12 +349,17 @@ private static string GetVisualStudioDirectory(BuildContext buildContext, bool?
 
     var prereleasePaths = new List<KeyValuePair<string, string>>(new [] 
     { 
+        new KeyValuePair<string, string>("Visual Studio 2026 Preview", $@"{programFilesx64}\Microsoft Visual Studio\18\Insiders\"),
+        new KeyValuePair<string, string>("Visual Studio 2026 Preview", $@"{programFilesx64}\Microsoft Visual Studio\18\Preview\"),
         new KeyValuePair<string, string>("Visual Studio 2022 Preview", $@"{programFilesx64}\Microsoft Visual Studio\2022\Preview\"),
         new KeyValuePair<string, string>("Visual Studio 2019 Preview", $@"{programFilesx86}\Microsoft Visual Studio\2019\Preview\"),
     });
 
     var normalPaths = new List<KeyValuePair<string, string>> (new []
     {
+        new KeyValuePair<string, string>("Visual Studio 2026 Enterprise", $@"{programFilesx64}\Microsoft Visual Studio\18\Enterprise\"),
+        new KeyValuePair<string, string>("Visual Studio 2026 Professional", $@"{programFilesx64}\Microsoft Visual Studio\18\Professional\"),
+        new KeyValuePair<string, string>("Visual Studio 2026 Community", $@"{programFilesx64}\Microsoft Visual Studio\18\Community\"),
         new KeyValuePair<string, string>("Visual Studio 2022 Enterprise", $@"{programFilesx64}\Microsoft Visual Studio\2022\Enterprise\"),
         new KeyValuePair<string, string>("Visual Studio 2022 Professional", $@"{programFilesx64}\Microsoft Visual Studio\2022\Professional\"),
         new KeyValuePair<string, string>("Visual Studio 2022 Community", $@"{programFilesx64}\Microsoft Visual Studio\2022\Community\"),