Merge pull request #633 from WildGums/GitHubSync/20231115-184644

GitHubSync update
WildGums · Nov 15, 2023 · 7403569 · 7403569
2 parents aa63291 + 267f356
commit 7403569
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 14 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "3.1.0",
+      "version": "3.2.0",
       "commands": [
         "dotnet-cake"
       ]

diff --git a/deployment/cake/installers-squirrel.cake b/deployment/cake/installers-squirrel.cake
@@ -62,11 +62,11 @@ public class SquirrelInstaller : IInstaller
 
         if (!BuildContext.CakeContext.FileExists(nuSpecTemplateFileName))
         {
-            BuildContext.CakeContext.Information("Skip packaging of WPF app '{0}' using Squirrel since no Squirrel template is present");
+            BuildContext.CakeContext.Information($"Skip packaging of WPF app '{projectName}' using Squirrel since no Squirrel template is present");
             return;
         }
 
-        BuildContext.CakeContext.LogSeparator("Packaging WPF app '{0}' using Squirrel", projectName);
+        BuildContext.CakeContext.LogSeparator($"Packaging WPF app '{projectName}' using Squirrel");
 
         BuildContext.CakeContext.CreateDirectory(squirrelReleasesRoot);
         BuildContext.CakeContext.CreateDirectory(squirrelOutputIntermediate);
@@ -98,7 +98,7 @@ public class SquirrelInstaller : IInstaller
         var appSourceDirectory = System.IO.Path.Combine(BuildContext.General.OutputRootDirectory, projectName);
         var appTargetDirectory = System.IO.Path.Combine(squirrelOutputIntermediate, "lib");
 
-        BuildContext.CakeContext.Information("Copying files from '{0}' => '{1}'", appSourceDirectory, appTargetDirectory);
+        BuildContext.CakeContext.Information($"Copying files from '{appSourceDirectory}' => '{appTargetDirectory}'");
 
         BuildContext.CakeContext.CopyDirectory(appSourceDirectory, appTargetDirectory);
 
@@ -110,7 +110,7 @@ public class SquirrelInstaller : IInstaller
         {
             var squirrelTargetFile = System.IO.Path.Combine(appTargetDirectory, subDirectory.Segments[subDirectory.Segments.Length - 1], "Squirrel.exe");
 
-            BuildContext.CakeContext.Information("Copying Squirrel.exe to support self-updates from '{0}' => '{1}'", squirrelSourceFile, squirrelTargetFile);
+            BuildContext.CakeContext.Information($"Copying Squirrel.exe to support self-updates from '{squirrelSourceFile}' => '{squirrelTargetFile}'");
 
             BuildContext.CakeContext.CopyFile(squirrelSourceFile, squirrelTargetFile);
         }
@@ -144,7 +144,7 @@ public class SquirrelInstaller : IInstaller
             var sourcePackageFileName = System.IO.Path.Combine(squirrelOutputIntermediate, $"{projectSlug}{setupSuffix}.{BuildContext.General.Version.NuGet}.nupkg");
             var targetPackageFileName = System.IO.Path.Combine(squirrelOutputIntermediate, $"{projectName}.{BuildContext.General.Version.NuGet}.nupkg");
 
-            BuildContext.CakeContext.Information("Moving file from '{0}' => '{1}'", sourcePackageFileName, targetPackageFileName);
+            BuildContext.CakeContext.Information($"Moving file from '{sourcePackageFileName}' => '{targetPackageFileName}'");
 
             BuildContext.CakeContext.MoveFile(sourcePackageFileName, targetPackageFileName);
         }
@@ -157,7 +157,7 @@ public class SquirrelInstaller : IInstaller
         BuildContext.CakeContext.CreateDirectory(releasesSourceDirectory);
         BuildContext.CakeContext.CreateDirectory(releasesTargetDirectory);
 
-        BuildContext.CakeContext.Information("Copying releases from '{0}' => '{1}'", releasesSourceDirectory, releasesTargetDirectory);
+        BuildContext.CakeContext.Information($"Copying releases from '{releasesSourceDirectory}' => '{releasesTargetDirectory}'");
 
         BuildContext.CakeContext.CopyDirectory(releasesSourceDirectory, releasesTargetDirectory);
 
