From 781f9953cf29cb8ccb196752f5cbb599c2ea7173 Mon Sep 17 00:00:00 2001 From: DotNet-Bot <dn-bot@microsoft.com> Date: Fri, 17 Mar 2023 20:18:46 +0000 Subject: [PATCH] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230317.7 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.116-servicing.23161.4 -> To Version 6.0.116-servicing.23167.7 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.NETCore.Platforms,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.16 -> To Version 6.0.16 (parent: Microsoft.NET.Sdk --- NuGet.config | 23 ++++----------------- eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++------- 3 files changed, 35 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2717a24ac..5e7f30663 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,29 +7,19 @@ <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-732cd26" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-732cd26e/nuget/v3/index.json" /> + <add key="darc-int-dotnet-aspnetcore-206b88e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-206b88ef/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-emsdk --> - <add key="darc-pub-dotnet-emsdk-0c39542" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-0c395427/nuget/v3/index.json" /> - <add key="darc-pub-dotnet-emsdk-0c39542-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-0c395427-4/nuget/v3/index.json" /> - <add key="darc-pub-dotnet-emsdk-0c39542-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-0c395427-3/nuget/v3/index.json" /> - <add key="darc-pub-dotnet-emsdk-0c39542-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-0c395427-2/nuget/v3/index.json" /> - <add key="darc-pub-dotnet-emsdk-0c39542-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-0c395427-1/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-b4ba75b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-b4ba75bf/nuget/v3/index.json" /> + <add key="darc-int-dotnet-runtime-90ad458" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-90ad458e/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-templating --> <add key="darc-int-dotnet-templating-e2ab2f3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-e2ab2f3e/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-6b2fdd7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-6b2fdd77/nuget/v3/index.json" /> - <add key="darc-int-dotnet-windowsdesktop-6b2fdd7-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-6b2fdd77-4/nuget/v3/index.json" /> - <add key="darc-int-dotnet-windowsdesktop-6b2fdd7-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-6b2fdd77-3/nuget/v3/index.json" /> - <add key="darc-int-dotnet-windowsdesktop-6b2fdd7-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-6b2fdd77-2/nuget/v3/index.json" /> - <add key="darc-int-dotnet-windowsdesktop-6b2fdd7-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-6b2fdd77-1/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" /> @@ -50,21 +40,16 @@ <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-732cd26" value="true" /> + <add key="darc-int-dotnet-aspnetcore-206b88e" 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-b4ba75b" value="true" /> + <add key="darc-int-dotnet-runtime-90ad458" value="true" /> <!-- Begin: Package sources from dotnet-templating --> <add key="darc-int-dotnet-templating-e2ab2f3" value="true" /> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-6b2fdd7-1" value="true" /> - <add key="darc-int-dotnet-windowsdesktop-6b2fdd7-2" value="true" /> - <add key="darc-int-dotnet-windowsdesktop-6b2fdd7-3" value="true" /> - <add key="darc-int-dotnet-windowsdesktop-6b2fdd7-4" value="true" /> - <add key="darc-int-dotnet-windowsdesktop-6b2fdd7" 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 7ff8e6f86..c10a8e3cd 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>6b2fdd77613088f3c2ac2c52f7873098ee1d1860</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.16-servicing.23160.8" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.16-servicing.23166.11" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>b4ba75bf386ec2f298aa0220852acac2e58f245f</Sha> + <Sha>90ad458e8bbe50831ff4edb0f3a51699a4acf21c</Sha> </Dependency> <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.16" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>b4ba75bf386ec2f298aa0220852acac2e58f245f</Sha> + <Sha>90ad458e8bbe50831ff4edb0f3a51699a4acf21c</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.16-servicing.23160.8" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.16-servicing.23166.11" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>b4ba75bf386ec2f298aa0220852acac2e58f245f</Sha> + <Sha>90ad458e8bbe50831ff4edb0f3a51699a4acf21c</Sha> </Dependency> <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.16" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>b4ba75bf386ec2f298aa0220852acac2e58f245f</Sha> + <Sha>90ad458e8bbe50831ff4edb0f3a51699a4acf21c</Sha> <SourceBuildTarball RepoName="runtime" ManagedOnly="true" /> </Dependency> <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.16" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>b4ba75bf386ec2f298aa0220852acac2e58f245f</Sha> + <Sha>90ad458e8bbe50831ff4edb0f3a51699a4acf21c</Sha> </Dependency> <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.16" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>b4ba75bf386ec2f298aa0220852acac2e58f245f</Sha> + <Sha>90ad458e8bbe50831ff4edb0f3a51699a4acf21c</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. --> @@ -50,32 +50,32 @@ </Dependency> <Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.9" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>b4ba75bf386ec2f298aa0220852acac2e58f245f</Sha> + <Sha>90ad458e8bbe50831ff4edb0f3a51699a4acf21c</Sha> </Dependency> <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.16" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>732cd26e19e07ff83dacc7fe1ec25acee913eace</Sha> + <Sha>206b88efa734237274703a99f3b131e68a089767</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.16-servicing.23164.13" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.16-servicing.23166.11" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>732cd26e19e07ff83dacc7fe1ec25acee913eace</Sha> + <Sha>206b88efa734237274703a99f3b131e68a089767</Sha> </Dependency> <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.16" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>732cd26e19e07ff83dacc7fe1ec25acee913eace</Sha> + <Sha>206b88efa734237274703a99f3b131e68a089767</Sha> <SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" /> </Dependency> - <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.16-servicing.23164.13" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.16-servicing.23166.11" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>732cd26e19e07ff83dacc7fe1ec25acee913eace</Sha> + <Sha>206b88efa734237274703a99f3b131e68a089767</Sha> </Dependency> - <Dependency Name="dotnet-dev-certs" Version="6.0.16-servicing.23164.13" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="dotnet-dev-certs" Version="6.0.16-servicing.23166.11" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>732cd26e19e07ff83dacc7fe1ec25acee913eace</Sha> + <Sha>206b88efa734237274703a99f3b131e68a089767</Sha> </Dependency> - <Dependency Name="dotnet-user-secrets" Version="6.0.16-servicing.23164.13" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="dotnet-user-secrets" Version="6.0.16-servicing.23166.11" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>732cd26e19e07ff83dacc7fe1ec25acee913eace</Sha> + <Sha>206b88efa734237274703a99f3b131e68a089767</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>e2ab2f3e70d016866890a66ff6aa0dd54e8ffbf0</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk" Version="6.0.116-servicing.23165.25"> + <Dependency Name="Microsoft.NET.Sdk" Version="6.0.116-servicing.23167.7"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>b590a503c965bb71620e7079262ff7757bc68ba5</Sha> + <Sha>9c1b30712e58ea4e2f480da354c71f7791e43aa2</Sha> <SourceBuild RepoName="sdk" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.116-servicing.23165.25"> + <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.116-servicing.23167.7"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>b590a503c965bb71620e7079262ff7757bc68ba5</Sha> + <Sha>9c1b30712e58ea4e2f480da354c71f7791e43aa2</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.15-servicing.23117.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> diff --git a/eng/Versions.props b/eng/Versions.props index 61a33c66d..4d89dadef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ <!-- Dependencies from https://github.com/aspnet/AspNetCore --> <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.16</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion> <MicrosoftAspNetCoreAppRefPackageVersion>6.0.16</MicrosoftAspNetCoreAppRefPackageVersion> - <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.16-servicing.23164.13</MicrosoftAspNetCoreAppRefInternalPackageVersion> - <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.16-servicing.23164.13</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion> - <dotnetdevcertsPackageVersion>6.0.16-servicing.23164.13</dotnetdevcertsPackageVersion> - <dotnetusersecretsPackageVersion>6.0.16-servicing.23164.13</dotnetusersecretsPackageVersion> + <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.16-servicing.23166.11</MicrosoftAspNetCoreAppRefInternalPackageVersion> + <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.16-servicing.23166.11</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion> + <dotnetdevcertsPackageVersion>6.0.16-servicing.23166.11</dotnetdevcertsPackageVersion> + <dotnetusersecretsPackageVersion>6.0.16-servicing.23166.11</dotnetusersecretsPackageVersion> </PropertyGroup> <PropertyGroup> <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/sdk --> - <MicrosoftNETSdkPackageVersion>6.0.116-servicing.23165.25</MicrosoftNETSdkPackageVersion> - <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.116-servicing.23165.25</MicrosoftDotNetMSBuildSdkResolverPackageVersion> + <MicrosoftNETSdkPackageVersion>6.0.116-servicing.23167.7</MicrosoftNETSdkPackageVersion> + <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.116-servicing.23167.7</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.16-servicing.23160.8</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion> - <VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.16-servicing.23160.8</VSRedistCommonNetCoreTargetingPackx6460PackageVersion> + <VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.16-servicing.23166.11</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion> + <VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.16-servicing.23166.11</VSRedistCommonNetCoreTargetingPackx6460PackageVersion> <MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.16</MicrosoftNETCoreAppRuntimewinx64PackageVersion> <MicrosoftNETCoreAppHostwinx64PackageVersion>6.0.16</MicrosoftNETCoreAppHostwinx64PackageVersion> <MicrosoftNETCoreAppRefPackageVersion>6.0.16</MicrosoftNETCoreAppRefPackageVersion>