Skip to content

Commit be5787e

Browse files
authored
runtime: remove netcoreapp2.x targets (#1890)
1 parent 5deb944 commit be5787e

8 files changed

+616
-50
lines changed

patches/arcade/0013-Don-t-build-SourceBuild.Tasks-for-net472.patch

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

patches/arcade/0016-remove-netcoreapp2.x-targets.patch

Lines changed: 223 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
From a158ba6c9bdf7465264a5de8ee62e5d3572b961a Mon Sep 17 00:00:00 2001
2+
From: Tom Deseyn <[email protected]>
3+
Date: Thu, 12 Nov 2020 15:51:37 +0100
4+
Subject: [PATCH] nuget.client: build for .NET 5
5+
6+
---
7+
build/common.project.props | 4 ++--
8+
build/packages.targets | 4 ++--
9+
src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj | 2 +-
10+
3 files changed, 5 insertions(+), 5 deletions(-)
11+
12+
diff --git a/build/common.project.props b/build/common.project.props
13+
index 03c93ae65..4679fd57a 100644
14+
--- a/build/common.project.props
15+
+++ b/build/common.project.props
16+
@@ -13,11 +13,11 @@
17+
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
18+
<NETFXTargetFrameworkVersion>v4.7.2</NETFXTargetFrameworkVersion>
19+
<NETFXTargetFramework>net472</NETFXTargetFramework>
20+
- <NETCoreTargetFramework>netcoreapp2.1</NETCoreTargetFramework>
21+
+ <NETCoreTargetFramework>netcoreapp5.0</NETCoreTargetFramework>
22+
<NETCoreTargetFrameworksForSigning>$(NETCoreTargetFramework);netcoreapp5.0</NETCoreTargetFrameworksForSigning>
23+
<IsBuildOnlyXPLATProjects>$(DotNetBuildFromSource)</IsBuildOnlyXPLATProjects>
24+
<NETCoreTestTargetFramework>netcoreapp5.0</NETCoreTestTargetFramework>
25+
- <NetStandardVersion>netstandard2.0</NetStandardVersion>
26+
+ <NetStandardVersion>netcoreapp5.0</NetStandardVersion>
27+
<TargetFrameworksExe>$(NETFXTargetFramework);$(NETCoreTargetFramework)</TargetFrameworksExe>
28+
<TargetFrameworksExe Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">$(NETCoreTargetFramework)</TargetFrameworksExe>
29+
<TargetFrameworksExeForSigning>$(TargetFrameworksExe);netcoreapp5.0</TargetFrameworksExeForSigning>
30+
diff --git a/build/packages.targets b/build/packages.targets
31+
index 873850ccb..baa369e09 100644
32+
--- a/build/packages.targets
33+
+++ b/build/packages.targets
34+
@@ -8,7 +8,7 @@
35+
<VSServicesVersion>16.153.0</VSServicesVersion>
36+
<VSThreadingVersion>16.7.56</VSThreadingVersion>
37+
<!-- TODO - remove this when temporary patching is no longer necessary. See https://github.com/nuget/home/issues/8952 -->
38+
- <PatchedSystemPackagesVersion>5.0.0-preview.3.20214.6</PatchedSystemPackagesVersion>
39+
+ <PatchedSystemPackagesVersion>5.0.0</PatchedSystemPackagesVersion>
40+
</PropertyGroup>
41+
42+
<!-- Test and package versions -->
43+
@@ -66,7 +66,7 @@
44+
<PackageReference Update="System.Diagnostics.Debug" Version="$(SystemPackagesVersion)" />
45+
<PackageReference Update="System.Security.Cryptography.Pkcs" Version="$(PatchedSystemPackagesVersion)" />
46+
<PackageReference Update="System.Security.Cryptography.Cng" Version="$(PatchedSystemPackagesVersion)" />
47+
- <PackageReference Update="System.Security.Cryptography.ProtectedData" Version="4.4.0" />
48+
+ <PackageReference Update="System.Security.Cryptography.ProtectedData" Version="$(PatchedSystemPackagesVersion)" />
49+
<PackageReference Update="System.Threading.Tasks.Dataflow" Version="4.9.0" />
50+
<PackageReference Update="VSLangProj" Version="7.0.3300" />
51+
<PackageReference Update="VSLangProj110" Version="11.0.61030" />
52+
diff --git a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj
53+
index 4f3ac234c..1ad241531 100644
54+
--- a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj
55+
+++ b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj
56+
@@ -4,7 +4,7 @@
57+
58+
<PropertyGroup>
59+
<Description>NuGet's understanding of target frameworks.</Description>
60+
- <TargetFrameworks>$(TargetFrameworksLibrary)</TargetFrameworks>
61+
+ <TargetFrameworks>netstandard2.0</TargetFrameworks>
62+
<TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' != 'true'">$(TargetFrameworks);net40;net45</TargetFrameworks>
63+
<TargetFramework />
64+
<NoWarn>$(NoWarn);CS1591;CS1574;CS1573</NoWarn>
65+
--
66+
2.26.2
67+

patches/runtime/0005-Update-empty-proj-to-netcoreapp2.1.patch

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

0 commit comments

Comments
 (0)