Skip to content

Commit e05eaa1

Browse files
crummelcrummel
authored
Update to March 2021 3.1. (#2088)
* Update version hashes and N-1 version. * Update repo URLs. * Fix casing
1 parent 899abf9 commit e05eaa1

9 files changed

+67
-118
lines changed

‎build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ if [ "${internalPackageFeedPat:-}" ]; then
124124
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-4210e7d1/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
125125
{"endpoint":"https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-corefx-43e382ec/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
126126
{"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-9b154f56/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
127-
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}
127+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
128+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/internal/_packaging/3-1-13-2-18-21/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}
128129
]}'
129130
fi
130131

‎eng/Version.Details.xml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -27,36 +27,36 @@
2727
<Sha>1127689f262d52ea8ff68ef03d706fa62b3b40a1</Sha>
2828
<RepoName>linker</RepoName>
2929
</Dependency>
30-
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.12-servicing.21065.4" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
30+
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.13-servicing.21111.2" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
3131
<Uri>https://github.com/dotnet/coreclr</Uri>
32-
<Sha>fa682a7bd0a7a1eb5f80904c10b88301eb33150c</Sha>
32+
<Sha>c531bbb17fd887eaf7073f7159db43477d557ae3</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.21069.5" CoherentParentDependency="Microsoft.NETCore.App.Runtime.linux-x64">
40+
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-servicing.21116.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.linux-x64">
4141
<Uri>https://github.com/dotnet/corefx</Uri>
42-
<Sha>50a99d5d3c6e68aecf70627897c0d862a92fc283</Sha>
42+
<Sha>9299d909ff6c03c664a3f9a3ef995a9fa2eeec3e</Sha>
4343
<RepoName>corefx</RepoName>
4444
<RepoName>corefx-portable</RepoName>
4545
</Dependency>
46-
<Dependency Name="Microsoft.NETCore.App.Runtime.linux-x64" Version="3.1.12" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
46+
<Dependency Name="Microsoft.NETCore.App.Runtime.linux-x64" Version="3.1.13" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
4747
<Uri>https://github.com/dotnet/core-setup</Uri>
48-
<Sha>0267ad09c6f2e2a37b23b7d230ffbf9e787dd388</Sha>
48+
<Sha>64df28ec4a52d6cc23efffbb918eab87ee42600f</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.12" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.linux-x64">
52+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.1.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.linux-x64">
5353
<Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
54-
<Sha>7f783df7bb2513f30f7d86f2ff1a80e9d5a5a9c5</Sha>
54+
<Sha>1756aa62b0ee24952b064aabf88f240da51179b1</Sha>
5555
<RepoName>aspnetcore-tooling</RepoName>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.12" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
57+
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.13" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
5858
<Uri>https://github.com/dotnet/templating</Uri>
59-
<Sha>9b154f56a0d634c7257b3e5286af6a8d7b0c1f35</Sha>
59+
<Sha>01919484d0079b505f1befc05109f4f8405c2ec4</Sha>
6060
<RepoName>templating</RepoName>
6161
</Dependency>
6262
<Dependency Name="Microsoft.NETCore.Compilers" Version="3.4.1-beta4-20127-10" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
@@ -72,14 +72,14 @@
7272
<Sha>6f8eb3a2e1db6b458451b9cfd2a4f5557769b041</Sha>
7373
<RepoName>nuget-client</RepoName>
7474
</Dependency>
75-
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.12" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
75+
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.13" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
7676
<Uri>https://github.com/dotnet/extensions</Uri>
77-
<Sha>4210e7d19b3e18ecadbd1c4c8589e39eea035d5f</Sha>
77+
<Sha>945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f</Sha>
7878
<RepoName>aspnet-extensions</RepoName>
7979
</Dependency>
80-
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.112-servicing.21071.11" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
80+
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.113-servicing.21112.20" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
8181
<Uri>https://github.com/dotnet/sdk</Uri>
82-
<Sha>bcb77a6887a5600d050bba4be39c0512f4d5a036</Sha>
82+
<Sha>567532b5ebc207581830835b65bbd75feca7044c</Sha>
8383
<RepoName>sdk</RepoName>
8484
</Dependency>
8585
<Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.19208.1" CoherentParentDependency="Microsoft.DotNet.Cli.Runtime">
@@ -96,37 +96,37 @@
9696
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
9797
<Sha>173ee3bd61c9549557eefa3cfb718bdef157cb87</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="3.1.12" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
99+
<Dependency Name="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="3.1.13" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
100100
<Uri>https://github.com/dotnet/aspnetcore</Uri>
101-
<Sha>331b52b370cd4e7fe2919d4d4cda27412e2ab1cc</Sha>
101+
<Sha>cf2c5c9c6dca430b97aa96429b84d0da07eb77f1</Sha>
102102
<RepoName>aspnetcore</RepoName>
103103
</Dependency>
104-
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.112-servicing.21071.9" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
104+
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.113-servicing.21117.4" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
105105
<Uri>https://github.com/dotnet/cli</Uri>
106-
<Sha>d4aa2a9233c3fcfab38e9539b44c8143a2bbccd3</Sha>
106+
<Sha>bf72556791de4b18f1517271c858707d3eb2613a</Sha>
107107
<RepoName>cli</RepoName>
108108
</Dependency>
109109
<Dependency Name="Microsoft.FSharp.Compiler" Version="10.7.0-beta.19610.6" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
110110
<Uri>https://github.com/dotnet/fsharp</Uri>
111111
<Sha>dc86ab5d2c46e9a7c49290e7e2270ab1eeb0c61e</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.NET.Sdk.Web" Version="3.1.12-servicing.21070.14" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
113+
<Dependency Name="Microsoft.NET.Sdk.Web" Version="3.1.13-servicing.21117.4" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
114114
<Uri>https://github.com/dotnet/websdk</Uri>
115-
<Sha>7373166c63518d71a6f9fb7fe83b4ff47700b9fe</Sha>
115+
<Sha>55d967978dda970e58d997a73bcb9dd86de1f9e4</Sha>
116116
<RepoName>websdk</RepoName>
117117
</Dependency>
118118
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.3.0" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
119119
<Uri>https://github.com/microsoft/vstest</Uri>
120120
<Sha>55e7e45431c9c05656c999b902686e7402664573</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.112-servicing.21071.25" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
122+
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.113-servicing.21117.35" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
123123
<Uri>https://github.com/dotnet/toolset</Uri>
124-
<Sha>1ca4fe1cdbf170c999d22e2c5e1cb586f54a8bf7</Sha>
124+
<Sha>6dfa1a00637e5a59cf077919d7d536b56900b102</Sha>
125125
<RepoName>toolset</RepoName>
126126
</Dependency>
127-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="1.0.0-preview.21072.16">
127+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="3.1.113-servicing-015239">
128128
<Uri>https://github.com/dotnet/installer</Uri>
129-
<Sha>cd75074bf4176d61f2c043cfaab67ed78762d329</Sha>
129+
<Sha>2703068f9520050e59ba9c2e44aabe8fe533c65e</Sha>
130130
<RepoName>core-sdk</RepoName>
131131
</Dependency>
132132
<!-- external dependencies, not handled by Maestro/Arcade -->

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
<!-- Production Dependencies -->
99
<PropertyGroup>
1010
<PrivateSourceBuildReferencePackagesPackageVersion>1.0.0-beta.20374.1</PrivateSourceBuildReferencePackagesPackageVersion>
11-
<PrivateSourceBuiltArtifactsPackageVersion>0.1.0-3.1.111</PrivateSourceBuiltArtifactsPackageVersion>
11+
<PrivateSourceBuiltArtifactsPackageVersion>0.1.0-3.1.112</PrivateSourceBuiltArtifactsPackageVersion>
1212
</PropertyGroup>
1313
</Project>

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "3.1.111"
3+
"dotnet": "3.1.112"
44
},
55
"msbuild-sdks": {
66
"Microsoft.Build.CentralPackageVersions": "2.0.1",

‎patches/aspnetcore/0007-Fix-version-number.patch renamed to ‎patches/aspnetcore/0006-Fix-version-number.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
From 0aa35905e8b6a575dc340a4c48493b2540618880 Mon Sep 17 00:00:00 2001
1+
From 383d34d178f6d3cb4b0eb155a139f74300a89fe4 Mon Sep 17 00:00:00 2001
22
From: dseefeld <dseefeld@microsoft.com>
33
Date: Fri, 4 Dec 2020 17:28:35 +0000
4-
Subject: [PATCH 07/15] Fix version number
4+
Subject: [PATCH 06/14] Fix version number
55

66
This file is actually a very long minified JS file with a version number at the
77
end. The file is treated as binary, making this patch less clear, but it's easy
88
to update/reapply it with a text editor.
99
---
10-
.../Web.JS/dist/Release/blazor.server.js | Bin 216950 -> 216951 bytes
10+
.../Web.JS/dist/Release/blazor.server.js | Bin 242561 -> 242562 bytes
1111
1 file changed, 0 insertions(+), 0 deletions(-)
1212

1313
diff --git a/src/Components/Web.JS/dist/Release/blazor.server.js b/src/Components/Web.JS/dist/Release/blazor.server.js
14-
index 3042cc0c0242767d8389582c9243eb48195a3954..ec2211a04cb1f7d02cd5477a95cdd2b175df4d98 100644
14+
index 1c602124e2c7a54b062e3b1d52c32580a70927bd..f4a07dde84be054ae6020981d431562c706fa577 100644
1515
GIT binary patch
1616
delta 23
17-
ecmex1kN5jL-i8*&7N#xC1^(=YMoP7@n$`ewoCps9
17+
ecmZpC&e!yuuc3vpg=q_O^=5WsrP^3cYc2qA3kU)L
1818

