respect LangVersion for preview features (#219)

SimonCropp · web-flow · commit f8faee0135bd · 2024-09-13T08:21:28.000+10:00
diff --git a/src/Consume/Consume.cs b/src/Consume/Consume.cs
@@ -111,6 +111,8 @@ void UsePreviewFeature()
     {
     }
 
+#if LangVersion13
+
     [OverloadResolutionPriority(1)]
     void Method(int x)
     {
@@ -126,7 +128,10 @@ void Method(object x)
     {
     }
 
+#endif
+
 #if FeatureMemory
+
     void CollectionBuilderAttribute()
     {
         MyCollection myCollection = [1, 2, 3, 4, 5];
@@ -140,9 +145,11 @@ class MyCollection(ReadOnlySpan<int> initValues)
 
         public static MyCollection Create(ReadOnlySpan<int> values) => new(values);
     }
+
 #endif
 
 #if FeatureValueTuple
+
     void Ranges()
     {
         var range = "value"[1..];
@@ -154,6 +161,7 @@ void Ranges()
         //     "value2"
         // }[..1];
     }
+
 #endif
 
     #endregion
@@ -326,6 +334,7 @@ void Random_Methods()
     }
 
 #if FeatureMemory
+
     void ReadOnlySpan_Methods()
     {
         var readOnlySpan = "value".AsSpan();
@@ -340,18 +349,22 @@ void ReadOnlySpan_Methods()
         result = readOnlySpan.StartsWith("value", StringComparison.Ordinal);
         var split = readOnlySpan.Split('a');
         split = readOnlySpan.Split("a".AsSpan());
+#if LangVersion13
         split = readOnlySpan.SplitAny('a');
         split = readOnlySpan.SplitAny("a".AsSpan());
+#endif
     }
 
 #endif
 
 #if FeatureMemory
+
     void Regex_Methods()
     {
         var regex = new Regex("result");
         regex.IsMatch("value".AsSpan());
     }
+
 #endif
 
     void SByte_Methods()
diff --git a/src/ConsumeCs12/ConsumeCs12.csproj b/src/ConsumeCs12/ConsumeCs12.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <NoWarn>$(NoWarn);PolyfillTargetsForNuget</NoWarn>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>12.0</LangVersion>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT'">net461;net462;net47;net471;net472;net48;net481;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>$(TargetFrameworks);netstandard2.0;netstandard2.1;netcoreapp2.0;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="System.Memory" Condition="$(TargetFramework) != '.NETStandard' or $(TargetFrameworkIdentifier) == '.NETFramework' or $(TargetFramework.StartsWith('netcoreapp'))" />
+    <PackageReference Include="System.ValueTuple" Condition="$(TargetFramework.StartsWith('net46'))" />
+    <PackageReference Include="System.Net.Http" Condition="$(TargetFramework.StartsWith('net4'))" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" Condition="$(TargetFramework) == 'netstandard2.0' or $(TargetFramework) == 'netcoreapp2.0' or $(TargetFrameworkIdentifier) == '.NETFramework'" />
+    <Compile Include="..\Consume\*.cs" />
+  </ItemGroup>
+  <Import Project="$(SolutionDir)\Polyfill\Polyfill.targets" />
+  <Import Project="$(SolutionDir)\TestIncludes.targets" />
+</Project>
diff --git a/src/ConsumeCs13/ConsumeCs13.csproj b/src/ConsumeCs13/ConsumeCs13.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <NoWarn>$(NoWarn);PolyfillTargetsForNuget</NoWarn>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>13.0</LangVersion>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT'">net461;net462;net47;net471;net472;net48;net481;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>$(TargetFrameworks);netstandard2.0;netstandard2.1;netcoreapp2.0;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="System.Memory" Condition="$(TargetFramework) != '.NETStandard' or $(TargetFrameworkIdentifier) == '.NETFramework' or $(TargetFramework.StartsWith('netcoreapp'))" />
+    <PackageReference Include="System.ValueTuple" Condition="$(TargetFramework.StartsWith('net46'))" />
+    <PackageReference Include="System.Net.Http" Condition="$(TargetFramework.StartsWith('net4'))" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" Condition="$(TargetFramework) == 'netstandard2.0' or $(TargetFramework) == 'netcoreapp2.0' or $(TargetFrameworkIdentifier) == '.NETFramework'" />
+    <Compile Include="..\Consume\*.cs" />
+  </ItemGroup>
+  <Import Project="$(SolutionDir)\Polyfill\Polyfill.targets" />
+  <Import Project="$(SolutionDir)\TestIncludes.targets" />
+</Project>
diff --git a/src/ConsumeCsDefault/ConsumeCsDefault.csproj b/src/ConsumeCsDefault/ConsumeCsDefault.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <NoWarn>$(NoWarn);PolyfillTargetsForNuget</NoWarn>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>default</LangVersion>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT'">net461;net462;net47;net471;net472;net48;net481;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>$(TargetFrameworks);netstandard2.0;netstandard2.1;netcoreapp2.0;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="System.Memory" Condition="$(TargetFramework) != '.NETStandard' or $(TargetFrameworkIdentifier) == '.NETFramework' or $(TargetFramework.StartsWith('netcoreapp'))" />
+    <PackageReference Include="System.ValueTuple" Condition="$(TargetFramework.StartsWith('net46'))" />
+    <PackageReference Include="System.Net.Http" Condition="$(TargetFramework.StartsWith('net4'))" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" Condition="$(TargetFramework) == 'netstandard2.0' or $(TargetFramework) == 'netcoreapp2.0' or $(TargetFrameworkIdentifier) == '.NETFramework'" />
+    <Compile Include="..\Consume\*.cs" />
+  </ItemGroup>
+  <Import Project="$(SolutionDir)\Polyfill\Polyfill.targets" />
+  <Import Project="$(SolutionDir)\TestIncludes.targets" />
+</Project>
diff --git a/src/ConsumeCsLatest/ConsumeCsLatest.csproj b/src/ConsumeCsLatest/ConsumeCsLatest.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <NoWarn>$(NoWarn);PolyfillTargetsForNuget</NoWarn>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>latest</LangVersion>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT'">net461;net462;net47;net471;net472;net48;net481;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>$(TargetFrameworks);netstandard2.0;netstandard2.1;netcoreapp2.0;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="System.Memory" Condition="$(TargetFramework) != '.NETStandard' or $(TargetFrameworkIdentifier) == '.NETFramework' or $(TargetFramework.StartsWith('netcoreapp'))" />
+    <PackageReference Include="System.ValueTuple" Condition="$(TargetFramework.StartsWith('net46'))" />
+    <PackageReference Include="System.Net.Http" Condition="$(TargetFramework.StartsWith('net4'))" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" Condition="$(TargetFramework) == 'netstandard2.0' or $(TargetFramework) == 'netcoreapp2.0' or $(TargetFrameworkIdentifier) == '.NETFramework'" />
+    <Compile Include="..\Consume\*.cs" />
+  </ItemGroup>
+  <Import Project="$(SolutionDir)\Polyfill\Polyfill.targets" />
+  <Import Project="$(SolutionDir)\TestIncludes.targets" />
+</Project>
diff --git a/src/ConsumeCsLatestMajor/ConsumeCsLatestMajor.csproj b/src/ConsumeCsLatestMajor/ConsumeCsLatestMajor.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <NoWarn>$(NoWarn);PolyfillTargetsForNuget</NoWarn>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>latestMajor</LangVersion>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT'">net461;net462;net47;net471;net472;net48;net481;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>$(TargetFrameworks);netstandard2.0;netstandard2.1;netcoreapp2.0;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="System.Memory" Condition="$(TargetFramework) != '.NETStandard' or $(TargetFrameworkIdentifier) == '.NETFramework' or $(TargetFramework.StartsWith('netcoreapp'))" />
+    <PackageReference Include="System.ValueTuple" Condition="$(TargetFramework.StartsWith('net46'))" />
+    <PackageReference Include="System.Net.Http" Condition="$(TargetFramework.StartsWith('net4'))" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" Condition="$(TargetFramework) == 'netstandard2.0' or $(TargetFramework) == 'netcoreapp2.0' or $(TargetFrameworkIdentifier) == '.NETFramework'" />
+    <Compile Include="..\Consume\*.cs" />
+  </ItemGroup>
+  <Import Project="$(SolutionDir)\Polyfill\Polyfill.targets" />
+  <Import Project="$(SolutionDir)\TestIncludes.targets" />
+</Project>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <Version>6.6.1</Version>
+    <Version>6.6.2</Version>
     <AssemblyVersion>1.0.0</AssemblyVersion>
     <PackageTags>Polyfill</PackageTags>
     <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
diff --git a/src/Polyfill.sln b/src/Polyfill.sln
@@ -43,6 +43,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TargetFrameworkUsage", "Tar
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsumeMemoryWithNoTask", "ConsumeMemoryWithNoTask\ConsumeMemoryWithNoTask.csproj", "{1BDDA7F0-0D45-418C-B3DB-BBA39C29FD77}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsumeCs12", "ConsumeCs12\ConsumeCs12.csproj", "{4ACF4760-B3C5-4D07-9D92-2B8225BA8881}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsumeCs13", "ConsumeCs13\ConsumeCs13.csproj", "{EE99F818-0D49-434F-B787-348CA34051EF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsumeCsLatest", "ConsumeCsLatest\ConsumeCsLatest.csproj", "{684570FB-7049-44F0-9DCC-32F73F242694}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsumeCsLatestMajor", "ConsumeCsLatestMajor\ConsumeCsLatestMajor.csproj", "{9BB64345-DE4F-4396-9320-AAA712D7E3CE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsumeCsDefault", "ConsumeCsDefault\ConsumeCsDefault.csproj", "{86AA1F8D-4081-4D31-812E-866C0951415D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -96,6 +106,26 @@ Global
 		{1BDDA7F0-0D45-418C-B3DB-BBA39C29FD77}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1BDDA7F0-0D45-418C-B3DB-BBA39C29FD77}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1BDDA7F0-0D45-418C-B3DB-BBA39C29FD77}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4ACF4760-B3C5-4D07-9D92-2B8225BA8881}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4ACF4760-B3C5-4D07-9D92-2B8225BA8881}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4ACF4760-B3C5-4D07-9D92-2B8225BA8881}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4ACF4760-B3C5-4D07-9D92-2B8225BA8881}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EE99F818-0D49-434F-B787-348CA34051EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EE99F818-0D49-434F-B787-348CA34051EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EE99F818-0D49-434F-B787-348CA34051EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EE99F818-0D49-434F-B787-348CA34051EF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{684570FB-7049-44F0-9DCC-32F73F242694}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{684570FB-7049-44F0-9DCC-32F73F242694}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{684570FB-7049-44F0-9DCC-32F73F242694}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{684570FB-7049-44F0-9DCC-32F73F242694}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9BB64345-DE4F-4396-9320-AAA712D7E3CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9BB64345-DE4F-4396-9320-AAA712D7E3CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9BB64345-DE4F-4396-9320-AAA712D7E3CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9BB64345-DE4F-4396-9320-AAA712D7E3CE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{86AA1F8D-4081-4D31-812E-866C0951415D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{86AA1F8D-4081-4D31-812E-866C0951415D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{86AA1F8D-4081-4D31-812E-866C0951415D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{86AA1F8D-4081-4D31-812E-866C0951415D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/Polyfill/Polyfill.targets b/src/Polyfill/Polyfill.targets
@@ -4,6 +4,13 @@
     <LowerFramework>$(TargetFramework.ToLower())</LowerFramework>
     <LowerFrameworks>$(TargetFrameworks.ToLower())</LowerFrameworks>
   </PropertyGroup>
+  <PropertyGroup Condition="$([MSBuild]::VersionGreaterThanOrEquals($(SdkAnalysisLevel), '9'))">
+    <DefineConstants Condition="$(LangVersion) == '13'">$(DefineConstants);LangVersion13</DefineConstants>
+    <DefineConstants Condition="$(LangVersion) == 'latest'">$(DefineConstants);LangVersion13</DefineConstants>
+    <DefineConstants Condition="$(LangVersion) == 'preview'">$(DefineConstants);LangVersion13</DefineConstants>
+    <DefineConstants Condition="$(LangVersion) == 'default'">$(DefineConstants);LangVersion13</DefineConstants>
+    <DefineConstants Condition="$(LangVersion) == 'latestMajor'">$(DefineConstants);LangVersion13</DefineConstants>
+  </PropertyGroup>
   <PropertyGroup Condition="$(AllowUnsafeBlocks) == 'true' ">
     <DefineConstants>$(DefineConstants);AllowUnsafeBlocks</DefineConstants>
   </PropertyGroup>
diff --git a/src/Polyfill/Polyfill_Memory_SpanSplit.cs b/src/Polyfill/Polyfill_Memory_SpanSplit.cs
@@ -43,6 +43,8 @@ public static SpanSplitEnumerator<T> Split<T>(this ReadOnlySpan<T> source, ReadO
         where T : IEquatable<T> =>
         new SpanSplitEnumerator<T>(source, separator, treatAsSingleSeparator: true);
 
+#if LangVersion13
+
     /// <summary>
     /// Returns a type that allows for enumeration of each element within a split span
     /// using any of the provided elements.
@@ -63,6 +65,8 @@ public static SpanSplitEnumerator<T> SplitAny<T>(this ReadOnlySpan<T> source, [U
         where T : IEquatable<T> =>
         new SpanSplitEnumerator<T>(source, separators);
 
+#endif
+
 #if NET8_0
 
     /// <summary>

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,8 @@ void UsePreviewFeature()`
`111`	`111`	`{`
`112`	`112`	`}`
`113`	`113`
	`114`	`+#if LangVersion13`
	`115`	`+`
`114`	`116`	`[OverloadResolutionPriority(1)]`
`115`	`117`	`void Method(int x)`
`116`	`118`	`{`
`@@ -126,7 +128,10 @@ void Method(object x)`
`126`	`128`	`{`
`127`	`129`	`}`
`128`	`130`
	`131`	`+#endif`
	`132`	`+`
`129`	`133`	`#if FeatureMemory`
	`134`	`+`
`130`	`135`	`void CollectionBuilderAttribute()`
`131`	`136`	`{`
`132`	`137`	`MyCollection myCollection = [1, 2, 3, 4, 5];`
`@@ -140,9 +145,11 @@ class MyCollection(ReadOnlySpan<int> initValues)`
`140`	`145`
`141`	`146`	`public static MyCollection Create(ReadOnlySpan<int> values) => new(values);`
`142`	`147`	`}`
	`148`	`+`
`143`	`149`	`#endif`
`144`	`150`
`145`	`151`	`#if FeatureValueTuple`
	`152`	`+`
`146`	`153`	`void Ranges()`
`147`	`154`	`{`
`148`	`155`	`var range = "value"[1..];`
`@@ -154,6 +161,7 @@ void Ranges()`
`154`	`161`	`// "value2"`
`155`	`162`	`// }[..1];`
`156`	`163`	`}`
	`164`	`+`
`157`	`165`	`#endif`
`158`	`166`
`159`	`167`	`#endregion`
`@@ -326,6 +334,7 @@ void Random_Methods()`
`326`	`334`	`}`
`327`	`335`
`328`	`336`	`#if FeatureMemory`
	`337`	`+`
`329`	`338`	`void ReadOnlySpan_Methods()`
`330`	`339`	`{`
`331`	`340`	`var readOnlySpan = "value".AsSpan();`
`@@ -340,18 +349,22 @@ void ReadOnlySpan_Methods()`
`340`	`349`	`result = readOnlySpan.StartsWith("value", StringComparison.Ordinal);`
`341`	`350`	`var split = readOnlySpan.Split('a');`
`342`	`351`	`split = readOnlySpan.Split("a".AsSpan());`
	`352`	`+#if LangVersion13`
`343`	`353`	`split = readOnlySpan.SplitAny('a');`
`344`	`354`	`split = readOnlySpan.SplitAny("a".AsSpan());`
	`355`	`+#endif`
`345`	`356`	`}`
`346`	`357`
`347`	`358`	`#endif`
`348`	`359`
`349`	`360`	`#if FeatureMemory`
	`361`	`+`
`350`	`362`	`void Regex_Methods()`
`351`	`363`	`{`
`352`	`364`	`var regex = new Regex("result");`
`353`	`365`	`regex.IsMatch("value".AsSpan());`
`354`	`366`	`}`
	`367`	`+`
`355`	`368`	`#endif`
`356`	`369`
`357`	`370`	`void SByte_Methods()`