From 52f9dd6a8e0a319929e440ce0b9281d5cc317222 Mon Sep 17 00:00:00 2001
From: "Leila Lali (from Dev Box)" <llali@microsoft.com>
Date: Thu, 12 Dec 2024 16:13:58 -0800
Subject: [PATCH] Supporting .net8 target

---
 .github/workflows/pr-validation.yml | 2 +-
 Directory.Build.props               | 6 ++----
 Test/Directory.Build.props          | 3 +--
 global.json                         | 2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/pr-validation.yml b/.github/workflows/pr-validation.yml
index 211702c..892a474 100644
--- a/.github/workflows/pr-validation.yml
+++ b/.github/workflows/pr-validation.yml
@@ -38,4 +38,4 @@ jobs:
 
       - name: Run tests Linux
         if: matrix.os == 'ubuntu-latest'
-        run: dotnet test /p:TargetFramework=net6.0
+        run: dotnet test /p:TargetFramework=net8.0
diff --git a/Directory.Build.props b/Directory.Build.props
index 42dfe75..4b5babd 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -27,11 +27,9 @@
     <!-- This is the default target framework for all the projects. 
          Individual projects may specify additional target frameworks -->
     <NetfxVersion>net462</NetfxVersion>
-    <NetStandardVersion>netstandard2.1</NetStandardVersion>
-    <NetStandardVersion20>netstandard2.0</NetStandardVersion20>
-    <NetCoreVersion>net6.0</NetCoreVersion>
+    <NetCoreVersion>net8.0</NetCoreVersion>
 
-    <TargetFrameworks>$(NetStandardVersion);$(NetfxVersion);$(NetCoreVersion);$(NetStandardVersion20)</TargetFrameworks>
+    <TargetFrameworks>$(NetfxVersion);$(NetCoreVersion)</TargetFrameworks>
     <PreviewRelease Condition="'$(PreviewRelease)' == ''">false</PreviewRelease>
     <VersionProductName>Microsoft SQL Script DOM</VersionProductName>
 
diff --git a/Test/Directory.Build.props b/Test/Directory.Build.props
index ee4c60e..15d559a 100644
--- a/Test/Directory.Build.props
+++ b/Test/Directory.Build.props
@@ -31,8 +31,7 @@
     <TargetFrameworks>$(NetfxVersion);$(NetCoreVersion)</TargetFrameworks>
 
     <!-- The TargetGroup can be used to express condition that are common to more than one TargetFramework (currently not used)-->
-    <TargetGroup Condition="'$(TargetFramework)'=='netstandard2.0' Or '$(TargetFramework)'=='netstandard2.1' Or '$(TargetFramework)'=='netstandard2.2'">netstandard</TargetGroup>
-    <TargetGroup Condition="'$(TargetFramework)'=='netcoreapp3.1' Or '$(TargetFramework)'=='net5.0' Or '$(TargetFramework)'=='net6.0'">netcore</TargetGroup>
+    <TargetGroup Condition="'$(TargetFramework)'=='net8.0'">netcore</TargetGroup>
     <TargetGroup Condition="'$(TargetGroup)'==''">netfx</TargetGroup>
 
     <!-- Enable optimized NuGet restore -->
diff --git a/global.json b/global.json
index ac22e7f..63f719f 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
     "sdk": {
-      "version": "6.0.427",
+      "version": "8.0.404",
       "rollForward": "latestMajor"
     },
     "msbuild-sdks": {