feat: support build for .NET 9.0 (#64)

Seddryck · Dec 1, 2024 · 890f5b1 · 890f5b1
1 parent de4933d
commit 890f5b1
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 7 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -8,7 +8,7 @@
 
 	<PropertyGroup>
         <LangVersion>12.0</LangVersion>
-        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
         <RuntimeIdentifiers>win-x64;linux-x64</RuntimeIdentifiers>
 		<Platform>AnyCPU</Platform>
 		<ImplicitUsings>enable</ImplicitUsings>

diff --git a/appveyor.yml b/appveyor.yml
@@ -21,11 +21,18 @@ environment:
 
 init:
 - cmd: git config --global core.autocrlf true
-- cmd: setx IGNORE_NORMALISATION_GIT_HEAD_MOVE "1"
-- cmd: setx DOTNET_NO_WORKLOAD_UPDATE_NOTIFICATION "true"
+- cmd: setx IGNORE_NORMALISATION_GIT_HEAD_MOVE 1
+- cmd: setx DOTNET_NO_WORKLOAD_UPDATE_NOTIFICATION 1
+- cmd: setx DOTNET_CLI_TELEMETRY_OPTOUT 1
+- cmd: setx DOTNET_NOLOGO 1
 - cmd: RefreshEnv.cmd
 - pwsh: Write-Host "Target branch is '$($env:APPVEYOR_REPO_BRANCH)'"
 
+install:
+- ps: |
+    Invoke-WebRequest -Uri 'https://dot.net/v1/dotnet-install.ps1' -UseBasicParsing -OutFile "$env:temp\dotnet-install.ps1"
+    & $env:temp\dotnet-install.ps1 -Architecture x64 -Version '9.0.100' -InstallDir "$env:ProgramFiles\dotnet"
+
 before_build:
 - cmd: gitversion /output buildserver /verbosity Minimal
 - pwsh: Write-Host "Building Didot version $($env:GitVersion_SemVer)"
@@ -47,7 +54,6 @@ before_build:
     }
 
 build_script:
-  #- dotnet --info
   - dotnet build Didot.sln -p:version="%GitVersion_SemVer%" -c Release /p:ContinuousIntegrationBuild=true --nologo 
 
 test_script:

diff --git a/package.ps1 b/package.ps1
@@ -6,7 +6,7 @@ $projects = @(
   "src/Didot.Core/Didot.Core.csproj",
   "src/Didot.Cli/Didot.Cli.csproj"
 )
-$frameworks = @("net7.0", "net8.0")
+$frameworks = @("net8.0", "net9.0")
 $runtimes = ("win-x64", "linux-x64")
 
 foreach ($project in $projects) {
@@ -23,4 +23,4 @@ foreach ($project in $projects) {
     }
     Write-Host "Packaging Nuget $project ..."
     dotnet pack $project -p:version="$env:GitVersion_SemVer" -c Release --include-symbols --no-build --nologo
-}    
+}    
diff --git a/src/Didot.Cli/Didot.Cli.csproj b/src/Didot.Cli/Didot.Cli.csproj
@@ -27,6 +27,7 @@
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
+    <PackageReference Include="System.Private.Uri" Version="4.3.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Didot.Core/Didot.Core.csproj b/src/Didot.Core/Didot.Core.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -17,5 +17,8 @@
     <PackageReference Include="SmartFormat.NET" Version="3.5.1" />
     <PackageReference Include="YamlDotNet" Version="16.2.1" />
   </ItemGroup>
+  <ItemGroup>
+      <PackageReference Include="System.Private.Uri" Version="4.3.2" />
+  </ItemGroup>
 
 </Project>
diff --git a/testing/Didot.Cli.Testing/Didot.Cli.Testing.csproj b/testing/Didot.Cli.Testing/Didot.Cli.Testing.csproj
@@ -19,6 +19,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="System.Private.Uri" Version="4.3.2" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Update="DotNet.ReproducibleBuilds" Version="1.2.25">

diff --git a/testing/Didot.Core.Testing/Didot.Core.Testing.csproj b/testing/Didot.Core.Testing/Didot.Core.Testing.csproj
@@ -19,6 +19,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="System.Private.Uri" Version="4.3.2" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Update="DotNet.ReproducibleBuilds" Version="1.2.25">