Skip to content

Remove net461 support #648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 20, 2023
Merged

Remove net461 support #648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b8609f2
Remove all net461 reference package artifacts
MichaelSimons Apr 18, 2023
3d09299
Remove net461 targeting pack
MichaelSimons Apr 18, 2023
5760c13
Remove testing changes
MichaelSimons Apr 18, 2023
6a7191f
Update generator to always exclude net4* tfms
MichaelSimons Apr 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/packageSourceGenerator/PackageSourceGenerator.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
<PackagesTargetDirectory Condition="'$(PackageType)' == 'text'">$(RepoRoot)src\textOnlyPackages\src\</PackagesTargetDirectory>
<!-- The following target frameworks aren't buildable with the current SDK and as they don't contribute to the set of
source build target verticals, can be safely excluded. -->
<ExcludeTargetFrameworks>monoandroid*;monotouch*;net20;net35;net40;net45*;net462;net463;net47*;netcore50;netcoreapp2.0;portable*;uap*;win8;win81;wp8;wpa81;xamarin*</ExcludeTargetFrameworks>
<ExcludeTargetFrameworks>monoandroid*;monotouch*;net20;net35;net4*;netcore50;netcoreapp2.0;portable*;uap*;win8;win81;wp8;wpa81;xamarin*</ExcludeTargetFrameworks>
<!-- The following target frameworks should be excluded even though they are supported by the current SDK because there is no need to have them.
Only exclude them when target frameworks to include aren't provided. -->
<ExcludeTargetFrameworks Condition="'$(IncludeTargetFrameworks)' == ''">$(ExcludeTargetFrameworks);net4*;netcoreapp3.1</ExcludeTargetFrameworks>
<ExcludeTargetFrameworks Condition="'$(IncludeTargetFrameworks)' == ''">$(ExcludeTargetFrameworks);netcoreapp3.1</ExcludeTargetFrameworks>
</PropertyGroup>

<PropertyGroup Condition="'$(PackageName)' != '' and '$(PackageVersion)' != ''">
Expand Down
3 changes: 0 additions & 3 deletions ...rc/microsoft.extensions.logging.console/6.0.0/microsoft.extensions.logging.console.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,5 @@
<dependency id="System.Buffers" version="4.5.1" exclude="Build,Analyzers" />
</group>
</dependencies>
<frameworkAssemblies>
<frameworkAssembly assemblyName="System.Runtime" targetFramework=".NETFramework4.6.1" />
</frameworkAssemblies>
</metadata>
</package>
10 changes: 1 addition & 9 deletions ...es/src/microsoft.extensions.objectpool/6.0.0/Microsoft.Extensions.ObjectPool.6.0.0.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<NuspecFile>$(ArtifactsBinDir)microsoft.extensions.objectpool/6.0.0/microsoft.extensions.objectpool.nuspec</NuspecFile>
<StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
</PropertyGroup>
Expand All @@ -15,10 +15,6 @@
<OutputPath>$(ArtifactsBinDir)microsoft.extensions.objectpool/6.0.0/lib/</OutputPath>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
<OutputPath>$(ArtifactsBinDir)microsoft.extensions.objectpool/6.0.0/lib/</OutputPath>
</PropertyGroup>

<ItemGroup>
<Compile Include="**/ref/$(TargetFramework)/*.cs" />
<Compile Include="**/lib/$(TargetFramework)/*.cs" />
Expand All @@ -28,8 +24,4 @@
<PackageReference Include="NETStandard.Library" Version="$(NETStandardImplicitPackageVersion)" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net461" Version="1.0.2" />
</ItemGroup>

</Project>
1 change: 0 additions & 1 deletion ...Packages/src/microsoft.extensions.objectpool/6.0.0/Microsoft.Extensions.ObjectPool.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ This package was built from the source code at https://github.com/dotnet/aspnetc
<serviceable>true</serviceable>
<repository type="git" url="https://github.com/dotnet/aspnetcore" commit="ae1a6cbe225b99c0bf38b7e31bf60cb653b73a52" />
<dependencies>
<group targetFramework=".NETFramework4.6.1" />
<group targetFramework="net6.0" />
<group targetFramework=".NETStandard2.0" />
</dependencies>
Expand Down
104 changes: 0 additions & 104 deletions ...s/src/microsoft.extensions.objectpool/6.0.0/lib/net461/Microsoft.Extensions.ObjectPool.cs
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions src/referencePackages/src/system.memory/4.5.1/system.memory.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
<dependency id="System.Buffers" version="4.4.0" exclude="Compile" />
<dependency id="System.Runtime.CompilerServices.Unsafe" version="4.5.0" exclude="Compile" />
</group>
<group targetFramework=".NETFramework4.6.1">
<dependency id="System.Buffers" version="4.4.0" exclude="Compile" />
<dependency id="System.Numerics.Vectors" version="4.4.0" exclude="Compile" />
<dependency id="System.Runtime.CompilerServices.Unsafe" version="4.5.0" exclude="Compile" />
</group>
<group targetFramework=".NETCoreApp2.1" />
<group targetFramework=".NETStandard1.1">
<dependency id="NETStandard.Library" version="1.6.1" />
Expand Down
5 changes: 0 additions & 5 deletions src/referencePackages/src/system.memory/4.5.3/system.memory.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
<dependency id="System.Buffers" version="4.4.0" />
<dependency id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" />
</group>
<group targetFramework=".NETFramework4.6.1">
<dependency id="System.Buffers" version="4.4.0" />
<dependency id="System.Numerics.Vectors" version="4.4.0" />
<dependency id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" />
</group>
<group targetFramework=".NETCoreApp2.1" />
<group targetFramework=".NETStandard1.1">
<dependency id="System.Buffers" version="4.4.0" />
Expand Down
14 changes: 1 addition & 13 deletions src/referencePackages/src/system.memory/4.5.5/System.Memory.4.5.5.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard1.1;netstandard2.0;net461</TargetFrameworks>
<TargetFrameworks>netstandard1.1;netstandard2.0</TargetFrameworks>
<NuspecFile>$(ArtifactsBinDir)system.memory/4.5.5/system.memory.nuspec</NuspecFile>
<StrongNameKeyId>Open</StrongNameKeyId>
</PropertyGroup>
Expand All @@ -19,10 +19,6 @@
<OutputPath>$(ArtifactsBinDir)system.memory/4.5.5/lib/</OutputPath>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
<OutputPath>$(ArtifactsBinDir)system.memory/4.5.5/lib/</OutputPath>
</PropertyGroup>

<ItemGroup>
<Compile Include="**/ref/$(TargetFramework)/*.cs" />
<Compile Include="**/lib/$(TargetFramework)/*.cs" />
Expand All @@ -47,12 +43,4 @@
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.3" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
<PackageReference Include="System.Buffers" Version="4.5.1" />
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.3" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net461" Version="1.0.2" />
<Reference Include="System" />
</ItemGroup>

</Project>
Loading