Update build to use .NET SDK 8 and C# 12

xunit · Jan 15, 2024 · edf51bc · edf51bc
1 parent 3cb1ad2
commit edf51bc
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 8 deletions.
diff --git a/.github/workflows/.global.json b/.github/workflows/.global.json
@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "8.0.100",
+    "rollForward": "latestMinor"
+  }
+}
diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml
@@ -19,12 +19,16 @@ jobs:
       - name: Add MSBuild to PATH
         uses: microsoft/setup-msbuild@v1
 
+      - name: Replace global.json
+        run: cp .github/workflows/.global.json global.json
+        shell: bash
+
       - name: Install .NET SDK
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: |
             6.0.x
-            7.0.x
+            8.0.x
 
       - name: Get .NET information
         run: dotnet --info

diff --git a/.github/workflows/push-main.yaml b/.github/workflows/push-main.yaml
@@ -22,12 +22,16 @@ jobs:
       - name: Add MSBuild to PATH
         uses: microsoft/setup-msbuild@v1
 
+      - name: Replace global.json
+        run: cp .github/workflows/.global.json global.json
+        shell: bash
+
       - name: Install .NET SDK
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: |
             6.0.x
-            7.0.x
+            8.0.x
 
       - name: Get .NET information
         run: dotnet --info

diff --git a/Directory.build.props b/Directory.build.props
@@ -7,7 +7,7 @@
     <Copyright>Copyright (c) .NET Foundation and Contributors.</Copyright>
     <DebugType>embedded</DebugType>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <LangVersion>latest</LangVersion>
+    <LangVersion>12.0</LangVersion>
     <MSBuildCopyContentTransitively>false</MSBuildCopyContentTransitively>
     <PackageIcon>logo-512-transparent.png</PackageIcon>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/build.ps1 b/build.ps1
@@ -21,8 +21,8 @@ if ($null -eq (Get-Command "dotnet" -ErrorAction Ignore)) {
 }
 
 $version = [Version]$([regex]::matches((&dotnet --version), '^(\d+\.)?(\d+\.)?(\*|\d+)').value)
-if ($version.Major -lt 7) {
-	throw ".NET SDK version ($version) is too low; please install version 7.0 or later"
+if ($version.Major -lt 8) {
+	throw ".NET SDK version ($version) is too low; please install version 8.0 or later"
 }
 
 if ($null -eq (Get-Command "msbuild.exe" -ErrorAction Ignore)) {

diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -5,7 +5,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>portable</DebugType>
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <LangVersion>latest</LangVersion>
+    <LangVersion>12.0</LangVersion>
     <PackageId>$(MSBuildProjectName)</PackageId>
     <VersionPrefix>99.99.99-dev</VersionPrefix>
     <WarningsAsErrors>true</WarningsAsErrors>

diff --git a/tools/builder/build.csproj b/tools/builder/build.csproj
@@ -1,11 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <LangVersion>10.0</LangVersion>
     <NoWarn>$(NoWarn);CS8002</NoWarn>
     <Nullable>enable</Nullable>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>