Upgrade project to .NET 9.0 and update dependencies

tforkmann · Nov 13, 2024 · f94f63b · f94f63b
1 parent dd1bf2a
commit f94f63b
Show file tree

Hide file tree

Showing 10 changed files with 182 additions and 179 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -10,14 +10,14 @@
       "rollForward": false
     },
     "fable": {
-      "version": "4.17.0",
+      "version": "4.23.0",
       "commands": [
         "fable"
       ],
       "rollForward": false
     },
     "paket": {
-      "version": "8.0.3",
+      "version": "9.0.0",
       "commands": [
         "paket"
       ],
@@ -38,4 +38,4 @@
       "rollForward": false
     }
   }
-}
+}
diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
@@ -235,14 +235,15 @@
 				<Splits>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',').Length)</Splits>
 				<PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
 				<PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>
+				<Reference>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[2])</Reference>
 				<AllPrivateAssets>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4])</AllPrivateAssets>
 				<CopyLocal Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 6">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5])</CopyLocal>
 				<OmitContent Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 7">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[6])</OmitContent>
 				<ImportTargets Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 8">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[7])</ImportTargets>
 				<Aliases Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 9">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[8])</Aliases>
 			</PaketReferencesFileLinesInfo>
-			<PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)">
-				<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
+			<PackageReference Condition=" '$(ManagePackageVersionsCentrally)' != 'true' Or '%(PaketReferencesFileLinesInfo.Reference)' == 'Direct' " Include="%(PaketReferencesFileLinesInfo.PackageName)">
+				<Version Condition=" '$(ManagePackageVersionsCentrally)' != 'true' ">%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
 				<PrivateAssets Condition=" ('%(PaketReferencesFileLinesInfo.AllPrivateAssets)' == 'true') Or ('$(PackAsTool)' == 'true') ">All</PrivateAssets>
 				<ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.CopyLocal) == 'false' or %(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
 				<ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.OmitContent) == 'true'">$(ExcludeAssets);contentFiles</ExcludeAssets>
@@ -252,6 +253,10 @@
 				<AllowExplicitVersion>true</AllowExplicitVersion>
 
 			</PackageReference>
+
+			<PackageVersion Include="%(PaketReferencesFileLinesInfo.PackageName)">
+				<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
+			</PackageVersion>
 		</ItemGroup>
 
 		<PropertyGroup>

diff --git a/Build.fsproj b/Build.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Helpers.fs" />

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
     "sdk": {
-        "version": "8.0.403",
+        "version": "9.0.100",
         "rollForward": "latestMinor"
     }
 }
diff --git a/paket.dependencies b/paket.dependencies
@@ -1,5 +1,5 @@
 source https://api.nuget.org/v3/index.json
-framework: net8.0
+framework: net9.0
 storage: none
 
 nuget Fake.Core.Target
@@ -13,21 +13,21 @@ nuget Farmer
 group AzureTackle
   storage: none
   source https://api.nuget.org/v3/index.json
-  framework: net8.0
+  framework: net9.0
   nuget FSharp.Core
   nuget Azure.Data.Tables
 
 group Test
   storage: none
   source https://api.nuget.org/v3/index.json
-  framework: net8.0
+  framework: net9.0
   nuget Expecto
   nuget Azure.Data.Tables
   nuget Microsoft.Extensions.Configuration.Json
 
 group Docs
     source https://api.nuget.org/v3/index.json
-    framework: net8.0
+    framework: net9.0
     nuget Feliz.Router
     nuget Zanaptak.TypedCssClasses
     nuget Fable.SimpleHttp