Skip to content

Commit 8873551

Browse files
SimonCroppSimonCropp
committed
refs or cleanup
1 parent f966b34 commit 8873551

File tree

7 files changed

+83
-9
lines changed

7 files changed

+83
-9
lines changed

‎src/ConsumeClassicReferences/ConsumeClassicReferences.csproj

+42-1
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,55 @@
66
<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;net10.0</TargetFrameworks>
77
</PropertyGroup>
88
<ItemGroup>
9-
<PackageReference Include="System.Memory" Condition="$(TargetFrameworkIdentifier) == '.NETStandard' or $(TargetFrameworkIdentifier) == '.NETFramework' or $(TargetFramework.StartsWith('netcoreapp'))" />
109
<PackageReference Include="System.ValueTuple" Condition="$(TargetFramework.StartsWith('net46'))" />
1110
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Condition="$(TargetFramework.StartsWith('net4'))" />
1211
<PackageReference Include="System.Threading.Tasks.Extensions" Condition="$(TargetFramework) == 'netstandard2.0' or $(TargetFramework) == 'netcoreapp2.0' or $(TargetFrameworkIdentifier) == '.NETFramework'" />
1312
<PackageReference Include="System.Runtime" />
1413
<Reference Include="System.Net.Http" Condition="$(TargetFrameworkIdentifier) == '.NETFramework'" />
1514
<Compile Include="..\Consume\*.cs" />
1615
</ItemGroup>
16+
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
17+
<PackageReference Include="System.Memory" />
18+
</ItemGroup>
19+
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
20+
<PackageReference Include="System.Memory" />
21+
</ItemGroup>
22+
<ItemGroup Condition="'$(TargetFramework)' == 'net47'">
23+
<PackageReference Include="System.Memory" />
24+
</ItemGroup>
25+
<ItemGroup Condition="'$(TargetFramework)' == 'net471'">
26+
<PackageReference Include="System.Memory" />
27+
</ItemGroup>
28+
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
29+
<PackageReference Include="System.Memory" />
30+
</ItemGroup>
31+
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
32+
<PackageReference Include="System.Memory" />
33+
</ItemGroup>
34+
<ItemGroup Condition="'$(TargetFramework)' == 'net481'">
35+
<PackageReference Include="System.Memory" />
36+
</ItemGroup>
37+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
38+
<PackageReference Include="System.Memory" />
39+
</ItemGroup>
40+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
41+
<PackageReference Include="System.Memory" />
42+
</ItemGroup>
43+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.2'">
44+
<PackageReference Include="System.Memory" />
45+
</ItemGroup>
46+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
47+
<PackageReference Include="System.Memory" />
48+
</ItemGroup>
49+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
50+
<PackageReference Include="System.Memory" />
51+
</ItemGroup>
52+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
53+
<PackageReference Include="System.Memory" />
54+
</ItemGroup>
55+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
56+
<PackageReference Include="System.Memory" />
57+
</ItemGroup>
1758
<Import Project="$(SolutionDir)\Polyfill\Polyfill.targets" />
1859
<Import Project="$(SolutionDir)\TestIncludes.targets" />
1960
</Project>

‎src/Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
33
<PropertyGroup>
4+
<NoWarn>CS1591;NETSDK1138;NU1901;NU1902;NU1903;CA1822;CA1847;CA1861;NU1510;NU1608;NU1109</NoWarn>
45
<Version>7.26.0</Version>
56
<AssemblyVersion>1.0.0</AssemblyVersion>
67
<PackageTags>Polyfill</PackageTags>
78
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
89
<SignAssembly>false</SignAssembly>
9-
<NoWarn>CS1591;NETSDK1138;NU1901;NU1902;NU1903;CA1822;CA1847;CA1861;NU1510</NoWarn>
1010
<CheckEolTargetFramework>false</CheckEolTargetFramework>
1111
<LangVersion>preview</LangVersion>
1212
<ImplicitUsings>false</ImplicitUsings>

‎src/Directory.Packages.props

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
<PackageVersion Include="NUnit" Version="3.14.0" />
1111
<PackageVersion Include="NUnit3TestAdapter" Version="5.0.0" />
1212
<PackageVersion Include="ProjectDefaults" Version="1.0.150" />
13-
<PackageVersion Include="Microsoft.Bcl.Memory" Version="9.0.3" />
14-
<PackageVersion Include="System.Memory" Version="4.6.2" />
13+
<PackageVersion Include="Microsoft.Bcl.Memory" Version="9.0.4" />
14+
<PackageVersion Include="System.Memory" Version="4.6.3" />
1515
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
16-
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.6.2" />
16+
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.6.3" />
1717
<PackageVersion Include="System.ValueTuple" Version="4.6.1" />
1818
<PackageVersion Include="System.Runtime" Version="4.3.1" />
1919
<PackageVersion Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />

‎src/PublicTests/PublicTests.csproj

