Upgraded test project targets.

lextudio · Oct 29, 2024 · 8def136 · 8def136
1 parent 16ccf3d
commit 8def136
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/Tests/CSharpCore/Tests.NetStandard.csproj b/Tests/CSharpCore/Tests.NetStandard.csproj
@@ -10,13 +10,15 @@
   <PropertyGroup>
     <OutputType Condition="'$(TargetFramework)'!='net471'">Exe</OutputType>
     <!-- Detect SDK version -->
-    <IsNet60Supported Condition="'$(NETCoreSdkVersion)' >= '6.0'">true</IsNet60Supported>
-    <IsNet80Supported Condition="'$(NETCoreSdkVersion)' >= '8.0'">true</IsNet80Supported>
-    <!-- Only support .NET 6/8 and .NET Framework 4.7.1 right now. -->
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' AND '$(IsNet80Supported)' == 'true' ">net6.0;net8.0;net471</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' AND '$(IsNet80Supported)' != 'true' AND '$(IsNet60Supported)' == 'true' ">net6.0;net471</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' AND '$(IsNet80Supported)' == 'true'">net6.0;net8.0</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' AND '$(IsNet80Supported)' != 'true' AND '$(IsNet60Supported)' == 'true' ">net6.0</TargetFrameworks>
+    <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" />