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

Commit 98a02c3

Browse files
vseanreesermsftvseanreesermsft
authored
Merge pull request #13829 from vseanreesermsft/internal-merge-3.1.4xx-2022-06-14-1036
Merging internal commits for release/3.1.4xx
2 parents 650abbe + db3c551 commit 98a02c3

File tree

4 files changed

+28
-26
lines changed

4 files changed

+28
-26
lines changed

‎.vsts-ci.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
trigger:
2-
- master
3-
- release/*
4-
- internal/release/3.*
2+
batch: true
3+
branches:
4+
include:
5+
- release/3.*
6+
- internal/release/3.*
57

68
variables:
79
- name: _TeamName

‎NuGet.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +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" />
8+
<add key="darc-int-dotnet-core-setup-dae24f1" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-dae24f14/nuget/v3/index.json" />
99
<!-- End: Package sources from dotnet-core-setup -->
1010
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1111
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@@ -19,7 +19,7 @@
1919
<disabledPackageSources>
2020
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2121
<!-- Begin: Package sources from dotnet-core-setup -->
22-
<add key="darc-int-dotnet-core-setup-9165b88" value="true" />
22+
<add key="darc-int-dotnet-core-setup-dae24f1" value="true" />
2323
<!-- End: Package sources from dotnet-core-setup -->
2424
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2525
</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.25-servicing.22213.12">
4+
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="3.1.26-servicing.22261.9">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
6-
<Sha>ce3b0dc31df0909a8d8d766694afbc96dfff3036</Sha>
6+
<Sha>23fb709e24f28892f355a3192bdbea9ac58a78a9</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.25">
8+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.26">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
10-
<Sha>9165b88e05fc37585aa1c3fc9585b5a7d751bb21</Sha>
10+
<Sha>dae24f14e71c9317afbcf2ffaf6a6faa247c1c86</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>
@@ -21,19 +21,19 @@
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
2222
<Sha>9165b88e05fc37585aa1c3fc9585b5a7d751bb21</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.1.25">
24+
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.1.26">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
26-
<Sha>9165b88e05fc37585aa1c3fc9585b5a7d751bb21</Sha>
26+
<Sha>dae24f14e71c9317afbcf2ffaf6a6faa247c1c86</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.25-servicing.22219.10">
34+
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.1.26-servicing.22274.3">
3535
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
36-
<Sha>4768f164d522e128f91827810527730f7468fd74</Sha>
36+
<Sha>0c26925a185ba2996051c0f37a995ef0a682cf54</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,21 +48,21 @@
4848
</Dependency>
4949
</ToolsetDependencies>
5050
<ProductDependencies>
51-
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.419-servicing.22214.4">
51+
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.420-servicing.22274.3">
5252
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
53-
<Sha>315625efecfd26d99a965360ff4544ce825b4f55</Sha>
53+
<Sha>e6a70bf1527b6bce09fbbe6a94e026a7da49f850</Sha>
5454
</Dependency>
55-
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.25-servicing.22218.2">
55+
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.26-servicing.22273.3">
5656
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
57-
<Sha>9165b88e05fc37585aa1c3fc9585b5a7d751bb21</Sha>
57+
<Sha>dae24f14e71c9317afbcf2ffaf6a6faa247c1c86</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>
6161
<Sha>0e89c2116ad28e404ba56c14d1c3f938caa25a01</Sha>
6262
</Dependency>
63-
<Dependency Name="NuGet.Build.Tasks" Version="5.7.1-rtm.4">
63+
<Dependency Name="NuGet.Build.Tasks" Version="5.7.2-rtm.8">
6464
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted</Uri>
65-
<Sha>89c5d71421d1db6867cedeff26b1634a42a01ff0</Sha>
65+
<Sha>332fc3399af39ebaf103f04e039f7c0ce0b53c88</Sha>
6666
</Dependency>
6767
</ProductDependencies>
6868
</Dependencies>

‎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.25</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
21+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.26</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
2222
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
23-
<MicrosoftNETCoreAppInternalPackageVersion>3.1.25-servicing.22218.2</MicrosoftNETCoreAppInternalPackageVersion>
23+
<MicrosoftNETCoreAppInternalPackageVersion>3.1.26-servicing.22273.3</MicrosoftNETCoreAppInternalPackageVersion>
2424
<MicrosoftDotNetPlatformAbstractionsPackageVersion>3.1.6</MicrosoftDotNetPlatformAbstractionsPackageVersion>
2525
<MicrosoftExtensionsDependencyModelPackageVersion>3.1.25</MicrosoftExtensionsDependencyModelPackageVersion>
26-
<MicrosoftNETCoreDotNetHostResolverPackageVersion>3.1.25</MicrosoftNETCoreDotNetHostResolverPackageVersion>
26+
<MicrosoftNETCoreDotNetHostResolverPackageVersion>3.1.26</MicrosoftNETCoreDotNetHostResolverPackageVersion>
2727
<MicrosoftNETHostModelVersion>3.1.16</MicrosoftNETHostModelVersion>
2828
</PropertyGroup>
2929
<PropertyGroup>
3030
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
31-
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.1.25-servicing.22219.10</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
31+
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.1.26-servicing.22274.3</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.419-servicing.22214.4</MicrosoftNETSdkPackageVersion>
42+
<MicrosoftNETSdkPackageVersion>3.1.420-servicing.22274.3</MicrosoftNETSdkPackageVersion>
4343
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
4444
</PropertyGroup>
4545
<PropertyGroup>
4646
<!-- Dependencies from https://github.com/dotnet/templating -->
47-
<MicrosoftTemplateEngineCliPackageVersion>3.1.25-servicing.22213.12</MicrosoftTemplateEngineCliPackageVersion>
47+
<MicrosoftTemplateEngineCliPackageVersion>3.1.26-servicing.22261.9</MicrosoftTemplateEngineCliPackageVersion>
4848
<MicrosoftTemplateEngineAbstractionsPackageVersion>$(MicrosoftTemplateEngineCliPackageVersion)</MicrosoftTemplateEngineAbstractionsPackageVersion>
4949
<MicrosoftTemplateEngineCliLocalizationPackageVersion>$(MicrosoftTemplateEngineCliPackageVersion)</MicrosoftTemplateEngineCliLocalizationPackageVersion>
5050
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineCliPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
@@ -57,7 +57,7 @@
5757
</PropertyGroup>
5858
<PropertyGroup>
5959
<!-- Dependencies from https://github.com/NuGet/NuGet.Client-->
60-
<NuGetBuildTasksPackageVersion>5.7.1-rtm.4</NuGetBuildTasksPackageVersion>
60+
<NuGetBuildTasksPackageVersion>5.7.2-rtm.8</NuGetBuildTasksPackageVersion>
6161
<NuGetCommonPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetCommonPackageVersion>
6262
<NuGetConfigurationPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetConfigurationPackageVersion>
6363
<NuGetFrameworksPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetFrameworksPackageVersion>

0 commit comments

Comments
 (0)