1919
delta 22
20-
dcmex9kN4X=-i8*&7N#xC1^#T7O0}_?)&OiD2jl<%
20+
dcmZpA&e!;yuc3vpg=q_O^=39BrP^3cYXE2e2lfB}
2121

22-
--
22+
--
2323
2.18.0
2424

‎patches/aspnetcore/0008-Remove-Yarn-dependency-not-used-in-source-build.patch renamed to ‎patches/aspnetcore/0007-Remove-Yarn-dependency-not-used-in-source-build.patch

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
1-
From 0c65bf213286fc84e2b9a2f2768cca8ec5449407 Mon Sep 17 00:00:00 2001
1+
From 3a6f962c2f353cbd8b91ab04be441e0203aefd85 Mon Sep 17 00:00:00 2001
22
From: adaggarwal <aditya.aggarwal@microsoft.com>
33
Date: Thu, 14 Nov 2019 17:34:41 +0000
4-
Subject: [PATCH] Remove Yarn dependency - not used in source-build
4+
Subject: [PATCH 07/14] Remove Yarn dependency - not used in source-build
55

66
---
7-
eng/targets/Npm.Common.targets | 3 ---
8-
global.json | 1 -
9-
.../src/Microsoft.Authentication.WebAssembly.Msal.csproj | 2 --
10-
...oft.AspNetCore.Components.WebAssembly.Authentication.csproj | 2 --
11-
.../NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj | 3 ---
12-
.../SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj | 3 ---
13-
src/Shared/E2ETesting/E2ETesting.targets | 3 ---
14-
7 files changed, 17 deletions(-)
7+
eng/targets/Npm.Common.targets | 2 --
8+
global.json | 1 -
9+
.../src/Microsoft.Authentication.WebAssembly.Msal.csproj | 2 --
10+
...soft.AspNetCore.Components.WebAssembly.Authentication.csproj | 2 --
11+
.../NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj | 2 --
12+
.../SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj | 2 --
13+
src/Shared/E2ETesting/E2ETesting.targets | 2 --
14+
7 files changed, 13 deletions(-)
1515

