From 11c4b95c74f9cf0485929d204f9c4af6848ca322 Mon Sep 17 00:00:00 2001
From: DotNet-Bot <dn-bot@microsoft.com>
Date: Fri, 24 Nov 2023 11:48:17 +0000
Subject: [PATCH 01/10] Update dependencies from
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231124.1
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
From Version 6.0.125-servicing.23523.37 -> To Version 6.0.126-servicing.23574.1
Dependency coherency updates
Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0
From Version 6.0.25 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk
---
NuGet.config | 6 ++++
eng/Version.Details.xml | 68 ++++++++++++++++++++---------------------
eng/Versions.props | 32 +++++++++----------
3 files changed, 56 insertions(+), 50 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index dd632b04b..03f09e6af 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,14 +7,17 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
+ <add key="darc-int-dotnet-aspnetcore-2813f39" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-2813f390/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-runtime -->
+ <add key="darc-int-dotnet-runtime-965a793" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-965a793e/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
+ <add key="darc-int-dotnet-templating-8f42eee" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8f42eeee/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-windowsdesktop -->
@@ -37,11 +40,14 @@
<disabledPackageSources>
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
+ <add key="darc-int-dotnet-aspnetcore-2813f39" value="true" />
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
+ <add key="darc-int-dotnet-runtime-965a793" value="true" />
<!-- Begin: Package sources from dotnet-templating -->
+ <add key="darc-int-dotnet-templating-8f42eee" value="true" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-windowsdesktop -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 039431cba..a891e9673 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -17,30 +17,30 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>a74946f8dae6d29fd18c8fc702e23f8fe77c729c</Sha>
</Dependency>
- <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.25-servicing.23519.12" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.26-servicing.23572.29" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
- <Sha>492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4</Sha>
+ <Sha>965a793efc765ddbea3c43e43c13b8e956b61946</Sha>
</Dependency>
- <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.25" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
- <Sha>492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4</Sha>
+ <Sha>965a793efc765ddbea3c43e43c13b8e956b61946</Sha>
</Dependency>
- <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.25-servicing.23519.12" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.26-servicing.23572.29" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
- <Sha>492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4</Sha>
+ <Sha>965a793efc765ddbea3c43e43c13b8e956b61946</Sha>
</Dependency>
- <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.25" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
- <Sha>492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4</Sha>
+ <Sha>965a793efc765ddbea3c43e43c13b8e956b61946</Sha>
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
</Dependency>
- <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.25" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
- <Sha>492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4</Sha>
+ <Sha>965a793efc765ddbea3c43e43c13b8e956b61946</Sha>
</Dependency>
- <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.25" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
- <Sha>492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4</Sha>
+ <Sha>965a793efc765ddbea3c43e43c13b8e956b61946</Sha>
</Dependency>
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
<!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
@@ -52,30 +52,30 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>a08d9ce2caf02455c0b825bcdc32974bdf769a80</Sha>
</Dependency>
- <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.25" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd</Sha>
+ <Sha>2813f390b0d8ad577f32f27a1c57031e56f02f45</Sha>
</Dependency>
- <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.25-servicing.23523.15" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.26-servicing.23573.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd</Sha>
+ <Sha>2813f390b0d8ad577f32f27a1c57031e56f02f45</Sha>
</Dependency>
- <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.25" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd</Sha>
+ <Sha>2813f390b0d8ad577f32f27a1c57031e56f02f45</Sha>
<SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
- <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.25-servicing.23523.15" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.26-servicing.23573.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd</Sha>
+ <Sha>2813f390b0d8ad577f32f27a1c57031e56f02f45</Sha>
</Dependency>
- <Dependency Name="dotnet-dev-certs" Version="6.0.25-servicing.23523.15" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="dotnet-dev-certs" Version="6.0.26-servicing.23573.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd</Sha>
+ <Sha>2813f390b0d8ad577f32f27a1c57031e56f02f45</Sha>
</Dependency>
- <Dependency Name="dotnet-user-secrets" Version="6.0.25-servicing.23523.15" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="dotnet-user-secrets" Version="6.0.26-servicing.23573.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd</Sha>
+ <Sha>2813f390b0d8ad577f32f27a1c57031e56f02f45</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22064.3">
<Uri>https://github.com/dotnet/test-templates</Uri>
@@ -90,27 +90,27 @@
<Sha>c40ef7e056b48e011c43a21354d6790ba6b8b4fc</Sha>
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
</Dependency>
- <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.125" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.126" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
- <Sha>7e5c0220b5ebe21277a6943f32ca92e666d30e37</Sha>
+ <Sha>8f42eeeef2041f39db00cf87a08ad9e6eb3f613d</Sha>
</Dependency>
- <Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.125-servicing.23519.23" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.126-servicing.23573.12" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
- <Sha>7e5c0220b5ebe21277a6943f32ca92e666d30e37</Sha>
+ <Sha>8f42eeeef2041f39db00cf87a08ad9e6eb3f613d</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
- <Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.125" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.126" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
- <Sha>7e5c0220b5ebe21277a6943f32ca92e666d30e37</Sha>
+ <Sha>8f42eeeef2041f39db00cf87a08ad9e6eb3f613d</Sha>
</Dependency>
- <Dependency Name="Microsoft.NET.Sdk" Version="6.0.125-servicing.23523.37">
+ <Dependency Name="Microsoft.NET.Sdk" Version="6.0.126-servicing.23574.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
- <Sha>a8b4ec801637f85c99edb62569b72d99c550da7e</Sha>
+ <Sha>cb1f8762b907a48ebcb8f8d41151559940b8258a</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
- <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.125-servicing.23523.37">
+ <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.126-servicing.23574.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
- <Sha>a8b4ec801637f85c99edb62569b72d99c550da7e</Sha>
+ <Sha>cb1f8762b907a48ebcb8f8d41151559940b8258a</Sha>
</Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.25-servicing.23519.16" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
diff --git a/eng/Versions.props b/eng/Versions.props
index 616f2592a..c2386ebf9 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -31,7 +31,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/templating -->
- <MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.125</MicrosoftDotNetCommonItemTemplatesPackageVersion>
+ <MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.126</MicrosoftDotNetCommonItemTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/test-templates -->
@@ -44,20 +44,20 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
- <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.25</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
- <MicrosoftAspNetCoreAppRefPackageVersion>6.0.25</MicrosoftAspNetCoreAppRefPackageVersion>
- <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.25-servicing.23523.15</MicrosoftAspNetCoreAppRefInternalPackageVersion>
- <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.25-servicing.23523.15</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
- <dotnetdevcertsPackageVersion>6.0.25-servicing.23523.15</dotnetdevcertsPackageVersion>
- <dotnetusersecretsPackageVersion>6.0.25-servicing.23523.15</dotnetusersecretsPackageVersion>
+ <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.26</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
+ <MicrosoftAspNetCoreAppRefPackageVersion>6.0.26</MicrosoftAspNetCoreAppRefPackageVersion>
+ <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.26-servicing.23573.6</MicrosoftAspNetCoreAppRefInternalPackageVersion>
+ <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.26-servicing.23573.6</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
+ <dotnetdevcertsPackageVersion>6.0.26-servicing.23573.6</dotnetdevcertsPackageVersion>
+ <dotnetusersecretsPackageVersion>6.0.26-servicing.23573.6</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
- <MicrosoftNETSdkPackageVersion>6.0.125-servicing.23523.37</MicrosoftNETSdkPackageVersion>
- <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.125-servicing.23523.37</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+ <MicrosoftNETSdkPackageVersion>6.0.126-servicing.23574.1</MicrosoftNETSdkPackageVersion>
+ <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.126-servicing.23574.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@@ -68,12 +68,12 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/core-setup -->
- <VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.25-servicing.23519.12</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
- <VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.25-servicing.23519.12</VSRedistCommonNetCoreTargetingPackx6460PackageVersion>
- <MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.25</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
- <MicrosoftNETCoreAppHostwinx64PackageVersion>6.0.25</MicrosoftNETCoreAppHostwinx64PackageVersion>
- <MicrosoftNETCoreAppRefPackageVersion>6.0.25</MicrosoftNETCoreAppRefPackageVersion>
- <MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.25</MicrosoftNETCoreDotNetHostResolverPackageVersion>
+ <VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.26-servicing.23572.29</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
+ <VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.26-servicing.23572.29</VSRedistCommonNetCoreTargetingPackx6460PackageVersion>
+ <MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.26</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
+ <MicrosoftNETCoreAppHostwinx64PackageVersion>6.0.26</MicrosoftNETCoreAppHostwinx64PackageVersion>
+ <MicrosoftNETCoreAppRefPackageVersion>6.0.26</MicrosoftNETCoreAppRefPackageVersion>
+ <MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.26</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
@@ -115,7 +115,7 @@
<MicrosoftDotNetWpfProjectTemplates60PackageVersion>$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)</MicrosoftDotNetWpfProjectTemplates60PackageVersion>
<NUnit3Templates60PackageVersion>$(NUnit3DotNetNewTemplatePackageVersion)</NUnit3Templates60PackageVersion>
<MicrosoftDotNetCommonItemTemplates60PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonItemTemplates60PackageVersion>
- <MicrosoftDotNetCommonProjectTemplates60PackageVersion>6.0.125</MicrosoftDotNetCommonProjectTemplates60PackageVersion>
+ <MicrosoftDotNetCommonProjectTemplates60PackageVersion>6.0.126</MicrosoftDotNetCommonProjectTemplates60PackageVersion>
<AspNetCorePackageVersionFor60Templates>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</AspNetCorePackageVersionFor60Templates>
<!-- 5.0 Template versions -->
<MicrosoftDotnetWinFormsProjectTemplates50PackageVersion>$(MicrosoftWinFormsProjectTemplates50PackageVersion)</MicrosoftDotnetWinFormsProjectTemplates50PackageVersion>
From fd7471c9072304c51021a2216c218af95959ca2e Mon Sep 17 00:00:00 2001
From: DotNet-Bot <dn-bot@microsoft.com>
Date: Tue, 28 Nov 2023 11:54:25 +0000
Subject: [PATCH 02/10] Update dependencies from
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.6
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
From Version 6.0.126-servicing.23574.1 -> To Version 6.0.126-servicing.23578.6
Dependency coherency updates
Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets
From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk
---
NuGet.config | 4 ++--
eng/Version.Details.xml | 28 ++++++++++++++--------------
eng/Versions.props | 12 ++++++------
3 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index 03f09e6af..fe7817f00 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,7 +7,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
- <add key="darc-int-dotnet-aspnetcore-2813f39" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-2813f390/nuget/v3/index.json" />
+ <add key="darc-int-dotnet-aspnetcore-00f7c0e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-00f7c0ed/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<!-- End: Package sources from dotnet-emsdk -->
@@ -40,7 +40,7 @@
<disabledPackageSources>
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
- <add key="darc-int-dotnet-aspnetcore-2813f39" value="true" />
+ <add key="darc-int-dotnet-aspnetcore-00f7c0e" value="true" />
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from dotnet-aspnetcore -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index a891e9673..7e5d919ef 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -54,28 +54,28 @@
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>2813f390b0d8ad577f32f27a1c57031e56f02f45</Sha>
+ <Sha>00f7c0edf759ec4fa22094a1571b1b1530ffe183</Sha>
</Dependency>
- <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.26-servicing.23573.6" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.26-servicing.23577.12" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>2813f390b0d8ad577f32f27a1c57031e56f02f45</Sha>
+ <Sha>00f7c0edf759ec4fa22094a1571b1b1530ffe183</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>2813f390b0d8ad577f32f27a1c57031e56f02f45</Sha>
+ <Sha>00f7c0edf759ec4fa22094a1571b1b1530ffe183</Sha>
<SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
- <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.26-servicing.23573.6" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.26-servicing.23577.12" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>2813f390b0d8ad577f32f27a1c57031e56f02f45</Sha>
+ <Sha>00f7c0edf759ec4fa22094a1571b1b1530ffe183</Sha>
</Dependency>
- <Dependency Name="dotnet-dev-certs" Version="6.0.26-servicing.23573.6" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="dotnet-dev-certs" Version="6.0.26-servicing.23577.12" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>2813f390b0d8ad577f32f27a1c57031e56f02f45</Sha>
+ <Sha>00f7c0edf759ec4fa22094a1571b1b1530ffe183</Sha>
</Dependency>
- <Dependency Name="dotnet-user-secrets" Version="6.0.26-servicing.23573.6" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="dotnet-user-secrets" Version="6.0.26-servicing.23577.12" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>2813f390b0d8ad577f32f27a1c57031e56f02f45</Sha>
+ <Sha>00f7c0edf759ec4fa22094a1571b1b1530ffe183</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22064.3">
<Uri>https://github.com/dotnet/test-templates</Uri>
@@ -103,14 +103,14 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>8f42eeeef2041f39db00cf87a08ad9e6eb3f613d</Sha>
</Dependency>
- <Dependency Name="Microsoft.NET.Sdk" Version="6.0.126-servicing.23574.1">
+ <Dependency Name="Microsoft.NET.Sdk" Version="6.0.126-servicing.23578.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
- <Sha>cb1f8762b907a48ebcb8f8d41151559940b8258a</Sha>
+ <Sha>b3a797e95e70efc1a8360afc0ab845f0b5fc668a</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
- <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.126-servicing.23574.1">
+ <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.126-servicing.23578.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
- <Sha>cb1f8762b907a48ebcb8f8d41151559940b8258a</Sha>
+ <Sha>b3a797e95e70efc1a8360afc0ab845f0b5fc668a</Sha>
</Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.25-servicing.23519.16" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
diff --git a/eng/Versions.props b/eng/Versions.props
index c2386ebf9..c68cdb0ad 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -46,18 +46,18 @@
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.26</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>6.0.26</MicrosoftAspNetCoreAppRefPackageVersion>
- <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.26-servicing.23573.6</MicrosoftAspNetCoreAppRefInternalPackageVersion>
- <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.26-servicing.23573.6</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
- <dotnetdevcertsPackageVersion>6.0.26-servicing.23573.6</dotnetdevcertsPackageVersion>
- <dotnetusersecretsPackageVersion>6.0.26-servicing.23573.6</dotnetusersecretsPackageVersion>
+ <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.26-servicing.23577.12</MicrosoftAspNetCoreAppRefInternalPackageVersion>
+ <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.26-servicing.23577.12</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
+ <dotnetdevcertsPackageVersion>6.0.26-servicing.23577.12</dotnetdevcertsPackageVersion>
+ <dotnetusersecretsPackageVersion>6.0.26-servicing.23577.12</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
- <MicrosoftNETSdkPackageVersion>6.0.126-servicing.23574.1</MicrosoftNETSdkPackageVersion>
- <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.126-servicing.23574.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+ <MicrosoftNETSdkPackageVersion>6.0.126-servicing.23578.6</MicrosoftNETSdkPackageVersion>
+ <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.126-servicing.23578.6</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
From aef743128cbc7065ce729367f2a6d454b0ed6f43 Mon Sep 17 00:00:00 2001
From: DotNet-Bot <dn-bot@microsoft.com>
Date: Wed, 29 Nov 2023 12:30:26 +0000
Subject: [PATCH 03/10] Update dependencies from
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231129.2
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
From Version 6.0.126-servicing.23578.6 -> To Version 6.0.126-servicing.23579.2
Dependency coherency updates
Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0
From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk
---
NuGet.config | 8 ++++----
eng/Version.Details.xml | 36 ++++++++++++++++++------------------
eng/Versions.props | 12 ++++++------
3 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index fe7817f00..4fab6601b 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,7 +7,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
- <add key="darc-int-dotnet-aspnetcore-00f7c0e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-00f7c0ed/nuget/v3/index.json" />
+ <add key="darc-int-dotnet-aspnetcore-ed655b4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-ed655b45/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<!-- End: Package sources from dotnet-emsdk -->
@@ -17,7 +17,7 @@
<add key="darc-int-dotnet-runtime-965a793" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-965a793e/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
- <add key="darc-int-dotnet-templating-8f42eee" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8f42eeee/nuget/v3/index.json" />
+ <add key="darc-int-dotnet-templating-e58a1e0" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-e58a1e05/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-windowsdesktop -->
@@ -40,14 +40,14 @@
<disabledPackageSources>
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
- <add key="darc-int-dotnet-aspnetcore-00f7c0e" value="true" />
+ <add key="darc-int-dotnet-aspnetcore-ed655b4" value="true" />
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-965a793" value="true" />
<!-- Begin: Package sources from dotnet-templating -->
- <add key="darc-int-dotnet-templating-8f42eee" value="true" />
+ <add key="darc-int-dotnet-templating-e58a1e0" value="true" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-windowsdesktop -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 7e5d919ef..a4bf66b6a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -54,28 +54,28 @@
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>00f7c0edf759ec4fa22094a1571b1b1530ffe183</Sha>
+ <Sha>ed655b45693cabc1de87e4d76d0785a3868396c2</Sha>
</Dependency>
- <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.26-servicing.23577.12" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.26-servicing.23578.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>00f7c0edf759ec4fa22094a1571b1b1530ffe183</Sha>
+ <Sha>ed655b45693cabc1de87e4d76d0785a3868396c2</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>00f7c0edf759ec4fa22094a1571b1b1530ffe183</Sha>
+ <Sha>ed655b45693cabc1de87e4d76d0785a3868396c2</Sha>
<SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
- <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.26-servicing.23577.12" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.26-servicing.23578.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>00f7c0edf759ec4fa22094a1571b1b1530ffe183</Sha>
+ <Sha>ed655b45693cabc1de87e4d76d0785a3868396c2</Sha>
</Dependency>
- <Dependency Name="dotnet-dev-certs" Version="6.0.26-servicing.23577.12" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="dotnet-dev-certs" Version="6.0.26-servicing.23578.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>00f7c0edf759ec4fa22094a1571b1b1530ffe183</Sha>
+ <Sha>ed655b45693cabc1de87e4d76d0785a3868396c2</Sha>
</Dependency>
- <Dependency Name="dotnet-user-secrets" Version="6.0.26-servicing.23577.12" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="dotnet-user-secrets" Version="6.0.26-servicing.23578.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>00f7c0edf759ec4fa22094a1571b1b1530ffe183</Sha>
+ <Sha>ed655b45693cabc1de87e4d76d0785a3868396c2</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22064.3">
<Uri>https://github.com/dotnet/test-templates</Uri>
@@ -92,25 +92,25 @@
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.126" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
- <Sha>8f42eeeef2041f39db00cf87a08ad9e6eb3f613d</Sha>
+ <Sha>e58a1e0535c781fc1c12a5bbbc81c5044260d3e0</Sha>
</Dependency>
- <Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.126-servicing.23573.12" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.126-servicing.23578.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
- <Sha>8f42eeeef2041f39db00cf87a08ad9e6eb3f613d</Sha>
+ <Sha>e58a1e0535c781fc1c12a5bbbc81c5044260d3e0</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.126" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
- <Sha>8f42eeeef2041f39db00cf87a08ad9e6eb3f613d</Sha>
+ <Sha>e58a1e0535c781fc1c12a5bbbc81c5044260d3e0</Sha>
</Dependency>
- <Dependency Name="Microsoft.NET.Sdk" Version="6.0.126-servicing.23578.6">
+ <Dependency Name="Microsoft.NET.Sdk" Version="6.0.126-servicing.23579.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
- <Sha>b3a797e95e70efc1a8360afc0ab845f0b5fc668a</Sha>
+ <Sha>bf47a20af74904ba30cc994c491f744e86545dd7</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
- <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.126-servicing.23578.6">
+ <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.126-servicing.23579.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
- <Sha>b3a797e95e70efc1a8360afc0ab845f0b5fc668a</Sha>
+ <Sha>bf47a20af74904ba30cc994c491f744e86545dd7</Sha>
</Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.25-servicing.23519.16" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
diff --git a/eng/Versions.props b/eng/Versions.props
index c68cdb0ad..7731bf09c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -46,18 +46,18 @@
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.26</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>6.0.26</MicrosoftAspNetCoreAppRefPackageVersion>
- <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.26-servicing.23577.12</MicrosoftAspNetCoreAppRefInternalPackageVersion>
- <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.26-servicing.23577.12</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
- <dotnetdevcertsPackageVersion>6.0.26-servicing.23577.12</dotnetdevcertsPackageVersion>
- <dotnetusersecretsPackageVersion>6.0.26-servicing.23577.12</dotnetusersecretsPackageVersion>
+ <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.26-servicing.23578.6</MicrosoftAspNetCoreAppRefInternalPackageVersion>
+ <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.26-servicing.23578.6</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
+ <dotnetdevcertsPackageVersion>6.0.26-servicing.23578.6</dotnetdevcertsPackageVersion>
+ <dotnetusersecretsPackageVersion>6.0.26-servicing.23578.6</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
- <MicrosoftNETSdkPackageVersion>6.0.126-servicing.23578.6</MicrosoftNETSdkPackageVersion>
- <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.126-servicing.23578.6</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+ <MicrosoftNETSdkPackageVersion>6.0.126-servicing.23579.2</MicrosoftNETSdkPackageVersion>
+ <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.126-servicing.23579.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
From 74bce27a5926a4a430b802efe4aeccf187ef1c9e Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Fri, 1 Dec 2023 19:40:24 +0000
Subject: [PATCH 04/10] Merged PR 35744: [internal/release/6.0.1xx] Update
dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies
[marker]: <> (Begin:Coherency Updates)
## Coherency Updates
The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)
[DependencyUpdate]: <> (Begin)
- **Coherency Updates**:
- **Microsoft.AspNetCore.App.Ref**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk)
- **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk)
- **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk)
- **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk)
- **dotnet-dev-certs**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk)
- **dotnet-user-secrets**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk)
[DependencyUpdate]: <> (End)
[marker]: <> (End:Coherency Updates)
[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20231201.7
- **Date Produced**: December 1, 2023 7:13:07 PM UTC
- **Commit**: 280895b0c4e22fe6995fa31637d14a8da840d8d0
- **Branch**: refs/heads/internal/release/6.0.1xx
[DependencyUpdate]: <> (Begin)
- **Updates**:
- **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.126-servicing.23579.2 to 6.0.126-servicing.23601.7][1]
- **Microsoft.NET.Sdk**: [from 6.0.126-servicing.23579.2 to 6.0.126-servicing.23601.7][1]
- **Microsoft.AspNetCore.App.Ref**: [from 6.0.26 to 6.0.26][2]
- **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2]
- **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.26 to 6.0.26][2]
- **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2]
- **dotnet-dev-certs**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2]
- **dotnet-user-secrets**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2]
[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCbf47a20af7&targetVersion=GC280895b0c4&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCed655b4569&targetVersion=GC4ed6b143f1&_a=files
[DependencyUpdate]: <> (End)
[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
---
NuGet.config | 4 ++--
eng/Version.Details.xml | 28 ++++++++++++++--------------
eng/Versions.props | 12 ++++++------
3 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index 4fab6601b..f22372130 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,7 +7,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
- <add key="darc-int-dotnet-aspnetcore-ed655b4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-ed655b45/nuget/v3/index.json" />
+ <add key="darc-int-dotnet-aspnetcore-4ed6b14" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-4ed6b143/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<!-- End: Package sources from dotnet-emsdk -->
@@ -40,7 +40,7 @@
<disabledPackageSources>
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
- <add key="darc-int-dotnet-aspnetcore-ed655b4" value="true" />
+ <add key="darc-int-dotnet-aspnetcore-4ed6b14" value="true" />
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from dotnet-aspnetcore -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index a4bf66b6a..8c74919a0 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -54,28 +54,28 @@
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>ed655b45693cabc1de87e4d76d0785a3868396c2</Sha>
+ <Sha>4ed6b143f1b3e8de62590966d21d92f5f9e9c006</Sha>
</Dependency>
- <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.26-servicing.23578.6" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.26-servicing.23601.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>ed655b45693cabc1de87e4d76d0785a3868396c2</Sha>
+ <Sha>4ed6b143f1b3e8de62590966d21d92f5f9e9c006</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>ed655b45693cabc1de87e4d76d0785a3868396c2</Sha>
+ <Sha>4ed6b143f1b3e8de62590966d21d92f5f9e9c006</Sha>
<SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
- <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.26-servicing.23578.6" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.26-servicing.23601.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>ed655b45693cabc1de87e4d76d0785a3868396c2</Sha>
+ <Sha>4ed6b143f1b3e8de62590966d21d92f5f9e9c006</Sha>
</Dependency>
- <Dependency Name="dotnet-dev-certs" Version="6.0.26-servicing.23578.6" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="dotnet-dev-certs" Version="6.0.26-servicing.23601.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>ed655b45693cabc1de87e4d76d0785a3868396c2</Sha>
+ <Sha>4ed6b143f1b3e8de62590966d21d92f5f9e9c006</Sha>
</Dependency>
- <Dependency Name="dotnet-user-secrets" Version="6.0.26-servicing.23578.6" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="dotnet-user-secrets" Version="6.0.26-servicing.23601.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>ed655b45693cabc1de87e4d76d0785a3868396c2</Sha>
+ <Sha>4ed6b143f1b3e8de62590966d21d92f5f9e9c006</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22064.3">
<Uri>https://github.com/dotnet/test-templates</Uri>
@@ -103,14 +103,14 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>e58a1e0535c781fc1c12a5bbbc81c5044260d3e0</Sha>
</Dependency>
- <Dependency Name="Microsoft.NET.Sdk" Version="6.0.126-servicing.23579.2">
+ <Dependency Name="Microsoft.NET.Sdk" Version="6.0.126-servicing.23601.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
- <Sha>bf47a20af74904ba30cc994c491f744e86545dd7</Sha>
+ <Sha>280895b0c4e22fe6995fa31637d14a8da840d8d0</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
- <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.126-servicing.23579.2">
+ <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.126-servicing.23601.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
- <Sha>bf47a20af74904ba30cc994c491f744e86545dd7</Sha>
+ <Sha>280895b0c4e22fe6995fa31637d14a8da840d8d0</Sha>
</Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.25-servicing.23519.16" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
diff --git a/eng/Versions.props b/eng/Versions.props
index 7731bf09c..be784a3b6 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -46,18 +46,18 @@
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.26</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>6.0.26</MicrosoftAspNetCoreAppRefPackageVersion>
- <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.26-servicing.23578.6</MicrosoftAspNetCoreAppRefInternalPackageVersion>
- <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.26-servicing.23578.6</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
- <dotnetdevcertsPackageVersion>6.0.26-servicing.23578.6</dotnetdevcertsPackageVersion>
- <dotnetusersecretsPackageVersion>6.0.26-servicing.23578.6</dotnetusersecretsPackageVersion>
+ <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.26-servicing.23601.6</MicrosoftAspNetCoreAppRefInternalPackageVersion>
+ <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.26-servicing.23601.6</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
+ <dotnetdevcertsPackageVersion>6.0.26-servicing.23601.6</dotnetdevcertsPackageVersion>
+ <dotnetusersecretsPackageVersion>6.0.26-servicing.23601.6</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
- <MicrosoftNETSdkPackageVersion>6.0.126-servicing.23579.2</MicrosoftNETSdkPackageVersion>
- <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.126-servicing.23579.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+ <MicrosoftNETSdkPackageVersion>6.0.126-servicing.23601.7</MicrosoftNETSdkPackageVersion>
+ <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.126-servicing.23601.7</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
From de57e296c6d868343c7bb814ab2292fdd143da00 Mon Sep 17 00:00:00 2001
From: DotNet-Bot <dn-bot@microsoft.com>
Date: Fri, 1 Dec 2023 20:22:51 +0000
Subject: [PATCH 05/10] Update dependencies from
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231201.15
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
From Version 6.0.126-servicing.23601.7 -> To Version 6.0.126-servicing.23601.15
Dependency coherency updates
Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets
From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk
---
NuGet.config | 4 ++--
eng/Version.Details.xml | 28 ++++++++++++++--------------
eng/Versions.props | 12 ++++++------
3 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index f22372130..9a61de726 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,7 +7,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
- <add key="darc-int-dotnet-aspnetcore-4ed6b14" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-4ed6b143/nuget/v3/index.json" />
+ <add key="darc-int-dotnet-aspnetcore-3fcbb4e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-3fcbb4e1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<!-- End: Package sources from dotnet-emsdk -->
@@ -40,7 +40,7 @@
<disabledPackageSources>
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
- <add key="darc-int-dotnet-aspnetcore-4ed6b14" value="true" />
+ <add key="darc-int-dotnet-aspnetcore-3fcbb4e" value="true" />
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from dotnet-aspnetcore -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 8c74919a0..c54327a2d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -54,28 +54,28 @@
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>4ed6b143f1b3e8de62590966d21d92f5f9e9c006</Sha>
+ <Sha>3fcbb4e1ccc6d063f7fce7c9977698b809111758</Sha>
</Dependency>
- <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.26-servicing.23601.6" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.26-servicing.23601.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>4ed6b143f1b3e8de62590966d21d92f5f9e9c006</Sha>
+ <Sha>3fcbb4e1ccc6d063f7fce7c9977698b809111758</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>4ed6b143f1b3e8de62590966d21d92f5f9e9c006</Sha>
+ <Sha>3fcbb4e1ccc6d063f7fce7c9977698b809111758</Sha>
<SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
- <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.26-servicing.23601.6" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.26-servicing.23601.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>4ed6b143f1b3e8de62590966d21d92f5f9e9c006</Sha>
+ <Sha>3fcbb4e1ccc6d063f7fce7c9977698b809111758</Sha>
</Dependency>
- <Dependency Name="dotnet-dev-certs" Version="6.0.26-servicing.23601.6" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="dotnet-dev-certs" Version="6.0.26-servicing.23601.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>4ed6b143f1b3e8de62590966d21d92f5f9e9c006</Sha>
+ <Sha>3fcbb4e1ccc6d063f7fce7c9977698b809111758</Sha>
</Dependency>
- <Dependency Name="dotnet-user-secrets" Version="6.0.26-servicing.23601.6" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="dotnet-user-secrets" Version="6.0.26-servicing.23601.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>4ed6b143f1b3e8de62590966d21d92f5f9e9c006</Sha>
+ <Sha>3fcbb4e1ccc6d063f7fce7c9977698b809111758</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22064.3">
<Uri>https://github.com/dotnet/test-templates</Uri>
@@ -103,14 +103,14 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>e58a1e0535c781fc1c12a5bbbc81c5044260d3e0</Sha>
</Dependency>
- <Dependency Name="Microsoft.NET.Sdk" Version="6.0.126-servicing.23601.7">
+ <Dependency Name="Microsoft.NET.Sdk" Version="6.0.126-servicing.23601.15">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
- <Sha>280895b0c4e22fe6995fa31637d14a8da840d8d0</Sha>
+ <Sha>3652ba2a882726bbaed0dc2e906154197ded6811</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
- <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.126-servicing.23601.7">
+ <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.126-servicing.23601.15">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
- <Sha>280895b0c4e22fe6995fa31637d14a8da840d8d0</Sha>
+ <Sha>3652ba2a882726bbaed0dc2e906154197ded6811</Sha>
</Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.25-servicing.23519.16" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
diff --git a/eng/Versions.props b/eng/Versions.props
index be784a3b6..4a187c317 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -46,18 +46,18 @@
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.26</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>6.0.26</MicrosoftAspNetCoreAppRefPackageVersion>
- <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.26-servicing.23601.6</MicrosoftAspNetCoreAppRefInternalPackageVersion>
- <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.26-servicing.23601.6</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
- <dotnetdevcertsPackageVersion>6.0.26-servicing.23601.6</dotnetdevcertsPackageVersion>
- <dotnetusersecretsPackageVersion>6.0.26-servicing.23601.6</dotnetusersecretsPackageVersion>
+ <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.26-servicing.23601.8</MicrosoftAspNetCoreAppRefInternalPackageVersion>
+ <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.26-servicing.23601.8</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
+ <dotnetdevcertsPackageVersion>6.0.26-servicing.23601.8</dotnetdevcertsPackageVersion>
+ <dotnetusersecretsPackageVersion>6.0.26-servicing.23601.8</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
- <MicrosoftNETSdkPackageVersion>6.0.126-servicing.23601.7</MicrosoftNETSdkPackageVersion>
- <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.126-servicing.23601.7</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+ <MicrosoftNETSdkPackageVersion>6.0.126-servicing.23601.15</MicrosoftNETSdkPackageVersion>
+ <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.126-servicing.23601.15</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
From 1f121863d4457763492b55e8fc8fa78ce0cbb589 Mon Sep 17 00:00:00 2001
From: DotNet-Bot <dn-bot@microsoft.com>
Date: Mon, 4 Dec 2023 19:28:35 +0000
Subject: [PATCH 06/10] Update dependencies from
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231204.12
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
From Version 6.0.126-servicing.23601.15 -> To Version 6.0.126-servicing.23604.12
Dependency coherency updates
Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates
From Version 6.0.25 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk
---
NuGet.config | 8 ++++++++
eng/Version.Details.xml | 32 ++++++++++++++++----------------
eng/Versions.props | 16 ++++++++--------
3 files changed, 32 insertions(+), 24 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index 9a61de726..51d242180 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -8,6 +8,7 @@
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-3fcbb4e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-3fcbb4e1/nuget/v3/index.json" />
+ <add key="darc-int-dotnet-aspnetcore-3fcbb4e-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-3fcbb4e1-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<!-- End: Package sources from dotnet-emsdk -->
@@ -15,11 +16,14 @@
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-965a793" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-965a793e/nuget/v3/index.json" />
+ <add key="darc-int-dotnet-runtime-965a793-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-965a793e-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-e58a1e0" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-e58a1e05/nuget/v3/index.json" />
+ <add key="darc-int-dotnet-templating-e58a1e0-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-e58a1e05-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
+ <add key="darc-int-dotnet-windowsdesktop-456adb5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-456adb55/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@@ -40,16 +44,20 @@
<disabledPackageSources>
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
+ <add key="darc-int-dotnet-aspnetcore-3fcbb4e-1" value="true" />
<add key="darc-int-dotnet-aspnetcore-3fcbb4e" value="true" />
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
+ <add key="darc-int-dotnet-runtime-965a793-1" value="true" />
<add key="darc-int-dotnet-runtime-965a793" value="true" />
<!-- Begin: Package sources from dotnet-templating -->
+ <add key="darc-int-dotnet-templating-e58a1e0-1" value="true" />
<add key="darc-int-dotnet-templating-e58a1e0" value="true" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
+ <add key="darc-int-dotnet-windowsdesktop-456adb5" value="true" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index c54327a2d..72d2cedbe 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
- <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.25" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
- <Sha>a74946f8dae6d29fd18c8fc702e23f8fe77c729c</Sha>
+ <Sha>456adb551c1878a5dcc44f0b6e7d69de4789cbdc</Sha>
</Dependency>
- <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.25-servicing.23520.5" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.26-servicing.23604.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
- <Sha>a74946f8dae6d29fd18c8fc702e23f8fe77c729c</Sha>
+ <Sha>456adb551c1878a5dcc44f0b6e7d69de4789cbdc</Sha>
</Dependency>
- <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.25-servicing.23520.5" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.26-servicing.23604.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
- <Sha>a74946f8dae6d29fd18c8fc702e23f8fe77c729c</Sha>
+ <Sha>456adb551c1878a5dcc44f0b6e7d69de4789cbdc</Sha>
</Dependency>
- <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.25" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
- <Sha>a74946f8dae6d29fd18c8fc702e23f8fe77c729c</Sha>
+ <Sha>456adb551c1878a5dcc44f0b6e7d69de4789cbdc</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.26-servicing.23572.29" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -103,23 +103,23 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>e58a1e0535c781fc1c12a5bbbc81c5044260d3e0</Sha>
</Dependency>
- <Dependency Name="Microsoft.NET.Sdk" Version="6.0.126-servicing.23601.15">
+ <Dependency Name="Microsoft.NET.Sdk" Version="6.0.126-servicing.23604.12">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
- <Sha>3652ba2a882726bbaed0dc2e906154197ded6811</Sha>
+ <Sha>493e67d12750dc460c159ff6a5c81fec6e525f46</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
- <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.126-servicing.23601.15">
+ <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.126-servicing.23604.12">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
- <Sha>3652ba2a882726bbaed0dc2e906154197ded6811</Sha>
+ <Sha>493e67d12750dc460c159ff6a5c81fec6e525f46</Sha>
</Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
- <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.25-servicing.23519.16" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
+ <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.26-servicing.23573.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
- <Sha>d4ee94199afb6c67ed448c252a07c0747c089e41</Sha>
+ <Sha>b4d268210a29a07ba7a3003360b2b037881880db</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.25-servicing.23519.18" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
+ <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.26-servicing.23573.8" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
- <Sha>fcec4d8986bb8339964c429abd6e4651b968ff4f</Sha>
+ <Sha>981ef8014ab994eb3fce88dd81b815fce930dfa5</Sha>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.0-beta.21522.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 4a187c317..061193e71 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -23,11 +23,11 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
- <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>6.0.25-servicing.23519.16</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
+ <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>6.0.26-servicing.23573.4</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/wpf -->
- <MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.25-servicing.23519.18</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
+ <MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.26-servicing.23573.8</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/templating -->
@@ -56,8 +56,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
- <MicrosoftNETSdkPackageVersion>6.0.126-servicing.23601.15</MicrosoftNETSdkPackageVersion>
- <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.126-servicing.23601.15</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+ <MicrosoftNETSdkPackageVersion>6.0.126-servicing.23604.12</MicrosoftNETSdkPackageVersion>
+ <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.126-servicing.23604.12</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@@ -78,10 +78,10 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
- <VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.25-servicing.23520.5</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
- <VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>6.0.25-servicing.23520.5</VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>
- <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>6.0.25</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
- <MicrosoftWindowsDesktopAppRefPackageVersion>6.0.25</MicrosoftWindowsDesktopAppRefPackageVersion>
+ <VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.26-servicing.23604.3</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
+ <VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>6.0.26-servicing.23604.3</VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>
+ <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>6.0.26</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
+ <MicrosoftWindowsDesktopAppRefPackageVersion>6.0.26</MicrosoftWindowsDesktopAppRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->
From 5f19470397cdaf2c7dfc47f384e201fc90944ad2 Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Tue, 5 Dec 2023 22:25:34 +0000
Subject: [PATCH 07/10] Merged PR 35828: [internal/release/6.0.1xx] Update
dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies
[marker]: <> (Begin:Coherency Updates)
## Coherency Updates
The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)
[DependencyUpdate]: <> (Begin)
- **Coherency Updates**:
- **Microsoft.NETCore.App.Ref**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk)
- **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8 (parent: Microsoft.NET.Sdk)
- **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk)
- **Microsoft.NETCore.App.Host.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk)
- **Microsoft.NETCore.DotNetHostResolver**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk)
- **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8 (parent: Microsoft.NET.Sdk)
- **Microsoft.NET.Workload.Emscripten.Manifest-6.0.100**: from 6.0.25 to 6.0.26 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0)
[DependencyUpdate]: <> (End)
[marker]: <> (End:Coherency Updates)
[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20231205.14
- **Date Produced**: December 5, 2023 10:05:04 PM UTC
- **Commit**: 9b8cdd0062a889793bda0f84365492c6e21ff981
- **Branch**: refs/heads/internal/release/6.0.1xx
[DependencyUpdate]: <> (Begin)
- **Updates**:
- **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.126-servicing.23604.12 to 6.0.126-servicing.23605.14][1]
- **Microsoft.NET.Sdk**: [from 6.0.126-servicing.23604.12 to 6.0.126-servicing.23605.14][1]
- **Microsoft.NETCore.App.Ref**: [from 6.0.26 to 6.0.26][2]
- **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][2]
- **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.26 to 6.0.26][2]
- **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.26 to 6.0.26][2]
- **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.26 to 6.0.26][2]
- **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][2]
- **Microsoft.NET.Workload.Emscripten.Manifest-6.0.100**: [from 6.0.25 to 6.0.26][3]
[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC493e67d127&targetVersion=GC9b8cdd0062&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC965a793efc&targetVersion=GCdc45e96840&_a=files
[3]: https://github.com/dotnet/emsdk/compare/d8bc162ccf...5ccc36f598
[DependencyUpdate]: <> (End)...
---
NuGet.config | 7 +++----
eng/Version.Details.xml | 28 ++++++++++++++--------------
eng/Versions.props | 10 +++++-----
3 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index 51d242180..36c575133 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -11,12 +11,12 @@
<add key="darc-int-dotnet-aspnetcore-3fcbb4e-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-3fcbb4e1-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
+ <add key="darc-pub-dotnet-emsdk-5ccc36f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-5ccc36f5/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-runtime -->
- <add key="darc-int-dotnet-runtime-965a793" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-965a793e/nuget/v3/index.json" />
- <add key="darc-int-dotnet-runtime-965a793-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-965a793e-1/nuget/v3/index.json" />
+ <add key="darc-int-dotnet-runtime-dc45e96" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-dc45e968/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-e58a1e0" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-e58a1e05/nuget/v3/index.json" />
@@ -50,8 +50,7 @@
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
- <add key="darc-int-dotnet-runtime-965a793-1" value="true" />
- <add key="darc-int-dotnet-runtime-965a793" value="true" />
+ <add key="darc-int-dotnet-runtime-dc45e96" value="true" />
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-e58a1e0-1" value="true" />
<add key="darc-int-dotnet-templating-e58a1e0" value="true" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 72d2cedbe..671fad883 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -17,30 +17,30 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>456adb551c1878a5dcc44f0b6e7d69de4789cbdc</Sha>
</Dependency>
- <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.26-servicing.23572.29" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.26-servicing.23605.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
- <Sha>965a793efc765ddbea3c43e43c13b8e956b61946</Sha>
+ <Sha>dc45e96840243b203b13e61952230e225d2aac52</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
- <Sha>965a793efc765ddbea3c43e43c13b8e956b61946</Sha>
+ <Sha>dc45e96840243b203b13e61952230e225d2aac52</Sha>
</Dependency>
- <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.26-servicing.23572.29" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.26-servicing.23605.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
- <Sha>965a793efc765ddbea3c43e43c13b8e956b61946</Sha>
+ <Sha>dc45e96840243b203b13e61952230e225d2aac52</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
- <Sha>965a793efc765ddbea3c43e43c13b8e956b61946</Sha>
+ <Sha>dc45e96840243b203b13e61952230e225d2aac52</Sha>
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
- <Sha>965a793efc765ddbea3c43e43c13b8e956b61946</Sha>
+ <Sha>dc45e96840243b203b13e61952230e225d2aac52</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
- <Sha>965a793efc765ddbea3c43e43c13b8e956b61946</Sha>
+ <Sha>dc45e96840243b203b13e61952230e225d2aac52</Sha>
</Dependency>
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
<!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
@@ -103,14 +103,14 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>e58a1e0535c781fc1c12a5bbbc81c5044260d3e0</Sha>
</Dependency>
- <Dependency Name="Microsoft.NET.Sdk" Version="6.0.126-servicing.23604.12">
+ <Dependency Name="Microsoft.NET.Sdk" Version="6.0.126-servicing.23605.14">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
- <Sha>493e67d12750dc460c159ff6a5c81fec6e525f46</Sha>
+ <Sha>9b8cdd0062a889793bda0f84365492c6e21ff981</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
- <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.126-servicing.23604.12">
+ <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.126-servicing.23605.14">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
- <Sha>493e67d12750dc460c159ff6a5c81fec6e525f46</Sha>
+ <Sha>9b8cdd0062a889793bda0f84365492c6e21ff981</Sha>
</Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.26-servicing.23573.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@@ -166,9 +166,9 @@
<Sha>698fdad58fa64a55f16cd9562c90224cc498ed02</Sha>
<SourceBuildTarball RepoName="xdt" ManagedOnly="true" />
</Dependency>
- <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.25" CoherentParentDependency="VS.Redist.Common.NetCore.SharedFramework.x64.6.0">
+ <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.26" CoherentParentDependency="VS.Redist.Common.NetCore.SharedFramework.x64.6.0">
<Uri>https://github.com/dotnet/emsdk</Uri>
- <Sha>d8bc162ccf7ce14fdbec9c2c50d6e856a7063c91</Sha>
+ <Sha>5ccc36f5985e2089f47c97a19c250e65ddefd0ba</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build" Version="6.0.0-servicing.22419.2">
<Uri>https://github.com/dotnet/source-build</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 061193e71..e07ebd6dd 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -56,8 +56,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
- <MicrosoftNETSdkPackageVersion>6.0.126-servicing.23604.12</MicrosoftNETSdkPackageVersion>
- <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.126-servicing.23604.12</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+ <MicrosoftNETSdkPackageVersion>6.0.126-servicing.23605.14</MicrosoftNETSdkPackageVersion>
+ <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.126-servicing.23605.14</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@@ -68,8 +68,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/core-setup -->
- <VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.26-servicing.23572.29</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
- <VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.26-servicing.23572.29</VSRedistCommonNetCoreTargetingPackx6460PackageVersion>
+ <VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.26-servicing.23605.8</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
+ <VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.26-servicing.23605.8</VSRedistCommonNetCoreTargetingPackx6460PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.26</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>6.0.26</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.26</MicrosoftNETCoreAppRefPackageVersion>
@@ -185,7 +185,7 @@
<XamarinMacOSWorkloadManifestVersion>12.0.101-preview.9.31</XamarinMacOSWorkloadManifestVersion>
<XamarinTvOSWorkloadManifestVersion>15.0.101-preview.9.31</XamarinTvOSWorkloadManifestVersion>
<MonoWorkloadManifestVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MonoWorkloadManifestVersion>
- <MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.25</MicrosoftNETWorkloadEmscriptenManifest60100Version>
+ <MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.26</MicrosoftNETWorkloadEmscriptenManifest60100Version>
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenManifest60100Version)</EmscriptenWorkloadManifestVersion>
</PropertyGroup>
<PropertyGroup>
From 1e2c0c0af5208112c081e6788a841f94be4c0bd5 Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Tue, 5 Dec 2023 23:28:28 +0000
Subject: [PATCH 08/10] Merged PR 35838: [internal/release/6.0.1xx] Update
dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies
[marker]: <> (Begin:Coherency Updates)
## Coherency Updates
The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)
[DependencyUpdate]: <> (Begin)
- **Coherency Updates**:
- **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.126 to 6.0.126 (parent: Microsoft.NET.Sdk)
- **Microsoft.TemplateEngine.Cli**: from 6.0.126-servicing.23578.2 to 6.0.126-servicing.23605.4 (parent: Microsoft.NET.Sdk)
- **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.126 to 6.0.126 (parent: Microsoft.NET.Sdk)
[DependencyUpdate]: <> (End)
[marker]: <> (End:Coherency Updates)
[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20231205.20
- **Date Produced**: December 5, 2023 11:06:57 PM UTC
- **Commit**: 45302fdcb923ce0d0c28b9f34f7684443b980a62
- **Branch**: refs/heads/internal/release/6.0.1xx
[DependencyUpdate]: <> (Begin)
- **Updates**:
- **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.126-servicing.23605.14 to 6.0.126-servicing.23605.20][1]
- **Microsoft.NET.Sdk**: [from 6.0.126-servicing.23605.14 to 6.0.126-servicing.23605.20][1]
- **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.126 to 6.0.126][2]
- **Microsoft.TemplateEngine.Cli**: [from 6.0.126-servicing.23578.2 to 6.0.126-servicing.23605.4][2]
- **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.126 to 6.0.126][2]
[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC9b8cdd0062&targetVersion=GC45302fdcb9&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCe58a1e0535&targetVersion=GC28656189e4&_a=files
[DependencyUpdate]: <> (End)
[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
---
NuGet.config | 6 ++----
eng/Version.Details.xml | 16 ++++++++--------
eng/Versions.props | 4 ++--
3 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index 36c575133..e7470c4b2 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -19,8 +19,7 @@
<add key="darc-int-dotnet-runtime-dc45e96" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-dc45e968/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
- <add key="darc-int-dotnet-templating-e58a1e0" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-e58a1e05/nuget/v3/index.json" />
- <add key="darc-int-dotnet-templating-e58a1e0-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-e58a1e05-1/nuget/v3/index.json" />
+ <add key="darc-int-dotnet-templating-2865618" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-28656189/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-456adb5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-456adb55/nuget/v3/index.json" />
@@ -52,8 +51,7 @@
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-dc45e96" value="true" />
<!-- Begin: Package sources from dotnet-templating -->
- <add key="darc-int-dotnet-templating-e58a1e0-1" value="true" />
- <add key="darc-int-dotnet-templating-e58a1e0" value="true" />
+ <add key="darc-int-dotnet-templating-2865618" value="true" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-456adb5" value="true" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 671fad883..89d861c82 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -92,25 +92,25 @@
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.126" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
- <Sha>e58a1e0535c781fc1c12a5bbbc81c5044260d3e0</Sha>
+ <Sha>28656189e49c05368afda92b482da8c0049d5638</Sha>
</Dependency>
- <Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.126-servicing.23578.2" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.126-servicing.23605.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
- <Sha>e58a1e0535c781fc1c12a5bbbc81c5044260d3e0</Sha>
+ <Sha>28656189e49c05368afda92b482da8c0049d5638</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.126" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
- <Sha>e58a1e0535c781fc1c12a5bbbc81c5044260d3e0</Sha>
+ <Sha>28656189e49c05368afda92b482da8c0049d5638</Sha>
</Dependency>
- <Dependency Name="Microsoft.NET.Sdk" Version="6.0.126-servicing.23605.14">
+ <Dependency Name="Microsoft.NET.Sdk" Version="6.0.126-servicing.23605.20">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
- <Sha>9b8cdd0062a889793bda0f84365492c6e21ff981</Sha>
+ <Sha>45302fdcb923ce0d0c28b9f34f7684443b980a62</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
- <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.126-servicing.23605.14">
+ <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.126-servicing.23605.20">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
- <Sha>9b8cdd0062a889793bda0f84365492c6e21ff981</Sha>
+ <Sha>45302fdcb923ce0d0c28b9f34f7684443b980a62</Sha>
</Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.26-servicing.23573.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
diff --git a/eng/Versions.props b/eng/Versions.props
index e07ebd6dd..9d7973343 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -56,8 +56,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
- <MicrosoftNETSdkPackageVersion>6.0.126-servicing.23605.14</MicrosoftNETSdkPackageVersion>
- <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.126-servicing.23605.14</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+ <MicrosoftNETSdkPackageVersion>6.0.126-servicing.23605.20</MicrosoftNETSdkPackageVersion>
+ <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.126-servicing.23605.20</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
From d9445f2ea5b7c1eaadd126545bf313f45a676696 Mon Sep 17 00:00:00 2001
From: DotNet-Bot <dn-bot@microsoft.com>
Date: Wed, 6 Dec 2023 00:07:04 +0000
Subject: [PATCH 09/10] Update dependencies from
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231205.30
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
From Version 6.0.126-servicing.23605.20 -> To Version 6.0.126-servicing.23605.30
Dependency coherency updates
Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets
From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk
---
NuGet.config | 6 ++----
eng/Version.Details.xml | 28 ++++++++++++++--------------
eng/Versions.props | 12 ++++++------
3 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index e7470c4b2..fbf9c4902 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,8 +7,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
- <add key="darc-int-dotnet-aspnetcore-3fcbb4e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-3fcbb4e1/nuget/v3/index.json" />
- <add key="darc-int-dotnet-aspnetcore-3fcbb4e-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-3fcbb4e1-1/nuget/v3/index.json" />
+ <add key="darc-int-dotnet-aspnetcore-d504a7b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-d504a7b7/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-5ccc36f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-5ccc36f5/nuget/v3/index.json" />
@@ -43,8 +42,7 @@
<disabledPackageSources>
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
- <add key="darc-int-dotnet-aspnetcore-3fcbb4e-1" value="true" />
- <add key="darc-int-dotnet-aspnetcore-3fcbb4e" value="true" />
+ <add key="darc-int-dotnet-aspnetcore-d504a7b" value="true" />
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from dotnet-aspnetcore -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 89d861c82..6114908f0 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -54,28 +54,28 @@
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>3fcbb4e1ccc6d063f7fce7c9977698b809111758</Sha>
+ <Sha>d504a7b7dab277712646747e9f5cce0d9507245e</Sha>
</Dependency>
- <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.26-servicing.23601.8" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.26-servicing.23605.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>3fcbb4e1ccc6d063f7fce7c9977698b809111758</Sha>
+ <Sha>d504a7b7dab277712646747e9f5cce0d9507245e</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>3fcbb4e1ccc6d063f7fce7c9977698b809111758</Sha>
+ <Sha>d504a7b7dab277712646747e9f5cce0d9507245e</Sha>
<SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
- <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.26-servicing.23601.8" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.26-servicing.23605.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>3fcbb4e1ccc6d063f7fce7c9977698b809111758</Sha>
+ <Sha>d504a7b7dab277712646747e9f5cce0d9507245e</Sha>
</Dependency>
- <Dependency Name="dotnet-dev-certs" Version="6.0.26-servicing.23601.8" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="dotnet-dev-certs" Version="6.0.26-servicing.23605.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>3fcbb4e1ccc6d063f7fce7c9977698b809111758</Sha>
+ <Sha>d504a7b7dab277712646747e9f5cce0d9507245e</Sha>
</Dependency>
- <Dependency Name="dotnet-user-secrets" Version="6.0.26-servicing.23601.8" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="dotnet-user-secrets" Version="6.0.26-servicing.23605.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
- <Sha>3fcbb4e1ccc6d063f7fce7c9977698b809111758</Sha>
+ <Sha>d504a7b7dab277712646747e9f5cce0d9507245e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22064.3">
<Uri>https://github.com/dotnet/test-templates</Uri>
@@ -103,14 +103,14 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>28656189e49c05368afda92b482da8c0049d5638</Sha>
</Dependency>
- <Dependency Name="Microsoft.NET.Sdk" Version="6.0.126-servicing.23605.20">
+ <Dependency Name="Microsoft.NET.Sdk" Version="6.0.126-servicing.23605.30">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
- <Sha>45302fdcb923ce0d0c28b9f34f7684443b980a62</Sha>
+ <Sha>3359fe0db5f3f0c33f81fd2c15ff44421512390f</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
- <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.126-servicing.23605.20">
+ <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.126-servicing.23605.30">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
- <Sha>45302fdcb923ce0d0c28b9f34f7684443b980a62</Sha>
+ <Sha>3359fe0db5f3f0c33f81fd2c15ff44421512390f</Sha>
</Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.26-servicing.23573.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
diff --git a/eng/Versions.props b/eng/Versions.props
index 9d7973343..b326a0658 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -46,18 +46,18 @@
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.26</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>6.0.26</MicrosoftAspNetCoreAppRefPackageVersion>
- <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.26-servicing.23601.8</MicrosoftAspNetCoreAppRefInternalPackageVersion>
- <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.26-servicing.23601.8</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
- <dotnetdevcertsPackageVersion>6.0.26-servicing.23601.8</dotnetdevcertsPackageVersion>
- <dotnetusersecretsPackageVersion>6.0.26-servicing.23601.8</dotnetusersecretsPackageVersion>
+ <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.26-servicing.23605.6</MicrosoftAspNetCoreAppRefInternalPackageVersion>
+ <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.26-servicing.23605.6</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
+ <dotnetdevcertsPackageVersion>6.0.26-servicing.23605.6</dotnetdevcertsPackageVersion>
+ <dotnetusersecretsPackageVersion>6.0.26-servicing.23605.6</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
- <MicrosoftNETSdkPackageVersion>6.0.126-servicing.23605.20</MicrosoftNETSdkPackageVersion>
- <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.126-servicing.23605.20</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+ <MicrosoftNETSdkPackageVersion>6.0.126-servicing.23605.30</MicrosoftNETSdkPackageVersion>
+ <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.126-servicing.23605.30</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
From a706d50916a1dd757a838896dddbb6798fa2e748 Mon Sep 17 00:00:00 2001
From: DotNet-Bot <dn-bot@microsoft.com>
Date: Wed, 6 Dec 2023 01:15:19 +0000
Subject: [PATCH 10/10] Update dependencies from
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231205.37
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
From Version 6.0.126-servicing.23605.30 -> To Version 6.0.126-servicing.23605.37
Dependency coherency updates
Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates
From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk
---
NuGet.config | 4 ++--
eng/Version.Details.xml | 28 ++++++++++++++--------------
eng/Versions.props | 12 ++++++------
3 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index fbf9c4902..e97435cf7 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -21,7 +21,7 @@
<add key="darc-int-dotnet-templating-2865618" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-28656189/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
- <add key="darc-int-dotnet-windowsdesktop-456adb5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-456adb55/nuget/v3/index.json" />
+ <add key="darc-int-dotnet-windowsdesktop-84ebced" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-84ebced9/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@@ -52,7 +52,7 @@
<add key="darc-int-dotnet-templating-2865618" value="true" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
- <add key="darc-int-dotnet-windowsdesktop-456adb5" value="true" />
+ <add key="darc-int-dotnet-windowsdesktop-84ebced" value="true" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 6114908f0..b750cf329 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,19 +3,19 @@
<ProductDependencies>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
- <Sha>456adb551c1878a5dcc44f0b6e7d69de4789cbdc</Sha>
+ <Sha>84ebced93b7a69ba3332fe6000354306d4eea9dd</Sha>
</Dependency>
- <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.26-servicing.23604.3" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.26-servicing.23605.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
- <Sha>456adb551c1878a5dcc44f0b6e7d69de4789cbdc</Sha>
+ <Sha>84ebced93b7a69ba3332fe6000354306d4eea9dd</Sha>
</Dependency>
- <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.26-servicing.23604.3" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.26-servicing.23605.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
- <Sha>456adb551c1878a5dcc44f0b6e7d69de4789cbdc</Sha>
+ <Sha>84ebced93b7a69ba3332fe6000354306d4eea9dd</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
- <Sha>456adb551c1878a5dcc44f0b6e7d69de4789cbdc</Sha>
+ <Sha>84ebced93b7a69ba3332fe6000354306d4eea9dd</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.26-servicing.23605.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -103,23 +103,23 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>28656189e49c05368afda92b482da8c0049d5638</Sha>
</Dependency>
- <Dependency Name="Microsoft.NET.Sdk" Version="6.0.126-servicing.23605.30">
+ <Dependency Name="Microsoft.NET.Sdk" Version="6.0.126-servicing.23605.37">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
- <Sha>3359fe0db5f3f0c33f81fd2c15ff44421512390f</Sha>
+ <Sha>3f5d0be2f51d49013230c45b5a9a6dad582f40f3</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
- <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.126-servicing.23605.30">
+ <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.126-servicing.23605.37">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
- <Sha>3359fe0db5f3f0c33f81fd2c15ff44421512390f</Sha>
+ <Sha>3f5d0be2f51d49013230c45b5a9a6dad582f40f3</Sha>
</Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
- <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.26-servicing.23573.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
+ <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.26-servicing.23605.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
- <Sha>b4d268210a29a07ba7a3003360b2b037881880db</Sha>
+ <Sha>c309ca06b81112f5e42cc9ca6f8bf0c4a772be6b</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.26-servicing.23573.8" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
+ <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.26-servicing.23605.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
- <Sha>981ef8014ab994eb3fce88dd81b815fce930dfa5</Sha>
+ <Sha>e5b72d0fb5a405d5443b571ba1d78f419bdbcdb7</Sha>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.0-beta.21522.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index b326a0658..1f643f677 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -23,11 +23,11 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
- <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>6.0.26-servicing.23573.4</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
+ <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>6.0.26-servicing.23605.5</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/wpf -->
- <MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.26-servicing.23573.8</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
+ <MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.26-servicing.23605.3</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/templating -->
@@ -56,8 +56,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
- <MicrosoftNETSdkPackageVersion>6.0.126-servicing.23605.30</MicrosoftNETSdkPackageVersion>
- <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.126-servicing.23605.30</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+ <MicrosoftNETSdkPackageVersion>6.0.126-servicing.23605.37</MicrosoftNETSdkPackageVersion>
+ <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.126-servicing.23605.37</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@@ -78,8 +78,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
- <VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.26-servicing.23604.3</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
- <VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>6.0.26-servicing.23604.3</VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>
+ <VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.26-servicing.23605.4</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
+ <VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>6.0.26-servicing.23605.4</VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>6.0.26</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>6.0.26</MicrosoftWindowsDesktopAppRefPackageVersion>
</PropertyGroup>