Skip to content

Remove netcoreapp2.1 artifacts and support #674

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
MichaelSimons merged 4 commits into from
May 22, 2023
Merged

Remove netcoreapp2.1 artifacts and support #674

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
7eb85f3
Remove all reference package artifacts
MichaelSimons May 16, 2023
1311170
Remove target pack
MichaelSimons May 16, 2023
9f39ae5
Remove generator support
MichaelSimons May 16, 2023
4708667
Merge branch 'main' into cleanup-netcoreapp2.1
MichaelSimons May 22, 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
2 changes: 1 addition & 1 deletion src/packageSourceGenerator/PackageSourceGenerator.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<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;net4*;netcore50;netcoreapp2.0;portable*;uap*;win8;win81;wp8;wpa81;xamarin*</ExcludeTargetFrameworks>
<ExcludeTargetFrameworks>monoandroid*;monotouch*;net20;net35;net4*;netcore50;netcoreapp2.*;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);netcoreapp3.1</ExcludeTargetFrameworks>
Expand Down
1 change: 0 additions & 1 deletion ...encePackages/src/microsoft.bcl.asyncinterfaces/1.1.0/microsoft.bcl.asyncinterfaces.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<serviceable>true</serviceable>
<dependencies>
<group targetFramework=".NETCoreApp2.1" />
<group targetFramework=".NETStandard2.0">
<dependency id="System.Threading.Tasks.Extensions" version="4.5.2" />
</group>
Expand Down
1 change: 0 additions & 1 deletion ...encePackages/src/microsoft.bcl.asyncinterfaces/5.0.0/microsoft.bcl.asyncinterfaces.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
<serviceable>true</serviceable>
<repository type="git" url="git://github.com/dotnet/runtime" commit="cf258a14b70ad9069470a108f13765e0e5988f51" />
<dependencies>
<group targetFramework=".NETCoreApp2.1" />
<group targetFramework=".NETStandard2.0">
<dependency id="System.Threading.Tasks.Extensions" version="4.5.4" />
</group>
Expand Down
2 changes: 1 addition & 1 deletion src/referencePackages/src/microsoft.bcl.hashcode/1.1.1/Microsoft.Bcl.HashCode.1.1.1.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;netstandard2.1;netcoreapp2.1</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
<NuspecFile>$(ArtifactsBinDir)microsoft.bcl.hashcode/1.1.1/microsoft.bcl.hashcode.nuspec</NuspecFile>
<StrongNameKeyId>Open</StrongNameKeyId>
<DisableImplicitFrameworkReferences>false</DisableImplicitFrameworkReferences>
Expand Down
1 change: 0 additions & 1 deletion src/referencePackages/src/microsoft.bcl.hashcode/1.1.1/microsoft.bcl.hashcode.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<serviceable>true</serviceable>
<dependencies>
<group targetFramework=".NETCoreApp2.1" />
<group targetFramework=".NETStandard2.0" />
<group targetFramework=".NETStandard2.1" />
</dependencies>
Expand Down
32 changes: 0 additions & 32 deletions ...encePackages/src/microsoft.bcl.hashcode/1.1.1/ref/netcoreapp2.1/Microsoft.Bcl.HashCode.cs
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions src/referencePackages/src/microsoft.build/15.7.179/microsoft.build.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,6 @@
<serviceable>true</serviceable>
<repository url="https://github.com/microsoft/msbuild" />
<dependencies>
<group targetFramework=".NETCoreApp2.1">
<dependency id="Microsoft.Build.Framework" version="15.7.179" exclude="Build,Analyzers" />
<dependency id="System.Collections.Immutable" version="1.3.1" exclude="Build,Analyzers" />
<dependency id="System.Diagnostics.TraceSource" version="4.0.0" exclude="Build,Analyzers" />
<dependency id="System.IO.Compression" version="4.3.0" exclude="Build,Analyzers" />
<dependency id="System.IO.Pipes.AccessControl" version="4.3.0" exclude="Build,Analyzers" />
<dependency id="System.Reflection.Metadata" version="1.3.0" exclude="Build,Analyzers" />
<dependency id="System.Reflection.TypeExtensions" version="4.1.0" exclude="Build,Analyzers" />
<dependency id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" exclude="Build,Analyzers" />
<dependency id="System.Runtime.Loader" version="4.0.0" exclude="Build,Analyzers" />
<dependency id="System.Security.Principal.Windows" version="4.3.0" exclude="Build,Analyzers" />
<dependency id="System.Text.Encoding.CodePages" version="4.0.1" exclude="Build,Analyzers" />
<dependency id="System.Threading.Tasks.Dataflow" version="4.6.0" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETStandard2.0">
<dependency id="Microsoft.Build.Framework" version="15.7.179" exclude="Build,Analyzers" />
<dependency id="System.Collections.Immutable" version="1.3.1" exclude="Build,Analyzers" />
Expand Down
4 changes: 0 additions & 4 deletions src/referencePackages/src/microsoft.win32.registry/4.7.0/microsoft.win32.registry.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
<dependency id="System.Security.AccessControl" version="4.7.0" />
<dependency id="System.Security.Principal.Windows" version="4.7.0" />
</group>
<group targetFramework=".NETCoreApp2.1">
<dependency id="System.Security.AccessControl" version="4.7.0" />
<dependency id="System.Security.Principal.Windows" version="4.7.0" />
</group>
<group targetFramework=".NETStandard1.3">
<dependency id="NETStandard.Library" version="1.6.1" />
</group>
Expand Down
4 changes: 0 additions & 4 deletions src/referencePackages/src/microsoft.win32.registry/5.0.0/microsoft.win32.registry.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
<dependency id="System.Security.AccessControl" version="5.0.0" />
<dependency id="System.Security.Principal.Windows" version="5.0.0" />
</group>
<group targetFramework=".NETCoreApp2.1">
<dependency id="System.Security.AccessControl" version="5.0.0" />
<dependency id="System.Security.Principal.Windows" version="5.0.0" />
</group>
<group targetFramework=".NETStandard1.3">
<dependency id="NETStandard.Library" version="1.6.1" />
</group>
Expand Down
1 change: 0 additions & 1 deletion ...erencePackages/src/system.collections.immutable/5.0.0/system.collections.immutable.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ System.Collections.Immutable.ImmutableStack&lt;T&gt;</description>
<dependency id="NETStandard.Library" version="1.6.1" />
<dependency id="System.Memory" version="4.5.4" />
</group>
<group targetFramework=".NETCoreApp2.1" />
<group targetFramework=".NETStandard1.0">
<dependency id="NETStandard.Library" version="1.6.1" />
</group>
Expand Down
10 changes: 1 addition & 9 deletions src/referencePackages/src/system.data.sqlclient/4.8.5/System.Data.SqlClient.4.8.5.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,9 @@

<PropertyGroup>
<!-- Upgraded TFM from netcoreapp2.1 to net6.0 to minimize dependencies and avoid a dependency on netcoreapp2.1. -->
<!-- TODO: Remove netcoreapp2.1 TFM after the change is consumed by runtime. -->
<TargetFrameworks>net6.0;netcoreapp2.1</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<AssemblyName>System.Data.SqlClient</AssemblyName>
<ProjectTemplateVersion>2</ProjectTemplateVersion>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
<PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.7.0" />
<PackageReference Include="System.Security.Principal.Windows" Version="4.7.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0" />
</ItemGroup>

</Project>
Loading