Skip to content

Commit 2b1abb2

Browse files
dagooddagood
authored
Merge pull request #1832 from dagood/3.1.110
2 parents 56e2fd1 + 4a4aa5b commit 2b1abb2

10 files changed

+68
-128
lines changed

‎NuGet.config

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33
<packageSources>
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
6-
<add key="darc-pub-dotnet-templating-7ea6e50" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7ea6e507/nuget/v3/index.json" />
7-
<add key="darc-pub-dotnet-extensions-d8a50ea" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-extensions-d8a50ea1/nuget/v3/index.json" />
8-
<add key="darc-pub-dotnet-core-setup-774fc3d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-774fc3d6/nuget/v3/index.json" />
9-
<add key="darc-pub-dotnet-aspnetcore-tooling-f677187" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-tooling-f6771873/nuget/v3/index.json" />
10-
<add key="darc-pub-dotnet-aspnetcore-d12868d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-d12868dd/nuget/v3/index.json" />
6+
<add key="darc-pub-dotnet-templating-608ee2d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-608ee2d9/nuget/v3/index.json" />
7+
<add key="darc-pub-dotnet-extensions-bdc3bee" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-extensions-bdc3beed/nuget/v3/index.json" />
8+
<add key="darc-pub-dotnet-core-setup-1721e39-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-1721e394-2/nuget/v3/index.json" />
9+
<add key="darc-pub-dotnet-core-setup-1721e39-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-1721e394-1/nuget/v3/index.json" />
10+
<add key="darc-pub-dotnet-core-setup-1721e39" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-1721e394/nuget/v3/index.json" />
11+
<add key="darc-pub-dotnet-aspnetcore-tooling-e2442f2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-tooling-e2442f29/nuget/v3/index.json" />
12+
<add key="darc-pub-dotnet-aspnetcore-e318707" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-e3187077/nuget/v3/index.json" />
1113
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1214
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
1315
<add key="nuget-build" value="https://dotnet.myget.org/F/nuget-build/api/v3/index.json" />

