Remove source-build patches that were backported
This commit is contained in:
MichaelSimons
parent
abff1f8b19
commit
5ad51d6f86
3 changed files with 0 additions and 94 deletions
|
|
@ -1,28 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: MichaelSimons <msimons@microsoft.com>
|
||||
Date: Tue, 23 Nov 2021 16:13:36 +0000
|
||||
Subject: [PATCH] Update System.Threading.Tasks.DataFlow version
|
||||
|
||||
Addresses:
|
||||
NuGet.Build.Tasks.csproj : error NU1605: Detected package downgrade: System.Threading.Tasks.Dataflow from 6.0.0 to 4.9.0. Reference the package directly from the project to select a different version. [src/nuget-client.a998efecd431ec8a41536b5ac0152c16f1e2e646/build/restorehelper.targets]
|
||||
NuGet.Build.Tasks.csproj : error NU1605: NuGet.Build.Tasks -> Microsoft.Build.Tasks.Core 17.1.0-preview-21572-15 -> System.Threading.Tasks.Dataflow (>= 6.0.0) [src/nuget-client.a998efecd431ec8a41536b5ac0152c16f1e2e646/build/restorehelper.targets]
|
||||
NuGet.Build.Tasks.csproj : error NU1605: NuGet.Build.Tasks -> System.Threading.Tasks.Dataflow (>= 4.9.0) [src/nuget-client.a998efecd431ec8a41536b5ac0152c16f1e2e646/build/restorehelper.targets]
|
||||
|
||||
Backport issue: https://github.com/dotnet/source-build/issues/2311
|
||||
---
|
||||
build/packages.targets | 2 +-
|
||||
1 file changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/build/packages.targets b/build/packages.targets
|
||||
index a0aa4cc..ef5a1cc 100644
|
||||
--- a/build/packages.targets
|
||||
+++ b/build/packages.targets
|
||||
@@ -58,7 +59,7 @@
|
||||
<PackageReference Update="System.Security.Cryptography.Cng" Version="$(CryptographyPackagesVersion)" />
|
||||
<PackageReference Update="System.Security.Cryptography.Pkcs" Version="$(CryptographyPackagesVersion)" />
|
||||
<PackageReference Update="System.Security.Cryptography.ProtectedData" Version="4.4.0" />
|
||||
- <PackageReference Update="System.Threading.Tasks.Dataflow" Version="4.9.0" />
|
||||
+ <PackageReference Update="System.Threading.Tasks.Dataflow" Version="6.0.0" />
|
||||
<PackageReference Update="VSSDK.TemplateWizardInterface" Version="12.0.4" />
|
||||
<PackageReference Update="VsWebSite.Interop" Version="$(VSFrameworkVersion)" />
|
||||
<PackageReference Update="Microsoft.Net.Compilers.Toolset" Version="3.9.0" />
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
From 7260c572b1ce424f7ff3a64aa3227417c6a7a676 Mon Sep 17 00:00:00 2001
|
||||
From: Logan Bussell <36081148+lbussell@users.noreply.github.com>
|
||||
Date: Fri, 8 Oct 2021 00:56:41 +0000
|
||||
Subject: [PATCH] remove Microsoft.DotNet prebuilts
|
||||
|
||||
Pull request for applying this patch: https://github.com/dotnet/roslyn/pull/57159
|
||||
---
|
||||
eng/Tools.props | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/eng/Tools.props b/eng/Tools.props
|
||||
index 1579b510558..944448855ee 100644
|
||||
--- a/eng/Tools.props
|
||||
+++ b/eng/Tools.props
|
||||
@@ -1,6 +1,6 @@
|
||||
<Project>
|
||||
|
||||
- <ItemGroup>
|
||||
+ <ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
|
||||
<!--
|
||||
This package would normally be restored by the Arcade SDK, but it is not included during restore operations
|
||||
if the -package flag is not also provided during the build. Roslyn separates the restore operation from the
|
||||
--
|
||||
2.30.2
|
||||
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Davis Goodin <dagood@microsoft.com>
|
||||
Date: Tue, 19 Oct 2021 19:38:52 -0500
|
||||
Subject: [PATCH] Disable apphost build of 'csi', 'vbi' for source-build
|
||||
|
||||
Creating an apphost for a netcoreapp3.1 project uses the apphost pack as a
|
||||
prebuilt. Stopping these projects from creating the apphost removes the prebuilt
|
||||
for source-build.
|
||||
|
||||
See: https://github.com/dotnet/roslyn/issues/57233
|
||||
|
||||
PR: https://github.com/dotnet/roslyn/pull/57306
|
||||
---
|
||||
src/Interactive/csi/csi.csproj | 1 +
|
||||
src/Interactive/vbi/vbi.vbproj | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/Interactive/csi/csi.csproj b/src/Interactive/csi/csi.csproj
|
||||
index 3970bb4e9ea..e96beb550d2 100644
|
||||
--- a/src/Interactive/csi/csi.csproj
|
||||
+++ b/src/Interactive/csi/csi.csproj
|
||||
@@ -6,6 +6,7 @@
|
||||
<OutputType>Exe</OutputType>
|
||||
<RootNamespace>CSharpInteractive</RootNamespace>
|
||||
<TargetFrameworks>net6.0;net472</TargetFrameworks>
|
||||
+ <UseAppHost Condition="'$(DotNetBuildFromSource)' == 'true'">false</UseAppHost>
|
||||
</PropertyGroup>
|
||||
<ItemGroup Label="Project References">
|
||||
<ProjectReference Include="..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" />
|
||||
diff --git a/src/Interactive/vbi/vbi.vbproj b/src/Interactive/vbi/vbi.vbproj
|
||||
index 5bbdf7f03a7..5f732d71534 100644
|
||||
--- a/src/Interactive/vbi/vbi.vbproj
|
||||
+++ b/src/Interactive/vbi/vbi.vbproj
|
||||
@@ -6,6 +6,7 @@
|
||||
<OutputType>Exe</OutputType>
|
||||
<StartupObject>Sub Main</StartupObject>
|
||||
<TargetFrameworks>net6.0;net472</TargetFrameworks>
|
||||
+ <UseAppHost Condition="'$(DotNetBuildFromSource)' == 'true'">false</UseAppHost>
|
||||
<RootNamespace></RootNamespace>
|
||||
</PropertyGroup>
|
||||
<ItemGroup Label="Project References">
|
||||
Loading…
Add table
Reference in a new issue