Merge pull request #3 from Cysharp/hadashiA/fix-test-target

neuecc · web-flow · commit 3be7e5aed743 · 2023-11-16T18:18:02.000+09:00
Fix test targetframework for CI
diff --git a/src/Utf8StringInterpolation/ArrayBufferWriter.cs b/src/Utf8StringInterpolation/ArrayBufferWriter.cs
@@ -1,10 +1,4 @@
-﻿#if NET6_0_OR_GREATER || NETSTANDARD2_1
-
-using System.Runtime.CompilerServices;
-[assembly: TypeForwardedTo(typeof(System.Buffers.ArrayBufferWriter<>))]
-
-#else
-
+﻿#if !NET6_0_OR_GREATER && !NETSTANDARD2_1_OR_GREATER
 using System;
 using System.Diagnostics;
 
@@ -252,5 +246,4 @@ private static void ThrowOutOfMemoryException(uint capacity)
 		}
 	}
 }
-
-#endif
+#endif
diff --git a/tests/Utf8StringInterpolation.Tests/Utf8StringInterpolation.Tests.csproj b/tests/Utf8StringInterpolation.Tests/Utf8StringInterpolation.Tests.csproj
@@ -1,10 +1,11 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net48;net5.0;net6.0;net8.0</TargetFrameworks>
+		<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net48</TargetFrameworks>
+		<TargetFrameworks>$(TargetFrameworks);net5.0;net6.0;net8.0</TargetFrameworks>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
-		<LangVersion>11.0</LangVersion>
+		<LangVersion>12.0</LangVersion>
 		<IsPackable>false</IsPackable>
 		<IsTestProject>true</IsTestProject>
 	</PropertyGroup>

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,4 @@`
`1`		`-#if NET6_0_OR_GREATER \|\| NETSTANDARD2_1`
`2`		`-`
`3`		`-using System.Runtime.CompilerServices;`
`4`		`-[assembly: TypeForwardedTo(typeof(System.Buffers.ArrayBufferWriter<>))]`
`5`		`-`
`6`		`-#else`
`7`		`-`
	`1`	`+#if !NET6_0_OR_GREATER && !NETSTANDARD2_1_OR_GREATER`
`8`	`2`	`using System;`
`9`	`3`	`using System.Diagnostics;`
`10`	`4`
`@@ -252,5 +246,4 @@ private static void ThrowOutOfMemoryException(uint capacity)`
`252`	`246`	`}`
`253`	`247`	`}`
`254`	`248`	`}`
`255`		`-`
`256`		`-#endif`
	`249`	`+#endif`