Skip to content

Commit 7973d2e

Browse files
dotnet-maestro[bot]crummeladaggarwal
authored
[release/3.1] Update dependencies from dotnet/core-sdk (#1451)
* Update dependencies from https://github.com/dotnet/core-sdk build 20200118.6 - Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.20068.6 Dependency coherency updates - Microsoft.Dotnet.Toolset.Internal - 3.1.102-servicing.20067.13 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NETCore.Runtime.CoreCLR - 3.1.2-servicing.20066.2 (parent: Microsoft.Private.CoreFx.NETCoreApp) - Microsoft.NETCore.App - 3.1.2-servicing.20067.4 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.DotNet.Common.ItemTemplates - 3.1.2 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NETCore.Compilers - 3.4.1-beta4-19614-01 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.Extensions.Logging - 3.1.2 (parent: Microsoft.AspNetCore.Mvc.Razor.Extensions) - Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.1.2 (parent: Microsoft.AspNetCore.App.Ref) - Microsoft.AspNetCore.App.Ref - 3.1.2 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NET.Sdk - 3.1.102-servicing.20065.3 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.Cli.Runtime - 3.1.102-servicing.20067.4 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.FSharp.Compiler - 10.7.0-beta.19610.6 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk.Web - 3.1.101-servicing.19616.2 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/core-sdk build 20200119.5 - Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.20069.5 Dependency coherency updates - Microsoft.Dotnet.Toolset.Internal - 3.1.102-servicing.20069.2 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NETCore.Runtime.CoreCLR - 3.1.2-servicing.20066.2 (parent: Microsoft.Private.CoreFx.NETCoreApp) - Microsoft.NETCore.App - 3.1.2-servicing.20067.4 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.DotNet.Common.ItemTemplates - 3.1.2 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NETCore.Compilers - 3.4.1-beta4-19614-01 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.Extensions.Logging - 3.1.2 (parent: Microsoft.AspNetCore.Mvc.Razor.Extensions) - Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.1.2 (parent: Microsoft.AspNetCore.App.Ref) - Microsoft.AspNetCore.App.Ref - 3.1.2 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NET.Sdk - 3.1.102-servicing.20068.5 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.Cli.Runtime - 3.1.102-servicing.20069.1 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.FSharp.Compiler - 10.7.0-beta.19610.6 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk.Web - 3.1.101-servicing.19616.2 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/core-sdk build 20200120.6 - Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.20070.6 Dependency coherency updates - Microsoft.Dotnet.Toolset.Internal - 3.1.102-servicing.20070.8 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NETCore.Runtime.CoreCLR - 3.1.2-servicing.20066.2 (parent: Microsoft.Private.CoreFx.NETCoreApp) - Microsoft.NETCore.App - 3.1.2-servicing.20067.4 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.DotNet.Common.ItemTemplates - 3.1.2 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NETCore.Compilers - 3.4.1-beta4-19614-01 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.Extensions.Logging - 3.1.2 (parent: Microsoft.AspNetCore.Mvc.Razor.Extensions) - Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.1.2 (parent: Microsoft.AspNetCore.App.Ref) - Microsoft.AspNetCore.App.Ref - 3.1.2 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NET.Sdk - 3.1.102-servicing.20068.5 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.Cli.Runtime - 3.1.102-servicing.20069.1 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.FSharp.Compiler - 10.7.0-beta.19610.6 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk.Web - 3.1.102-servicing.20068.3 (parent: Microsoft.Dotnet.Toolset.Internal) * Try not removing netstandard from project * Remove some obsolete ASP.NET extensions patches * Fix ASP verbosity flag * Only build ASP for netcoreapp * Update ProdConFeed * Add core-setup patch to pick up correct libhostpolicy * Production Prebuilts(online): update versions * patch: aspnetcore: change RID to sb-rid * Patch: coreClr: Remove Helix prebuilt * Patch: aspnet-extensions: build ms internal ext refs for aspnetcore * aspnetcore: patch: Resolve to using sb-rid for clrjit path only * Don't overwrite ASP.NET version if we already have it * Revert "Don't overwrite ASP.NET version if we already have it" This reverts commit d452ef9. * Need to override RID for ASP.NET on OSX as well Co-authored-by: Chris Rummel <[email protected]> Co-authored-by: Aditya Aggarwal <[email protected]>
1 parent d384e7b commit 7973d2e

File tree

45 files changed

+1046
-2049
lines changed

Some content is hidden

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

45 files changed

+1046
-2049
lines changed

‎NuGet.config‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<add key="darc-pub-microsoft-msbuild-e901037-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-microsoft-msbuild-e901037f-2/nuget/v3/index.json" />
7-
<add key="darc-pub-dotnet-templating-53a17fc-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-53a17fce-1/nuget/v3/index.json" />
87
<add key="darc-pub-dotnet-standard-a5b5f2e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-standard-a5b5f2e1/nuget/v3/index.json" />
9-
<add key="darc-pub-aspnet-Extensions-4e1be2f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-Extensions-4e1be2fb/nuget/v3/index.json" />
10-
<add key="darc-pub-aspnet-AspNetCore-Tooling-2903677" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-AspNetCore-Tooling-29036777/nuget/v3/index.json" />
11-
<add key="darc-pub-aspnet-AspNetCore-2b7e994" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-AspNetCore-2b7e994b/nuget/v3/index.json" />
8+
<add key="darc-pub-dotnet-aspnetcore-tooling-2dab42e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-tooling-2dab42e1/nuget/v3/index.json" />
9+
<add key="darc-pub-dotnet-aspnetcore-c3acdca" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-c3acdcac/nuget/v3/index.json" />
10+
<add key="darc-pub-aspnet-Extensions-1286a6f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-Extensions-1286a6ff/nuget/v3/index.json" />
1211
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1312
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
1413
<add key="nuget-build" value="https://dotnet.myget.org/F/nuget-build/api/v3/index.json" />

‎ProdConFeed.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://dotnetfeed.blob.core.windows.net/dotnet-core-3-1-ga-014709/index.json
1+
https://pkgs.dev.azure.com/dnceng/public/_packaging/3.1.102-servicing-014865/nuget/v3/index.json

‎dir.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@
209209
<ExtraPackageVersionPropsPackageInfo Include="VSRedistCommonAspNetCoreTargetingPackx6430PackageVersion" Version="$(aspnetcoreOutputPackageVersion)" />
210210
<!-- OSX needs the OSX version instead of Linux. We don't have a lot of flexibility in how we output these properties so we're relying on the previous one being blank if the Linux version of the package is missing. -->
211211
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftAspNetCoreAppRuntimePackageVersion" Version="%24(MicrosoftAspNetCoreAppRuntimeOsxX64PackageVersion)" DoNotOverwrite="true" />
212+
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftAspNetCoreAppRuntimePackageVersion" Version="%24(MicrosoftAspNetCoreAppRuntimewinx64PackageVersion)" DoNotOverwrite="true" />
212213

213214
<!-- property used by Arcade to determine what version of SourceLink to use -->
214215
<!-- if MicrosoftSourceLinkCommonPackageVersion is non-empty, then we've already built SourceLink, regardless of whether

‎eng/Version.Details.xml‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -27,52 +27,52 @@
2727
<Sha>1127689f262d52ea8ff68ef03d706fa62b3b40a1</Sha>
2828
<RepoName>linker</RepoName>
2929
</Dependency>
30-
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.0-rtm.19564.2" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
30+
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.2-servicing.20066.2" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
3131
<Uri>https://github.com/dotnet/coreclr</Uri>
32-
<Sha>1ed7226e39b7214807318d2cc8ff37492527ffa1</Sha>
32+
<Sha>fd22fd600a2526a7c58536da0e80325eb710d7f1</Sha>
3333
<RepoName>coreclr</RepoName>
3434
</Dependency>
35-
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.0-rtm.19564.2" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
35+
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.2-servicing.20066.2" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
3636
<Uri>https://github.com/dotnet/coreclr</Uri>
37-
<Sha>1ed7226e39b7214807318d2cc8ff37492527ffa1</Sha>
37+
<Sha>fd22fd600a2526a7c58536da0e80325eb710d7f1</Sha>
3838
<RepoName>coreclr-portable</RepoName>
3939
</Dependency>
4040
<Dependency Name="NETStandard.Library" Version="2.1.0" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
4141
<Uri>https://github.com/dotnet/standard</Uri>
4242
<Sha>a5b5f2e1e369972c8ff1e2183979fab6099f52ef</Sha>
4343
</Dependency>
44-
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-rtm.19564.4" CoherentParentDependency="Microsoft.NETCore.App">
44+
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-servicing.20067.2" CoherentParentDependency="Microsoft.NETCore.App">
4545
<Uri>https://github.com/dotnet/corefx</Uri>
4646
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
4747
<RepoName>corefx</RepoName>
4848
</Dependency>
49-
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-rtm.19564.4" CoherentParentDependency="Microsoft.NETCore.App">
49+
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-servicing.20067.2" CoherentParentDependency="Microsoft.NETCore.App">
5050
<Uri>https://github.com/dotnet/corefx</Uri>
5151
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
5252
<RepoName>corefx-portable</RepoName>
5353
</Dependency>
54-
<Dependency Name="Microsoft.NETCore.App" Version="3.1.0-rtm.19565.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
54+
<Dependency Name="Microsoft.NETCore.App" Version="3.1.2-servicing.20067.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
5555
<Uri>https://github.com/dotnet/core-setup</Uri>
56-
<Sha>65f04fb6db7a5e198d05dbebd5c4ad21eb018f89</Sha>
56+
<Sha>916b5cba268e1e1e803243004f4276cf40b2dda8</Sha>
5757
<RepoName>core-setup</RepoName>
5858
</Dependency>
59-
<Dependency Name="Microsoft.NETCore.App" Version="3.1.0-rtm.19565.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
59+
<Dependency Name="Microsoft.NETCore.App" Version="3.1.2-servicing.20067.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
6060
<Uri>https://github.com/dotnet/core-setup</Uri>
61-
<Sha>65f04fb6db7a5e198d05dbebd5c4ad21eb018f89</Sha>
61+
<Sha>916b5cba268e1e1e803243004f4276cf40b2dda8</Sha>
6262
<RepoName>core-setup-portable</RepoName>
6363
</Dependency>
64-
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.1.0" CoherentParentDependency="Microsoft.AspNetCore.App.Ref">
65-
<Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
66-
<Sha>29036777e7cd2172a81c45c69e0dc257e8b8184e</Sha>
64+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.1.2" CoherentParentDependency="Microsoft.AspNetCore.App.Ref">
65+
<Uri>https://github.com/dotnet/AspNetCore-Tooling</Uri>
66+
<Sha>2dab42e151ea8020a75cdaaa8c46bf5d9093b8c0</Sha>
6767
<RepoName>aspnetcore-tooling</RepoName>
6868
</Dependency>
69-
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.0" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
69+
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
7070
<Uri>https://github.com/dotnet/templating</Uri>
71-
<Sha>53a17fce7ce81aa68ddaa7b04f371dc6391d3497</Sha>
71+
<Sha>247f60e9e34a03ed99e855eb1ea0c20931a968db</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.NETCore.Compilers" Version="3.4.0-beta4-19562-05" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
73+
<Dependency Name="Microsoft.NETCore.Compilers" Version="3.4.1-beta4-19614-01" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
7474
<Uri>https://github.com/dotnet/roslyn</Uri>
75-
<Sha>ff930dec4565e2bc424ad3bf3e22ecb20542c87d</Sha>
75+
<Sha>165046097562cfe65b09c2e9a9d8f7cd88526f2c</Sha>
7676
</Dependency>
7777
<Dependency Name="Microsoft.Build" Version="16.4.0" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
7878
<Uri>https://github.com/microsoft/msbuild</Uri>
@@ -83,14 +83,14 @@
8383
<Sha>6f8eb3a2e1db6b458451b9cfd2a4f5557769b041</Sha>
8484
<RepoName>nuget-client</RepoName>
8585
</Dependency>
86-
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.0" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
87-
<Uri>https://github.com/aspnet/Extensions</Uri>
88-
<Sha>4e1be2fb546751c773968d7b40ff7f4b62887153</Sha>
86+
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.2" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
87+
<Uri>https://github.com/dotnet/Extensions</Uri>
88+
<Sha>1286a6ff55e300352dabeb6d778c9fcdd258bd08</Sha>
8989
<RepoName>aspnet-extensions</RepoName>
9090
</Dependency>
91-
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.100-rtm.19565.4" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
91+
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.102-servicing.20068.5" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
9292
<Uri>https://github.com/dotnet/sdk</Uri>
93-
<Sha>fc412c7e032c25a17da0e8ca4556b34897313d7c</Sha>
93+
<Sha>90a093bbbe2c46ef19e301d717bed3cfaa56abb3</Sha>
9494
<RepoName>sdk</RepoName>
9595
</Dependency>
9696
<Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.19208.1" CoherentParentDependency="Microsoft.DotNet.Cli.Runtime">
@@ -108,36 +108,36 @@
108108
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
109109
<Sha>173ee3bd61c9549557eefa3cfb718bdef157cb87</Sha>
110110
</Dependency>
111-
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.1.0" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
112-
<Uri>https://github.com/aspnet/AspNetCore</Uri>
113-
<Sha>2b7e994b8a304700a09617ffc5052f0d943bbcba</Sha>
111+
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.1.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
112+
<Uri>https://github.com/dotnet/AspNetCore</Uri>
113+
<Sha>c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc</Sha>
114114
<RepoName>aspnetcore</RepoName>
115115
</Dependency>
116-
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.100-rtm.19566.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
116+
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.102-servicing.20069.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
117117
<Uri>https://github.com/dotnet/cli</Uri>
118-
<Sha>56fe2cca1ad3b1e450ece97a226ce8a655d31271</Sha>
118+
<Sha>32fddd23b1e53272472f6feb27f5e12a445b7236</Sha>
119119
<RepoName>cli</RepoName>
120120
</Dependency>
121-
<Dependency Name="Microsoft.FSharp.Compiler" Version="10.7.0-beta.19556.5" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
121+
<Dependency Name="Microsoft.FSharp.Compiler" Version="10.7.0-beta.19610.6" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
122122
<Uri>https://github.com/dotnet/fsharp</Uri>
123-
<Sha>e7597deb7042710a7142bdccabd6f92b0840d354</Sha>
123+
<Sha>dc86ab5d2c46e9a7c49290e7e2270ab1eeb0c61e</Sha>
124124
</Dependency>
125-
<Dependency Name="Microsoft.NET.Sdk.Web" Version="3.1.100-rtm.19566.2" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
125+
<Dependency Name="Microsoft.NET.Sdk.Web" Version="3.1.102-servicing.20068.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
126126
<Uri>https://github.com/aspnet/websdk</Uri>
127-
<Sha>6ac9d49bc28ce976ffd92539e0c14d15d5b31c3a</Sha>
127+
<Sha>589ed451f2bcb51d7f47a37ebf4e3d501979174c</Sha>
128128
</Dependency>
129129
<Dependency Name="Microsoft.TestPlatform.Build" Version="16.3.0" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
130130
<Uri>https://github.com/microsoft/vstest</Uri>
131131
<Sha>55e7e45431c9c05656c999b902686e7402664573</Sha>
132132
</Dependency>
133-
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.100-rtm.19566.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
133+
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.102-servicing.20070.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
134134
<Uri>https://github.com/dotnet/toolset</Uri>
135-
<Sha>575b1c9f9636e57881fc41817d3f049dff6ff470</Sha>
135+
<Sha>a46d93e5e100f9046cb589b5d4ba70bde41f3480</Sha>
136136
<RepoName>toolset</RepoName>
137137
</Dependency>
138-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="1.0.0-preview.19566.10">
138+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="1.0.0-preview.20080.8">
139139
<Uri>https://github.com/dotnet/core-sdk</Uri>
140-
<Sha>cd82f021f4c2c8901bd7975fcaefc34fdeec3ded</Sha>
140+
<Sha>573d158fea168b51e0f9e628d08c9d3ca8a40ef8</Sha>
141141
<RepoName>core-sdk</RepoName>
142142
</Dependency>
143143
<!-- external dependencies, not handled by Maestro/Arcade -->

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
From b5498725a373eb203f75673687884393af8257fc Mon Sep 17 00:00:00 2001
1+
From 1bf082723351ab7c9a0829ca488d8bf546b86e0c Mon Sep 17 00:00:00 2001
22
From: Chris Rummel <[email protected]>
33
Date: Wed, 23 Oct 2019 18:56:04 -0500
4-
Subject: [PATCH 2/2] Don't call dotnet without a path
4+
Subject: [PATCH 1/3] Don't call dotnet without a path
55

66
---
77
eng/common/tools.sh | 6 +++---
88
1 file changed, 3 insertions(+), 3 deletions(-)
99

1010
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
11-
index 757d5b9ea..5a4cfeb1f 100755
11+
index 94965a8fd..8e14f8b6f 100755
1212
--- a/eng/common/tools.sh
1313
+++ b/eng/common/tools.sh
14-
@@ -340,9 +340,9 @@ function MSBuild {
14+
@@ -362,9 +362,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 757d5b9ea..5a4cfeb1f 100755
2525
local toolset_dir="${_InitializeToolset%/*}"
2626
local logger_path="$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll"
2727
--
28-
2.18.0
28+
2.21.0
2929

0 commit comments

Comments
 (0)