diff --git a/.github/workflows/pr-validation.yml b/.github/workflows/pr-validation.yml index e4bc680..fe72d77 100644 --- a/.github/workflows/pr-validation.yml +++ b/.github/workflows/pr-validation.yml @@ -9,12 +9,8 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest, macos-latest] - targetFramework: [net6.0, net7.0, net8.0, net9.0] + targetFramework: [net8.0, net9.0] include: - - targetFramework: net6.0 - dotnetVersion: 6.x - - targetFramework: net7.0 - dotnetVersion: 7.x - targetFramework: net8.0 dotnetVersion: 8.x - targetFramework: net9.0 diff --git a/src/Microsoft.Build.Sql.Templates/Microsoft.Build.Sql.Templates.csproj b/src/Microsoft.Build.Sql.Templates/Microsoft.Build.Sql.Templates.csproj index 37eafef..0b085fb 100644 --- a/src/Microsoft.Build.Sql.Templates/Microsoft.Build.Sql.Templates.csproj +++ b/src/Microsoft.Build.Sql.Templates/Microsoft.Build.Sql.Templates.csproj @@ -1,7 +1,7 @@ - netstandard2.1 + net8.0 Template Microsoft.Build.Sql.Templates Microsoft.Build.Sql templates diff --git a/src/Microsoft.Build.Sql/Microsoft.Build.Sql.csproj b/src/Microsoft.Build.Sql/Microsoft.Build.Sql.csproj index 6fffe10..706b3f0 100644 --- a/src/Microsoft.Build.Sql/Microsoft.Build.Sql.csproj +++ b/src/Microsoft.Build.Sql/Microsoft.Build.Sql.csproj @@ -1,14 +1,14 @@ - netstandard2.1 + net8.0 $(MSBuildThisFileDirectory)Microsoft.Build.Sql.nuspec MSBuildSDK false true - $(MSBuildThisFileDirectory)\tools\netstandard2.1\ + $(MSBuildThisFileDirectory)\tools\net8.0\ @@ -17,22 +17,22 @@ - + - - - - + + + + - + - - + + diff --git a/src/Microsoft.Build.Sql/sdk/Sdk.props b/src/Microsoft.Build.Sql/sdk/Sdk.props index 4b94526..67e4218 100644 --- a/src/Microsoft.Build.Sql/sdk/Sdk.props +++ b/src/Microsoft.Build.Sql/sdk/Sdk.props @@ -11,7 +11,7 @@ true false - $(MSBuildThisFileDirectory)..\tools\netstandard2.1 + $(MSBuildThisFileDirectory)..\tools\net8.0 netstandard2.1 @(SupportedTargetFramework->'%(Alias)') diff --git a/src/Microsoft.Build.Sql/sdk/Sdk.targets b/src/Microsoft.Build.Sql/sdk/Sdk.targets index abb5a46..02c428c 100644 --- a/src/Microsoft.Build.Sql/sdk/Sdk.targets +++ b/src/Microsoft.Build.Sql/sdk/Sdk.targets @@ -51,7 +51,7 @@ --> - + diff --git a/test/Microsoft.Build.Sql.Tests/BuildTests.cs b/test/Microsoft.Build.Sql.Tests/BuildTests.cs index ff4c154..910e16c 100644 --- a/test/Microsoft.Build.Sql.Tests/BuildTests.cs +++ b/test/Microsoft.Build.Sql.Tests/BuildTests.cs @@ -320,12 +320,8 @@ public void VerifyBuildWithTransitiveProjectReferences() [TestCase("netcoreapp3.1")] [TestCase("net5.0")] [TestCase("net6.0")] -#if NET7_0_OR_GREATER [TestCase("net7.0")] -#endif -#if NET8_0_OR_GREATER [TestCase("net8.0")] -#endif #if NET9_0_OR_GREATER [TestCase("net9.0")] #endif diff --git a/test/Microsoft.Build.Sql.Tests/Microsoft.Build.Sql.Tests.csproj b/test/Microsoft.Build.Sql.Tests/Microsoft.Build.Sql.Tests.csproj index 3c4b355..fddcc78 100644 --- a/test/Microsoft.Build.Sql.Tests/Microsoft.Build.Sql.Tests.csproj +++ b/test/Microsoft.Build.Sql.Tests/Microsoft.Build.Sql.Tests.csproj @@ -3,7 +3,7 @@ - net6.0;net7.0;net8.0;net9.0 + net8.0;net9.0 enable false