[v2] Add .NET 9 Preview as target

henrikfroehling · Aug 24, 2024 · 786c278 · 786c278
1 parent d3fd488
commit 786c278
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 13 deletions.
diff --git a/.github/constants.env b/.github/constants.env
@@ -1,4 +1,2 @@
-DOTNET_VERSION: '8.0.x'
-DOTNET_QUALITY: 'ga'
-JAVA_DISTRIBUTION: 'temurin'
-JAVA_VERSION: '21'
+DOTNET_VERSION_STABLE: '8.0.x'
+DOTNET_VERSION_PREVIEW: '9.0.100-preview.7.24407.12'
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -74,8 +74,11 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: ${{ env.DOTNET_VERSION }}
-          dotnet-quality: ${{ env.DOTNET_QUALITY }}
+          cache: true
+          cache-dependency-path: '**/packages.lock.json'
+          dotnet-version: |
+            ${{ env.DOTNET_VERSION_STABLE }}
+            ${{ env.DOTNET_VERSION_PREVIEW }}
 
       - name: Restore dependencies
         run: dotnet restore

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -42,8 +42,11 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: ${{ env.DOTNET_VERSION }}
-          dotnet-quality: ${{ env.DOTNET_QUALITY }}
+          cache: true
+          cache-dependency-path: '**/packages.lock.json'
+          dotnet-version: |
+            ${{ env.DOTNET_VERSION_STABLE }}
+            ${{ env.DOTNET_VERSION_PREVIEW }}
 
       - name: Setup DocFX
         run: dotnet tool update -g docfx

diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
@@ -32,8 +32,11 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: ${{ env.DOTNET_VERSION }}
-          dotnet-quality: ${{ env.DOTNET_QUALITY }}
+          cache: true
+          cache-dependency-path: '**/packages.lock.json'
+          dotnet-version: |
+            ${{ env.DOTNET_VERSION_STABLE }}
+            ${{ env.DOTNET_VERSION_PREVIEW }}
 
       - name: Install SonarCloud scanner
         if: steps.cache-sonar-scanner.outputs.cache-hit != 'true'

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -8,10 +8,11 @@
     <LibraryNETFrameworkTargets>net472;net481</LibraryNETFrameworkTargets>
     <LibraryNETStandardTargets>netstandard2.0;netstandard2.1</LibraryNETStandardTargets>
     <LibraryCommonNETTargets>net6.0;net7.0;net8.0</LibraryCommonNETTargets>
+    <LibraryCommonNETPreviewTargets>net9.0</LibraryCommonNETPreviewTargets>
 
-    <LibraryTargetFrameworks>$(LibraryNETStandardTargets);net5.0;$(LibraryCommonNETTargets)</LibraryTargetFrameworks>
-    <HttpClientFactoryLibraryTargetFrameworks>$(LibraryNETStandardTargets);$(LibraryCommonNETTargets)</HttpClientFactoryLibraryTargetFrameworks>
-    <TestTargetFrameworks>$(LibraryNETFrameworkTargets);$(LibraryCommonNETTargets)</TestTargetFrameworks>
+    <LibraryTargetFrameworks>$(LibraryNETStandardTargets);net5.0;$(LibraryCommonNETTargets);$(LibraryCommonNETPreviewTargets)</LibraryTargetFrameworks>
+    <HttpClientFactoryLibraryTargetFrameworks>$(LibraryNETStandardTargets);$(LibraryCommonNETTargets);$(LibraryCommonNETPreviewTargets)</HttpClientFactoryLibraryTargetFrameworks>
+    <TestTargetFrameworks>$(LibraryNETFrameworkTargets);$(LibraryCommonNETTargets);$(LibraryCommonNETPreviewTargets)</TestTargetFrameworks>
 
     <!-- These tests use Verify packages which only support these .NET versions >= 6. -->
     <SourceGenerationTestTargetFrameworks>$(LibraryCommonNETTargets)</SourceGenerationTestTargetFrameworks>