From 1a93c8b6ebf761d2be728e78f80f389866929307 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 15 Jul 2022 19:40:37 +0000 Subject: [PATCH 1/2] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220715.11 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22364.3 -> To Version 6.0.400-rtm.22365.11 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Build From Version 6.0.7 -> To Version 6.0.8 (parent: Microsoft.NET.Sdk --- NuGet.config | 15 +++--- eng/Version.Details.xml | 106 ++++++++++++++++++++-------------------- eng/Versions.props | 44 ++++++++--------- 3 files changed, 84 insertions(+), 81 deletions(-) diff --git a/NuGet.config b/NuGet.config index a983e09b4..1161d1e28 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,19 +7,21 @@ - - - + + + + + @@ -38,14 +40,15 @@ - - - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 877fb6bcc..ca23a66fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 657c81c5cd1ec6a66f64f3103d53047087a65163 + 590580628cf9b02219cca72a73f218e468c5892b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 657c81c5cd1ec6a66f64f3103d53047087a65163 + 590580628cf9b02219cca72a73f218e468c5892b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 657c81c5cd1ec6a66f64f3103d53047087a65163 + 590580628cf9b02219cca72a73f218e468c5892b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 657c81c5cd1ec6a66f64f3103d53047087a65163 + 590580628cf9b02219cca72a73f218e468c5892b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c + 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c + 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c + 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c + 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c + 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c + 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - - https://github.com/dotnet/templating - d8d193bf161de2a50a251035e4f9df2e2e85d7e7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-templating + bb5ba57f877b922b418138a969b82b3c1b4e40ad - - https://github.com/dotnet/templating - d8d193bf161de2a50a251035e4f9df2e2e85d7e7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-templating + bb5ba57f877b922b418138a969b82b3c1b4e40ad - - https://github.com/dotnet/templating - d8d193bf161de2a50a251035e4f9df2e2e85d7e7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-templating + bb5ba57f877b922b418138a969b82b3c1b4e40ad - - https://github.com/dotnet/sdk - 4445b8be251722225295d23ad8c7607b294ba353 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 47efcbaac35fdc296ac814f79bbb465a3798610e - - https://github.com/dotnet/sdk - 4445b8be251722225295d23ad8c7607b294ba353 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 47efcbaac35fdc296ac814f79bbb465a3798610e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 24977050704b627e631caf7b1ca4bcb0543f3ab2 + 876ba0c47b9b4fd4b7d729b8a0fe1bea8c9f765f - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5063a17b211e70ca0ff6fed1b57e9d04727c25a8 + 629fa4b5d72642eeb9a3931ad4d107594663c0f5 https://github.com/dotnet/fsharp @@ -146,9 +146,9 @@ 8b86c2058266c6069e71705623fe9f3b26b648cf - + https://github.com/dotnet/msbuild - 77c72dd0f1758e994cf2ebd2ddd6d1ada695d261 + 92e0776509a23ed2c1e24bf906a92f045899b885 diff --git a/eng/Versions.props b/eng/Versions.props index 8b6108da9..940349c0c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.7-servicing.22322.3 + 6.0.8-servicing.22363.7 - 6.0.7-servicing.22322.2 + 6.0.8-servicing.22363.8 - 6.0.400-preview.22358.2 + 6.0.400 @@ -44,20 +44,20 @@ - 6.0.7 - 6.0.7 - 6.0.7-servicing.22322.5 - 6.0.7-servicing.22322.5 - 6.0.7-servicing.22322.5 - 6.0.7-servicing.22322.5 + 6.0.8 + 6.0.8 + 6.0.8-servicing.22363.16 + 6.0.8-servicing.22363.16 + 6.0.8-servicing.22363.16 + 6.0.8-servicing.22363.16 0.2.0 - 6.0.400-preview.22364.3 - 6.0.400-preview.22364.3 + 6.0.400-rtm.22365.11 + 6.0.400-rtm.22365.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.7-servicing.22322.2 - 6.0.7-servicing.22322.2 - 6.0.7 - 6.0.7 - 6.0.7 - 6.0.7 + 6.0.8-servicing.22363.6 + 6.0.8-servicing.22363.6 + 6.0.8 + 6.0.8 + 6.0.8 + 6.0.8 2.1.0 - 6.0.7-servicing.22322.3 - 6.0.7-servicing.22322.3 - 6.0.7 - 6.0.7 + 6.0.8-servicing.22363.10 + 6.0.8-servicing.22363.10 + 6.0.8 + 6.0.8 @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.400-preview.22358.2 + 6.0.400 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From a350ed8b1d271c73ac0b60db99023488bcf5aa78 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 15 Jul 2022 23:31:21 +0000 Subject: [PATCH 2/2] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220715.19 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.400-preview.22364.3 -> To Version 6.0.400-rtm.22365.19 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Build From Version 6.0.7 -> To Version 6.0.8 (parent: Microsoft.NET.Sdk --- 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 ca23a66fa..910d95c0e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bb5ba57f877b922b418138a969b82b3c1b4e40ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 47efcbaac35fdc296ac814f79bbb465a3798610e + ec1808f917ea97eb42f76b9ae938177b36be77e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 47efcbaac35fdc296ac814f79bbb465a3798610e + ec1808f917ea97eb42f76b9ae938177b36be77e0 diff --git a/eng/Versions.props b/eng/Versions.props index 940349c0c..8f124271e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.400-rtm.22365.11 - 6.0.400-rtm.22365.11 + 6.0.400-rtm.22365.19 + 6.0.400-rtm.22365.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)