@@ -185,7 +185,7 @@ public class SquirrelInstaller : IInstaller
 
         if (BuildContext.Wpf.UpdateDeploymentsShare)
         {
-            BuildContext.CakeContext.Information("Copying updated Squirrel files back to deployments share at '{0}'", releasesSourceDirectory);
+            BuildContext.CakeContext.Information($"Copying updated Squirrel files back to deployments share at '{releasesSourceDirectory}'");
 
             // Copy the following files:
             // - [version]-full.nupkg

diff --git a/deployment/cake/issuetrackers-github.cake b/deployment/cake/issuetrackers-github.cake
@@ -1,4 +1,4 @@
-#tool "nuget:?package=gitreleasemanager&version=0.15.0"
+#tool "nuget:?package=gitreleasemanager&version=0.16.0"
 
 //-------------------------------------------------------------
 

diff --git a/deployment/cake/lib-msbuild.cake b/deployment/cake/lib-msbuild.cake
@@ -255,11 +255,13 @@ private static void RunMsBuild(BuildContext buildContext, string projectName, st
     buildContext.CakeContext.Information(string.Empty);
     buildContext.CakeContext.Information($"Done {action}ing project, took '{buildStopwatch.Elapsed}'");
     buildContext.CakeContext.Information(string.Empty);
-    buildContext.CakeContext.Information($"Investigating potential issues using '{logPath}'");
-    buildContext.CakeContext.Information(string.Empty);
 
-    if (System.IO.File.Exists(logPath))
+    if (buildContext.General.EnableMsBuildXmlLog &&
+        System.IO.File.Exists(logPath))
     {
+        buildContext.CakeContext.Information($"Investigating potential issues using '{logPath}'");
+        buildContext.CakeContext.Information(string.Empty);
+
         var investigationStopwatch = Stopwatch.StartNew();
 
         var issuesContext = buildContext.CakeContext.MsBuildIssuesFromFilePath(logPath, buildContext.CakeContext.MsBuildXmlFileLoggerFormat());
@@ -301,9 +303,12 @@ private static void RunMsBuild(BuildContext buildContext, string projectName, st
 
                 failBuild = true;
             }
+
+            buildContext.CakeContext.Information(string.Empty);
+            buildContext.CakeContext.Information($"Done investigating project, took '{investigationStopwatch.Elapsed}'");
+            buildContext.CakeContext.Information(string.Empty);
         }
 
-        buildContext.CakeContext.Information(string.Empty);
         buildContext.CakeContext.Information($"Done investigating project, took '{investigationStopwatch.Elapsed}'");
         buildContext.CakeContext.Information($"Total msbuild ({action} + investigation) took '{totalStopwatch.Elapsed}'");
         buildContext.CakeContext.Information(string.Empty);

diff --git a/src/Directory.Build.shared.explicit.props b/src/Directory.Build.shared.explicit.props
@@ -230,6 +230,30 @@
     <Page Include="Platforms\net\**\*.xaml" SubType="Designer" Generator="MSBuild:Compile" />
     <Compile Update="Platforms\net\**\*.xaml.cs" SubType="Code" DependentUpon="%(Filename)" />
   </ItemGroup>
+
+  <!-- .NET 9.0 -->
+  <PropertyGroup Condition=" $(TargetFramework.StartsWith('net9.0')) ">
+    <DefineConstants>$(DefineConstants);NETCORE;NETCORE9;NETCORE9_0;NET9;NET9_0</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup Condition=" $(TargetFramework.StartsWith('net9.0')) ">
+    <None Remove="Platforms\net\**\*.cs;Platforms\net\**\*.xaml;Platforms\net\**\*.xaml.cs" />
+    <Compile Include="Platforms\net\**\*.cs" DependentUpon="%(Filename)" />
+    <Page Include="Platforms\net\**\*.xaml" SubType="Designer" Generator="MSBuild:Compile" />
+    <Compile Update="Platforms\net\**\*.xaml.cs" SubType="Code" DependentUpon="%(Filename)" />
+  </ItemGroup>
+
+  <!-- .NET 10.0 -->
+  <PropertyGroup Condition=" $(TargetFramework.StartsWith('net10.0')) ">
+    <DefineConstants>$(DefineConstants);NETCORE;NETCORE10;NETCORE10_0;NET10;NET10_0</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup Condition=" $(TargetFramework.StartsWith('net10.0')) ">
+    <None Remove="Platforms\net\**\*.cs;Platforms\net\**\*.xaml;Platforms\net\**\*.xaml.cs" />
+    <Compile Include="Platforms\net\**\*.cs" DependentUpon="%(Filename)" />
+    <Page Include="Platforms\net\**\*.xaml" SubType="Designer" Generator="MSBuild:Compile" />
+    <Compile Update="Platforms\net\**\*.xaml.cs" SubType="Code" DependentUpon="%(Filename)" />
+  </ItemGroup>
 
   <!-- .NET Standard 2.0 -->
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">

diff --git a/src/global.json b/src/global.json
@@ -3,7 +3,7 @@
         "MSBuild.Sdk.Extras": "3.0.44"
     },
     "sdk": {
-        "version": "7.0.0",
+        "version": "8.0.0",
         "rollForward": "latestMinor",
         "allowPrerelease": false
     }