1616
diff --git a/eng/targets/Npm.Common.targets b/eng/targets/Npm.Common.targets
17-
index 062a9d3a8f..3f91b02d42 100644
17+
index 062a9d3a8f..83dfb8c6d0 100644
1818
--- a/eng/targets/Npm.Common.targets
1919
+++ b/eng/targets/Npm.Common.targets
20-
@@ -1,8 +1,5 @@
20+
@@ -1,8 +1,6 @@
2121
<Project DefaultTargets="Build" InitialTargets="_CheckForInvalidConfiguration">
2222

23-
- <!-- Version of this SDK is set in global.json -->
23+
<!-- Version of this SDK is set in global.json -->
2424
- <Sdk Name="Yarn.MSBuild" />
2525
-
2626
<PropertyGroup>
2727
<NormalizedPackageId>$(PackageId.Replace('@','').Replace('/','-'))</NormalizedPackageId>
2828
<PackageFileName>$(NormalizedPackageId)-$(PackageVersion).tgz</PackageFileName>
2929
diff --git a/global.json b/global.json
30-
index 6880ef82ed..854ab2f3a5 100644
30+
index 97783de603..de628eca3c 100644
3131
--- a/global.json
3232
+++ b/global.json
3333
@@ -24,7 +24,6 @@
3434
}
3535
},
3636
"msbuild-sdks": {
3737
- "Yarn.MSBuild": "1.15.2",
38-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21063.4",
39-
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21063.4"
38+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21110.10",
39+
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21110.10"
4040
}
4141
diff --git a/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj b/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj
4242
index 36eec6b93a..19c5906526 100644
@@ -63,45 +63,43 @@ index 8514f8792d..7ca9637b2d 100644
6363
<TargetFramework>netstandard2.1</TargetFramework>
6464
<Description>Build client-side authentication for single-page applications (SPAs).</Description>
6565
diff --git a/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj b/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj
66-
index e67862ea45..29c3b8c137 100644
66+
index e67862ea45..0b8ee65784 100644
6767
--- a/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj
6868
+++ b/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj
69-
@@ -16,9 +16,6 @@
70-
<Reference Include="Newtonsoft.Json" />
69+
@@ -17,8 +17,6 @@
7170
</ItemGroup>
7271

