Merge pull request #1238 from DNNCommunity/release/0.24.3

Released v0.24.3
DNNCommunity · Dec 18, 2024 · d678e4e · d678e4e
2 parents e9b622b + 7c941bc
commit d678e4e
Show file tree

Hide file tree

Showing 14 changed files with 338 additions and 293 deletions.
diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json
@@ -1,19 +1,5 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "properties": {
-    "Configuration": {
-      "type": "string",
-      "description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
-      "enum": [
-        "Debug",
-        "Release"
-      ]
-    },
-    "GithubToken": {
-      "type": "string",
-      "description": "Github Token"
-    }
-  },
   "definitions": {
     "Host": {
       "type": "string",
@@ -118,5 +104,25 @@
       }
     }
   },
-  "$ref": "#/definitions/NukeBuild"
+  "allOf": [
+    {
+      "properties": {
+        "Configuration": {
+          "type": "string",
+          "description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
+          "enum": [
+            "Debug",
+            "Release"
+          ]
+        },
+        "GithubToken": {
+          "type": "string",
+          "description": "Github Token"
+        }
+      }
+    },
+    {
+      "$ref": "#/definitions/NukeBuild"
+    }
+  ]
 }
diff --git a/_build/Build.cs b/_build/Build.cs
@@ -109,24 +109,6 @@ class Build : NukeBuild
     .DependsOn(Clean)
     .Executes(() =>
     {
-      NpmLogger = (type, output) =>
-      {
-        if (type == OutputType.Std)
-        {
-          Serilog.Log.Information(output);
-        }
-        if (type == OutputType.Err)
-        {
-          if (output.StartsWith("npm WARN", StringComparison.OrdinalIgnoreCase))
-          {
-            Serilog.Log.Warning(output);
-          }
-          else
-          {
-            Serilog.Log.Error(output);
-          }
-        }
-      };
       var version = gitRepository.IsOnMainOrMasterBranch() ? GitVersion.MajorMinorPatch : GitVersion.SemVer;
       Npm($"version {version} --allow-same-version --git-tag-version false --workspaces", RootDirectory);
 
@@ -182,9 +164,6 @@ class Build : NukeBuild
     .DependsOn(SetupGithubActor)
     .Executes(() =>
     {
-      // Prevents a bug where git sends ok message to the error output sink
-      GitLogger = (type, output) => Serilog.Log.Information(output);
-
       // Because in CI we are in detached head,
       // we create a local deploy branch to track our commit.
       Git("switch -c deploy");
@@ -211,7 +190,6 @@ class Build : NukeBuild
     .Executes(() =>
     {
       var version = gitRepository.IsOnMainOrMasterBranch() ? GitVersion.MajorMinorPatch : GitVersion.SemVer;
-      GitLogger = (type, output) => Serilog.Log.Information(output);
       Git($"tag v{version}");
       Git($"push origin --tags");
     });

diff --git a/_build/_build.csproj b/_build/_build.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <RootNamespace></RootNamespace>
     <NoWarn>CS0649;CS0169</NoWarn>
     <NukeRootDirectory>..</NukeRootDirectory>
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nuke.Common" Version="8.1.2" />
+    <PackageReference Include="Nuke.Common" Version="9.0.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.403",
+    "version": "9.0.100",
     "rollForward": "latestMajor"
   }
 }