From 1e97ca8042e6c35aa6a4365e8ee92eaadc846d4d Mon Sep 17 00:00:00 2001 From: DotNet Bot <dn-bot@microsoft.com> Date: Tue, 20 Sep 2022 22:44:00 +0000 Subject: [PATCH] Merged PR 26033: [internal/release/6.0.3xx] 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.WindowsDesktop.App.Ref**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22470.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22470.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22469.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22469.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.5 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.304 to 6.0.305 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.304-servicing.22420.10 to 6.0.305-servicing.22470.3 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.304 to 6.0.305 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.9 to 6.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.9-servicing.22419.10 to 6.0.10-servicing.22470.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win... --- NuGet.config | 8 ++++ eng/Version.Details.xml | 96 ++++++++++++++++++++--------------------- eng/Versions.props | 46 ++++++++++---------- 3 files changed, 79 insertions(+), 71 deletions(-) diff --git a/NuGet.config b/NuGet.config index 36197c18e..e0141f88e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +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-3678930" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-3678930d/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-emsdk --> <!-- End: Package sources from dotnet-emsdk --> @@ -15,10 +16,13 @@ <add key="darc-int-DotNet-msbuild-Trusted-038f9ba-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-038f9bae-1/nuget/v3/index.json" /> <!-- End: Package sources from DotNet-msbuild-Trusted --> <!-- Begin: Package sources from dotnet-runtime --> + <add key="darc-int-dotnet-runtime-3bd501a" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-3bd501a0/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-templating --> + <add key="darc-int-dotnet-templating-a596312" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-a596312f/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-windowsdesktop --> + <add key="darc-int-dotnet-windowsdesktop-6281f2d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-6281f2d8/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" /> @@ -41,11 +45,15 @@ <add key="darc-int-DotNet-msbuild-Trusted-038f9ba" value="true" /> <!-- End: Package sources from DotNet-msbuild-Trusted --> <!-- Begin: Package sources from dotnet-aspnetcore --> + <add key="darc-int-dotnet-aspnetcore-3678930" value="true" /> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-runtime --> + <add key="darc-int-dotnet-runtime-3bd501a" value="true" /> <!-- Begin: Package sources from dotnet-templating --> + <add key="darc-int-dotnet-templating-a596312" value="true" /> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-windowsdesktop --> + <add key="darc-int-dotnet-windowsdesktop-6281f2d" 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 5128fedf6..c9216ca47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ <?xml version="1.0" encoding="utf-8"?> <Dependencies> <ProductDependencies> - <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.9" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.10" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>f40e7ceff0e19c1383a2613030a5b78da8bcfed3</Sha> + <Sha>6281f2d8b6fdec03cffc91e31a134f6f6cc855df</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.9-servicing.22420.3" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.10-servicing.22470.9" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>f40e7ceff0e19c1383a2613030a5b78da8bcfed3</Sha> + <Sha>6281f2d8b6fdec03cffc91e31a134f6f6cc855df</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.9-servicing.22420.3" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.10-servicing.22470.9" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>f40e7ceff0e19c1383a2613030a5b78da8bcfed3</Sha> + <Sha>6281f2d8b6fdec03cffc91e31a134f6f6cc855df</Sha> </Dependency> - <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.9" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.10" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>f40e7ceff0e19c1383a2613030a5b78da8bcfed3</Sha> + <Sha>6281f2d8b6fdec03cffc91e31a134f6f6cc855df</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.9-servicing.22419.5" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.10-servicing.22469.10" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>163a63591cf9e9b682063cf3995948c2b885a042</Sha> + <Sha>3bd501a063af406167e0195844048a3c222afd29</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.9" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.10" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>163a63591cf9e9b682063cf3995948c2b885a042</Sha> + <Sha>3bd501a063af406167e0195844048a3c222afd29</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.9-servicing.22419.5" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.10-servicing.22469.10" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>163a63591cf9e9b682063cf3995948c2b885a042</Sha> + <Sha>3bd501a063af406167e0195844048a3c222afd29</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.9" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.10" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>163a63591cf9e9b682063cf3995948c2b885a042</Sha> + <Sha>3bd501a063af406167e0195844048a3c222afd29</Sha> <SourceBuildTarball RepoName="runtime" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.9" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.10" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>163a63591cf9e9b682063cf3995948c2b885a042</Sha> + <Sha>3bd501a063af406167e0195844048a3c222afd29</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.9" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.10" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>163a63591cf9e9b682063cf3995948c2b885a042</Sha> + <Sha>3bd501a063af406167e0195844048a3c222afd29</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. --> @@ -48,34 +48,34 @@ <Uri>https://github.com/dotnet/core-setup</Uri> <Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.5" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.6" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>0ec02c8c96e2eda06dc5b5edfdbdba0f36415082</Sha> + <Sha>3bd501a063af406167e0195844048a3c222afd29</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.9" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.10" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>3fe12b935c03138f76364dc877a7e069e254b5b2</Sha> + <Sha>3678930d3590d1e4dd7b675dfba72f8b1cf621bf</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.9-servicing.22419.26" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.10-servicing.22469.29" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>3fe12b935c03138f76364dc877a7e069e254b5b2</Sha> + <Sha>3678930d3590d1e4dd7b675dfba72f8b1cf621bf</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.9" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.10" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>3fe12b935c03138f76364dc877a7e069e254b5b2</Sha> + <Sha>3678930d3590d1e4dd7b675dfba72f8b1cf621bf</Sha> <SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" /> </Dependency> - <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.9-servicing.22419.26" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.10-servicing.22469.29" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>3fe12b935c03138f76364dc877a7e069e254b5b2</Sha> + <Sha>3678930d3590d1e4dd7b675dfba72f8b1cf621bf</Sha> </Dependency> - <Dependency Name="dotnet-dev-certs" Version="6.0.9-servicing.22419.26" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="dotnet-dev-certs" Version="6.0.10-servicing.22469.29" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>3fe12b935c03138f76364dc877a7e069e254b5b2</Sha> + <Sha>3678930d3590d1e4dd7b675dfba72f8b1cf621bf</Sha> </Dependency> - <Dependency Name="dotnet-user-secrets" Version="6.0.9-servicing.22419.26" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="dotnet-user-secrets" Version="6.0.10-servicing.22469.29" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>3fe12b935c03138f76364dc877a7e069e254b5b2</Sha> + <Sha>3678930d3590d1e4dd7b675dfba72f8b1cf621bf</Sha> </Dependency> <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22207.1"> <Uri>https://github.com/dotnet/test-templates</Uri> @@ -90,36 +90,36 @@ <Sha>9388790ba9ed8fef11584b2c74fe6789782a1592</Sha> <SourceBuild RepoName="test-templates" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.304" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.305" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri> - <Sha>0b3a1bf29b9888fb2ae25df25be9f5231606c66f</Sha> + <Sha>a596312f285b849740c070b3b9f0825dc0ba84cf</Sha> </Dependency> - <Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.304-servicing.22420.10" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.305-servicing.22470.3" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri> - <Sha>0b3a1bf29b9888fb2ae25df25be9f5231606c66f</Sha> + <Sha>a596312f285b849740c070b3b9f0825dc0ba84cf</Sha> <SourceBuild RepoName="templating" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.304" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.305" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri> - <Sha>0b3a1bf29b9888fb2ae25df25be9f5231606c66f</Sha> + <Sha>a596312f285b849740c070b3b9f0825dc0ba84cf</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk" Version="6.0.305-servicing.22469.16"> + <Dependency Name="Microsoft.NET.Sdk" Version="6.0.305-servicing.22470.36"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>edd49c1bacac9342e15445a777722858e7f5fddf</Sha> + <Sha>fea45187a3648a964eb48f1c3cbbac1f59ae8a85</Sha> <SourceBuild RepoName="sdk" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.305-servicing.22469.16"> + <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.305-servicing.22470.36"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>edd49c1bacac9342e15445a777722858e7f5fddf</Sha> + <Sha>fea45187a3648a964eb48f1c3cbbac1f59ae8a85</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.9-servicing.22419.10" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> + <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.10-servicing.22470.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri> - <Sha>ec81900c9f76e0f25dbdcb7d7effcfb96cb6f77c</Sha> + <Sha>24d64ba63551a0f0457d62b834d043292d090815</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.9-servicing.22420.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> + <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.10-servicing.22470.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri> - <Sha>a97bb2af3c7d400dfe8aca3fa3d47ba83d925d6c</Sha> + <Sha>bbe6a9e6d0da0f80a57f80914177691fd1f1b97e</Sha> </Dependency> <Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.4-beta.22329.1" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://github.com/dotnet/fsharp</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index 58f127efe..4c2e4948f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ </PropertyGroup> <PropertyGroup> <!-- Dependency from https://github.com/dotnet/winforms --> - <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>6.0.9-servicing.22419.10</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion> + <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>6.0.10-servicing.22470.3</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependency from https://github.com/dotnet/wpf --> - <MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.9-servicing.22420.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion> + <MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.10-servicing.22470.7</MicrosoftDotNetWpfProjectTemplatesPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependency from https://github.com/dotnet/templating --> - <MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.304</MicrosoftDotNetCommonItemTemplatesPackageVersion> + <MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.305</MicrosoftDotNetCommonItemTemplatesPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependency from https://github.com/dotnet/test-templates --> @@ -44,44 +44,44 @@ </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/aspnet/AspNetCore --> - <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.9</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion> - <MicrosoftAspNetCoreAppRefPackageVersion>6.0.9</MicrosoftAspNetCoreAppRefPackageVersion> - <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.9-servicing.22419.26</MicrosoftAspNetCoreAppRefInternalPackageVersion> - <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.9-servicing.22419.26</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion> - <dotnetdevcertsPackageVersion>6.0.9-servicing.22419.26</dotnetdevcertsPackageVersion> - <dotnetusersecretsPackageVersion>6.0.9-servicing.22419.26</dotnetusersecretsPackageVersion> + <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.10</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion> + <MicrosoftAspNetCoreAppRefPackageVersion>6.0.10</MicrosoftAspNetCoreAppRefPackageVersion> + <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.10-servicing.22469.29</MicrosoftAspNetCoreAppRefInternalPackageVersion> + <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.10-servicing.22469.29</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion> + <dotnetdevcertsPackageVersion>6.0.10-servicing.22469.29</dotnetdevcertsPackageVersion> + <dotnetusersecretsPackageVersion>6.0.10-servicing.22469.29</dotnetusersecretsPackageVersion> </PropertyGroup> <PropertyGroup> <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/sdk --> - <MicrosoftNETSdkPackageVersion>6.0.305-servicing.22469.16</MicrosoftNETSdkPackageVersion> - <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.305-servicing.22469.16</MicrosoftDotNetMSBuildSdkResolverPackageVersion> + <MicrosoftNETSdkPackageVersion>6.0.305-servicing.22470.36</MicrosoftNETSdkPackageVersion> + <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.305-servicing.22470.36</MicrosoftDotNetMSBuildSdkResolverPackageVersion> <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion> <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion> <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/corefx --> - <MicrosoftNETCorePlatformsPackageVersion>6.0.5</MicrosoftNETCorePlatformsPackageVersion> + <MicrosoftNETCorePlatformsPackageVersion>6.0.6</MicrosoftNETCorePlatformsPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/core-setup --> - <VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.9-servicing.22419.5</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion> - <VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.9-servicing.22419.5</VSRedistCommonNetCoreTargetingPackx6460PackageVersion> - <MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.9</MicrosoftNETCoreAppRuntimewinx64PackageVersion> - <MicrosoftNETCoreAppHostwinx64PackageVersion>6.0.9</MicrosoftNETCoreAppHostwinx64PackageVersion> - <MicrosoftNETCoreAppRefPackageVersion>6.0.9</MicrosoftNETCoreAppRefPackageVersion> - <MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.9</MicrosoftNETCoreDotNetHostResolverPackageVersion> + <VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.10-servicing.22469.10</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion> + <VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.10-servicing.22469.10</VSRedistCommonNetCoreTargetingPackx6460PackageVersion> + <MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.10</MicrosoftNETCoreAppRuntimewinx64PackageVersion> + <MicrosoftNETCoreAppHostwinx64PackageVersion>6.0.10</MicrosoftNETCoreAppHostwinx64PackageVersion> + <MicrosoftNETCoreAppRefPackageVersion>6.0.10</MicrosoftNETCoreAppRefPackageVersion> + <MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.10</MicrosoftNETCoreDotNetHostResolverPackageVersion> <NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/windowsdesktop --> - <VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.9-servicing.22420.3</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion> - <VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>6.0.9-servicing.22420.3</VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion> - <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>6.0.9</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion> - <MicrosoftWindowsDesktopAppRefPackageVersion>6.0.9</MicrosoftWindowsDesktopAppRefPackageVersion> + <VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.10-servicing.22470.9</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion> + <VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>6.0.10-servicing.22470.9</VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion> + <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>6.0.10</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion> + <MicrosoftWindowsDesktopAppRefPackageVersion>6.0.10</MicrosoftWindowsDesktopAppRefPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 --> @@ -115,7 +115,7 @@ <MicrosoftDotNetWpfProjectTemplates60PackageVersion>$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)</MicrosoftDotNetWpfProjectTemplates60PackageVersion> <NUnit3Templates60PackageVersion>$(NUnit3DotNetNewTemplatePackageVersion)</NUnit3Templates60PackageVersion> <MicrosoftDotNetCommonItemTemplates60PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonItemTemplates60PackageVersion> - <MicrosoftDotNetCommonProjectTemplates60PackageVersion>6.0.304</MicrosoftDotNetCommonProjectTemplates60PackageVersion> + <MicrosoftDotNetCommonProjectTemplates60PackageVersion>6.0.305</MicrosoftDotNetCommonProjectTemplates60PackageVersion> <AspNetCorePackageVersionFor60Templates>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</AspNetCorePackageVersionFor60Templates> <!-- 5.0 Template versions --> <MicrosoftDotnetWinFormsProjectTemplates50PackageVersion>$(MicrosoftWinFormsProjectTemplates50PackageVersion)</MicrosoftDotnetWinFormsProjectTemplates50PackageVersion>