Updated project targets.

lextudio · Oct 29, 2024 · 626faa4 · 626faa4
1 parent 9897ca7
commit 626faa4
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 15 deletions.
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
@@ -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@master
       with:

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -9,7 +9,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/Samples/CSharpCore/snmpd/bin/Debug/net6.0/snmpd.dll",
+            "program": "${workspaceFolder}/Samples/CSharpCore/snmpd/bin/Debug/net8.0/snmpd.dll",
             "args": [],
             "cwd": "${workspaceFolder}/Samples/CSharpCore/snmpd",
             "console": "internalConsole",

diff --git a/Samples/CSharpCore/BytesViewer/BytesViewer.csproj b/Samples/CSharpCore/BytesViewer/BytesViewer.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <OutputType>WinExe</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWindowsForms>true</UseWindowsForms>

diff --git a/Samples/CSharpCore/snmpbulkget/snmpbulkget.csproj b/Samples/CSharpCore/snmpbulkget/snmpbulkget.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Samples/CSharpCore/snmpd/snmpd.csproj b/Samples/CSharpCore/snmpd/snmpd.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 

diff --git a/Samples/CSharpCore/snmpdiscover/snmpdiscover.csproj b/Samples/CSharpCore/snmpdiscover/snmpdiscover.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Samples/CSharpCore/snmpget/snmpget.csproj b/Samples/CSharpCore/snmpget/snmpget.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Samples/CSharpCore/snmpgetnext/snmpgetnext.csproj b/Samples/CSharpCore/snmpgetnext/snmpgetnext.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Samples/CSharpCore/snmpsendtrap/snmpsendtrap.csproj b/Samples/CSharpCore/snmpsendtrap/snmpsendtrap.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Samples/CSharpCore/snmpset/snmpset.csproj b/Samples/CSharpCore/snmpset/snmpset.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Samples/CSharpCore/snmptrapd/snmptrapd.csproj b/Samples/CSharpCore/snmptrapd/snmptrapd.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 

diff --git a/Samples/CSharpCore/snmpwalk/snmpwalk.csproj b/Samples/CSharpCore/snmpwalk/snmpwalk.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Tests/CSharpCore/Tests.NetStandard.csproj b/Tests/CSharpCore/Tests.NetStandard.csproj
@@ -7,9 +7,16 @@
   </PropertyGroup>
   <PropertyGroup>
     <OutputType Condition="'$(TargetFramework)'!='net471'">Exe</OutputType>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' AND '$(MSBuildAssemblyVersion)' == '17.0' ">net6.0;net471</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' AND '$(MSBuildAssemblyVersion)' == '16.0' ">net471</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">net6.0</TargetFrameworks>
+    <!-- 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>
+    <TargetFrameworks Condition="'$(IsNet90Supported)' == 'true' ">($TargetFrameworks);net9.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">($TargetFrameworks);net471</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <EmbeddedResource Include="**\*.resx" />