Skip to content

Commit de7578c

Browse files
Remove net461 support (dotnet#644)
* Remove all net461 reference package artifacts * Remove net461 targeting pack * Remove testing changes * Update generator to always exclude net4* tfms
1 parent 483a9c6 commit de7578c

File tree

210 files changed

+5
-3769457
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

210 files changed

+5
-3769457
lines changed

src/packageSourceGenerator/PackageSourceGenerator.proj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
<PackagesTargetDirectory Condition="'$(PackageType)' == 'text'">$(RepoRoot)src\textOnlyPackages\src\</PackagesTargetDirectory>
99
<!-- The following target frameworks aren't buildable with the current SDK and as they don't contribute to the set of
1010
source build target verticals, can be safely excluded. -->
11-
<ExcludeTargetFrameworks>monoandroid*;monotouch*;net20;net35;net40;net45*;net462;net463;net47*;netcore50;netcoreapp2.0;portable*;uap*;win8;win81;wp8;wpa81;xamarin*</ExcludeTargetFrameworks>
11+
<ExcludeTargetFrameworks>monoandroid*;monotouch*;net20;net35;net4*;netcore50;netcoreapp2.0;portable*;uap*;win8;win81;wp8;wpa81;xamarin*</ExcludeTargetFrameworks>
1212
<!-- The following target frameworks should be excluded even though they are supported by the current SDK because there is no need to have them.
1313
Only exclude them when target frameworks to include aren't provided. -->
14-
<ExcludeTargetFrameworks Condition="'$(IncludeTargetFrameworks)' == ''">$(ExcludeTargetFrameworks);net4*;netcoreapp3.1</ExcludeTargetFrameworks>
14+
<ExcludeTargetFrameworks Condition="'$(IncludeTargetFrameworks)' == ''">$(ExcludeTargetFrameworks);netcoreapp3.1</ExcludeTargetFrameworks>
1515
</PropertyGroup>
1616

1717
<PropertyGroup Condition="'$(PackageName)' != '' and '$(PackageVersion)' != ''">

src/referencePackages/src/microsoft.extensions.logging.console/6.0.0/microsoft.extensions.logging.console.nuspec

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,5 @@
3232
<dependency id="System.Buffers" version="4.5.1" exclude="Build,Analyzers" />
3333
</group>
3434
</dependencies>
35-
<frameworkAssemblies>
36-
<frameworkAssembly assemblyName="System.Runtime" targetFramework=".NETFramework4.6.1" />
37-
</frameworkAssemblies>
3835
</metadata>
3936
</package>
Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
55
<NuspecFile>$(ArtifactsBinDir)microsoft.extensions.objectpool/6.0.0/microsoft.extensions.objectpool.nuspec</NuspecFile>
66
<StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
77
</PropertyGroup>
@@ -15,10 +15,6 @@
1515
<OutputPath>$(ArtifactsBinDir)microsoft.extensions.objectpool/6.0.0/lib/</OutputPath>
1616
</PropertyGroup>
1717

18-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
19-
<OutputPath>$(ArtifactsBinDir)microsoft.extensions.objectpool/6.0.0/lib/</OutputPath>
20-
</PropertyGroup>
21-
2218
<ItemGroup>
2319
<Compile Include="**/ref/$(TargetFramework)/*.cs" />
2420
<Compile Include="**/lib/$(TargetFramework)/*.cs" />
@@ -28,8 +24,4 @@
2824
<PackageReference Include="NETStandard.Library" Version="$(NETStandardImplicitPackageVersion)" />
2925
</ItemGroup>
3026

31-
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
32-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net461" Version="1.0.2" />
33-
</ItemGroup>
34-
3527
</Project>

src/referencePackages/src/microsoft.extensions.objectpool/6.0.0/Microsoft.Extensions.ObjectPool.nuspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ This package was built from the source code at https://github.com/dotnet/aspnetc
1616
<serviceable>true</serviceable>
1717
<repository type="git" url="https://github.com/dotnet/aspnetcore" commit="ae1a6cbe225b99c0bf38b7e31bf60cb653b73a52" />
1818
<dependencies>
19-
<group targetFramework=".NETFramework4.6.1" />
2019
<group targetFramework="net6.0" />
2120
<group targetFramework=".NETStandard2.0" />
2221
</dependencies>

src/referencePackages/src/microsoft.extensions.objectpool/6.0.0/lib/net461/Microsoft.Extensions.ObjectPool.cs

Lines changed: 0 additions & 104 deletions
This file was deleted.

src/referencePackages/src/system.memory/4.5.1/system.memory.nuspec

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
3636
<dependency id="System.Buffers" version="4.4.0" exclude="Compile" />
3737
<dependency id="System.Runtime.CompilerServices.Unsafe" version="4.5.0" exclude="Compile" />
3838
</group>
39-
<group targetFramework=".NETFramework4.6.1">
40-
<dependency id="System.Buffers" version="4.4.0" exclude="Compile" />
41-
<dependency id="System.Numerics.Vectors" version="4.4.0" exclude="Compile" />
42-
<dependency id="System.Runtime.CompilerServices.Unsafe" version="4.5.0" exclude="Compile" />
43-
</group>
4439
<group targetFramework=".NETCoreApp2.1" />
4540
<group targetFramework=".NETStandard1.1">
4641
<dependency id="NETStandard.Library" version="1.6.1" />

src/referencePackages/src/system.memory/4.5.3/system.memory.nuspec

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
3636
<dependency id="System.Buffers" version="4.4.0" />
3737
<dependency id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" />
3838
</group>
39-
<group targetFramework=".NETFramework4.6.1">
40-
<dependency id="System.Buffers" version="4.4.0" />
41-
<dependency id="System.Numerics.Vectors" version="4.4.0" />
42-
<dependency id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" />
43-
</group>
4439
<group targetFramework=".NETCoreApp2.1" />
4540
<group targetFramework=".NETStandard1.1">
4641
<dependency id="System.Buffers" version="4.4.0" />

src/referencePackages/src/system.memory/4.5.5/System.Memory.4.5.5.csproj

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard1.1;netstandard2.0;net461</TargetFrameworks>
4+
<TargetFrameworks>netstandard1.1;netstandard2.0</TargetFrameworks>
55
<NuspecFile>$(ArtifactsBinDir)system.memory/4.5.5/system.memory.nuspec</NuspecFile>
66
<StrongNameKeyId>Open</StrongNameKeyId>
77
</PropertyGroup>
@@ -19,10 +19,6 @@
1919
<OutputPath>$(ArtifactsBinDir)system.memory/4.5.5/lib/</OutputPath>
2020
</PropertyGroup>
2121

22-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
23-
<OutputPath>$(ArtifactsBinDir)system.memory/4.5.5/lib/</OutputPath>
24-
</PropertyGroup>
25-
2622
<ItemGroup>
2723
<Compile Include="**/ref/$(TargetFramework)/*.cs" />
2824
<Compile Include="**/lib/$(TargetFramework)/*.cs" />
@@ -47,12 +43,4 @@
4743
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.3" />
4844
</ItemGroup>
4945

50-
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
51-
<PackageReference Include="System.Buffers" Version="4.5.1" />
52-
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
53-
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.3" />
54-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net461" Version="1.0.2" />
55-
<Reference Include="System" />
56-
</ItemGroup>
57-
5846
</Project>

0 commit comments

Comments
 (0)