73-
- <!-- Version of this SDK is set in global.json -->
72+
<!-- Version of this SDK is set in global.json -->
7473
- <Sdk Name="Yarn.MSBuild" />
7574
-
7675
<Target Name="YarnInstall">
7776
<Message Text="Running yarn install on $(MSBuildProjectFile)" Importance="High" />
7877
<Yarn Command="install --mutex network" />
7978
diff --git a/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj b/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj
80-
index 3db479b01e..ad0149356f 100644
79+
index 3db479b01e..3690559484 100644
8180
--- a/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj
8281
+++ b/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj
83-
@@ -20,9 +20,6 @@
84-
<Reference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" />
82+
@@ -21,8 +21,6 @@
8583
</ItemGroup>
8684

87-
- <!-- Version of this SDK is set in global.json -->
85+
<!-- Version of this SDK is set in global.json -->
8886
- <Sdk Name="Yarn.MSBuild" />
8987
-
9088
<Target Name="YarnInstall">
9189
<Message Text="Running yarn install on $(MSBuildProjectFile)" Importance="High" />
9290
<Yarn Command="install --mutex network" />
9391
diff --git a/src/Shared/E2ETesting/E2ETesting.targets b/src/Shared/E2ETesting/E2ETesting.targets
94-
index 1cb421de3b..d82a2037a5 100644
92+
index 1cb421de3b..0e57c239c3 100644
9593
--- a/src/Shared/E2ETesting/E2ETesting.targets
9694
+++ b/src/Shared/E2ETesting/E2ETesting.targets
97-
@@ -1,7 +1,4 @@
95+
@@ -1,7 +1,5 @@
9896
<Project>
99-
- <!-- Version of this SDK is set in global.json -->
97+
<!-- Version of this SDK is set in global.json -->
10098
- <Sdk Name="Yarn.MSBuild" />
10199
-
102100
<!-- Make sure the settings files get copied to the test output folder. -->
103101
<ItemGroup>
104102
<None Update="e2eTestSettings*.json">
105103
--
106-
2.25.2
104+
2.18.0
107105

‎patches/aspnetcore/0012-Support-global.json-on-arm64-as-well.patch renamed to ‎patches/aspnetcore/0011-Support-global.json-on-arm64-as-well.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 4f70aa3d91e824fce0a138c105760eabccda2797 Mon Sep 17 00:00:00 2001
1+
From c35773385c2ad55b8ea1c1e97468a640b7d65ec5 Mon Sep 17 00:00:00 2001
22
From: Omair Majid <omajid@redhat.com>
33
Date: Wed, 23 Oct 2019 15:43:57 -0400
4-
Subject: [PATCH] Support global.json on arm64 as well
4+
Subject: [PATCH 11/14] Support global.json on arm64 as well
55

66
arcade uses the runtime section of global.json to decide which
77
architecture + runtime combination needs to be installed.
@@ -19,12 +19,12 @@ This gets us a working SDK/Runtime combo on arm64.
1919
1 file changed, 1 insertion(+), 4 deletions(-)
2020

2121
diff --git a/global.json b/global.json
22-
index 854ab2f3a5..bc379b038e 100644
22+
index de628eca3c..3fb6244e52 100644
2323
--- a/global.json
2424
+++ b/global.json
2525
@@ -5,10 +5,7 @@
2626
"tools": {
27-
"dotnet": "3.1.111",
27+
"dotnet": "3.1.112",
2828
"runtimes": {
2929
- "dotnet/x64": [
3030
- "$(MicrosoftNETCoreAppInternalPackageVersion)"
@@ -35,5 +35,5 @@ index 854ab2f3a5..bc379b038e 100644
3535
]
3636
},
3737
--
38-
2.25.2
38+
2.18.0
3939

‎patches/corefx/0009-correct-system.numerics.tensors-package-versions.patch

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎tools-local/prebuilt-baseline-online.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<Usage Id="Microsoft.DotNet.Common.ItemTemplates" Version="1.0.2-beta3" />
4949
<Usage Id="Microsoft.DotNet.Common.ItemTemplates" Version="1.0.2-beta4" />
5050
<Usage Id="Microsoft.DotNet.Common.ItemTemplates" Version="2.0.0-preview8.19373.1" />
51-
<Usage Id="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21063.4" IsDirectDependency="true" />
51+
<Usage Id="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21110.10" IsDirectDependency="true" />
5252
<Usage Id="Microsoft.DotNet.PlatformAbstractions" Version="2.0.0" IsDirectDependency="true" />
5353
<Usage Id="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" IsDirectDependency="true" />
5454
<Usage Id="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4-20181009-2100240" />

0 commit comments

Comments
 (0)