Skip to content

Commit 6879887

Browse files
dagooddagood
committed
Add sdk bootstrap fix; regen patches to fix order
1 parent 3ad23f3 commit 6879887

18 files changed

+134
-83
lines changed

‎patches/sdk/0001-Add-missing-PlatformAbstractions-reference.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 7561d7b66859d9a07205315cbb1da84f5c41ea43 Mon Sep 17 00:00:00 2001
1+
From 5ddc8ad1a28c543b131dd184342fd94723e3e628 Mon Sep 17 00:00:00 2001
22
From: Chris Rummel <[email protected]>
33
Date: Thu, 23 May 2019 01:20:00 -0500
4-
Subject: [PATCH 01/10] Add missing PlatformAbstractions reference.
4+
Subject: [PATCH] Add missing PlatformAbstractions reference.
55

66
---
77
.../Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj | 1 +
@@ -20,5 +20,5 @@ index ecc4d885c..a85e1a3c0 100644
2020
<PackageReference Include="NuGet.ProjectModel" Version="$(NuGetProjectModelVersion)" />
2121
<PackageReference Include="NuGet.Build.Tasks.Pack" Version="$(NuGetBuildTasksPackageVersion)" ExcludeAssets="All" />
2222
--
23-
2.18.2
23+
2.25.4
2424

‎patches/sdk/0002-Use-ref-only-msbuild-packages.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 830b02b72b1db735313996d506d44c51fc4850d8 Mon Sep 17 00:00:00 2001
1+
From bb9b454cb9c20a9c6562e203f446b136a807bb9a Mon Sep 17 00:00:00 2001
22
From: Nikola Milosavljevic <[email protected]>
33
Date: Wed, 21 Aug 2019 21:36:24 +0000
4-
Subject: [PATCH 02/10] Use ref-only msbuild packages
4+
Subject: [PATCH] Use ref-only msbuild packages
55

66
---
77
.../Microsoft.NET.Build.Extensions.Tasks.csproj | 5 +++--
@@ -43,5 +43,5 @@ index a85e1a3c0..3f345a481 100644
4343
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="$(MicrosoftDotNetPlatformAbstractionsPackageVersion)" />
4444
<PackageReference Include="Microsoft.NET.HostModel" Version="$(MicrosoftNETHostModelVersion)" />
4545
--
46-
2.18.2
46+
2.25.4
4747

‎patches/sdk/0003-Conditionally-include-PrecompileScript.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 56809a40c3855837b92b1959ae57437e2dc5cdc1 Mon Sep 17 00:00:00 2001
1+
From c1ec6ffdeb85e7fc1f4652b85b721b084f0ae97d Mon Sep 17 00:00:00 2001
22
From: dseefeld <[email protected]>
33
Date: Sat, 20 Jun 2020 18:54:24 -0400
4-
Subject: [PATCH 03/10] Conditionally include PrecompileScript
4+
Subject: [PATCH] Conditionally include PrecompileScript
55

66
---
77
.../ArgumentForwarding.Tests/ArgumentForwarding.Tests.csproj | 2 +-
@@ -21,5 +21,5 @@ index da033cd6b..ab7ff3133 100644
2121
BuildInParallel="False"
2222
Projects="../ArgumentsReflector/ArgumentsReflector.csproj"
2323
--
24-
2.18.2
24+
2.25.4
2525

‎patches/sdk/0004-Update-versions-of-Microsoft.Build-packages.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From bd81cda54247cab54dfab7f798221d1f38c4581d Mon Sep 17 00:00:00 2001
1+
From aa5f3a1150067505060cdd2346286123cbe64ed9 Mon Sep 17 00:00:00 2001
22
From: dseefeld <[email protected]>
33
Date: Sat, 20 Jun 2020 18:56:37 -0400
4-
Subject: [PATCH 04/10] Update versions of Microsoft.Build packages
4+
Subject: [PATCH] Update versions of Microsoft.Build packages
55

66
---
77
.../Microsoft.DotNet.Cli.Utils.csproj | 4 ++--
@@ -23,5 +23,5 @@ index 87a1be5ab..513b246b9 100644
2323

2424
</Project>
2525
--
26-
2.18.2
26+
2.25.4
2727

‎patches/sdk/0005-Add-reference-and-update-to-use-PVP.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From a85f88ee3eae71ad9d18ac75dd7533aa58faa2a5 Mon Sep 17 00:00:00 2001
1+
From 95ef2d0f2d0feada1c7d620b04d9394d7e73325b Mon Sep 17 00:00:00 2001
22
From: dseefeld <[email protected]>
33
Date: Sat, 20 Jun 2020 19:00:57 -0400
4-
Subject: [PATCH 05/10] Add reference and update to use PVP
4+
Subject: [PATCH] Add reference and update to use PVP
55