+12-1
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,23 @@
1111
<PackageReference Include="NUnit3TestAdapter" />
1212
<PackageReference Include="Microsoft.NET.Test.Sdk" />
1313
<PackageReference Include="ProjectDefaults" PrivateAssets="all" />
14-
<PackageReference Include="System.Memory" Condition="$(TargetFrameworkIdentifier) == '.NETStandard' or $(TargetFrameworkIdentifier) == '.NETFramework' or $(TargetFramework.StartsWith('netcoreapp'))" />
1514
<PackageReference Include="System.ValueTuple" Condition="$(TargetFramework.StartsWith('net46'))" />
1615
<PackageReference Include="System.Net.Http" Condition="$(TargetFramework.StartsWith('net4'))" />
1716
<PackageReference Include="System.Threading.Tasks.Extensions" Condition="$(TargetFramework) == 'netstandard2.0' or $(TargetFramework) == 'netcoreapp2.0' or $(TargetFrameworkIdentifier) == '.NETFramework'" />
1817
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Condition="$(TargetFramework.StartsWith('net4'))" />
1918
</ItemGroup>
19+
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
20+
<PackageReference Include="System.Memory" />
21+
</ItemGroup>
22+
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
23+
<PackageReference Include="System.Memory" />
24+
</ItemGroup>
25+
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
26+
<PackageReference Include="System.Memory" />
27+
</ItemGroup>
28+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
29+
<PackageReference Include="System.Memory" />
30+
</ItemGroup>
2031
<Import Project="$(SolutionDir)\Polyfill\Polyfill.targets" />
2132
<Import Project="$(SolutionDir)\TestIncludes.targets" />
2233
</Project>

‎src/Tests/Tests.csproj

+12-1
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,24 @@
1010
<PackageReference Include="Microsoft.NET.Test.Sdk" />
1111
<PackageReference Include="MarkdownSnippets.MsBuild" PrivateAssets="all" />
1212
<PackageReference Include="ProjectDefaults" PrivateAssets="all" />
13-
<PackageReference Include="System.Memory" Condition="$(TargetFrameworkIdentifier) == '.NETStandard' or $(TargetFrameworkIdentifier) == '.NETFramework' or $(TargetFramework.StartsWith('netcoreapp3'))" />
1413
<PackageReference Include="System.ValueTuple" Condition="$(TargetFramework.StartsWith('net46'))" />
1514
<PackageReference Include="System.Net.Http" Condition="$(TargetFramework.StartsWith('net4'))" />
1615
<PackageReference Include="System.Threading.Tasks.Extensions" Condition="$(TargetFramework) == 'netstandard2.0' or $(TargetFramework) == 'netcoreapp2.0' or $(TargetFrameworkIdentifier) == '.NETFramework'" />
1716
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Condition="$(TargetFramework.StartsWith('net4'))" />
1817

1918
</ItemGroup>
19+
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
20+
<PackageReference Include="System.Memory" />
21+
</ItemGroup>
22+
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
23+
<PackageReference Include="System.Memory" />
24+
</ItemGroup>
25+
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
26+
<PackageReference Include="System.Memory" />
27+
</ItemGroup>
28+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
29+
<PackageReference Include="System.Memory" />
30+
</ItemGroup>
2031
<Import Project="$(SolutionDir)\Polyfill\Polyfill.targets" />
2132
<Import Project="$(SolutionDir)\TestIncludes.targets" />
2233
</Project>

‎src/UnsafeTests/UnsafeTests.csproj

+12-1
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,23 @@
1111
<PackageReference Include="NUnit3TestAdapter" />
1212
<PackageReference Include="Microsoft.NET.Test.Sdk" />
1313
<PackageReference Include="ProjectDefaults" PrivateAssets="all" />
14-
<PackageReference Include="System.Memory" Condition="$(TargetFrameworkIdentifier) == '.NETStandard' or $(TargetFrameworkIdentifier) == '.NETFramework' or $(TargetFramework.StartsWith('netcoreapp'))" />
1514
<PackageReference Include="System.ValueTuple" Condition="$(TargetFramework.StartsWith('net46'))" />
1615
<PackageReference Include="System.Net.Http" Condition="$(TargetFramework.StartsWith('net4'))" />
1716
<PackageReference Include="System.Threading.Tasks.Extensions" Condition="$(TargetFramework) == 'netstandard2.0' or $(TargetFramework) == 'netcoreapp2.0' or $(TargetFrameworkIdentifier) == '.NETFramework'" />
1817
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Condition="$(TargetFramework.StartsWith('net4'))" />
1918
</ItemGroup>
19+
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
20+
<PackageReference Include="System.Memory" />
21+
</ItemGroup>
22+
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
23+
<PackageReference Include="System.Memory" />
24+
</ItemGroup>
25+
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
26+
<PackageReference Include="System.Memory" />
27+
</ItemGroup>
28+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
29+
<PackageReference Include="System.Memory" />
30+
</ItemGroup>
2031
<Import Project="$(SolutionDir)\Polyfill\Polyfill.targets" />
2132
<Import Project="$(SolutionDir)\TestIncludes.targets" />
2233
</Project>

‎src/global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{
1+
{
22
"sdk": {
33
"version": "10.0.100-preview.3.25156.15",
44
"allowPrerelease": true,

0 commit comments

Comments
 (0)