Remove .NET 4.6 support and bump MSBuild to v17

Abc-Arbitrage · Jan 12, 2024 · 756da27 · 756da27
1 parent d1cdd93
commit 756da27
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,7 +4,6 @@ on: [push, pull_request]
 
 env:
   BUILD_DOTNET_VERSION: 8.0.x
-  BUILD_LINUX_TEST_TFM: net8.0
   DOTNET_NOLOGO: 1
 
 jobs:
@@ -58,7 +57,7 @@ jobs:
         run: dotnet restore src/Abc.Zebus.MessageDsl.sln
 
       - name: Build Tests
-        run:  dotnet build --configuration Release --framework ${{ env.BUILD_LINUX_TEST_TFM }} --no-restore src/Abc.Zebus.MessageDsl.Tests/Abc.Zebus.MessageDsl.Tests.csproj
+        run:  dotnet build --configuration Release --no-restore src/Abc.Zebus.MessageDsl.Tests/Abc.Zebus.MessageDsl.Tests.csproj
 
       - name: Build Integration
         run:  dotnet build --configuration Release --no-restore src/Abc.Zebus.MessageDsl.Build.Integration/Abc.Zebus.MessageDsl.Build.Integration.csproj
@@ -67,4 +66,4 @@ jobs:
         run:  dotnet build --configuration Release --no-restore src/Abc.Zebus.MessageDsl.Generator.Integration/Abc.Zebus.MessageDsl.Generator.Integration.csproj
 
       - name: Test
-        run: dotnet test --configuration Release --framework ${{ env.BUILD_LINUX_TEST_TFM }} --no-build src/Abc.Zebus.MessageDsl.Tests/Abc.Zebus.MessageDsl.Tests.csproj
+        run: dotnet test --configuration Release --no-build src/Abc.Zebus.MessageDsl.Tests/Abc.Zebus.MessageDsl.Tests.csproj
diff --git a/src/Abc.Zebus.MessageDsl.Build.Integration/Abc.Zebus.MessageDsl.Build.Integration.csproj b/src/Abc.Zebus.MessageDsl.Build.Integration/Abc.Zebus.MessageDsl.Build.Integration.csproj
@@ -41,8 +41,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <ZebusMessagesBuildTaskPath Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\Abc.Zebus.MessageDsl.Build\bin\$(Configuration)\net46</ZebusMessagesBuildTaskPath>
-    <ZebusMessagesBuildTaskPath Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\Abc.Zebus.MessageDsl.Build\bin\$(Configuration)\netstandard2.0</ZebusMessagesBuildTaskPath>
+    <ZebusMessagesBuildTaskPath>$(MSBuildThisFileDirectory)..\Abc.Zebus.MessageDsl.Build\bin\$(Configuration)\netstandard2.0</ZebusMessagesBuildTaskPath>
   </PropertyGroup>
 
   <Import Project="..\Abc.Zebus.MessageDsl.Build\NuGet\build\Zebus.MessageDsl.Build.targets" />

diff --git a/src/Abc.Zebus.MessageDsl.Build/Abc.Zebus.MessageDsl.Build.csproj b/src/Abc.Zebus.MessageDsl.Build/Abc.Zebus.MessageDsl.Build.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <Nullable>annotations</Nullable>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\Abc.Zebus.MessageDsl\Abc.Zebus.MessageDsl.snk</AssemblyOriginatorKeyFile>
@@ -16,8 +16,8 @@
 
   <ItemGroup>
     <PackageReference Include="Antlr4.CodeGenerator" Version="4.6.6" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Build.Framework" Version="15.9.20" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.9.20" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="17.0.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.0.0" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
@@ -33,8 +33,7 @@
   <!-- Antlr4.Runtime -->
   <PropertyGroup>
     <NoWarn>$(NoWarn);0219;0162</NoWarn>
-    <DefineConstants Condition="'$(TargetFramework)' == 'net46'">$(DefineConstants);NET45;NET45PLUS;NET40PLUS;NET35PLUS;NET30PLUS;NET20PLUS</DefineConstants>
-    <DefineConstants Condition="'$(TargetFramework)' == 'netstandard2.0'">$(DefineConstants);PORTABLE;NETSTANDARD;NET45PLUS;NET40PLUS;NET35PLUS;NET30PLUS;NET20PLUS</DefineConstants>
+    <DefineConstants>$(DefineConstants);PORTABLE;NETSTANDARD;NET45PLUS;NET40PLUS;NET35PLUS;NET30PLUS;NET20PLUS</DefineConstants>
     <Antlr4RuntimeDir>..\..\lib\antlr4cs\runtime\CSharp\Antlr4.Runtime</Antlr4RuntimeDir>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/Abc.Zebus.MessageDsl.Build/NuGet/build/Zebus.MessageDsl.Build.targets b/src/Abc.Zebus.MessageDsl.Build/NuGet/build/Zebus.MessageDsl.Build.targets
@@ -1,8 +1,7 @@
 <Project>
 
   <PropertyGroup Condition="'$(ZebusMessagesBuildTaskPath)' == ''">
-    <ZebusMessagesBuildTaskPath Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net46</ZebusMessagesBuildTaskPath>
-    <ZebusMessagesBuildTaskPath Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\netstandard2.0</ZebusMessagesBuildTaskPath>
+    <ZebusMessagesBuildTaskPath>$(MSBuildThisFileDirectory)..\tools\netstandard2.0</ZebusMessagesBuildTaskPath>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Abc.Zebus.MessageDsl.Generator.Tests/Abc.Zebus.MessageDsl.Generator.Tests.csproj b/src/Abc.Zebus.MessageDsl.Generator.Tests/Abc.Zebus.MessageDsl.Generator.Tests.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>

diff --git a/src/Abc.Zebus.MessageDsl.Tests/Abc.Zebus.MessageDsl.Tests.csproj b/src/Abc.Zebus.MessageDsl.Tests/Abc.Zebus.MessageDsl.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net48</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\Abc.Zebus.MessageDsl\Abc.Zebus.MessageDsl.snk</AssemblyOriginatorKeyFile>
     <Nullable>disable</Nullable>

diff --git a/src/Abc.Zebus.MessageDsl/Abc.Zebus.MessageDsl.csproj b/src/Abc.Zebus.MessageDsl/Abc.Zebus.MessageDsl.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <Nullable>enable</Nullable>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>Abc.Zebus.MessageDsl.snk</AssemblyOriginatorKeyFile>