66
---
77
.../Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj | 1 +
@@ -20,5 +20,5 @@ index 513b246b9..ec9bfa366 100644
2020

2121
</Project>
2222
--
23-
2.18.2
23+
2.25.4
2424

‎patches/sdk/0008-Remove-test-project.patch renamed to ‎patches/sdk/0006-Remove-test-project.patch

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
From 9361b036fc86774a5268394c867be04a002efa95 Mon Sep 17 00:00:00 2001
1+
From e2b2c391df3466b6b71d07bac9fc2d7f3911912f Mon Sep 17 00:00:00 2001
22
From: dseefeld <[email protected]>
33
Date: Wed, 30 Sep 2020 22:05:26 +0000
44
Subject: [PATCH] Remove test project.
55

66
---
7-
sdk.sln | 168 ---------------------
8-
.../v1/dotnet-hello/dotnet-hello.csproj | 17 +--
9-
.../v2/dotnet-hello/dotnet-hello.csproj | 16 +-
10-
.../BuildTestPackages.targets | 16 --
7+
sdk.sln | 168 ------------------
8+
.../v1/dotnet-hello/dotnet-hello.csproj | 17 +-
9+
.../v2/dotnet-hello/dotnet-hello.csproj | 16 +-
10+
.../BuildTestPackages.targets | 16 --
1111
4 files changed, 2 insertions(+), 215 deletions(-)
1212

