mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove workaround now that NuGet builds fullfx.

Browse source
This commit is contained in:
Chris Rummel 2021-10-25 10:11:06 -05:00
parent 77928ad73e
commit 278e5b5027
No known key found for this signature in database
GPG key ID: DB9B2B231CB67DC7
1 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/SourceBuild/tarball/patches/sdk/0001-Build-Microsoft.NET.Build.Tasks-for-netfx.patch
View file

@ -1,4 +1,4 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 3540e85a194dda1e5448e0aab3212c8aeb5a1aff Mon Sep 17 00:00:00 2001
From: Eric Erhardt <eric.erhardt@microsoft.com> From: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Fri, 22 Oct 2021 20:48:25 +0000 Date: Fri, 22 Oct 2021 20:48:25 +0000
Subject: [PATCH] Build Microsoft.NET.Build.Tasks for netfx Subject: [PATCH] Build Microsoft.NET.Build.Tasks for netfx
@ -7,11 +7,11 @@ Required for omnisharp to work with a source-built .NET SDK.
Patch removal issue: https://github.com/dotnet/sdk/issues/22281 Patch removal issue: https://github.com/dotnet/sdk/issues/22281
--- ---
.../Microsoft.DotNet.Compatibility.csproj | 1 - .../Microsoft.DotNet.Compatibility.csproj | 1 -
.../Microsoft.DotNet.PackageValidation.csproj | 7 ++++++- .../Microsoft.DotNet.PackageValidation.csproj | 1 -
.../Microsoft.NET.Build.Extensions.Tasks.csproj | 1 - .../Microsoft.NET.Build.Extensions.Tasks.csproj | 1 -
.../Microsoft.NET.Build.Tasks.csproj | 1 - .../Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj | 1 -
4 files changed, 6 insertions(+), 4 deletions(-) 4 files changed, 4 deletions(-)
diff --git a/src/Compatibility/Microsoft.DotNet.Compatibility/Microsoft.DotNet.Compatibility.csproj b/src/Compatibility/Microsoft.DotNet.Compatibility/Microsoft.DotNet.Compatibility.csproj diff --git a/src/Compatibility/Microsoft.DotNet.Compatibility/Microsoft.DotNet.Compatibility.csproj b/src/Compatibility/Microsoft.DotNet.Compatibility/Microsoft.DotNet.Compatibility.csproj
index 92624be845..f9f8e46329 100644 index 92624be845..f9f8e46329 100644
@ -26,7 +26,7 @@ index 92624be845..f9f8e46329 100644
<IsShippingPackage>true</IsShippingPackage> <IsShippingPackage>true</IsShippingPackage>
<StrongNameKeyId>Open</StrongNameKeyId> <StrongNameKeyId>Open</StrongNameKeyId>
diff --git a/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj b/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj diff --git a/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj b/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj
index 7a8b648652..4f820adb72 100644 index 7a8b648652..4241f4577e 100644
--- a/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj --- a/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj
+++ b/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj +++ b/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj
@@ -2,7 +2,6 @@ @@ -2,7 +2,6 @@
@ -37,19 +37,6 @@ index 7a8b648652..4f820adb72 100644
<StrongNameKeyId>Open</StrongNameKeyId> <StrongNameKeyId>Open</StrongNameKeyId>
</PropertyGroup> </PropertyGroup>
@@ -15,6 +14,12 @@
<ProjectReference Include="..\Microsoft.DotNet.ApiCompatibility\Microsoft.DotNet.ApiCompatibility.csproj" />
</ItemGroup>
+ <!-- This is working around a source-build issue with NuGet. Since NuGet isn't building for netfx in source-build, this reference isn't getting set automatically -->
+ <!-- This can be removed once NuGet builds for netfx in source-build. -->
+ <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
+ <Reference Include="System.IO.Compression" />
+ </ItemGroup>
+
<ItemGroup>
<EmbeddedResource Update="Resources.resx" GenerateSource="true" />
</ItemGroup>
diff --git a/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj diff --git a/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj
index 13ada82225..280fbdc83e 100644 index 13ada82225..280fbdc83e 100644
--- a/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj --- a/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj
@ -74,3 +61,6 @@ index 604ef43bf2..bce39c67d4 100644
<Nullable>annotations</Nullable> <Nullable>annotations</Nullable>
</PropertyGroup> </PropertyGroup>
--
2.31.1