migrate build system to net8 / fake v6

akkadotnet · Apr 17, 2024 · 7edda72 · 7edda72
1 parent fe49a6b
commit 7edda72
Show file tree

Hide file tree

Showing 13 changed files with 402 additions and 524 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -7,6 +7,12 @@
       "commands": [
         "jb"
       ]
+    },
+    "docfx": {
+      "version": "2.76.0",
+      "commands": [
+        "docfx"
+      ]
     }
   }
 }
diff --git a/Akka.Persistence.Sql.sln b/Akka.Persistence.Sql.sln
@@ -18,8 +18,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_", "_", "{20C26B2D-59EA-42
 		src\Directory.Build.props = src\Directory.Build.props
 		src\Directory.Packages.props = src\Directory.Packages.props
 		build.cmd = build.cmd
-		build.fsx = build.fsx
-		build.ps1 = build.ps1
 		build.sh = build.sh
 	EndProjectSection
 EndProject
@@ -80,6 +78,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{42
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HoconConfiguration", "src\Examples\HoconConfiguration\HoconConfiguration.csproj", "{043A8917-5931-40FC-A093-21BB0AB56875}"
 EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Build", "src\Build\Build.fsproj", "{EE01C6E5-0DE7-4EE8-94FB-E78728814AA8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -134,6 +134,10 @@ Global
 		{043A8917-5931-40FC-A093-21BB0AB56875}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{043A8917-5931-40FC-A093-21BB0AB56875}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{043A8917-5931-40FC-A093-21BB0AB56875}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EE01C6E5-0DE7-4EE8-94FB-E78728814AA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EE01C6E5-0DE7-4EE8-94FB-E78728814AA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EE01C6E5-0DE7-4EE8-94FB-E78728814AA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EE01C6E5-0DE7-4EE8-94FB-E78728814AA8}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -149,6 +153,7 @@ Global
 		{1BE5B28E-0AB1-44BC-A5E8-5D352B42ACCF} = {3E392F73-EB03-4148-BC60-A1F734486190}
 		{043A8917-5931-40FC-A093-21BB0AB56875} = {42F8143A-03CA-41DA-B24D-33193ABB252C}
 		{7537908B-6A42-4E34-889F-6004A97D4987} = {20C26B2D-59EA-421C-9F64-BFFCE3D96260}
+		{EE01C6E5-0DE7-4EE8-94FB-E78728814AA8} = {C59D2898-1994-4C40-B152-1798060051ED}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B99E6BB8-642A-4A68-86DF-69567CBA700A}

diff --git a/build-system/azure-pipeline.template.yaml b/build-system/azure-pipeline.template.yaml
@@ -23,9 +23,9 @@ jobs:
         persistCredentials: true
 
       - task: UseDotNet@2
-        displayName: 'Use .NET 7'
+        displayName: 'Use .NET 8'
         inputs:
-          version: '7.x'
+          version: '8.x'
 
       # Linux or macOS
       - task: Bash@3

diff --git a/build-system/windows-release.yaml b/build-system/windows-release.yaml
@@ -21,9 +21,9 @@ variables:
 
 steps:
 - task: UseDotNet@2
-  displayName: 'Use .NET 7'
+  displayName: 'Use .NET 8'
   inputs:
-    version: '7.x'
+    version: '8.x'
 
 - task: BatchScript@1
   displayName: 'FAKE Build'

diff --git a/build.cmd b/build.cmd
@@ -1 +1 @@
-PowerShell.exe -file "build.ps1" %* 
+dotnet run --project ./build/build.fsproj -- -t %*
diff --git a/build.fsx b/build.fsx
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		PowerShell.exe -file "build.ps1" %*
		dotnet run --project ./build/build.fsproj -- -t %*