‎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.9-servicing.20472.1" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
30+
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.10-servicing.20516.1" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
3131
<Uri>https://github.com/dotnet/coreclr</Uri>
32-
<Sha>8775efa17eaf06dc8b6ea9dd3917871fe2d7ff8e</Sha>
32+
<Sha>d989459717cbce34262060c4b8b949185033e379</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.20472.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.linux-x64">
40+
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-servicing.20519.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.linux-x64">
4141
<Uri>https://github.com/dotnet/corefx</Uri>
42-
<Sha>3009a1fc20d9cb47d117399040d31c23f7b23e02</Sha>
42+
<Sha>1b5b5f0bf030bf7250c3258c140fa9e4214325c8</Sha>
4343
<RepoName>corefx</RepoName>
4444
<RepoName>corefx-portable</RepoName>
4545
</Dependency>
46-
<Dependency Name="Microsoft.NETCore.App.Runtime.linux-x64" Version="3.1.9" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
46+
<Dependency Name="Microsoft.NETCore.App.Runtime.linux-x64" Version="3.1.10" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
4747
<Uri>https://github.com/dotnet/core-setup</Uri>
48-
<Sha>774fc3d6a9659077864171d095f46b1ea19bb51d</Sha>
48+
<Sha>1721e3943939f9af7d5effa702bb7e9b99e254f1</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.9" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.linux-x64">
52+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.1.10" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.linux-x64">
5353
<Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
54-
<Sha>f677187340747f56193e7731df449579b4ba5af6</Sha>
54+
<Sha>e2442f29530222358b73882e38d18c4f850900aa</Sha>
5555
<RepoName>aspnetcore-tooling</RepoName>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.9" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
57+
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.10" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
5858
<Uri>https://github.com/dotnet/templating</Uri>
59-
<Sha>7ea6e5075b24adc5a0d8964125699d141ac67efa</Sha>
59+
<Sha>608ee2d9c93b432e9741b0f744cdc710a1e9fae9</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.9" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
75+
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.10" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
7676
<Uri>https://github.com/dotnet/extensions</Uri>
77-
<Sha>d8a50ea1cc9892cda13c5237dec402ca10ddeaa1</Sha>
77+
<Sha>bdc3beedabad610723b62f484f0ff7be6c97d87e</Sha>
7878
<RepoName>aspnet-extensions</RepoName>
7979
</Dependency>
80-
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.109-servicing.20461.11" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
80+
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.110-servicing.20516.4" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
8181
<Uri>https://github.com/dotnet/sdk</Uri>
82-
<Sha>afdde814dc8dedb325e63b39cf72249b43918a23</Sha>
82+
<Sha>81423bd010adc9ae1c1196c87fa2bb50a89db1bb</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.9" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
99+
<Dependency Name="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="3.1.10" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
100100
<Uri>https://github.com/dotnet/aspnetcore</Uri>
101-
<Sha>d12868dd7c10ff0433c16b06d3b59d03c40d987a</Sha>
101+
<Sha>e3187077455f953200e3c930430808a30f48b82e</Sha>
102102
<RepoName>aspnetcore</RepoName>
103103
</Dependency>
104-
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.109-servicing.20473.6" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
104+
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.110-servicing.20520.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
105105
<Uri>https://github.com/dotnet/cli</Uri>
106-
<Sha>8425963d35b2ebb92fdb4312e20ce3f91a886073</Sha>
106+
<Sha>6178adefc009ccdaffa99cbdb57fe3e8b6980825</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.109-servicing.20473.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
113+
<Dependency Name="Microsoft.NET.Sdk.Web" Version="3.1.110-servicing.20520.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
114114
<Uri>https://github.com/dotnet/websdk</Uri>
115-
<Sha>d4160cb5bf36df284208df3f64c7a461826eb90d</Sha>
115+
<Sha>1fbd5c7407eec344444a601fb4cf69a79a2d2164</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.109-servicing.20473.11" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
122+
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.110-servicing.20521.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
123123
<Uri>https://github.com/dotnet/toolset</Uri>
124-
<Sha>6bde7fd6666a4e97f5409b536ff5290bcb3bcd3e</Sha>
124+
<Sha>1ea353920cd54590f12c6e4592da05bc14a09baa</Sha>
125125
<RepoName>toolset</RepoName>
126126
</Dependency>
127-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="1.0.0-preview.20474.6">
127+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="1.0.0-preview.20521.10">
128128
<Uri>https://github.com/dotnet/installer</Uri>
129-
<Sha>32ced2d411573dd57d75c222e5d89ecd0e03c11d</Sha>
129+
<Sha>f02c158773cf1b5fd547570d55ad5a436b58f81d</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.108</PrivateSourceBuiltArtifactsPackageVersion>
11+
<PrivateSourceBuiltArtifactsPackageVersion>0.1.0-3.1.109</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.108"
3+
"dotnet": "3.1.109"
44
},
55
"msbuild-sdks": {
66
"Microsoft.Build.CentralPackageVersions": "2.0.1",

‎patches/aspnetcore/0007-Fix-version-number.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ 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 222661 -> 222658 bytes
10+
.../Web.JS/dist/Release/blazor.server.js | Bin 216950 -> 216952 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 93953a2749b38d198df7d85b370d232789f6a592..3d2b39c93eecec27f94896db784a90f160d3acf2 100644
14+
index 3042cc0c0242767d8389582c9243eb48195a3954..bd9b07978bb91635b732dc021e821c1cf154a1b9 100644
1515
GIT binary patch
16-
delta 27
17-
icmX?ln)lFY-i8*&7N#xC+f%uX^$hhalxkx&t+@c03kd@N
16+
delta 24
17+
fcmex1kN3ws-i8*&7N#xC1^yg{21>QDn$}zZd&LMD
1818

