Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit 4e84bdd

Browse files
vseanreesermsftvseanreesermsft
authored
Merge pull request #13824 from vseanreesermsft/internal-merge-3.1.4xx-2022-05-10-1216
Merging internal commits for release/3.1.4xx
2 parents 3d97134 + 7830ba7 commit 4e84bdd

File tree

3 files changed

+23
-21
lines changed

3 files changed

+23
-21
lines changed

‎NuGet.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<clear />
66
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
77
<!-- Begin: Package sources from dotnet-core-setup -->
8+
<add key="darc-int-dotnet-core-setup-9165b88" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-9165b88e/nuget/v3/index.json" />
89
<!-- End: Package sources from dotnet-core-setup -->
910
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1011
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@@ -18,6 +19,7 @@
1819
<disabledPackageSources>
1920
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2021
<!-- Begin: Package sources from dotnet-core-setup -->
22+
<add key="darc-int-dotnet-core-setup-9165b88" value="true" />
2123
<!-- End: Package sources from dotnet-core-setup -->
2224
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2325
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="3.1.24-servicing.22159.4">
4+
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="3.1.25-servicing.22213.12">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
6-
<Sha>c088cfded1fb1fb84c210514a717ccd5631b15b1</Sha>
6+
<Sha>ce3b0dc31df0909a8d8d766694afbc96dfff3036</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.24">
8+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.25">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
10-
<Sha>3b3838608327c1d49fcf77fc47487e40e4dc3000</Sha>
10+
<Sha>9165b88e05fc37585aa1c3fc9585b5a7d751bb21</Sha>
1111
</Dependency>
1212
<Dependency Name="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
@@ -17,23 +17,23 @@
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
1818
<Sha>4c6b4aa257241c4d419b8c271e37afac4445b1c0</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="3.1.6">
20+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="3.1.25">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
22-
<Sha>3acd9b0cd16596bad450c82be08780875a73c05c</Sha>
22+
<Sha>9165b88e05fc37585aa1c3fc9585b5a7d751bb21</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.1.24">
24+
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.1.25">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
26-
<Sha>3b3838608327c1d49fcf77fc47487e40e4dc3000</Sha>
26+
<Sha>9165b88e05fc37585aa1c3fc9585b5a7d751bb21</Sha>
2727
</Dependency>
2828
<!-- Specific version here is not interesting, but we want Maestro to add corefx
2929
private feeds -->
3030
<Dependency Name="System.Text.Json" Version="4.7.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
3131
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri>
3232
<Sha>059a4a19e602494bfbed473dbbb18f2dbfbd0878</Sha>
3333
</Dependency>
34-
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.1.24-servicing.22180.6">
34+
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.1.25-servicing.22219.10">
3535
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
36-
<Sha>d1fa2cb155ab9226f20b87ab0d7a1eb16b8a8b69</Sha>
36+
<Sha>4768f164d522e128f91827810527730f7468fd74</Sha>
3737
</Dependency>
3838
<!-- Keep this dependency at the bottom of ProductDependencies, else it will be picked as the parent for CoherentParentDependencies -->
3939
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.1.0" Pinned="true">
@@ -48,13 +48,13 @@
4848
</Dependency>
4949
</ToolsetDependencies>
5050
<ProductDependencies>
51-
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.418-servicing.22159.9">
51+
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.419-servicing.22214.4">
5252
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
53-
<Sha>fd13ff852d8a7e9dc095386301e1f9fb7e87c565</Sha>
53+
<Sha>315625efecfd26d99a965360ff4544ce825b4f55</Sha>
5454
</Dependency>
55-
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.24-servicing.22179.7">
55+
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.25-servicing.22218.2">
5656
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
57-
<Sha>3b3838608327c1d49fcf77fc47487e40e4dc3000</Sha>
57+
<Sha>9165b88e05fc37585aa1c3fc9585b5a7d751bb21</Sha>
5858
</Dependency>
5959
<Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.19208.1">
6060
<Uri>https://github.com/dotnet/CliCommandLineParser</Uri>

‎eng/Versions.props

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@
1818
<PropertyGroup>
1919
<!-- Dependencies from https://github.com/dotnet/core-setup -->
2020
<MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
21-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.24</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
21+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.25</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
2222
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
23-
<MicrosoftNETCoreAppInternalPackageVersion>3.1.24-servicing.22179.7</MicrosoftNETCoreAppInternalPackageVersion>
23+
<MicrosoftNETCoreAppInternalPackageVersion>3.1.25-servicing.22218.2</MicrosoftNETCoreAppInternalPackageVersion>
2424
<MicrosoftDotNetPlatformAbstractionsPackageVersion>3.1.6</MicrosoftDotNetPlatformAbstractionsPackageVersion>
25-
<MicrosoftExtensionsDependencyModelPackageVersion>3.1.6</MicrosoftExtensionsDependencyModelPackageVersion>
26-
<MicrosoftNETCoreDotNetHostResolverPackageVersion>3.1.24</MicrosoftNETCoreDotNetHostResolverPackageVersion>
25+
<MicrosoftExtensionsDependencyModelPackageVersion>3.1.25</MicrosoftExtensionsDependencyModelPackageVersion>
26+
<MicrosoftNETCoreDotNetHostResolverPackageVersion>3.1.25</MicrosoftNETCoreDotNetHostResolverPackageVersion>
2727
<MicrosoftNETHostModelVersion>3.1.16</MicrosoftNETHostModelVersion>
2828
</PropertyGroup>
2929
<PropertyGroup>
3030
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
31-
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.1.24-servicing.22180.6</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
31+
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.1.25-servicing.22219.10</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
3232
</PropertyGroup>
3333
<PropertyGroup>
3434
<!-- Dependencies from https://github.com/microsoft/msbuild -->
@@ -39,12 +39,12 @@
3939
</PropertyGroup>
4040
<PropertyGroup>
4141
<!-- Dependencies from https://github.com/dotnet/sdk -->
42-
<MicrosoftNETSdkPackageVersion>3.1.418-servicing.22159.9</MicrosoftNETSdkPackageVersion>
42+
<MicrosoftNETSdkPackageVersion>3.1.419-servicing.22214.4</MicrosoftNETSdkPackageVersion>
4343
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
4444
</PropertyGroup>
4545
<PropertyGroup>
4646
<!-- Dependencies from https://github.com/dotnet/templating -->
47-
<MicrosoftTemplateEngineCliPackageVersion>3.1.24-servicing.22159.4</MicrosoftTemplateEngineCliPackageVersion>
47+
<MicrosoftTemplateEngineCliPackageVersion>3.1.25-servicing.22213.12</MicrosoftTemplateEngineCliPackageVersion>
4848
<MicrosoftTemplateEngineAbstractionsPackageVersion>$(MicrosoftTemplateEngineCliPackageVersion)</MicrosoftTemplateEngineAbstractionsPackageVersion>
4949
<MicrosoftTemplateEngineCliLocalizationPackageVersion>$(MicrosoftTemplateEngineCliPackageVersion)</MicrosoftTemplateEngineCliLocalizationPackageVersion>
5050
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineCliPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>

0 commit comments

Comments
 (0)