Removed .NET 6.

lextudio · Nov 13, 2024 · e7edce9 · e7edce9
1 parent adacd85
commit e7edce9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
@@ -13,8 +13,8 @@ jobs:
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
-          6.0.x
           8.0.x
+          9.0.x
     - name: Build
       shell: bash
       run: |
@@ -36,8 +36,8 @@ jobs:
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
-          6.0.x
           8.0.x
+          9.0.x
     - name: Build
       shell: bash
       run: |
@@ -60,8 +60,8 @@ jobs:
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
-          6.0.x
           8.0.x
+          9.0.x
     - name: Build
       shell: cmd
       run: build.release.bat
@@ -70,7 +70,7 @@ jobs:
       run: |
         dotnet test Tests/CSharpCore/Tests.NetStandard.csproj --configuration Release --no-build /p:AltCover=true /p:AltCoverStrongNameKey=../../SharpSnmpLib/sharpsnmplib.snk /p:AltCoverAssemblyFilter='^(xunit)|(AltCover)|(SharpSnmpLib\.Tests)'
         dotnet tool install --global dotnet-reportgenerator-globaltool
-        reportgenerator -reports:${{ github.workspace }}\Tests\CSharpCore\coverage.net6.0.xml -targetdir:${{ github.workspace }}\TestResults -reporttypes:lcov
+        reportgenerator -reports:${{ github.workspace }}\Tests\CSharpCore\coverage.net8.0.xml -targetdir:${{ github.workspace }}\TestResults -reporttypes:lcov
     - name: Publish coverage report to coveralls.io
       uses: coverallsapp/github-action@v2
       with:

diff --git a/SharpSnmpLib/SharpSnmpLib.csproj b/SharpSnmpLib/SharpSnmpLib.csproj
@@ -6,10 +6,9 @@
     <UseWindowsForms>false</UseWindowsForms>
     <!-- Detect SDK version -->
     <ParsedSdkVersion>$([System.Text.RegularExpressions.Regex]::Replace($(NETCoreSdkVersion), '-.*', ''))</ParsedSdkVersion>
-    <IsNet60Supported Condition="'$(ParsedSdkVersion)' >= '6.0'">true</IsNet60Supported>
-    <!-- Only support .NET 6 and .NET Framework 4.7.1 right now. -->
-    <TargetFrameworks Condition="'$(IsNet60Supported)' == 'true'">net6.0;net471</TargetFrameworks>
-    <TargetFrameworks Condition="'$(IsNet60Supported)' != 'true'">net471</TargetFrameworks>
+    <IsNet80Supported Condition="'$(ParsedSdkVersion)' >= '8.0'">true</IsNet80Supported>
+    <!-- Only support .NET 8 and .NET Framework 4.7.1 right now. -->
+    <TargetFrameworks Condition="'$(IsNet80Supported)' == 'true'">net8.0;net471</TargetFrameworks>
     <PackageId>Lextm.SharpSnmpLib</PackageId>
     <Title>#SNMP Library</Title>
     <NeutralLanguage>en-US</NeutralLanguage>
@@ -40,7 +39,7 @@
     <IncludeSymbols>true</IncludeSymbols>
     <DebugType>portable</DebugType>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <GitVersionTargetFramework>net6.0</GitVersionTargetFramework>
+    <GitVersionTargetFramework>net8.0</GitVersionTargetFramework>
   </PropertyGroup>
   <PropertyGroup>
     <NoWarn>S5547;S907;S1133;S101;S1135</NoWarn>

diff --git a/Tests/CSharpCore/Tests.NetStandard.csproj b/Tests/CSharpCore/Tests.NetStandard.csproj
@@ -11,12 +11,10 @@
     <OutputType Condition="'$(TargetFramework)'!='net471'">Exe</OutputType>
     <!-- Detect SDK version -->
     <ParsedSdkVersion>$([System.Text.RegularExpressions.Regex]::Replace($(NETCoreSdkVersion), '-.*', ''))</ParsedSdkVersion>
-    <IsNet60Supported Condition="'$(ParsedSdkVersion)' >= '6.0'">true</IsNet60Supported>
     <IsNet80Supported Condition="'$(ParsedSdkVersion)' >= '8.0'">true</IsNet80Supported>
     <IsNet90Supported Condition="'$(ParsedSdkVersion)' >= '9.0'">true</IsNet90Supported>
-    <!-- Only support .NET 6/8/9 and .NET Framework 4.7.1 right now. -->
-    <TargetFrameworks Condition="'$(IsNet60Supported)' == 'true' ">net6.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(IsNet80Supported)' == 'true' ">$(TargetFrameworks);net8.0</TargetFrameworks>
+    <!-- Only support .NET 8/9 and .NET Framework 4.7.1 right now. -->
+    <TargetFrameworks Condition="'$(IsNet80Supported)' == 'true' ">net8.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(IsNet90Supported)' == 'true' ">$(TargetFrameworks);net9.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net471</TargetFrameworks>
   </PropertyGroup>