1313
diff --git a/sdk.sln b/sdk.sln
14-
index 5599dc0..fb666c1 100644
14+
index 7de14e012..2d0be5859 100644
1515
--- a/sdk.sln
1616
+++ b/sdk.sln
17-
@@ -32,11 +32,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tasks", "Tasks", "{1FEED16D
17+
@@ -33,11 +33,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tasks", "Tasks", "{1FEED16D
1818
EndProject
1919
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Build.Extensions.Tasks", "src\Tasks\Microsoft.NET.Build.Extensions.Tasks\Microsoft.NET.Build.Extensions.Tasks.csproj", "{61C31F8E-FE7C-47CC-B21C-3DEE499AD6F5}"
2020
EndProject
@@ -26,7 +26,7 @@ index 5599dc0..fb666c1 100644
2626
EndProject
2727
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{580D1AE7-AA8F-4912-8B76-105594E00B3B}"
2828
EndProject
29-
@@ -45,28 +43,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{529365
29+
@@ -46,28 +44,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{529365
3030
src\Tests\Common\Program.cs = src\Tests\Common\Program.cs
3131
EndProjectSection
3232
EndProject
@@ -55,7 +55,7 @@ index 5599dc0..fb666c1 100644
5555
EndProject
5656
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Cli", "Cli", "{9CEF03F6-1A61-431A-8ABD-9095974629AE}"
5757
EndProject
58-
@@ -92,37 +81,21 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "redist", "src\Layout\redist
58+
@@ -93,37 +82,21 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "redist", "src\Layout\redist
5959
EndProject
6060
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "toolset-tasks", "src\Layout\toolset-tasks\toolset-tasks.csproj", "{C687CA8D-9843-4045-BC20-917953F6C864}"
6161
EndProject
@@ -93,15 +93,15 @@ index 5599dc0..fb666c1 100644
9393
EndProject
9494
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebSdk", "WebSdk", "{974F9450-8895-41D9-8328-D55AFF81A814}"
9595
ProjectSection(SolutionItems) = preProject
96-
@@ -159,7 +132,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Sdk.Web.Tasks
96+
@@ -160,7 +133,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Sdk.Web.Tasks
9797
EndProject
9898
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Sdk.Worker.Tasks", "src\WebSdk\Worker\Tasks\Microsoft.NET.Sdk.Worker.Tasks.csproj", "{ACB5302C-8641-4E12-B7F7-0122D2A97C31}"
9999
EndProject
100100
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Sdk.Publish.Tasks.Tests", "src\Tests\Microsoft.NET.Sdk.Publish.Tasks.Tests\Microsoft.NET.Sdk.Publish.Tasks.Tests.csproj", "{1F26FAE6-2654-4E83-8936-146134638C59}"
101101
EndProject
102102
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sdk", "Sdk", "{F717D467-EF88-49B9-AD67-55FC6350A9DE}"
103103
ProjectSection(SolutionItems) = preProject
104-
@@ -266,54 +238,10 @@ Global
104+
@@ -274,54 +246,10 @@ Global
105105
{61C31F8E-FE7C-47CC-B21C-3DEE499AD6F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
106106
{61C31F8E-FE7C-47CC-B21C-3DEE499AD6F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
107107
{61C31F8E-FE7C-47CC-B21C-3DEE499AD6F5}.Release|Any CPU.Build.0 = Release|Any CPU
@@ -156,7 +156,7 @@ index 5599dc0..fb666c1 100644
156156
{CC25E192-70AD-4D91-B288-3AD40065DBAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
157157
{CC25E192-70AD-4D91-B288-3AD40065DBAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
158158
{CC25E192-70AD-4D91-B288-3AD40065DBAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
159-
@@ -354,70 +282,6 @@ Global
159+
@@ -362,70 +290,6 @@ Global
160160
{C687CA8D-9843-4045-BC20-917953F6C864}.Debug|Any CPU.Build.0 = Debug|Any CPU
161161
{C687CA8D-9843-4045-BC20-917953F6C864}.Release|Any CPU.ActiveCfg = Release|Any CPU
162162
{C687CA8D-9843-4045-BC20-917953F6C864}.Release|Any CPU.Build.0 = Release|Any CPU
@@ -227,7 +227,7 @@ index 5599dc0..fb666c1 100644
227227
{C713077C-5E5B-4512-8C40-53C90915557F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
228228
{C713077C-5E5B-4512-8C40-53C90915557F}.Debug|Any CPU.Build.0 = Debug|Any CPU
229229
{C713077C-5E5B-4512-8C40-53C90915557F}.Release|Any CPU.ActiveCfg = Release|Any CPU
230-
@@ -434,10 +298,6 @@ Global
230+
@@ -442,10 +306,6 @@ Global
231231
{ACB5302C-8641-4E12-B7F7-0122D2A97C31}.Debug|Any CPU.Build.0 = Debug|Any CPU
232232
{ACB5302C-8641-4E12-B7F7-0122D2A97C31}.Release|Any CPU.ActiveCfg = Release|Any CPU
233233
{ACB5302C-8641-4E12-B7F7-0122D2A97C31}.Release|Any CPU.Build.0 = Release|Any CPU
@@ -238,7 +238,7 @@ index 5599dc0..fb666c1 100644
238238
{89F798D9-A8BA-4556-B2A2-39CEF3587093}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
239239
{89F798D9-A8BA-4556-B2A2-39CEF3587093}.Debug|Any CPU.Build.0 = Debug|Any CPU
240240
{89F798D9-A8BA-4556-B2A2-39CEF3587093}.Release|Any CPU.ActiveCfg = Release|Any CPU
241-
@@ -465,21 +325,10 @@ Global
241+
@@ -485,21 +345,10 @@ Global
242242
GlobalSection(NestedProjects) = preSolution
243243
{1FEED16D-E07D-47C1-BB4C-56CD9F42B53B} = {22AB674F-ED91-4FBC-BFEE-8A1E82F9F05E}
244244
{61C31F8E-FE7C-47CC-B21C-3DEE499AD6F5} = {1FEED16D-E07D-47C1-BB4C-56CD9F42B53B}
@@ -260,7 +260,7 @@ index 5599dc0..fb666c1 100644
260260
{9CEF03F6-1A61-431A-8ABD-9095974629AE} = {22AB674F-ED91-4FBC-BFEE-8A1E82F9F05E}
261261
{CC25E192-70AD-4D91-B288-3AD40065DBAC} = {9CEF03F6-1A61-431A-8ABD-9095974629AE}
262262
{2119E6E5-2B75-402A-AFF3-3E7E7B671B9B} = {9CEF03F6-1A61-431A-8ABD-9095974629AE}
263-
@@ -492,22 +341,6 @@ Global
263+
@@ -512,22 +361,6 @@ Global
264264
{C2DF833D-2A83-408B-8122-3038ACDFDFD0} = {71C279BD-E850-4A8D-9775-11CA26B8E5BA}
265265
{AA273ACB-56FE-4F0C-8CC9-C2C45D31491D} = {71C279BD-E850-4A8D-9775-11CA26B8E5BA}
266266
{C687CA8D-9843-4045-BC20-917953F6C864} = {71C279BD-E850-4A8D-9775-11CA26B8E5BA}
@@ -283,7 +283,7 @@ index 5599dc0..fb666c1 100644
283283
{974F9450-8895-41D9-8328-D55AFF81A814} = {22AB674F-ED91-4FBC-BFEE-8A1E82F9F05E}
284284
{B1C96E63-6F34-4BFE-AD5B-091F8A86A704} = {974F9450-8895-41D9-8328-D55AFF81A814}
285285
{0C6854E8-01E5-4F76-97A0-E1FCF5428B10} = {B1C96E63-6F34-4BFE-AD5B-091F8A86A704}
286-
@@ -519,7 +352,6 @@ Global
286+
@@ -539,7 +372,6 @@ Global
287287
{518B88F4-D9C0-4865-8D33-9BB09F7D4A3E} = {5F8809DE-414C-42CB-A1BC-CF95267E6F49}
288288
{CC92D8D8-5914-451E-8F8E-9623103BC186} = {27302615-7D46-499E-AC84-D3E193F9A62D}
289289
{ACB5302C-8641-4E12-B7F7-0122D2A97C31} = {EBEF2950-E27B-4EB8-8F1C-2001984B4D41}
@@ -292,7 +292,7 @@ index 5599dc0..fb666c1 100644
292292
{2F565AE9-3DBC-4EFF-A3C4-4B65C7262282} = {409D6E91-ACFD-4801-A879-B166668EE256}
293293
{63DA18A8-D24A-4CD1-A7E7-2B181AB2DF9A} = {029BC558-D2FA-413F-83D0-A67216BA9DB1}
294294
diff --git a/src/Assets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj b/src/Assets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj
295-
index 48a78a6..5f28270 100644
295+
index 48a78a6e7..5f282702b 100644
296296
--- a/src/Assets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj
297297
+++ b/src/Assets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj
298298
@@ -1,16 +1 @@
@@ -315,7 +315,7 @@ index 48a78a6..5f28270 100644
315315
+
316316
\ No newline at end of file
317317
diff --git a/src/Assets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj b/src/Assets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj
318-
index 8956d36..5f28270 100644
318+
index 8956d362f..5f282702b 100644
319319
--- a/src/Assets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj
320320
+++ b/src/Assets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj
321321
@@ -1,15 +1 @@
@@ -337,7 +337,7 @@ index 8956d36..5f28270 100644
337337
+
338338
\ No newline at end of file
339339
diff --git a/src/Tests/Microsoft.NET.TestFramework/BuildTestPackages.targets b/src/Tests/Microsoft.NET.TestFramework/BuildTestPackages.targets
340-
index 34d58c2..611b838 100644
340+
index 34d58c2f1..611b838eb 100644
341341
--- a/src/Tests/Microsoft.NET.TestFramework/BuildTestPackages.targets
342342
+++ b/src/Tests/Microsoft.NET.TestFramework/BuildTestPackages.targets
343343
@@ -84,22 +84,6 @@
@@ -364,5 +364,5 @@ index 34d58c2..611b838 100644
364364
<Name>dotnet-outputsframeworkversion-netcoreapp1.0</Name>
365365
<ProjectName>dotnet-outputsframeworkversion-netcoreapp1.0.csproj</ProjectName>
366366
--
367-
1.8.3.1
367+
2.25.4
368368

‎patches/sdk/0009-Exclude-System.Text.Json-when-calling-PublishTestCli.patch renamed to ‎patches/sdk/0007-Exclude-System.Text.Json-when-calling-PublishTestCli.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
From 608d906169f66b73dafee00a216adeb7ba35136a Mon Sep 17 00:00:00 2001
1+
From c4f1049265429a2f9ed0478dd21cbbe0171d5685 Mon Sep 17 00:00:00 2001
22
From: dseefeld <[email protected]>
33
Date: Wed, 1 Jul 2020 21:40:38 +0000
4-
Subject: [PATCH 09/10] Exclude System.Text.Json when calling PublishTestCli
4+
Subject: [PATCH] Exclude System.Text.Json when calling PublishTestCli
55

66
---
77
src/Layout/redist/targets/GenerateLayout.targets | 1 +
88
1 file changed, 1 insertion(+)
99

1010
diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets
11-
index 6641b42d7..43c7a58cb 100644
11+
index c3713a8d4..8d4fc0d42 100644
1212
--- a/src/Layout/redist/targets/GenerateLayout.targets
1313
+++ b/src/Layout/redist/targets/GenerateLayout.targets
14-
@@ -92,6 +92,7 @@
14+
@@ -105,6 +105,7 @@
1515
<TestCliBitsToExclude Include="$(TestCliNuGetDirectory)System.Memory.dll" />
1616
<TestCliBitsToExclude Include="$(TestCliNuGetDirectory)System.Runtime.CompilerServices.Unsafe.dll" />
1717
<TestCliBitsToExclude Include="$(TestCliNuGetDirectory)NuGet.Frameworks.dll" />
@@ -20,5 +20,5 @@ index 6641b42d7..43c7a58cb 100644
2020
Exclude="@(TestCliBitsToExclude)" />
2121
</ItemGroup>
2222
--
23-
2.18.2
23+
2.25.4
2424

‎patches/sdk/0010-Patch-out-Windows-Desktop-targets.patch renamed to ‎patches/sdk/0008-Patch-out-Windows-Desktop-targets.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
From 1212f6c9b693b2a612073d104887d1ff64002a51 Mon Sep 17 00:00:00 2001
1+
From bcb3f9ecc874ba8a5d648af9ea35651465ed1976 Mon Sep 17 00:00:00 2001
22
From: Chris Rummel <[email protected]>
33
Date: Fri, 4 Sep 2020 04:01:01 -0500
4-
Subject: [PATCH 10/10] Patch out Windows Desktop targets
4+
Subject: [PATCH] Patch out Windows Desktop targets
55

66
---
77
.../Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props | 2 +-
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props
11-
index 13f9cfa5b..c924919c5 100644
11+
index 4523af8c9..e7d515a49 100644
1212
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props
1313
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props
14-
@@ -131,6 +131,6 @@ Copyright (c) .NET Foundation. All rights reserved.
14+
@@ -144,6 +144,6 @@ Copyright (c) .NET Foundation. All rights reserved.
1515
<Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.PackTool.props" />
1616
<Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.PackProjectTool.props" />
1717

@@ -20,5 +20,5 @@ index 13f9cfa5b..c924919c5 100644
2020
<Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.Windows.props" />
2121
</Project>
2222
--
23-
2.18.0
23+
2.25.4
2424

‎patches/sdk/0010-PlatformAbstractions-is-not-produced-in-source-build.patch renamed to ‎patches/sdk/0009-PlatformAbstractions-is-not-produced-in-source-build.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
From 1d7b4c71be9cb787c29da49d55140cabe79e7b6c Mon Sep 17 00:00:00 2001
1+
From 8b3b7f9b2573c8448827586e66d5cff854a9526d Mon Sep 17 00:00:00 2001
22
From: Chris Rummel <[email protected]>
33
Date: Wed, 12 Aug 2020 14:26:52 -0500
4-
Subject: [PATCH 10/10] PlatformAbstractions is not produced in source-build
4+
Subject: [PATCH] PlatformAbstractions is not produced in source-build
55

66
---
77
.../Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj | 2 +-
8-
1 files changed, 1 insertions(+), 1 deletions(-)
8+
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
11-
index ecf56d956..59545bb39 100644
11+
index 3f345a481..6baf86487 100644
1212
--- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
1313
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
1414
@@ -50,7 +50,7 @@
@@ -21,5 +21,5 @@ index ecf56d956..59545bb39 100644
2121
<PackageReference Include="NuGet.ProjectModel" Version="$(NuGetProjectModelVersion)" />
2222
<PackageReference Include="NuGet.Build.Tasks.Pack" Version="$(NuGetBuildTasksPackageVersion)" ExcludeAssets="All" />
2323
--
24-
2.18.2
24+
2.25.4
2525

‎patches/sdk/0011-Use-source-built-MSBuild-for-F.patch renamed to ‎patches/sdk/0010-Use-source-built-MSBuild-for-F.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
From 0f85807b2c27e881bfb0f367a8c002fb318a6573 Mon Sep 17 00:00:00 2001
1+
From 36233ce4ad5492b6022b59a1fec876800d6608a9 Mon Sep 17 00:00:00 2001
22
From: Chris Rummel <[email protected]>
33
Date: Tue, 8 Sep 2020 12:20:40 -0500
4-
Subject: [PATCH 11/11] Use source-built MSBuild for F#.
4+
Subject: [PATCH] Use source-built MSBuild for F#.
55

66
---
77
eng/Versions.props | 1 +
88
1 file changed, 1 insertion(+)
99

1010
diff --git a/eng/Versions.props b/eng/Versions.props
11-
index bdacff7..ec1efc4 100644
11+
index 7c7c0a349..cc43f479f 100644
1212
--- a/eng/Versions.props
1313
+++ b/eng/Versions.props
1414
@@ -92,6 +92,7 @@
@@ -20,5 +20,5 @@ index bdacff7..ec1efc4 100644
2020
<PropertyGroup>
2121
<!-- Dependencies from https://github.com/dotnet/CliCommandLineParser -->
2222
--
23-
2.18.0
23+
2.25.4
2424

0 commit comments

Comments
 (0)