Skip to content

Commit e6ce839

Browse files
wtgodbewtgodbe
authored
Merge pull request #6977 from vseanreesermsft/internal-merge-3.1-2022-10-11-1010
Merging internal commits for release/3.1
2 parents 943b323 + bfbd2cb commit e6ce839

File tree

4 files changed

+38
-29
lines changed

4 files changed

+38
-29
lines changed

‎NuGet.config‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
<!-- Begin: Package sources from dotnet-corefx -->
77
<!-- End: Package sources from dotnet-corefx -->
88
<!-- Begin: Package sources from dotnet-core-setup -->
9-
<add key="darc-int-dotnet-core-setup-0bcbc31" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-0bcbc312/nuget/v3/index.json" />
9+
<add key="darc-int-dotnet-core-setup-6ea7191" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-6ea71919/nuget/v3/index.json" />
1010
<!-- End: Package sources from dotnet-core-setup -->
1111
<!-- Begin: Package sources from dotnet-extensions -->
12-
<add key="darc-int-dotnet-extensions-a5c93f6" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-a5c93f64/nuget/v3/index.json" />
12+
<add key="darc-int-dotnet-extensions-c62ee3d" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-c62ee3d0/nuget/v3/index.json" />
1313
<!-- End: Package sources from dotnet-extensions -->
1414
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1515
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -25,12 +25,21 @@
2525
<clear />
2626
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2727
<!-- Begin: Package sources from dotnet-extensions -->
28-
<add key="darc-int-dotnet-extensions-a5c93f6" value="true" />
28+
<add key="darc-int-dotnet-extensions-c62ee3d" value="true" />
2929
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3030
<add key="darc-int-dotnet-extensions-4210e7d" value="true" />
3131
<add key="darc-int-dotnet-extensions-4210e7d" value="true" />
3232
<!-- End: Package sources from dotnet-extensions -->
3333
<!-- Begin: Package sources from dotnet-core-setup -->
34+
<add key="darc-int-dotnet-core-setup-6ea7191" value="true" />
35+
<add key="darc-int-dotnet-core-setup-e96b8e2" value="true" />
36+
<add key="darc-int-dotnet-core-setup-3f2ca30" value="true" />
37+
<add key="darc-int-dotnet-core-setup-5ae5357" value="true" />
38+
<add key="darc-int-dotnet-core-setup-d501b36" value="true" />
39+
<add key="darc-int-dotnet-core-setup-8634714" value="true" />
40+
<add key="darc-int-dotnet-core-setup-1896f25" value="true" />
41+
<add key="darc-int-dotnet-core-setup-a241eb0" value="true" />
42+
<add key="darc-int-dotnet-core-setup-9ef769a" value="true" />
3443
<add key="darc-int-dotnet-core-setup-0bcbc31" value="true" />
3544
<add key="darc-int-dotnet-core-setup-fac8702" value="true" />
3645
<add key="darc-int-dotnet-core-setup-e59f024" value="true" />

