Skip to content

GitHubSync update #609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GeertvanHorrik merged 1 commit into from
Nov 14, 2025
Merged

GitHubSync update #609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion deployment/cake/generic-tasks.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 10 additions & 2 deletions deployment/cake/generic-variables.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ public class SolutionContext : BuildContextBase

protected override void LogStateInfoForContext()
{

CakeContext.Information($"Solution filename: '{FileName}'");
}
}

Expand Down Expand Up @@ -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)
Expand Down
9 changes: 7 additions & 2 deletions deployment/cake/lib-msbuild.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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\"),
Expand Down