19-
delta 30
20-
lcmX?fn)m2w-i8*&7N#xC+f(^W^$he3bW>8xlxkx&tpT@;3Sj^M
19+
delta 22
20+
dcmew{kN4X=-i8*&7N#xC1^#T7O0}_?)&OiZ2ju_&
2121

22-
--
22+
--
2323
2.18.0
2424

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From ada8d6847f94cdbab444dab899d746a86c5bdc1d Mon Sep 17 00:00:00 2001
1+
From 0c65bf213286fc84e2b9a2f2768cca8ec5449407 Mon Sep 17 00:00:00 2001
22
From: adaggarwal <[email protected]>
33
Date: Thu, 14 Nov 2019 17:34:41 +0000
44
Subject: [PATCH] Remove Yarn dependency - not used in source-build
@@ -27,16 +27,16 @@ index 062a9d3a8f..3f91b02d42 100644
2727
<NormalizedPackageId>$(PackageId.Replace('@','').Replace('/','-'))</NormalizedPackageId>
2828
<PackageFileName>$(NormalizedPackageId)-$(PackageVersion).tgz</PackageFileName>
2929
diff --git a/global.json b/global.json
30-
index 974708a611..f0ea6add96 100644
30+
index 6880ef82ed..854ab2f3a5 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.20213.4",
39-
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20213.4"
38+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20509.7",
39+
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20509.7"
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

‎patches/aspnetcore/0012-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 d4f88b027d6250591506f541c3763db30502fd01 Mon Sep 17 00:00:00 2001
1+
From 4f70aa3d91e824fce0a138c105760eabccda2797 Mon Sep 17 00:00:00 2001
22
From: Omair Majid <[email protected]>
33
Date: Wed, 23 Oct 2019 15:43:57 -0400
4-
Subject: [PATCH 12/15] Support global.json on arm64 as well
4+
Subject: [PATCH] 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 1a5c06a73b..7ebd66e5c9 100644
22+
index 854ab2f3a5..bc379b038e 100644
2323
--- a/global.json
2424
+++ b/global.json
2525
@@ -5,10 +5,7 @@
2626
"tools": {
27-
"dotnet": "3.1.107",
27+
"dotnet": "3.1.109",
2828
"runtimes": {
2929
- "dotnet/x64": [
3030
- "$(MicrosoftNETCoreAppInternalPackageVersion)"
@@ -35,5 +35,5 @@ index 1a5c06a73b..7ebd66e5c9 100644
3535
]
3636
},
3737
--
38-
2.18.0
38+
2.25.2
3939

‎patches/coreclr/0005-Fix-bad-configure-tests.patch

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

‎smoke-testNuGet.Config

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@
44
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
55
<clear />
66
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
7-
<add key="darc-pub-dotnet-templating-7ea6e50" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7ea6e507/nuget/v3/index.json" />
8-
<add key="darc-pub-dotnet-extensions-d8a50ea" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-extensions-d8a50ea1/nuget/v3/index.json" />
9-
<add key="darc-pub-dotnet-core-setup-774fc3d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-774fc3d6/nuget/v3/index.json" />
10-
<add key="darc-pub-dotnet-aspnetcore-tooling-f677187" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-tooling-f6771873/nuget/v3/index.json" />
11-
<add key="darc-pub-dotnet-aspnetcore-d12868d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-d12868dd/nuget/v3/index.json" />
7+
<add key="darc-pub-dotnet-templating-608ee2d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-608ee2d9/nuget/v3/index.json" />
8+
<add key="darc-pub-dotnet-extensions-bdc3bee" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-extensions-bdc3beed/nuget/v3/index.json" />
9+
<add key="darc-pub-dotnet-core-setup-1721e39-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-1721e394-2/nuget/v3/index.json" />
10+
<add key="darc-pub-dotnet-core-setup-1721e39-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-1721e394-1/nuget/v3/index.json" />
11+
<add key="darc-pub-dotnet-core-setup-1721e39" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-1721e394/nuget/v3/index.json" />
12+
<add key="darc-pub-dotnet-aspnetcore-tooling-e2442f2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-tooling-e2442f29/nuget/v3/index.json" />
13+
<add key="darc-pub-dotnet-aspnetcore-e318707" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-e3187077/nuget/v3/index.json" />
1214
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1315
<add key="source-built-packages" value="SOURCE_BUILT_PACKAGES" />
1416
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />

0 commit comments

Comments
 (0)