‎eng/Version.Details.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.1.29-servicing.22417.4">
4+
<Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.1.30-servicing.22476.2">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
6-
<Sha>a5c93f643829c9d3d804468b193d27fa68d87bb0</Sha>
6+
<Sha>c62ee3d0c9492db518f79bf5e4d364bce7c78c66</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.1.29-servicing.22417.4">
8+
<Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.1.30-servicing.22476.2">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
10-
<Sha>a5c93f643829c9d3d804468b193d27fa68d87bb0</Sha>
10+
<Sha>c62ee3d0c9492db518f79bf5e4d364bce7c78c66</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.Extensions.NonCapturingTimer.Sources" Version="3.1.29-servicing.22417.4">
12+
<Dependency Name="Microsoft.Extensions.NonCapturingTimer.Sources" Version="3.1.30-servicing.22476.2">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
14-
<Sha>a5c93f643829c9d3d804468b193d27fa68d87bb0</Sha>
14+
<Sha>c62ee3d0c9492db518f79bf5e4d364bce7c78c66</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.29">
16+
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.30">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
18-
<Sha>a5c93f643829c9d3d804468b193d27fa68d87bb0</Sha>
18+
<Sha>c62ee3d0c9492db518f79bf5e4d364bce7c78c66</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.1.29-servicing.22417.4">
20+
<Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.1.30-servicing.22476.2">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
22-
<Sha>a5c93f643829c9d3d804468b193d27fa68d87bb0</Sha>
22+
<Sha>c62ee3d0c9492db518f79bf5e4d364bce7c78c66</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.29-servicing.22417.4">
24+
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.30-servicing.22476.2">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
26-
<Sha>a5c93f643829c9d3d804468b193d27fa68d87bb0</Sha>
26+
<Sha>c62ee3d0c9492db518f79bf5e4d364bce7c78c66</Sha>
2727
</Dependency>
2828
<Dependency Name="System.Text.Json" Version="4.7.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri>
@@ -49,9 +49,9 @@
4949
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
5050
<Sha>9165b88e05fc37585aa1c3fc9585b5a7d751bb21</Sha>
5151
</Dependency>
52-
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.29-servicing.22417.6" CoherentParentDependency="Microsoft.Extensions.Logging">
52+
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.30-servicing.22476.9" CoherentParentDependency="Microsoft.Extensions.Logging">
5353
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
54-
<Sha>0bcbc312ffe4477aa5c9b0d73736f9377d0518e6</Sha>
54+
<Sha>6ea71919a5bbed566449efe09e953e78abcc5363</Sha>
5555
</Dependency>
5656
<!-- Listed as a dependency to workaround https://github.com/dotnet/cli/issues/10528 -->
5757
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.9" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
@@ -62,9 +62,9 @@
6262
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
6363
All Runtime.$rid packages should have the same version.
6464
-->
65-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.29" CoherentParentDependency="Microsoft.Extensions.Logging">
65+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.30" CoherentParentDependency="Microsoft.Extensions.Logging">
6666
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
67-
<Sha>0bcbc312ffe4477aa5c9b0d73736f9377d0518e6</Sha>
67+
<Sha>6ea71919a5bbed566449efe09e953e78abcc5363</Sha>
6868
</Dependency>
6969
<!-- Keep this dependency at the bottom of ProductDependencies, else it will be picked as the parent for CoherentParentDependencies -->
7070
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.1.0" Pinned="true">

‎eng/Versions.props‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,16 @@
4747
4848
-->
4949
<PropertyGroup Label="Automated">
50-
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.1.29-servicing.22417.4</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
51-
<MicrosoftAspNetCoreTestingPackageVersion>3.1.29-servicing.22417.4</MicrosoftAspNetCoreTestingPackageVersion>
52-
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.1.29-servicing.22417.4</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
50+
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.1.30-servicing.22476.2</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
51+
<MicrosoftAspNetCoreTestingPackageVersion>3.1.30-servicing.22476.2</MicrosoftAspNetCoreTestingPackageVersion>
52+
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.1.30-servicing.22476.2</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
5353
<MicrosoftExtensionsDependencyModelPackageVersion>3.1.25</MicrosoftExtensionsDependencyModelPackageVersion>
54-
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.1.29-servicing.22417.4</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
55-
<MicrosoftExtensionsLoggingPackageVersion>3.1.29</MicrosoftExtensionsLoggingPackageVersion>
56-
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.1.29-servicing.22417.4</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
54+
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.1.30-servicing.22476.2</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
55+
<MicrosoftExtensionsLoggingPackageVersion>3.1.30</MicrosoftExtensionsLoggingPackageVersion>
56+
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.1.30-servicing.22476.2</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
5757
<MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
58-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.29</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
59-
<MicrosoftNETCoreAppInternalPackageVersion>3.1.29-servicing.22417.6</MicrosoftNETCoreAppInternalPackageVersion>
58+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.30</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
59+
<MicrosoftNETCoreAppInternalPackageVersion>3.1.30-servicing.22476.9</MicrosoftNETCoreAppInternalPackageVersion>
6060
<MicrosoftNETCorePlatformsPackageVersion>3.1.9</MicrosoftNETCorePlatformsPackageVersion>
6161
<SystemTextJsonPackageVersion>4.7.2</SystemTextJsonPackageVersion>
6262
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.7.1</SystemDiagnosticsDiagnosticSourcePackageVersion>

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "3.1.423",
3+
"dotnet": "3.1.424",
44
"runtimes": {
55
"dotnet": [
66
"2.1.30",
@@ -15,7 +15,7 @@
1515
}
1616
},
1717
"sdk": {
18-
"version": "3.1.423"
18+
"version": "3.1.424"
1919
},
2020
"msbuild-sdks": {
2121
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.22378.5",

0 commit comments

Comments
 (0)