From d501d432bbe8a169049c593e653b84d6918c6044 Mon Sep 17 00:00:00 2001 From: DotNet Bot <dn-bot@microsoft.com> Date: Mon, 2 May 2022 17:35:45 +0000 Subject: [PATCH 01/13] Merged PR 22598: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20220502.6 - **Date Produced**: May 2, 2022 4:54:18 PM UTC - **Commit**: 1a8f1baf45ee888efa9607571f2c4c649900fc4a - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.Sdk**: [from 6.0.300-rtm.22221.4 to 6.0.300-rtm.22252.6][2] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.300-rtm.22221.4 to 6.0.300-rtm.22252.6][2] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.5 to 6.0.5][3] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.5-servicing.22215.11 to 6.0.5-servicing.22227.2][3] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.5-servicing.22215.11 to 6.0.5-servicing.22227.2][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.5 to 6.0.5][3] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.4-servicing.22164.7 to 6.0.5-servicing.22214.3][4] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.5 to 6.0.5][3] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.5-servicing.22215.9 to 6.0.5-servicing.22215.11][5] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCac00abe&targetVersion=GC1a8f1ba&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCad94063&targetVersion=GC65aaba1&_a=files [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC0c636f9&targetVersion=GCa59b5f3&_a=files [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC14bf2e5&targetVersion=GC89dcce8&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) [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.5 to 6.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.5-servicing.22215.11 to 6.0.5-servicing.22227.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.5-servicing.22215.11 to 6.0.5-servicing.22227.2 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.5 to 6.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.4-servicing.22164.7 to 6.0.... --- NuGet.config | 14 ++++++++++++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 32 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3e42736a6..5dc437491 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,8 @@ <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-e5f183b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-e5f183b6-2/nuget/v3/index.json" /> + <add key="darc-int-dotnet-aspnetcore-e5f183b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-e5f183b6-1/nuget/v3/index.json" /> <add key="darc-int-dotnet-aspnetcore-e5f183b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-e5f183b6/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-emsdk --> @@ -15,13 +17,17 @@ <add key="darc-pub-DotNet-msbuild-Trusted-41abc56" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-41abc562/nuget/v3/index.json" /> <!-- End: Package sources from DotNet-msbuild-Trusted --> <!-- Begin: Package sources from dotnet-runtime --> + <add key="darc-int-dotnet-runtime-70ae3df-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-70ae3df4-2/nuget/v3/index.json" /> + <add key="darc-int-dotnet-runtime-70ae3df-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-70ae3df4-1/nuget/v3/index.json" /> <add key="darc-int-dotnet-runtime-70ae3df" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-70ae3df4/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-templating --> + <add key="darc-pub-dotnet-templating-60a2f73-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-60a2f73d-2/nuget/v3/index.json" /> + <add key="darc-pub-dotnet-templating-60a2f73-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-60a2f73d-1/nuget/v3/index.json" /> <add key="darc-pub-dotnet-templating-60a2f73" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-60a2f73d/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-ad94063" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-ad940638/nuget/v3/index.json" /> + <add key="darc-int-dotnet-windowsdesktop-65aaba1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-65aaba15/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,13 +47,17 @@ <!--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-e5f183b" value="true" /> + <add key="darc-int-dotnet-aspnetcore-e5f183b-1" value="true" /> + <add key="darc-int-dotnet-aspnetcore-e5f183b-2" value="true" /> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-runtime --> <add key="darc-int-dotnet-runtime-70ae3df" value="true" /> + <add key="darc-int-dotnet-runtime-70ae3df-1" value="true" /> + <add key="darc-int-dotnet-runtime-70ae3df-2" value="true" /> <!-- Begin: Package sources from dotnet-templating --> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-ad94063" value="true" /> + <add key="darc-int-dotnet-windowsdesktop-65aaba1" 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 1eafa497a..7d5754ae3 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.5" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>ad940638f459efe0d17d60ccf52454a32ea7e561</Sha> + <Sha>65aaba15166a6e676ec1be6b6ab2f43c2916d4ee</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.5-servicing.22215.11" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.5-servicing.22227.2" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>ad940638f459efe0d17d60ccf52454a32ea7e561</Sha> + <Sha>65aaba15166a6e676ec1be6b6ab2f43c2916d4ee</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.5-servicing.22215.11" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.5-servicing.22227.2" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>ad940638f459efe0d17d60ccf52454a32ea7e561</Sha> + <Sha>65aaba15166a6e676ec1be6b6ab2f43c2916d4ee</Sha> </Dependency> <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.5" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>ad940638f459efe0d17d60ccf52454a32ea7e561</Sha> + <Sha>65aaba15166a6e676ec1be6b6ab2f43c2916d4ee</Sha> </Dependency> <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.5-servicing.22213.9" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> @@ -103,23 +103,23 @@ <Uri>https://github.com/dotnet/templating</Uri> <Sha>60a2f73de55434984bbe3d5ad9281b3863355b31</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk" Version="6.0.300-rtm.22221.4"> + <Dependency Name="Microsoft.NET.Sdk" Version="6.0.300-rtm.22252.6"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>ac00abef032d4d576a844d7f1287119a9d20166e</Sha> + <Sha>1a8f1baf45ee888efa9607571f2c4c649900fc4a</Sha> <SourceBuild RepoName="sdk" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.300-rtm.22221.4"> + <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.300-rtm.22252.6"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>ac00abef032d4d576a844d7f1287119a9d20166e</Sha> + <Sha>1a8f1baf45ee888efa9607571f2c4c649900fc4a</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.4-servicing.22164.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> + <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.5-servicing.22214.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri> - <Sha>0c636f9d7cf5e0d9f23cf070c36711e7ac4d66ee</Sha> + <Sha>a59b5f3bcf2013b0681089930dd18c65f33ec202</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.5-servicing.22215.9" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> + <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.5-servicing.22215.11" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri> - <Sha>14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b</Sha> + <Sha>89dcce82c0690a9ac94a83594d714e53957a395d</Sha> </Dependency> <Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.3-beta.22219.3" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://github.com/dotnet/fsharp</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index c2eb24464..c7e0a3494 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.4-servicing.22164.7</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion> + <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>6.0.5-servicing.22214.3</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependency from https://github.com/dotnet/wpf --> - <MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.5-servicing.22215.9</MicrosoftDotNetWpfProjectTemplatesPackageVersion> + <MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.5-servicing.22215.11</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.300-rtm.22221.4</MicrosoftNETSdkPackageVersion> - <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.300-rtm.22221.4</MicrosoftDotNetMSBuildSdkResolverPackageVersion> + <MicrosoftNETSdkPackageVersion>6.0.300-rtm.22252.6</MicrosoftNETSdkPackageVersion> + <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.300-rtm.22252.6</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.5-servicing.22215.11</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion> - <VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>6.0.5-servicing.22215.11</VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion> + <VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.5-servicing.22227.2</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion> + <VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>6.0.5-servicing.22227.2</VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion> <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>6.0.5</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion> <MicrosoftWindowsDesktopAppRefPackageVersion>6.0.5</MicrosoftWindowsDesktopAppRefPackageVersion> </PropertyGroup> From 1380480834a9d824129c8d47d18c0d5a2c778d21 Mon Sep 17 00:00:00 2001 From: DotNet-Bot <dn-bot@microsoft.com> Date: Tue, 10 May 2022 20:09:42 +0000 Subject: [PATCH 02/13] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220509.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22213.1 -> To Version 6.0.0-servicing.22259.1 --- NuGet.config | 2 -- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5dc437491..30bdcf255 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,7 +27,6 @@ <add key="darc-pub-dotnet-templating-60a2f73" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-60a2f73d/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-65aaba1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-65aaba15/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" /> @@ -57,7 +56,6 @@ <!-- Begin: Package sources from dotnet-templating --> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-65aaba1" 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 7d5754ae3..60aef3b63 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ <Uri>https://github.com/dotnet/arcade</Uri> <Sha>1a6b24397e50146d0fece9cfb9c0b87275691e6f</Sha> </Dependency> - <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22213.1"> + <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22259.1"> <Uri>https://github.com/dotnet/source-build-reference-packages</Uri> - <Sha>60845bf36f0dd6dd310070548a58cb8ad3ab513c</Sha> + <Sha>b1f5e7bc4d52db0031868cdd5e90b76118c2c31a</Sha> <SourceBuildTarball RepoName="source-build-reference-packages" ManagedOnly="true" /> </Dependency> <Dependency Name="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-21480-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk"> From e0d981b70dd29535c779536d37ce25f3ef238c5b Mon Sep 17 00:00:00 2001 From: DotNet-Bot <dn-bot@microsoft.com> Date: Tue, 10 May 2022 20:11:07 +0000 Subject: [PATCH 03/13] Update dependencies from https://github.com/dotnet/arcade build 20220504.3 Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22212.5 -> To Version 6.0.0-beta.22254.3 --- NuGet.config | 2 -- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5dc437491..30bdcf255 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,7 +27,6 @@ <add key="darc-pub-dotnet-templating-60a2f73" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-60a2f73d/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-65aaba1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-65aaba15/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" /> @@ -57,7 +56,6 @@ <!-- Begin: Package sources from dotnet-templating --> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-65aaba1" 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 7d5754ae3..312ef482c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ </Dependency> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22212.5"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22254.3"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>1a6b24397e50146d0fece9cfb9c0b87275691e6f</Sha> + <Sha>5fdd5b6c08c6c39edf12001400a11786c03b3e35</Sha> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.22212.5"> + <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.22254.3"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>1a6b24397e50146d0fece9cfb9c0b87275691e6f</Sha> + <Sha>5fdd5b6c08c6c39edf12001400a11786c03b3e35</Sha> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22212.5"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22254.3"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>1a6b24397e50146d0fece9cfb9c0b87275691e6f</Sha> + <Sha>5fdd5b6c08c6c39edf12001400a11786c03b3e35</Sha> </Dependency> <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22213.1"> <Uri>https://github.com/dotnet/source-build-reference-packages</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index 0048b6ab1..c62c3a7fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ </PropertyGroup> <PropertyGroup> <!-- Dependency from https://github.com/dotnet/arcade --> - <MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.22212.5</MicrosoftDotNetBuildTasksInstallersPackageVersion> + <MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.22254.3</MicrosoftDotNetBuildTasksInstallersPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependency from https://github.com/dotnet/winforms --> diff --git a/global.json b/global.json index b645142d3..c751a7b2d 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22212.5", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22212.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22254.3", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22254.3" } } From c9abd25c045fa0751b17267515d7cff68742ad0e Mon Sep 17 00:00:00 2001 From: DotNet Bot <dn-bot@microsoft.com> Date: Thu, 12 May 2022 16:42:14 +0000 Subject: [PATCH 04/13] Merged PR 22627: [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.Net.Compilers.Toolset**: from 4.2.0-4.22220.2 to 4.2.0-4.22220.5 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20220511.2 - **Date Produced**: May 11, 2022 9:45:42 AM UTC - **Commit**: 07c36a7706dfa2b3775da973646c86f1da485a8b - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.Sdk**: [from 6.0.300-rtm.22252.6 to 6.0.301-rtm.22261.2][11] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.300-rtm.22252.6 to 6.0.301-rtm.22261.2][11] - **Microsoft.Net.Compilers.Toolset**: [from 4.2.0-4.22220.2 to 4.2.0-4.22220.5][12] [11]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1a8f1ba&targetVersion=GC07c36a7&_a=files [12]: https://github.com/dotnet/roslyn/compare/1e40aa1...432d17a [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d049dc4ce..8ae20890d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ <Uri>https://github.com/dotnet/templating</Uri> <Sha>60a2f73de55434984bbe3d5ad9281b3863355b31</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk" Version="6.0.300-rtm.22252.6"> + <Dependency Name="Microsoft.NET.Sdk" Version="6.0.301-rtm.22261.2"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>1a8f1baf45ee888efa9607571f2c4c649900fc4a</Sha> + <Sha>07c36a7706dfa2b3775da973646c86f1da485a8b</Sha> <SourceBuild RepoName="sdk" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.300-rtm.22252.6"> + <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.301-rtm.22261.2"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>1a8f1baf45ee888efa9607571f2c4c649900fc4a</Sha> + <Sha>07c36a7706dfa2b3775da973646c86f1da485a8b</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.5-servicing.22214.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> @@ -141,9 +141,9 @@ <SourceBuild RepoName="linker" ManagedOnly="true" /> <RepoName>linker</RepoName> </Dependency> - <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.2.0-4.22220.2" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.2.0-4.22220.5" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://github.com/dotnet/roslyn</Uri> - <Sha>1e40aa11ca0b522e201320f70d469de40f211b2c</Sha> + <Sha>432d17a83aa5623e4581756f4d642997048056bd</Sha> <SourceBuild RepoName="roslyn" ManagedOnly="true" /> </Dependency> <Dependency Name="Microsoft.Build" Version="17.2.0" CoherentParentDependency="Microsoft.NET.Sdk"> diff --git a/eng/Versions.props b/eng/Versions.props index c62c3a7fa..bada13902 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.300-rtm.22252.6</MicrosoftNETSdkPackageVersion> - <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.300-rtm.22252.6</MicrosoftDotNetMSBuildSdkResolverPackageVersion> + <MicrosoftNETSdkPackageVersion>6.0.301-rtm.22261.2</MicrosoftNETSdkPackageVersion> + <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.301-rtm.22261.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion> <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion> <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion> <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion> From e20e768bfdc0888c02c215a4d988dc3a4c55b634 Mon Sep 17 00:00:00 2001 From: DotNet Bot <dn-bot@microsoft.com> Date: Thu, 12 May 2022 17:05:55 +0000 Subject: [PATCH 05/13] Merged PR 22878: [internal/release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages This pull request updates the following dependencies [marker]: <> (Begin:4fe19a4b-6691-493a-bfdf-08da32c0fb1e) ## From https://github.com/dotnet/source-build-reference-packages - **Subscription**: 4fe19a4b-6691-493a-bfdf-08da32c0fb1e - **Build**: 20220512.1 - **Date Produced**: May 12, 2022 2:06:41 PM UTC - **Commit**: 07eecddb8505ad0dccb6ff6f23379d6b67aedc64 - **Branch**: refs/heads/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.source-build-reference-packages**: [from 6.0.0-servicing.22259.1 to 6.0.0-servicing.22262.1][1] [1]: https://github.com/dotnet/source-build-reference-packages/compare/b1f5e7b...07eecdd [DependencyUpdate]: <> (End) [marker]: <> (End:4fe19a4b-6691-493a-bfdf-08da32c0fb1e) --- NuGet.config | 3 --- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 30bdcf255..284909916 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,9 +22,6 @@ <add key="darc-int-dotnet-runtime-70ae3df" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-70ae3df4/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-templating --> - <add key="darc-pub-dotnet-templating-60a2f73-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-60a2f73d-2/nuget/v3/index.json" /> - <add key="darc-pub-dotnet-templating-60a2f73-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-60a2f73d-1/nuget/v3/index.json" /> - <add key="darc-pub-dotnet-templating-60a2f73" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-60a2f73d/nuget/v3/index.json" /> <!-- 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 8ae20890d..bea7c41e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ <Uri>https://github.com/dotnet/arcade</Uri> <Sha>5fdd5b6c08c6c39edf12001400a11786c03b3e35</Sha> </Dependency> - <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22259.1"> + <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22262.1"> <Uri>https://github.com/dotnet/source-build-reference-packages</Uri> - <Sha>b1f5e7bc4d52db0031868cdd5e90b76118c2c31a</Sha> + <Sha>07eecddb8505ad0dccb6ff6f23379d6b67aedc64</Sha> <SourceBuildTarball RepoName="source-build-reference-packages" ManagedOnly="true" /> </Dependency> <Dependency Name="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-21480-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk"> From 3ba5fa513263d941be88641f27463a0e3d1df23f Mon Sep 17 00:00:00 2001 From: DotNet Bot <dn-bot@microsoft.com> Date: Thu, 12 May 2022 20:04:33 +0000 Subject: [PATCH 06/13] Merged PR 22879: [internal/release/6.0.3xx] Update dependencies from dotnet/arcade This pull request updates the following dependencies [marker]: <> (Begin:6d383863-e2a5-4edc-fb90-08da32c10934) ## From https://github.com/dotnet/arcade - **Subscription**: 6d383863-e2a5-4edc-fb90-08da32c10934 - **Build**: 20220511.7 - **Date Produced**: May 11, 2022 5:34:05 PM UTC - **Commit**: e3cbecc5b0e51374e3d71dbb976004ab9cc90430 - **Branch**: refs/heads/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.CMake.Sdk**: [from 6.0.0-beta.22254.3 to 6.0.0-beta.22261.7][1] - **Microsoft.DotNet.Build.Tasks.Installers**: [from 6.0.0-beta.22254.3 to 6.0.0-beta.22261.7][1] - **Microsoft.DotNet.Arcade.Sdk**: [from 6.0.0-beta.22254.3 to 6.0.0-beta.22261.7][1] [1]: https://github.com/dotnet/arcade/compare/5fdd5b6...e3cbecc [DependencyUpdate]: <> (End) - **Updates to .NET SDKs:** - Updates tools.dotnet to 6.0.105 [marker]: <> (End:6d383863-e2a5-4edc-fb90-08da32c10934) --- NuGet.config | 6 ------ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 284909916..44bb1133f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,6 @@ <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-e5f183b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-e5f183b6-2/nuget/v3/index.json" /> - <add key="darc-int-dotnet-aspnetcore-e5f183b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-e5f183b6-1/nuget/v3/index.json" /> - <add key="darc-int-dotnet-aspnetcore-e5f183b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-e5f183b6/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-emsdk --> <!-- End: Package sources from dotnet-emsdk --> @@ -42,9 +39,6 @@ <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-e5f183b" value="true" /> - <add key="darc-int-dotnet-aspnetcore-e5f183b-1" value="true" /> - <add key="darc-int-dotnet-aspnetcore-e5f183b-2" value="true" /> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-runtime --> <add key="darc-int-dotnet-runtime-70ae3df" value="true" /> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bea7c41e2..591badacb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ </Dependency> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22254.3"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22261.7"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>5fdd5b6c08c6c39edf12001400a11786c03b3e35</Sha> + <Sha>e3cbecc5b0e51374e3d71dbb976004ab9cc90430</Sha> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.22254.3"> + <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.22261.7"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>5fdd5b6c08c6c39edf12001400a11786c03b3e35</Sha> + <Sha>e3cbecc5b0e51374e3d71dbb976004ab9cc90430</Sha> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22254.3"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22261.7"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>5fdd5b6c08c6c39edf12001400a11786c03b3e35</Sha> + <Sha>e3cbecc5b0e51374e3d71dbb976004ab9cc90430</Sha> </Dependency> <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22262.1"> <Uri>https://github.com/dotnet/source-build-reference-packages</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index bada13902..305b5eda5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ </PropertyGroup> <PropertyGroup> <!-- Dependency from https://github.com/dotnet/arcade --> - <MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.22254.3</MicrosoftDotNetBuildTasksInstallersPackageVersion> + <MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.22261.7</MicrosoftDotNetBuildTasksInstallersPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependency from https://github.com/dotnet/winforms --> diff --git a/global.json b/global.json index c751a7b2d..de4424c2a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.104", + "dotnet": "6.0.105", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22254.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22254.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22261.7", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22261.7" } } From f477fd69d25a11d563524a15959a2102eb1e3c92 Mon Sep 17 00:00:00 2001 From: DotNet Bot <dn-bot@microsoft.com> Date: Mon, 16 May 2022 18:14:23 +0000 Subject: [PATCH 07/13] Merged PR 22884: [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.5 to 6.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.5-servicing.22227.2 to 6.0.6-servicing.22260.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.5-servicing.22227.2 to 6.0.6-servicing.22260.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.5-servicing.22213.9 to 6.0.6-servicing.22255.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.5 to 6.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.5-servicing.22213.9 to 6.0.6-servicing.22255.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.5 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.5 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.5 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.5 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.5-servicing.22218.2 to 6.0.6-servicing.22260.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.5 to 6.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.5-servicing.22218.2 to 6.0.6-servicing.22260.10 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.5-servicing.22218.2 to 6.0.6-servicing.22260.10 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.5-servicing.22218.2 to 6.0.6-servicing.22260.10 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.5 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.5-servicing.22214.3 to 6.0.6-servicing.22255.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.5 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.5-servicing.22215.11 to 6.0.6-servicing.22255.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8... --- NuGet.config | 12 +++---- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 40 ++++++++++----------- 3 files changed, 66 insertions(+), 66 deletions(-) diff --git a/NuGet.config b/NuGet.config index 44bb1133f..3c5e1c788 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-09f4073" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-09f40738/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-emsdk --> <!-- End: Package sources from dotnet-emsdk --> @@ -14,13 +15,12 @@ <add key="darc-pub-DotNet-msbuild-Trusted-41abc56" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-41abc562/nuget/v3/index.json" /> <!-- End: Package sources from DotNet-msbuild-Trusted --> <!-- Begin: Package sources from dotnet-runtime --> - <add key="darc-int-dotnet-runtime-70ae3df-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-70ae3df4-2/nuget/v3/index.json" /> - <add key="darc-int-dotnet-runtime-70ae3df-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-70ae3df4-1/nuget/v3/index.json" /> - <add key="darc-int-dotnet-runtime-70ae3df" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-70ae3df4/nuget/v3/index.json" /> + <add key="darc-int-dotnet-runtime-22095cd" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-22095cd4/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-templating --> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-windowsdesktop --> + <add key="darc-int-dotnet-windowsdesktop-bc63032" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-bc63032a/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" /> @@ -39,14 +39,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-09f4073" value="true" /> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-runtime --> - <add key="darc-int-dotnet-runtime-70ae3df" value="true" /> - <add key="darc-int-dotnet-runtime-70ae3df-1" value="true" /> - <add key="darc-int-dotnet-runtime-70ae3df-2" value="true" /> + <add key="darc-int-dotnet-runtime-22095cd" value="true" /> <!-- Begin: Package sources from dotnet-templating --> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-windowsdesktop --> + <add key="darc-int-dotnet-windowsdesktop-bc63032" 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 591badacb..99445d605 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.5" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.6" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>65aaba15166a6e676ec1be6b6ab2f43c2916d4ee</Sha> + <Sha>bc63032a084340c7ac42b47fecb9dc0b4d0c9373</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.5-servicing.22227.2" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.6-servicing.22260.6" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>65aaba15166a6e676ec1be6b6ab2f43c2916d4ee</Sha> + <Sha>bc63032a084340c7ac42b47fecb9dc0b4d0c9373</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.5-servicing.22227.2" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.6-servicing.22260.6" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>65aaba15166a6e676ec1be6b6ab2f43c2916d4ee</Sha> + <Sha>bc63032a084340c7ac42b47fecb9dc0b4d0c9373</Sha> </Dependency> - <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.5" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.6" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>65aaba15166a6e676ec1be6b6ab2f43c2916d4ee</Sha> + <Sha>bc63032a084340c7ac42b47fecb9dc0b4d0c9373</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.5-servicing.22213.9" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.6-servicing.22255.10" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>70ae3df4a6f3c92fb6b315afc405edd10ff38579</Sha> + <Sha>22095cd47b192aa48ca82c514e547cc528aebd9d</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.5" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.6" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>70ae3df4a6f3c92fb6b315afc405edd10ff38579</Sha> + <Sha>22095cd47b192aa48ca82c514e547cc528aebd9d</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.5-servicing.22213.9" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.6-servicing.22255.10" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>70ae3df4a6f3c92fb6b315afc405edd10ff38579</Sha> + <Sha>22095cd47b192aa48ca82c514e547cc528aebd9d</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.5" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.6" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>70ae3df4a6f3c92fb6b315afc405edd10ff38579</Sha> + <Sha>22095cd47b192aa48ca82c514e547cc528aebd9d</Sha> <SourceBuildTarball RepoName="runtime" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.5" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.6" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>70ae3df4a6f3c92fb6b315afc405edd10ff38579</Sha> + <Sha>22095cd47b192aa48ca82c514e547cc528aebd9d</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.5" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.6" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>70ae3df4a6f3c92fb6b315afc405edd10ff38579</Sha> + <Sha>22095cd47b192aa48ca82c514e547cc528aebd9d</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>be98e88c760526452df94ef452fff4602fb5bded</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.5" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.6" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>e5f183b656a0e8bc087108130a5a9b54ae94494e</Sha> + <Sha>09f40738cea0abc19e06851eb2180e4724870288</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.5-servicing.22218.2" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.6-servicing.22260.10" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>e5f183b656a0e8bc087108130a5a9b54ae94494e</Sha> + <Sha>09f40738cea0abc19e06851eb2180e4724870288</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.5" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.6" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>e5f183b656a0e8bc087108130a5a9b54ae94494e</Sha> + <Sha>09f40738cea0abc19e06851eb2180e4724870288</Sha> <SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" /> </Dependency> - <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.5-servicing.22218.2" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.6-servicing.22260.10" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>e5f183b656a0e8bc087108130a5a9b54ae94494e</Sha> + <Sha>09f40738cea0abc19e06851eb2180e4724870288</Sha> </Dependency> - <Dependency Name="dotnet-dev-certs" Version="6.0.5-servicing.22218.2" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="dotnet-dev-certs" Version="6.0.6-servicing.22260.10" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>e5f183b656a0e8bc087108130a5a9b54ae94494e</Sha> + <Sha>09f40738cea0abc19e06851eb2180e4724870288</Sha> </Dependency> - <Dependency Name="dotnet-user-secrets" Version="6.0.5-servicing.22218.2" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="dotnet-user-secrets" Version="6.0.6-servicing.22260.10" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>e5f183b656a0e8bc087108130a5a9b54ae94494e</Sha> + <Sha>09f40738cea0abc19e06851eb2180e4724870288</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> @@ -103,23 +103,23 @@ <Uri>https://github.com/dotnet/templating</Uri> <Sha>60a2f73de55434984bbe3d5ad9281b3863355b31</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk" Version="6.0.301-rtm.22261.2"> + <Dependency Name="Microsoft.NET.Sdk" Version="6.0.301-rtm.22262.4"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>07c36a7706dfa2b3775da973646c86f1da485a8b</Sha> + <Sha>a78ea1e97e04406618daaa48309d1c05336ca0ed</Sha> <SourceBuild RepoName="sdk" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.301-rtm.22261.2"> + <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.301-rtm.22262.4"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>07c36a7706dfa2b3775da973646c86f1da485a8b</Sha> + <Sha>a78ea1e97e04406618daaa48309d1c05336ca0ed</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.5-servicing.22214.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> + <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.6-servicing.22255.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri> - <Sha>a59b5f3bcf2013b0681089930dd18c65f33ec202</Sha> + <Sha>83daf50cbdf69c702829df567ac0d737007083ca</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.5-servicing.22215.11" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> + <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.6-servicing.22255.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri> - <Sha>89dcce82c0690a9ac94a83594d714e53957a395d</Sha> + <Sha>736757c0193667dc19c6d9d132d93a52cc8e4805</Sha> </Dependency> <Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.3-beta.22219.3" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://github.com/dotnet/fsharp</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index 553e1626d..0158d3754 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.5-servicing.22214.3</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion> + <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>6.0.6-servicing.22255.2</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependency from https://github.com/dotnet/wpf --> - <MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.5-servicing.22215.11</MicrosoftDotNetWpfProjectTemplatesPackageVersion> + <MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.6-servicing.22255.5</MicrosoftDotNetWpfProjectTemplatesPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependency from https://github.com/dotnet/templating --> @@ -44,20 +44,20 @@ </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/aspnet/AspNetCore --> - <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.5</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion> - <MicrosoftAspNetCoreAppRefPackageVersion>6.0.5</MicrosoftAspNetCoreAppRefPackageVersion> - <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.5-servicing.22218.2</MicrosoftAspNetCoreAppRefInternalPackageVersion> - <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.5-servicing.22218.2</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion> - <dotnetdevcertsPackageVersion>6.0.5-servicing.22218.2</dotnetdevcertsPackageVersion> - <dotnetusersecretsPackageVersion>6.0.5-servicing.22218.2</dotnetusersecretsPackageVersion> + <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.6</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion> + <MicrosoftAspNetCoreAppRefPackageVersion>6.0.6</MicrosoftAspNetCoreAppRefPackageVersion> + <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.6-servicing.22260.10</MicrosoftAspNetCoreAppRefInternalPackageVersion> + <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.6-servicing.22260.10</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion> + <dotnetdevcertsPackageVersion>6.0.6-servicing.22260.10</dotnetdevcertsPackageVersion> + <dotnetusersecretsPackageVersion>6.0.6-servicing.22260.10</dotnetusersecretsPackageVersion> </PropertyGroup> <PropertyGroup> <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/sdk --> - <MicrosoftNETSdkPackageVersion>6.0.301-rtm.22261.2</MicrosoftNETSdkPackageVersion> - <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.301-rtm.22261.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion> + <MicrosoftNETSdkPackageVersion>6.0.301-rtm.22262.4</MicrosoftNETSdkPackageVersion> + <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.301-rtm.22262.4</MicrosoftDotNetMSBuildSdkResolverPackageVersion> <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion> <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion> <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion> @@ -68,20 +68,20 @@ </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/core-setup --> - <VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.5-servicing.22213.9</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion> - <VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.5-servicing.22213.9</VSRedistCommonNetCoreTargetingPackx6460PackageVersion> - <MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.5</MicrosoftNETCoreAppRuntimewinx64PackageVersion> - <MicrosoftNETCoreAppHostwinx64PackageVersion>6.0.5</MicrosoftNETCoreAppHostwinx64PackageVersion> - <MicrosoftNETCoreAppRefPackageVersion>6.0.5</MicrosoftNETCoreAppRefPackageVersion> - <MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.5</MicrosoftNETCoreDotNetHostResolverPackageVersion> + <VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.6-servicing.22255.10</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion> + <VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.6-servicing.22255.10</VSRedistCommonNetCoreTargetingPackx6460PackageVersion> + <MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.6</MicrosoftNETCoreAppRuntimewinx64PackageVersion> + <MicrosoftNETCoreAppHostwinx64PackageVersion>6.0.6</MicrosoftNETCoreAppHostwinx64PackageVersion> + <MicrosoftNETCoreAppRefPackageVersion>6.0.6</MicrosoftNETCoreAppRefPackageVersion> + <MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.6</MicrosoftNETCoreDotNetHostResolverPackageVersion> <NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/windowsdesktop --> - <VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.5-servicing.22227.2</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion> - <VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>6.0.5-servicing.22227.2</VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion> - <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>6.0.5</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion> - <MicrosoftWindowsDesktopAppRefPackageVersion>6.0.5</MicrosoftWindowsDesktopAppRefPackageVersion> + <VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.6-servicing.22260.6</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion> + <VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>6.0.6-servicing.22260.6</VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion> + <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>6.0.6</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion> + <MicrosoftWindowsDesktopAppRefPackageVersion>6.0.6</MicrosoftWindowsDesktopAppRefPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 --> From 35b5a8783dd44f8cae8b7d7c240eae85ab95fa39 Mon Sep 17 00:00:00 2001 From: DotNet Bot <dn-bot@microsoft.com> Date: Tue, 17 May 2022 16:49:13 +0000 Subject: [PATCH 08/13] Merged PR 22971: [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**: - **NuGet.Build.Tasks**: from 6.2.0-rc.146 to 6.2.1-rc.2 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20220516.33 - **Date Produced**: May 16, 2022 10:53:49 PM UTC - **Commit**: 0ffb32f6130125c44acbd6fbc314d9c9e34c7c0c - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.Sdk**: [from 6.0.301-rtm.22262.4 to 6.0.301-rtm.22266.33][5] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.301-rtm.22262.4 to 6.0.301-rtm.22266.33][5] - **NuGet.Build.Tasks**: [from 6.2.0-rc.146 to 6.2.1-rc.2][6] [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCa78ea1e&targetVersion=GC0ffb32f&_a=files [6]: https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted/branches?baseVersion=GCb8a6126&targetVersion=GCa8942f4&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- NuGet.config | 1 - eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3c5e1c788..7167859ca 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,7 +12,6 @@ <!-- Begin: Package sources from dotnet-emsdk --> <!-- End: Package sources from dotnet-emsdk --> <!-- Begin: Package sources from DotNet-msbuild-Trusted --> - <add key="darc-pub-DotNet-msbuild-Trusted-41abc56" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-41abc562/nuget/v3/index.json" /> <!-- End: Package sources from DotNet-msbuild-Trusted --> <!-- Begin: Package sources from dotnet-runtime --> <add key="darc-int-dotnet-runtime-22095cd" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-22095cd4/nuget/v3/index.json" /> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 99445d605..b7a5c89e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ <Uri>https://github.com/dotnet/templating</Uri> <Sha>60a2f73de55434984bbe3d5ad9281b3863355b31</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk" Version="6.0.301-rtm.22262.4"> + <Dependency Name="Microsoft.NET.Sdk" Version="6.0.301-rtm.22266.33"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>a78ea1e97e04406618daaa48309d1c05336ca0ed</Sha> + <Sha>0ffb32f6130125c44acbd6fbc314d9c9e34c7c0c</Sha> <SourceBuild RepoName="sdk" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.301-rtm.22262.4"> + <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.301-rtm.22266.33"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>a78ea1e97e04406618daaa48309d1c05336ca0ed</Sha> + <Sha>0ffb32f6130125c44acbd6fbc314d9c9e34c7c0c</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.6-servicing.22255.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> @@ -151,9 +151,9 @@ <Sha>41abc5629965e3f9e41f1e67fdf78345c0c5cc4b</Sha> <SourceBuildTarball RepoName="msbuild" ManagedOnly="true" /> </Dependency> - <Dependency Name="NuGet.Build.Tasks" Version="6.2.0-rc.146" CoherentParentDependency="Microsoft.NET.Sdk"> - <Uri>https://github.com/nuget/nuget.client</Uri> - <Sha>b8a61266d9a6780cb7eb9c1942695cf813fdef0a</Sha> + <Dependency Name="NuGet.Build.Tasks" Version="6.2.1-rc.2" CoherentParentDependency="Microsoft.NET.Sdk"> + <Uri>https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted</Uri> + <Sha>a8942f45835ba527cedacc02f7a75468f7a7b4bd</Sha> <SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" /> </Dependency> <Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0"> diff --git a/eng/Versions.props b/eng/Versions.props index 0158d3754..bab7a0320 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.301-rtm.22262.4</MicrosoftNETSdkPackageVersion> - <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.301-rtm.22262.4</MicrosoftDotNetMSBuildSdkResolverPackageVersion> + <MicrosoftNETSdkPackageVersion>6.0.301-rtm.22266.33</MicrosoftNETSdkPackageVersion> + <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.301-rtm.22266.33</MicrosoftDotNetMSBuildSdkResolverPackageVersion> <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion> <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion> <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion> From 3b5b37d71d98b37d55c5778f6e08072100376d79 Mon Sep 17 00:00:00 2001 From: DotNet Bot <dn-bot@microsoft.com> Date: Wed, 18 May 2022 16:15:17 +0000 Subject: [PATCH 09/13] Merged PR 23016: [internal/release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages This pull request updates the following dependencies [marker]: <> (Begin:4fe19a4b-6691-493a-bfdf-08da32c0fb1e) ## From https://github.com/dotnet/source-build-reference-packages - **Subscription**: 4fe19a4b-6691-493a-bfdf-08da32c0fb1e - **Build**: 20220518.1 - **Date Produced**: May 18, 2022 2:03:24 PM UTC - **Commit**: 8ea40b4e4a381b819a7f9946e72d036f37cb75d4 - **Branch**: refs/heads/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.source-build-reference-packages**: [from 6.0.0-servicing.22262.1 to 6.0.0-servicing.22268.1][1] [1]: https://github.com/dotnet/source-build-reference-packages/compare/07eecdd...8ea40b4 [DependencyUpdate]: <> (End) [marker]: <> (End:4fe19a4b-6691-493a-bfdf-08da32c0fb1e) --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b7a5c89e8..50c2b0c6a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ <Uri>https://github.com/dotnet/arcade</Uri> <Sha>e3cbecc5b0e51374e3d71dbb976004ab9cc90430</Sha> </Dependency> - <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22262.1"> + <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22268.1"> <Uri>https://github.com/dotnet/source-build-reference-packages</Uri> - <Sha>07eecddb8505ad0dccb6ff6f23379d6b67aedc64</Sha> + <Sha>8ea40b4e4a381b819a7f9946e72d036f37cb75d4</Sha> <SourceBuildTarball RepoName="source-build-reference-packages" ManagedOnly="true" /> </Dependency> <Dependency Name="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-21480-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk"> From cc7da5b9f3cc9a537b4b2553b4a73f5ff2a952d3 Mon Sep 17 00:00:00 2001 From: DotNet Bot <dn-bot@microsoft.com> Date: Wed, 18 May 2022 21:57:33 +0000 Subject: [PATCH 10/13] Merged PR 23001: [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.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.6-servicing.22260.6 to 6.0.6-servicing.22267.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.6-servicing.22260.6 to 6.0.6-servicing.22267.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22255.10 to 6.0.6-servicing.22267.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.6-servicing.22255.10 to 6.0.6-servicing.22267.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.6-servicing.22260.10 to 6.0.6-servicing.22267.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22260.10 to 6.0.6-servicing.22267.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.6-servicing.22260.10 to 6.0.6-servicing.22267.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.6-servicing.22260.10 to 6.0.6-servicing.22267.6 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.6-servicing.22255.2 to 6.0.6-servicing.22266.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.6-servicing.22255.5 to 6.0.6-servicing.22267.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## Fro... --- NuGet.config | 12 ++-- eng/Version.Details.xml | 68 +++++++++---------- eng/Versions.props | 26 +++---- .../0007-WebHost-delegate-nullability.patch | 6 +- 4 files changed, 56 insertions(+), 56 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7167859ca..9f25c4eaa 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,19 +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-09f4073" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-09f40738/nuget/v3/index.json" /> + <add key="darc-int-dotnet-aspnetcore-b90b481" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-b90b4814/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-22095cd" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-22095cd4/nuget/v3/index.json" /> + <add key="darc-int-dotnet-runtime-7cca709" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-7cca709d/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-templating --> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-bc63032" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-bc63032a/nuget/v3/index.json" /> + <add key="darc-int-dotnet-windowsdesktop-9d7c703" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-9d7c7030/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" /> @@ -38,14 +38,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-09f4073" value="true" /> + <add key="darc-int-dotnet-aspnetcore-b90b481" value="true" /> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-runtime --> - <add key="darc-int-dotnet-runtime-22095cd" value="true" /> + <add key="darc-int-dotnet-runtime-7cca709" value="true" /> <!-- Begin: Package sources from dotnet-templating --> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-bc63032" value="true" /> + <add key="darc-int-dotnet-windowsdesktop-9d7c703" 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 50c2b0c6a..29a2d4088 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ <ProductDependencies> <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.6" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>bc63032a084340c7ac42b47fecb9dc0b4d0c9373</Sha> + <Sha>9d7c7030992e13a9b810b19e79de56759a78d6bc</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.6-servicing.22260.6" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.6-servicing.22267.5" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>bc63032a084340c7ac42b47fecb9dc0b4d0c9373</Sha> + <Sha>9d7c7030992e13a9b810b19e79de56759a78d6bc</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.6-servicing.22260.6" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.6-servicing.22267.5" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>bc63032a084340c7ac42b47fecb9dc0b4d0c9373</Sha> + <Sha>9d7c7030992e13a9b810b19e79de56759a78d6bc</Sha> </Dependency> <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.6" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>bc63032a084340c7ac42b47fecb9dc0b4d0c9373</Sha> + <Sha>9d7c7030992e13a9b810b19e79de56759a78d6bc</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.6-servicing.22255.10" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.6-servicing.22267.7" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>22095cd47b192aa48ca82c514e547cc528aebd9d</Sha> + <Sha>7cca709db2944a09b4db6ca7b20c457ff260fb5a</Sha> </Dependency> <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.6" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>22095cd47b192aa48ca82c514e547cc528aebd9d</Sha> + <Sha>7cca709db2944a09b4db6ca7b20c457ff260fb5a</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.6-servicing.22255.10" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.6-servicing.22267.7" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>22095cd47b192aa48ca82c514e547cc528aebd9d</Sha> + <Sha>7cca709db2944a09b4db6ca7b20c457ff260fb5a</Sha> </Dependency> <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.6" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>22095cd47b192aa48ca82c514e547cc528aebd9d</Sha> + <Sha>7cca709db2944a09b4db6ca7b20c457ff260fb5a</Sha> <SourceBuildTarball RepoName="runtime" ManagedOnly="true" /> </Dependency> <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.6" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>22095cd47b192aa48ca82c514e547cc528aebd9d</Sha> + <Sha>7cca709db2944a09b4db6ca7b20c457ff260fb5a</Sha> </Dependency> <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.6" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>22095cd47b192aa48ca82c514e547cc528aebd9d</Sha> + <Sha>7cca709db2944a09b4db6ca7b20c457ff260fb5a</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.3" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.4" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha> + <Sha>7cca709db2944a09b4db6ca7b20c457ff260fb5a</Sha> </Dependency> <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.6" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>09f40738cea0abc19e06851eb2180e4724870288</Sha> + <Sha>b90b48141f0ae7aeb382ff740ff3820ff19e7e29</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.6-servicing.22260.10" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.6-servicing.22267.6" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>09f40738cea0abc19e06851eb2180e4724870288</Sha> + <Sha>b90b48141f0ae7aeb382ff740ff3820ff19e7e29</Sha> </Dependency> <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.6" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>09f40738cea0abc19e06851eb2180e4724870288</Sha> + <Sha>b90b48141f0ae7aeb382ff740ff3820ff19e7e29</Sha> <SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" /> </Dependency> - <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.6-servicing.22260.10" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.6-servicing.22267.6" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>09f40738cea0abc19e06851eb2180e4724870288</Sha> + <Sha>b90b48141f0ae7aeb382ff740ff3820ff19e7e29</Sha> </Dependency> - <Dependency Name="dotnet-dev-certs" Version="6.0.6-servicing.22260.10" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="dotnet-dev-certs" Version="6.0.6-servicing.22267.6" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>09f40738cea0abc19e06851eb2180e4724870288</Sha> + <Sha>b90b48141f0ae7aeb382ff740ff3820ff19e7e29</Sha> </Dependency> - <Dependency Name="dotnet-user-secrets" Version="6.0.6-servicing.22260.10" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="dotnet-user-secrets" Version="6.0.6-servicing.22267.6" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>09f40738cea0abc19e06851eb2180e4724870288</Sha> + <Sha>b90b48141f0ae7aeb382ff740ff3820ff19e7e29</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> @@ -103,23 +103,23 @@ <Uri>https://github.com/dotnet/templating</Uri> <Sha>60a2f73de55434984bbe3d5ad9281b3863355b31</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk" Version="6.0.301-rtm.22266.33"> + <Dependency Name="Microsoft.NET.Sdk" Version="6.0.301-rtm.22268.5"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>0ffb32f6130125c44acbd6fbc314d9c9e34c7c0c</Sha> + <Sha>18fa0e2cef6a75a06aeda90a542cb7a3c8643c76</Sha> <SourceBuild RepoName="sdk" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.301-rtm.22266.33"> + <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.301-rtm.22268.5"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>0ffb32f6130125c44acbd6fbc314d9c9e34c7c0c</Sha> + <Sha>18fa0e2cef6a75a06aeda90a542cb7a3c8643c76</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.6-servicing.22255.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> + <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.6-servicing.22266.9" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri> - <Sha>83daf50cbdf69c702829df567ac0d737007083ca</Sha> + <Sha>7acd4abcc9c6a4268b2b52e7f64e27b614431a29</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.6-servicing.22255.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> + <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.6-servicing.22267.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri> - <Sha>736757c0193667dc19c6d9d132d93a52cc8e4805</Sha> + <Sha>e36f1456f1c6aff57150a30ac06f3cceaf2b2785</Sha> </Dependency> <Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.3-beta.22219.3" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://github.com/dotnet/fsharp</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index bab7a0320..b0b5c1eba 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.6-servicing.22255.2</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion> + <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>6.0.6-servicing.22266.9</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependency from https://github.com/dotnet/wpf --> - <MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.6-servicing.22255.5</MicrosoftDotNetWpfProjectTemplatesPackageVersion> + <MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.6-servicing.22267.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependency from https://github.com/dotnet/templating --> @@ -46,30 +46,30 @@ <!-- Dependencies from https://github.com/aspnet/AspNetCore --> <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.6</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion> <MicrosoftAspNetCoreAppRefPackageVersion>6.0.6</MicrosoftAspNetCoreAppRefPackageVersion> - <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.6-servicing.22260.10</MicrosoftAspNetCoreAppRefInternalPackageVersion> - <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.6-servicing.22260.10</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion> - <dotnetdevcertsPackageVersion>6.0.6-servicing.22260.10</dotnetdevcertsPackageVersion> - <dotnetusersecretsPackageVersion>6.0.6-servicing.22260.10</dotnetusersecretsPackageVersion> + <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.6-servicing.22267.6</MicrosoftAspNetCoreAppRefInternalPackageVersion> + <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.6-servicing.22267.6</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion> + <dotnetdevcertsPackageVersion>6.0.6-servicing.22267.6</dotnetdevcertsPackageVersion> + <dotnetusersecretsPackageVersion>6.0.6-servicing.22267.6</dotnetusersecretsPackageVersion> </PropertyGroup> <PropertyGroup> <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/sdk --> - <MicrosoftNETSdkPackageVersion>6.0.301-rtm.22266.33</MicrosoftNETSdkPackageVersion> - <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.301-rtm.22266.33</MicrosoftDotNetMSBuildSdkResolverPackageVersion> + <MicrosoftNETSdkPackageVersion>6.0.301-rtm.22268.5</MicrosoftNETSdkPackageVersion> + <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.301-rtm.22268.5</MicrosoftDotNetMSBuildSdkResolverPackageVersion> <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion> <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion> <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/corefx --> - <MicrosoftNETCorePlatformsPackageVersion>6.0.3</MicrosoftNETCorePlatformsPackageVersion> + <MicrosoftNETCorePlatformsPackageVersion>6.0.4</MicrosoftNETCorePlatformsPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/core-setup --> - <VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.6-servicing.22255.10</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion> - <VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.6-servicing.22255.10</VSRedistCommonNetCoreTargetingPackx6460PackageVersion> + <VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.6-servicing.22267.7</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion> + <VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.6-servicing.22267.7</VSRedistCommonNetCoreTargetingPackx6460PackageVersion> <MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.6</MicrosoftNETCoreAppRuntimewinx64PackageVersion> <MicrosoftNETCoreAppHostwinx64PackageVersion>6.0.6</MicrosoftNETCoreAppHostwinx64PackageVersion> <MicrosoftNETCoreAppRefPackageVersion>6.0.6</MicrosoftNETCoreAppRefPackageVersion> @@ -78,8 +78,8 @@ </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/windowsdesktop --> - <VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.6-servicing.22260.6</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion> - <VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>6.0.6-servicing.22260.6</VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion> + <VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.6-servicing.22267.5</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion> + <VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>6.0.6-servicing.22267.5</VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion> <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>6.0.6</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion> <MicrosoftWindowsDesktopAppRefPackageVersion>6.0.6</MicrosoftWindowsDesktopAppRefPackageVersion> </PropertyGroup> diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0007-WebHost-delegate-nullability.patch b/src/SourceBuild/tarball/patches/aspnetcore/0007-WebHost-delegate-nullability.patch index 426502e86..cf15d1bfc 100644 --- a/src/SourceBuild/tarball/patches/aspnetcore/0007-WebHost-delegate-nullability.patch +++ b/src/SourceBuild/tarball/patches/aspnetcore/0007-WebHost-delegate-nullability.patch @@ -24,14 +24,14 @@ index ca52bd1f40..643d03e8af 100644 // There's no way to to register multiple service types per definition. See https://github.com/aspnet/DependencyInjection/issues/360 -#pragma warning disable CS8634 // The type cannot be used as type parameter in the generic type or method. Nullability of type argument doesn't match 'class' constraint. - _applicationServiceCollection.AddSingleton(services -- => services.GetService<ApplicationLifetime>() as IHostApplicationLifetime); +- => services.GetService<ApplicationLifetime>()! as IHostApplicationLifetime); + _applicationServiceCollection.AddSingleton<IHostApplicationLifetime>(services + => services.GetService<ApplicationLifetime>()!); #pragma warning disable CS0618 // Type or member is obsolete - _applicationServiceCollection.AddSingleton(services -- => services.GetService<ApplicationLifetime>() as AspNetCore.Hosting.IApplicationLifetime); +- => services.GetService<ApplicationLifetime>()! as AspNetCore.Hosting.IApplicationLifetime); - _applicationServiceCollection.AddSingleton(services -- => services.GetService<ApplicationLifetime>() as Extensions.Hosting.IApplicationLifetime); +- => services.GetService<ApplicationLifetime>()! as Extensions.Hosting.IApplicationLifetime); + _applicationServiceCollection.AddSingleton<AspNetCore.Hosting.IApplicationLifetime>(services + => services.GetService<ApplicationLifetime>()!); + _applicationServiceCollection.AddSingleton<Extensions.Hosting.IApplicationLifetime>(services From 5652727602473e7fc11da393f5a0d9ee3331d989 Mon Sep 17 00:00:00 2001 From: DotNet Bot <dn-bot@microsoft.com> Date: Thu, 19 May 2022 14:27:48 +0000 Subject: [PATCH 11/13] Merged PR 23034: [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.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.6-servicing.22267.5 to 6.0.6-servicing.22268.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.6-servicing.22267.5 to 6.0.6-servicing.22268.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.6-servicing.22267.6 to 6.0.6-servicing.22268.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22267.6 to 6.0.6-servicing.22268.5 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.6-servicing.22267.6 to 6.0.6-servicing.22268.5 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.6-servicing.22267.6 to 6.0.6-servicing.22268.5 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.6-servicing.22266.9 to 6.0.6-servicing.22267.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.6-servicing.22267.2 to 6.0.6-servicing.22268.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20220518.19 - **Date Produced**: May 18, 2022 10:26:37 PM UTC - **Commit**: ff8b54790e2848932bc93233ea19f8dcd2e7c26f - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.Sdk**: [from 6.0.301-rtm.22268.5 to 6.0.301-rtm.22268.19][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.301-rtm.22268.5 to 6.0.301-rtm.22268.19][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.6 to 6.0.6][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.6-servicing.22267.5 to 6.0.6-servicing.22268.6][2] - **VS.Redist.Co... --- NuGet.config | 8 +++---- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9f25c4eaa..f50bca67f 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-b90b481" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-b90b4814/nuget/v3/index.json" /> + <add key="darc-int-dotnet-aspnetcore-68bb6fb" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-68bb6fb0/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-emsdk --> <!-- End: Package sources from dotnet-emsdk --> @@ -19,7 +19,7 @@ <!-- Begin: Package sources from dotnet-templating --> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-9d7c703" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-9d7c7030/nuget/v3/index.json" /> + <add key="darc-int-dotnet-windowsdesktop-7d10adc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-7d10adc3/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" /> @@ -38,14 +38,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-b90b481" value="true" /> + <add key="darc-int-dotnet-aspnetcore-68bb6fb" value="true" /> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-runtime --> <add key="darc-int-dotnet-runtime-7cca709" value="true" /> <!-- Begin: Package sources from dotnet-templating --> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-9d7c703" value="true" /> + <add key="darc-int-dotnet-windowsdesktop-7d10adc" 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 29a2d4088..3d9d00946 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.6" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>9d7c7030992e13a9b810b19e79de56759a78d6bc</Sha> + <Sha>7d10adc397690db6f5c73da866aa443232ff1c88</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.6-servicing.22267.5" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.6-servicing.22268.6" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>9d7c7030992e13a9b810b19e79de56759a78d6bc</Sha> + <Sha>7d10adc397690db6f5c73da866aa443232ff1c88</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.6-servicing.22267.5" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.6-servicing.22268.6" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>9d7c7030992e13a9b810b19e79de56759a78d6bc</Sha> + <Sha>7d10adc397690db6f5c73da866aa443232ff1c88</Sha> </Dependency> <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.6" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>9d7c7030992e13a9b810b19e79de56759a78d6bc</Sha> + <Sha>7d10adc397690db6f5c73da866aa443232ff1c88</Sha> </Dependency> <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.6-servicing.22267.7" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> @@ -54,28 +54,28 @@ </Dependency> <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.6" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>b90b48141f0ae7aeb382ff740ff3820ff19e7e29</Sha> + <Sha>68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff</Sha> </Dependency> - <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.6-servicing.22267.6" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.6-servicing.22268.5" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>b90b48141f0ae7aeb382ff740ff3820ff19e7e29</Sha> + <Sha>68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff</Sha> </Dependency> <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.6" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>b90b48141f0ae7aeb382ff740ff3820ff19e7e29</Sha> + <Sha>68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff</Sha> <SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" /> </Dependency> - <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.6-servicing.22267.6" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.6-servicing.22268.5" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>b90b48141f0ae7aeb382ff740ff3820ff19e7e29</Sha> + <Sha>68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff</Sha> </Dependency> - <Dependency Name="dotnet-dev-certs" Version="6.0.6-servicing.22267.6" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="dotnet-dev-certs" Version="6.0.6-servicing.22268.5" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>b90b48141f0ae7aeb382ff740ff3820ff19e7e29</Sha> + <Sha>68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff</Sha> </Dependency> - <Dependency Name="dotnet-user-secrets" Version="6.0.6-servicing.22267.6" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="dotnet-user-secrets" Version="6.0.6-servicing.22268.5" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri> - <Sha>b90b48141f0ae7aeb382ff740ff3820ff19e7e29</Sha> + <Sha>68bb6fb08f8f85bb3cf08953a0d2f4a254eaccff</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> @@ -103,23 +103,23 @@ <Uri>https://github.com/dotnet/templating</Uri> <Sha>60a2f73de55434984bbe3d5ad9281b3863355b31</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk" Version="6.0.301-rtm.22268.5"> + <Dependency Name="Microsoft.NET.Sdk" Version="6.0.301-rtm.22268.19"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>18fa0e2cef6a75a06aeda90a542cb7a3c8643c76</Sha> + <Sha>ff8b54790e2848932bc93233ea19f8dcd2e7c26f</Sha> <SourceBuild RepoName="sdk" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.301-rtm.22268.5"> + <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.301-rtm.22268.19"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>18fa0e2cef6a75a06aeda90a542cb7a3c8643c76</Sha> + <Sha>ff8b54790e2848932bc93233ea19f8dcd2e7c26f</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.6-servicing.22266.9" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> + <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.6-servicing.22267.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri> - <Sha>7acd4abcc9c6a4268b2b52e7f64e27b614431a29</Sha> + <Sha>604b5d0a197efa1dc7a5ae5d91a0492fd7fbadf8</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.6-servicing.22267.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> + <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.6-servicing.22268.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri> - <Sha>e36f1456f1c6aff57150a30ac06f3cceaf2b2785</Sha> + <Sha>dabcf2041548f7594b21e9bf865463abdfd14307</Sha> </Dependency> <Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.3-beta.22219.3" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://github.com/dotnet/fsharp</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index b0b5c1eba..ccd89551d 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.6-servicing.22266.9</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion> + <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>6.0.6-servicing.22267.5</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependency from https://github.com/dotnet/wpf --> - <MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.6-servicing.22267.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion> + <MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.6-servicing.22268.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependency from https://github.com/dotnet/templating --> @@ -46,18 +46,18 @@ <!-- Dependencies from https://github.com/aspnet/AspNetCore --> <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.6</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion> <MicrosoftAspNetCoreAppRefPackageVersion>6.0.6</MicrosoftAspNetCoreAppRefPackageVersion> - <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.6-servicing.22267.6</MicrosoftAspNetCoreAppRefInternalPackageVersion> - <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.6-servicing.22267.6</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion> - <dotnetdevcertsPackageVersion>6.0.6-servicing.22267.6</dotnetdevcertsPackageVersion> - <dotnetusersecretsPackageVersion>6.0.6-servicing.22267.6</dotnetusersecretsPackageVersion> + <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.6-servicing.22268.5</MicrosoftAspNetCoreAppRefInternalPackageVersion> + <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.6-servicing.22268.5</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion> + <dotnetdevcertsPackageVersion>6.0.6-servicing.22268.5</dotnetdevcertsPackageVersion> + <dotnetusersecretsPackageVersion>6.0.6-servicing.22268.5</dotnetusersecretsPackageVersion> </PropertyGroup> <PropertyGroup> <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/sdk --> - <MicrosoftNETSdkPackageVersion>6.0.301-rtm.22268.5</MicrosoftNETSdkPackageVersion> - <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.301-rtm.22268.5</MicrosoftDotNetMSBuildSdkResolverPackageVersion> + <MicrosoftNETSdkPackageVersion>6.0.301-rtm.22268.19</MicrosoftNETSdkPackageVersion> + <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.301-rtm.22268.19</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.6-servicing.22267.5</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion> - <VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>6.0.6-servicing.22267.5</VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion> + <VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.6-servicing.22268.6</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion> + <VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>6.0.6-servicing.22268.6</VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion> <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>6.0.6</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion> <MicrosoftWindowsDesktopAppRefPackageVersion>6.0.6</MicrosoftWindowsDesktopAppRefPackageVersion> </PropertyGroup> From 12e2f27948230453068b06b21b3e7af3d4931cbc Mon Sep 17 00:00:00 2001 From: DotNet Bot <dn-bot@microsoft.com> Date: Mon, 23 May 2022 22:47:27 +0000 Subject: [PATCH 12/13] Merged PR 23125: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20220523.19 - **Date Produced**: May 23, 2022 10:07:58 PM UTC - **Commit**: 04bbbea262152499d549062f6763ff36daa65e75 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.Sdk**: [from 6.0.301-rtm.22268.19 to 6.0.301-rtm.22273.19][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.301-rtm.22268.19 to 6.0.301-rtm.22273.19][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCff8b547&targetVersion=GC04bbbea&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3d9d00946..c9a76a23c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ <Uri>https://github.com/dotnet/templating</Uri> <Sha>60a2f73de55434984bbe3d5ad9281b3863355b31</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk" Version="6.0.301-rtm.22268.19"> + <Dependency Name="Microsoft.NET.Sdk" Version="6.0.301-rtm.22273.19"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>ff8b54790e2848932bc93233ea19f8dcd2e7c26f</Sha> + <Sha>04bbbea262152499d549062f6763ff36daa65e75</Sha> <SourceBuild RepoName="sdk" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.301-rtm.22268.19"> + <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.301-rtm.22273.19"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>ff8b54790e2848932bc93233ea19f8dcd2e7c26f</Sha> + <Sha>04bbbea262152499d549062f6763ff36daa65e75</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.6-servicing.22267.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> diff --git a/eng/Versions.props b/eng/Versions.props index ccd89551d..5ae0b2bef 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.301-rtm.22268.19</MicrosoftNETSdkPackageVersion> - <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.301-rtm.22268.19</MicrosoftDotNetMSBuildSdkResolverPackageVersion> + <MicrosoftNETSdkPackageVersion>6.0.301-rtm.22273.19</MicrosoftNETSdkPackageVersion> + <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.301-rtm.22273.19</MicrosoftDotNetMSBuildSdkResolverPackageVersion> <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion> <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion> <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion> From 4ab869cbcb716afc2e46f1a13cc8be99f550f15e Mon Sep 17 00:00:00 2001 From: DotNet Bot <dn-bot@microsoft.com> Date: Wed, 25 May 2022 00:18:22 +0000 Subject: [PATCH 13/13] Merged PR 23174: [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.FSharp.Compiler**: from 12.0.3-beta.22219.3 to 12.0.4-beta.22274.4 (parent: Microsoft.NET.Sdk) - **Microsoft.SourceBuild.Intermediate.fsharp**: from 6.0.4-beta.22219.3 to 6.0.5-beta.22274.4 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20220524.11 - **Date Produced**: May 24, 2022 11:44:49 PM UTC - **Commit**: 8daa5f75dfc7592e30e28e71d448621d12442893 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.Sdk**: [from 6.0.301-rtm.22273.19 to 6.0.301-rtm.22274.11][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.301-rtm.22273.19 to 6.0.301-rtm.22274.11][1] - **Microsoft.FSharp.Compiler**: [from 12.0.3-beta.22219.3 to 12.0.4-beta.22274.4][2] - **Microsoft.SourceBuild.Intermediate.fsharp**: [from 6.0.4-beta.22219.3 to 6.0.5-beta.22274.4][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC04bbbea&targetVersion=GC8daa5f7&_a=files [2]: https://github.com/dotnet/fsharp/compare/8854f5d...211fd76 [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9a76a23c..0500c8180 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ <Uri>https://github.com/dotnet/templating</Uri> <Sha>60a2f73de55434984bbe3d5ad9281b3863355b31</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk" Version="6.0.301-rtm.22273.19"> + <Dependency Name="Microsoft.NET.Sdk" Version="6.0.301-rtm.22274.11"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>04bbbea262152499d549062f6763ff36daa65e75</Sha> + <Sha>8daa5f75dfc7592e30e28e71d448621d12442893</Sha> <SourceBuild RepoName="sdk" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.301-rtm.22273.19"> + <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.301-rtm.22274.11"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>04bbbea262152499d549062f6763ff36daa65e75</Sha> + <Sha>8daa5f75dfc7592e30e28e71d448621d12442893</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.6-servicing.22267.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> @@ -121,13 +121,13 @@ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri> <Sha>dabcf2041548f7594b21e9bf865463abdfd14307</Sha> </Dependency> - <Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.3-beta.22219.3" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.4-beta.22274.4" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://github.com/dotnet/fsharp</Uri> - <Sha>8854f5d1f3bd7e60d42565a18a2f8c06ae307474</Sha> + <Sha>211fd760c2315d73cfa0d375fe64abb346bc1096</Sha> </Dependency> - <Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="6.0.4-beta.22219.3" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="6.0.5-beta.22274.4" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://github.com/dotnet/fsharp</Uri> - <Sha>8854f5d1f3bd7e60d42565a18a2f8c06ae307474</Sha> + <Sha>211fd760c2315d73cfa0d375fe64abb346bc1096</Sha> <SourceBuild RepoName="fsharp" ManagedOnly="true" /> </Dependency> <Dependency Name="Microsoft.NET.Test.Sdk" Version="17.2.0-release-20220408-11" CoherentParentDependency="Microsoft.NET.Sdk"> diff --git a/eng/Versions.props b/eng/Versions.props index 5ae0b2bef..053adef12 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.301-rtm.22273.19</MicrosoftNETSdkPackageVersion> - <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.301-rtm.22273.19</MicrosoftDotNetMSBuildSdkResolverPackageVersion> + <MicrosoftNETSdkPackageVersion>6.0.301-rtm.22274.11</MicrosoftNETSdkPackageVersion> + <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.301-rtm.22274.11</MicrosoftDotNetMSBuildSdkResolverPackageVersion> <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion> <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion> <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>