Skip to content

Commit 0413210

Browse files
crummelcrummel
authored
Update to May 3.1.104 release. (#1590)
* Update to May 3.1.104 release.
1 parent 1c991ba commit 0413210

File tree

66 files changed

+978
-382
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+978
-382
lines changed

‎eng/Version.Details.xml

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<Uri>https://github.com/dotnet/arcade</Uri>
66
<Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
77
</Dependency>
8-
<Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20107.1">
8+
<Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20278.2">
99
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
10-
<Sha>9cc7dad6c4d9302c00803df5dea41c8a7a59e047</Sha>
10+
<Sha>f3db8b2a4a7c12ac44283b516dac8cda12a5edeb</Sha>
1111
</Dependency>
1212
</ToolsetDependencies>
1313
<ProductDependencies>
@@ -27,36 +27,37 @@
2727
<Sha>1127689f262d52ea8ff68ef03d706fa62b3b40a1</Sha>
2828
<RepoName>linker</RepoName>
2929
</Dependency>
30-
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.3-servicing.20118.3" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
30+
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.4-servicing.20202.1" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
3131
<Uri>https://github.com/dotnet/coreclr</Uri>
32-
<Sha>c5d3d752260383fbed72ba2b4d86d82fea673c76</Sha>
32+
<Sha>05e3582c126663120b82a2eec8fd12dcb6929064</Sha>
3333
<RepoName>coreclr</RepoName>
3434
<RepoName>coreclr-portable</RepoName>
3535
</Dependency>
3636
<Dependency Name="NETStandard.Library" Version="2.1.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.linux-x64">
3737
<Uri>https://github.com/dotnet/standard</Uri>
3838
<Sha>a5b5f2e1e369972c8ff1e2183979fab6099f52ef</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-servicing.20120.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.linux-x64">
40+
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-servicing.20221.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.linux-x64">
4141
<Uri>https://github.com/dotnet/corefx</Uri>
42-
<Sha>8a3ffed558ddf943c1efa87d693227722d6af094</Sha>
42+
<Sha>059a4a19e602494bfbed473dbbb18f2dbfbd0878</Sha>
4343
<RepoName>corefx</RepoName>
4444
<RepoName>corefx-portable</RepoName>
4545
</Dependency>
46-
<Dependency Name="Microsoft.NETCore.App.Runtime.linux-x64" Version="3.1.3-servicing.20128.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
46+
<Dependency Name="Microsoft.NETCore.App.Runtime.linux-x64" Version="3.1.4-servicing.20221.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
4747
<Uri>https://github.com/dotnet/core-setup</Uri>
48-
<Sha>4a9f85e9f89d7f686fef2ae2109d876b1e2eed2a</Sha>
48+
<Sha>0c2e69caa609d5164e16df91d6d646eb9ed74640</Sha>
4949
<RepoName>core-setup</RepoName>
5050
<RepoName>core-setup-portable</RepoName>
5151
</Dependency>
52-
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.1.3" CoherentParentDependency="Microsoft.AspNetCore.App.Ref">
52+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.1.4" CoherentParentDependency="Microsoft.AspNetCore.App.Ref">
5353
<Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
54-
<Sha>5ecfad7e0515ee580f7e1b51d1558fc2a1d27ee5</Sha>
54+
<Sha>a8242d79df31dbff528c185dd62c290b7cc262de</Sha>
5555
<RepoName>aspnetcore-tooling</RepoName>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
57+
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
5858
<Uri>https://github.com/dotnet/templating</Uri>
59-
<Sha>46091435536c53242905ab4e991bdc0bac153e64</Sha>
59+
<Sha>d503e3a0aeafd9cd580d44495aafc116b5f71588</Sha>
60+
<RepoName>templating</RepoName>
6061
</Dependency>
6162
<Dependency Name="Microsoft.NETCore.Compilers" Version="3.4.1-beta4-20127-10" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
6263
<Uri>https://github.com/dotnet/roslyn</Uri>
@@ -71,14 +72,14 @@
7172
<Sha>6f8eb3a2e1db6b458451b9cfd2a4f5557769b041</Sha>
7273
<RepoName>nuget-client</RepoName>
7374
</Dependency>
74-
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.3" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
75+
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.4" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
7576
<Uri>https://github.com/dotnet/extensions</Uri>
76-
<Sha>7d9baaf617741d775578c8018729ac5b75734c69</Sha>
77+
<Sha>3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb</Sha>
7778
<RepoName>aspnet-extensions</RepoName>
7879
</Dependency>
79-
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.103-servicing.20128.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
80+
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.104-servicing.20223.11" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
8081
<Uri>https://github.com/dotnet/sdk</Uri>
81-
<Sha>ab04d19191b70ce82adc3830fdea05eec952505f</Sha>
82+
<Sha>99d7f3290a766fe288678650bd1f2af760b44212</Sha>
8283
<RepoName>sdk</RepoName>
8384
</Dependency>
8485
<Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.19208.1" CoherentParentDependency="Microsoft.DotNet.Cli.Runtime">
@@ -95,36 +96,37 @@
9596
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
9697
<Sha>173ee3bd61c9549557eefa3cfb718bdef157cb87</Sha>
9798
</Dependency>
98-
<Dependency Name="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="3.1.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
99+
<Dependency Name="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="3.1.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
99100
<Uri>https://github.com/dotnet/aspnetcore</Uri>
100-
<Sha>e81033e094d4663ffd227bb4aed30b76b0631e6d</Sha>
101+
<Sha>35628a67800a3e269eb375989d2fffa9d67b8dbf</Sha>
101102
<RepoName>aspnetcore</RepoName>
102103
</Dependency>
103-
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.103-servicing.20167.2" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
104+
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.104-servicing.20223.4" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
104105
<Uri>https://github.com/dotnet/cli</Uri>
105-
<Sha>f6250b79a00848f18e6e7b076b561d0a794983d3</Sha>
106+
<Sha>1afb98ab831b1a5c52675a2391365f999aeb9859</Sha>
106107
<RepoName>cli</RepoName>
107108
</Dependency>
108109
<Dependency Name="Microsoft.FSharp.Compiler" Version="10.7.0-beta.19610.6" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
109110
<Uri>https://github.com/dotnet/fsharp</Uri>
110111
<Sha>dc86ab5d2c46e9a7c49290e7e2270ab1eeb0c61e</Sha>
111112
</Dependency>
112-
<Dependency Name="Microsoft.NET.Sdk.Web" Version="3.1.103-servicing.20164.2" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
113-
<Uri>https://github.com/aspnet/websdk</Uri>
114-
<Sha>0152dfa567f877ee1c5da6e00033218002848956</Sha>
113+
<Dependency Name="Microsoft.NET.Sdk.Web" Version="3.1.104-servicing.20222.9" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
114+
<Uri>https://github.com/dotnet/websdk</Uri>
115+
<Sha>8d1ef114fbf7afc33420ae2121984c04dbb04e56</Sha>
116+
<RepoName>websdk</RepoName>
115117
</Dependency>
116118
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.3.0" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
117119
<Uri>https://github.com/microsoft/vstest</Uri>
118120
<Sha>55e7e45431c9c05656c999b902686e7402664573</Sha>
119121
</Dependency>
120-
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.103-servicing.20167.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
122+
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.104-servicing.20223.10" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
121123
<Uri>https://github.com/dotnet/toolset</Uri>
122-
<Sha>4d0fe6c07e644a576aad6e0c3842f61460e48158</Sha>
124+
<Sha>91f740fe926973a5ffefbddbfb9db61a737022dd</Sha>
123125
<RepoName>toolset</RepoName>
124126
</Dependency>
125-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="1.0.0-preview.20168.6">
126-
<Uri>https://github.com/dotnet/core-sdk</Uri>
127-
<Sha>6f74c4a1dd4fd0cc49eec7a28984476ed14d09d9</Sha>
127+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="1.0.0-preview.20224.3">
128+
<Uri>https://github.com/dotnet/installer</Uri>
129+
<Sha>0cf4df563ae73624abaa57158d99fb522d4536a1</Sha>
128130
<RepoName>core-sdk</RepoName>
129131
</Dependency>
130132
<!-- external dependencies, not handled by Maestro/Arcade -->

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88
<!-- Production Dependencies -->
99
<PropertyGroup>
10-
<PrivateSourceBuildReferencePackagesPackageVersion>1.0.0-beta.20107.1</PrivateSourceBuildReferencePackagesPackageVersion>
11-
<PrivateSourceBuiltArtifactsPackageVersion>0.1.0-3.1.101.2</PrivateSourceBuiltArtifactsPackageVersion>
10+
<PrivateSourceBuildReferencePackagesPackageVersion>1.0.0-beta.20278.2</PrivateSourceBuildReferencePackagesPackageVersion>
11+
<PrivateSourceBuiltArtifactsPackageVersion>0.1.0-3.1.103</PrivateSourceBuiltArtifactsPackageVersion>
1212
</PropertyGroup>
1313
</Project>

‎patches/arcade/0015-Force-S.R.CompilerServices.Unsafe-and-MS.DN.Platform.patch

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
From 715915f2cc01f833632480c7c212e05bfd2282ad Mon Sep 17 00:00:00 2001
2+
From: Chris Rummel <crummel@microsoft.com>
3+
Date: Thu, 14 May 2020 09:48:27 -0500
4+
Subject: [PATCH 15/15] Force S.R.CompilerServices.Unsafe and
5+
MS.DN.PlatformAbstractions versions.
6+
7+
---
8+
.../src/Microsoft.DotNet.Build.Tasks.Configuration.csproj | 2 +-
9+
.../Microsoft.DotNet.CodeAnalysis.csproj | 2 ++
10+
2 files changed, 3 insertions(+), 1 deletion(-)
11+
12+
diff --git a/src/Microsoft.DotNet.Build.Tasks.Configuration/src/Microsoft.DotNet.Build.Tasks.Configuration.csproj b/src/Microsoft.DotNet.Build.Tasks.Configuration/src/Microsoft.DotNet.Build.Tasks.Configuration.csproj
13+
index ce6a5e5e..c2d3f878 100644
14+
--- a/src/Microsoft.DotNet.Build.Tasks.Configuration/src/Microsoft.DotNet.Build.Tasks.Configuration.csproj
15+
+++ b/src/Microsoft.DotNet.Build.Tasks.Configuration/src/Microsoft.DotNet.Build.Tasks.Configuration.csproj
16+
@@ -23,7 +23,7 @@
17+
<ItemGroup>
18+
<PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" />
19+
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
20+
- <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="$(MicrosoftDotNetPlatformAbstractionsVersion)" />
21+
+ <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" />
22+
</ItemGroup>
23+
24+
<Import Project="$(RepoRoot)eng\BuildTask.targets" />
25+
diff --git a/src/Microsoft.DotNet.CodeAnalysis/Microsoft.DotNet.CodeAnalysis.csproj b/src/Microsoft.DotNet.CodeAnalysis/Microsoft.DotNet.CodeAnalysis.csproj
26+
index 5cdfd539..290795b6 100644
27+
--- a/src/Microsoft.DotNet.CodeAnalysis/Microsoft.DotNet.CodeAnalysis.csproj
28+
+++ b/src/Microsoft.DotNet.CodeAnalysis/Microsoft.DotNet.CodeAnalysis.csproj
29+
@@ -10,6 +10,8 @@
30+
31+
<ItemGroup>
32+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" ExcludeAssets="analyzers" />
33+
+ <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.1" />
34+
+ <PackageReference Include="System.Memory" Version="4.5.4" />
35+
</ItemGroup>
36+
37+
<ItemGroup>
38+
--
39+
2.18.0
40+

‎patches/aspnet-extensions/0001-Don-t-call-dotnet-without-a-path.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From d0e2be60ab2ec0e327442a7075f1b12a40163b24 Mon Sep 17 00:00:00 2001
1+
From 10ed4194c410e582552e1d9a11ecdb269415278d Mon Sep 17 00:00:00 2001
22
From: Chris Rummel <crummel@microsoft.com>
33
Date: Wed, 23 Oct 2019 18:56:04 -0500
44
Subject: [PATCH 1/4] Don't call dotnet without a path
@@ -8,10 +8,10 @@ Subject: [PATCH 1/4] Don't call dotnet without a path
88
1 file changed, 3 insertions(+), 3 deletions(-)
99

1010
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
11-
index 94965a8fd..8e14f8b6f 100755
11+
index acbb0c5b3..6ad3553bf 100755
1212
--- a/eng/common/tools.sh
1313
+++ b/eng/common/tools.sh
14-
@@ -362,9 +362,9 @@ function MSBuild {
14+
@@ -369,9 +369,9 @@ function MSBuild {
1515

1616
# Work around issues with Azure Artifacts credential provider
1717
# https://github.com/dotnet/arcade/issues/3932
@@ -25,5 +25,5 @@ index 94965a8fd..8e14f8b6f 100755
2525
local toolset_dir="${_InitializeToolset%/*}"
2626
local logger_path="$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll"
2727
--
28-
2.21.0
28+
2.18.0
2929

‎patches/aspnet-extensions/0002-Try-without-fullfx-build.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 5ec70fe062421ed1303b200336c052be16b70696 Mon Sep 17 00:00:00 2001
1+
From 176c654f7d9c0925f26973573c579fe6655fb806 Mon Sep 17 00:00:00 2001
22
From: Chris Rummel <crummel@microsoft.com>
33
Date: Thu, 23 Jan 2020 14:38:19 +0000
44
Subject: [PATCH 2/4] Try without fullfx build
@@ -21,5 +21,5 @@ index eb488c625..f57632234 100644
2121
<PackageTags>dependencyinjection;di</PackageTags>
2222
<IsPackable>true</IsPackable>
2323
--
24-
2.21.0
24+
2.18.0
2525

‎patches/aspnet-extensions/0003-Build-MS.Internal.Ext.Refs-for-AspNetCore.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From ee262a9aa66b64c2b78b801cb53de32fd259d99f Mon Sep 17 00:00:00 2001
1+
From ab847aa914da4ce93ade3dbe7bbc0ba7d262fec3 Mon Sep 17 00:00:00 2001
22
From: adaggarwal <aditya.aggarwal@microsoft.com>
33
Date: Fri, 7 Feb 2020 20:55:51 +0000
44
Subject: [PATCH 3/4] Build-MS.Internal.Ext.Refs-for-AspNetCore
@@ -35,5 +35,5 @@ index c89ec063a..952d69edc 100644
3535

3636
<!-- Override the default MSBuild targets so that nothing is returned from the project since it represents a collection of assemblies. -->
3737
--
38-
2.21.0
38+
2.18.0
3939

‎patches/aspnet-extensions/0004-remove-unneeded-feeds.patch

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,28 @@
1-
From bf15241e67930b1275c07c8a492bac42d1a1e5f5 Mon Sep 17 00:00:00 2001
1+
From fd07ca9fe759244d6d60cef6102a54e3c5e1a6ef Mon Sep 17 00:00:00 2001
22
From: Aditya Aggarwal <aditya.aggarwal@microsoft.com>
33
Date: Mon, 16 Mar 2020 04:44:40 +0000
44
Subject: [PATCH 4/4] remove unneeded feeds
55

66
---
7-
NuGet.config | 6 ------
8-
1 file changed, 6 deletions(-)
7+
NuGet.config | 5 -----
8+
1 file changed, 5 deletions(-)
99

1010
diff --git a/NuGet.config b/NuGet.config
11-
index 95c349a87..300765e80 100644
11+
index 74a78f54c..300765e80 100644
1212
--- a/NuGet.config
1313
+++ b/NuGet.config
14-
@@ -2,12 +2,6 @@
14+
@@ -2,11 +2,6 @@
1515
<configuration>
1616
<packageSources>
1717
<clear />
1818
- <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
19-
- <add key="darc-pub-dotnet-core-setup-4a9f85e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-4a9f85e9/nuget/v3/index.json" />
20-
- <add key="darc-pub-dotnet-corefx-e946ceb-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-e946cebe-1/nuget/v3/index.json" />
2119
- <add key="darc-pub-dotnet-corefx-8a3ffed" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-8a3ffed5/nuget/v3/index.json" />
22-
- <add key="darc-pub-dotnet-corefx-0f7f38c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-0f7f38c4/nuget/v3/index.json" />
20+
- <add key="darc-int-dotnet-core-setup-0c2e69c" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-0c2e69ca/nuget/v3/index.json" />
21+
- <add key="darc-int-dotnet-corefx-059a4a1" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-corefx-059a4a19/nuget/v3/index.json" />
2322
- <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2423
<add key="dotnet3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json" />
2524
<add key="dotnet3-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json" />
2625
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
2726
--
28-
2.21.0
27+
2.18.0
2928

‎patches/aspnetcore-tooling/0001-Don-t-build-fullfx.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From cf1550eae1202ed744ee849cef2b39a69b728420 Mon Sep 17 00:00:00 2001
1+
From 44486c4ab27e8667ab5c42467759f1cccb92697c Mon Sep 17 00:00:00 2001
22
From: Chris Rummel <crummel@microsoft.com>
33
Date: Sun, 20 Oct 2019 15:51:49 -0500
44
Subject: [PATCH 1/5] Don't build fullfx
@@ -61,5 +61,5 @@ index e5e8d926a..b0a7c5ea3 100644
6161
</PropertyGroup>
6262

6363
--
64-
2.21.0
64+
2.18.0
6565

‎patches/aspnetcore-tooling/0002-dont-call-dotnet-without-path.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 64c6327cd9a804b76d7450ed39628548578fd8ca Mon Sep 17 00:00:00 2001
1+
From e8ebd33ea7b97800d2b39bb0e9f9232e2bf5f2f7 Mon Sep 17 00:00:00 2001
22
From: adaggarwal <aditya.aggarwal@microsoft.com>
33
Date: Wed, 30 Oct 2019 19:41:56 +0000
44
Subject: [PATCH 2/5] dont call dotnet without path
@@ -25,5 +25,5 @@ index 94965a8fd..8e14f8b6f 100755
2525
local toolset_dir="${_InitializeToolset%/*}"
2626
local logger_path="$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll"
2727
--
28-
2.21.0
28+
2.18.0
2929

‎patches/aspnetcore-tooling/0003-Import-PackageVersions.props.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 5150c74891fe7b57a0ce332326caab087e4398d4 Mon Sep 17 00:00:00 2001
1+
From b22d0b1a2568ec0a5a149a6ea252e94c61bb06c8 Mon Sep 17 00:00:00 2001
22
From: adaggarwal <aditya.aggarwal@microsoft.com>
33
Date: Wed, 13 Nov 2019 16:31:47 +0000
44
Subject: [PATCH 3/5] Import PackageVersions.props
@@ -8,7 +8,7 @@ Subject: [PATCH 3/5] Import PackageVersions.props
88
1 file changed, 3 insertions(+)
99

1010
diff --git a/eng/Versions.props b/eng/Versions.props
11-
index 31bae2cc9..db7aa9ce9 100644
11+
index 1515c4582..f0fa8e3b9 100644
1212
--- a/eng/Versions.props
1313
+++ b/eng/Versions.props
1414
@@ -142,4 +142,7 @@
@@ -20,5 +20,5 @@ index 31bae2cc9..db7aa9ce9 100644
2020
+
2121
</Project>
2222
--
23-
2.21.0
23+
2.18.0
2424

0 commit comments

Comments
 (0)