From f94f58591adde2efcf17ee8455258f3e8913af61 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Jul 2022 00:09:57 +0000 Subject: [PATCH 1/9] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220705.10 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.107-servicing.22323.13 -> To Version 6.0.108-servicing.22355.10 --- NuGet.config | 16 ++++++++++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 08ee9c28b..43f77f05b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,8 @@ + + @@ -15,12 +17,18 @@ + + + + + + @@ -41,14 +49,22 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e311e0115..40f210176 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating d7124c65e9d6a8d3239a7003747a55fe4d00c61a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ddd19817d8f3ed4e88b135d9e218bee3fbbf2fda + 7f5abe2c7c62767d67bdcd81f9b1cd9e788fdf0d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ddd19817d8f3ed4e88b135d9e218bee3fbbf2fda + 7f5abe2c7c62767d67bdcd81f9b1cd9e788fdf0d diff --git a/eng/Versions.props b/eng/Versions.props index 79487d28b..7a32834fd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.107-servicing.22323.13 - 6.0.107-servicing.22323.13 + 6.0.108-servicing.22355.10 + 6.0.108-servicing.22355.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From be25e9cf89a075903c47107fa41e8cf81f30b019 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 12 Jul 2022 00:07:18 +0000 Subject: [PATCH 2/9] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220711.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.108-servicing.22355.10 -> To Version 6.0.108-servicing.22361.14 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.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.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.7 -> To Version 6.0.8 (parent: Microsoft.NET.Sdk --- NuGet.config | 32 ++++----------- eng/Version.Details.xml | 86 ++++++++++++++++++++--------------------- eng/Versions.props | 40 +++++++++---------- 3 files changed, 71 insertions(+), 87 deletions(-) diff --git a/NuGet.config b/NuGet.config index 43f77f05b..bc7be5f34 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,28 +7,20 @@ - - - + - - - + - - - + - - - + @@ -49,23 +41,15 @@ - - - + - - - + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 40f210176..955e77360 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 + 03bd31516879cccb9df648b61813dc1ee2ef7047 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 657c81c5cd1ec6a66f64f3103d53047087a65163 + 03bd31516879cccb9df648b61813dc1ee2ef7047 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 657c81c5cd1ec6a66f64f3103d53047087a65163 + 03bd31516879cccb9df648b61813dc1ee2ef7047 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 657c81c5cd1ec6a66f64f3103d53047087a65163 + 03bd31516879cccb9df648b61813dc1ee2ef7047 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + f316191dbb5782d76ceb457018dcd80ff8ce8692 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + f316191dbb5782d76ceb457018dcd80ff8ce8692 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + f316191dbb5782d76ceb457018dcd80ff8ce8692 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + f316191dbb5782d76ceb457018dcd80ff8ce8692 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + f316191dbb5782d76ceb457018dcd80ff8ce8692 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + f316191dbb5782d76ceb457018dcd80ff8ce8692 @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + f316191dbb5782d76ceb457018dcd80ff8ce8692 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c + 4361e98c7a5080acec52b329388ee6fc27623a57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c + 4361e98c7a5080acec52b329388ee6fc27623a57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c + 4361e98c7a5080acec52b329388ee6fc27623a57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c + 4361e98c7a5080acec52b329388ee6fc27623a57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c + 4361e98c7a5080acec52b329388ee6fc27623a57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 773e8cc3fbdc2c4ffbd57c1f53f21649ef94c35c + 4361e98c7a5080acec52b329388ee6fc27623a57 https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d7124c65e9d6a8d3239a7003747a55fe4d00c61a + 0a32a4d886f45af9f5962f98cfc8491577458e10 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d7124c65e9d6a8d3239a7003747a55fe4d00c61a + 0a32a4d886f45af9f5962f98cfc8491577458e10 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d7124c65e9d6a8d3239a7003747a55fe4d00c61a + 0a32a4d886f45af9f5962f98cfc8491577458e10 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7f5abe2c7c62767d67bdcd81f9b1cd9e788fdf0d + 0d25aebd7b861c1f0aa1a3c87303da596620b7e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7f5abe2c7c62767d67bdcd81f9b1cd9e788fdf0d + 0d25aebd7b861c1f0aa1a3c87303da596620b7e8 diff --git a/eng/Versions.props b/eng/Versions.props index 7a32834fd..21daea424 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.107 + 6.0.108 @@ -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.22356.15 + 6.0.8-servicing.22356.15 + 6.0.8-servicing.22356.15 + 6.0.8-servicing.22356.15 0.2.0 - 6.0.108-servicing.22355.10 - 6.0.108-servicing.22355.10 + 6.0.108-servicing.22361.14 + 6.0.108-servicing.22361.14 $(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.22356.4 + 6.0.8-servicing.22356.4 + 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.22356.2 + 6.0.8-servicing.22356.2 + 6.0.8 + 6.0.8 @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.107 + 6.0.108 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 23560d61e3c7858ceabecd8baffa8e6787da9d68 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 12 Jul 2022 20:53:11 +0000 Subject: [PATCH 3/9] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220712.8 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.108-servicing.22355.10 -> To Version 6.0.108-servicing.22362.8 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.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.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.SourceBuild.Intermediate.source-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 955e77360..7b3cf918a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0a32a4d886f45af9f5962f98cfc8491577458e10 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0d25aebd7b861c1f0aa1a3c87303da596620b7e8 + 7697fffbf3bf5756d2c4c96bdc2e10907c670b1e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0d25aebd7b861c1f0aa1a3c87303da596620b7e8 + 7697fffbf3bf5756d2c4c96bdc2e10907c670b1e diff --git a/eng/Versions.props b/eng/Versions.props index 21daea424..75969f4f3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.108-servicing.22361.14 - 6.0.108-servicing.22361.14 + 6.0.108-servicing.22362.8 + 6.0.108-servicing.22362.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f3889c2c226ded2c41bfb8c21165e6c043b8d224 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 13 Jul 2022 17:15:16 +0000 Subject: [PATCH 4/9] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220713.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.108-servicing.22362.8 -> To Version 6.0.108-servicing.22363.15 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.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.WindowsDesktop.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.SourceBuild.Intermediate.source-build From Version 6.0.8 -> To Version 6.0.8 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 +++++----- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++------ 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/NuGet.config b/NuGet.config index bc7be5f34..650c6d0a2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,15 +41,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 12abaf39c..a168d56a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 03bd31516879cccb9df648b61813dc1ee2ef7047 + 6a8cabe11be7a6321ef500dd0fab1cab4840015d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 03bd31516879cccb9df648b61813dc1ee2ef7047 + 6a8cabe11be7a6321ef500dd0fab1cab4840015d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 03bd31516879cccb9df648b61813dc1ee2ef7047 + 6a8cabe11be7a6321ef500dd0fab1cab4840015d https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 03bd31516879cccb9df648b61813dc1ee2ef7047 + 6a8cabe11be7a6321ef500dd0fab1cab4840015d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f316191dbb5782d76ceb457018dcd80ff8ce8692 + f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f316191dbb5782d76ceb457018dcd80ff8ce8692 + f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f316191dbb5782d76ceb457018dcd80ff8ce8692 + f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f316191dbb5782d76ceb457018dcd80ff8ce8692 + f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f316191dbb5782d76ceb457018dcd80ff8ce8692 + f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f316191dbb5782d76ceb457018dcd80ff8ce8692 + f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4361e98c7a5080acec52b329388ee6fc27623a57 + ae88823c0957661796fccc2a78adf2529e59f316 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4361e98c7a5080acec52b329388ee6fc27623a57 + ae88823c0957661796fccc2a78adf2529e59f316 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4361e98c7a5080acec52b329388ee6fc27623a57 + ae88823c0957661796fccc2a78adf2529e59f316 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4361e98c7a5080acec52b329388ee6fc27623a57 + ae88823c0957661796fccc2a78adf2529e59f316 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4361e98c7a5080acec52b329388ee6fc27623a57 + ae88823c0957661796fccc2a78adf2529e59f316 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4361e98c7a5080acec52b329388ee6fc27623a57 + ae88823c0957661796fccc2a78adf2529e59f316 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0a32a4d886f45af9f5962f98cfc8491577458e10 + 1f0d7b339b8c1eaf83b080b2964b1034eb4dd3bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0a32a4d886f45af9f5962f98cfc8491577458e10 + 1f0d7b339b8c1eaf83b080b2964b1034eb4dd3bb https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0a32a4d886f45af9f5962f98cfc8491577458e10 + 1f0d7b339b8c1eaf83b080b2964b1034eb4dd3bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7697fffbf3bf5756d2c4c96bdc2e10907c670b1e + dbf69155d451d9ae271bec4e21c9dfb4d369a6df - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7697fffbf3bf5756d2c4c96bdc2e10907c670b1e + dbf69155d451d9ae271bec4e21c9dfb4d369a6df @@ -170,9 +170,9 @@ https://github.com/dotnet/emsdk 52e9452f82e26f9fcae791e84c082ae22f1ef66f - + https://github.com/dotnet/source-build - 126aed9b11b5aece8ebcf7bdbb82d0654206d5a4 + 10d0f7e94aa45889155c312f51cfc01bf326b853 diff --git a/eng/Versions.props b/eng/Versions.props index b0afbf658..470941afa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.8 6.0.8 - 6.0.8-servicing.22356.15 - 6.0.8-servicing.22356.15 - 6.0.8-servicing.22356.15 - 6.0.8-servicing.22356.15 + 6.0.8-servicing.22363.5 + 6.0.8-servicing.22363.5 + 6.0.8-servicing.22363.5 + 6.0.8-servicing.22363.5 0.2.0 - 6.0.108-servicing.22362.8 - 6.0.108-servicing.22362.8 + 6.0.108-servicing.22363.15 + 6.0.108-servicing.22363.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.8-servicing.22356.4 - 6.0.8-servicing.22356.4 + 6.0.8-servicing.22362.13 + 6.0.8-servicing.22362.13 6.0.8 6.0.8 6.0.8 @@ -78,8 +78,8 @@ - 6.0.8-servicing.22356.2 - 6.0.8-servicing.22356.2 + 6.0.8-servicing.22362.4 + 6.0.8-servicing.22362.4 6.0.8 6.0.8 From 97180e68eba8d932134136a999951e336ecbfc4b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Jul 2022 17:18:47 +0000 Subject: [PATCH 5/9] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220714.10 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.108-servicing.22363.15 -> To Version 6.0.108-servicing.22364.10 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.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,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.8 -> To Version 6.0.8 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++------- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/NuGet.config b/NuGet.config index 650c6d0a2..bb5fc954d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,15 +41,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a168d56a4..5ef94d5b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6a8cabe11be7a6321ef500dd0fab1cab4840015d + 590580628cf9b02219cca72a73f218e468c5892b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6a8cabe11be7a6321ef500dd0fab1cab4840015d + 590580628cf9b02219cca72a73f218e468c5892b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6a8cabe11be7a6321ef500dd0fab1cab4840015d + 590580628cf9b02219cca72a73f218e468c5892b https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6a8cabe11be7a6321ef500dd0fab1cab4840015d + 590580628cf9b02219cca72a73f218e468c5892b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f9fbf00e01a9fa47c855bbfd8f983eea4fda1fa0 + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ae88823c0957661796fccc2a78adf2529e59f316 + 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ae88823c0957661796fccc2a78adf2529e59f316 + 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ae88823c0957661796fccc2a78adf2529e59f316 + 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ae88823c0957661796fccc2a78adf2529e59f316 + 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ae88823c0957661796fccc2a78adf2529e59f316 + 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ae88823c0957661796fccc2a78adf2529e59f316 + 6a01dd1e69c8b9bd1ae005ea465ef2bcd26294bf https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1f0d7b339b8c1eaf83b080b2964b1034eb4dd3bb + 733440663a189f4c4de64f53bab82fd9382b9a3a - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1f0d7b339b8c1eaf83b080b2964b1034eb4dd3bb + 733440663a189f4c4de64f53bab82fd9382b9a3a https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1f0d7b339b8c1eaf83b080b2964b1034eb4dd3bb + 733440663a189f4c4de64f53bab82fd9382b9a3a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dbf69155d451d9ae271bec4e21c9dfb4d369a6df + 7ee6a81d348500084da799b9e17c995983cc45db - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dbf69155d451d9ae271bec4e21c9dfb4d369a6df + 7ee6a81d348500084da799b9e17c995983cc45db - + 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 diff --git a/eng/Versions.props b/eng/Versions.props index 470941afa..5a2079d21 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.7-servicing.22322.3 + 6.0.8-servicing.22363.7 - 6.0.7-servicing.22322.2 + 6.0.8-servicing.22363.8 @@ -46,18 +46,18 @@ 6.0.8 6.0.8 - 6.0.8-servicing.22363.5 - 6.0.8-servicing.22363.5 - 6.0.8-servicing.22363.5 - 6.0.8-servicing.22363.5 + 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.108-servicing.22363.15 - 6.0.108-servicing.22363.15 + 6.0.108-servicing.22364.10 + 6.0.108-servicing.22364.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.8-servicing.22362.13 - 6.0.8-servicing.22362.13 + 6.0.8-servicing.22363.6 + 6.0.8-servicing.22363.6 6.0.8 6.0.8 6.0.8 @@ -78,8 +78,8 @@ - 6.0.8-servicing.22362.4 - 6.0.8-servicing.22362.4 + 6.0.8-servicing.22363.10 + 6.0.8-servicing.22363.10 6.0.8 6.0.8 From a1f9d557b3a92c1d134770c60fbbd5d71c69f234 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 18 Jul 2022 17:27:05 +0000 Subject: [PATCH 6/9] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220718.7 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.108-servicing.22364.10 -> To Version 6.0.108-servicing.22368.7 Dependency coherency updates Microsoft.NETCore.Platforms From Version 6.0.5 -> To Version 6.0.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5ef94d5b7..6eb58ebd6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,7 +50,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f316191dbb5782d76ceb457018dcd80ff8ce8692 + 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 733440663a189f4c4de64f53bab82fd9382b9a3a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7ee6a81d348500084da799b9e17c995983cc45db + 5a42b2d13276bc8f012a09589ad13842cb2e14d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7ee6a81d348500084da799b9e17c995983cc45db + 5a42b2d13276bc8f012a09589ad13842cb2e14d7 diff --git a/eng/Versions.props b/eng/Versions.props index 5a2079d21..bbe8f7ed1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.108-servicing.22364.10 - 6.0.108-servicing.22364.10 + 6.0.108-servicing.22368.7 + 6.0.108-servicing.22368.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 486395280b2e20dbfab401523b9baf8bdf86bd2e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 18 Jul 2022 22:22:57 +0000 Subject: [PATCH 7/9] Merged PR 24232: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.8-servicing.22363.10 to 6.0.8-servicing.22368.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.8-servicing.22363.10 to 6.0.8-servicing.22368.4 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.8-servicing.22363.7 to 6.0.8-servicing.22368.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.8-servicing.22363.8 to 6.0.8-servicing.22368.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220718.19 - **Date Produced**: July 18, 2022 9:38:19 PM UTC - **Commit**: 17ea4a71a1adac805a17c272977139ddc6200bf9 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.108-servicing.22368.7 to 6.0.108-servicing.22368.19][1] - **Microsoft.NET.Sdk**: [from 6.0.108-servicing.22368.7 to 6.0.108-servicing.22368.19][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.8 to 6.0.8][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.8-servicing.22363.10 to 6.0.8-servicing.22368.4][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.8-servicing.22363.10 to 6.0.8-servicing.22368.4][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.8 to 6.0.8][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.8-servicing.22363.7 to 6.0.8-servicing.22368.4][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.8 to 6.0.8][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.8-servicing.22363.8 to 6.0.8-servicing.22368.7][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC5a42b2d&targetVersion=GC17ea4a7&_a=files [2]: https://dev.azure.com/dnceng/internal/_g... --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index bb5fc954d..8cac51c22 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6eb58ebd6..ebd08459f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 590580628cf9b02219cca72a73f218e468c5892b + 919562130283931bdcd05a684af1421d1e962aa3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 590580628cf9b02219cca72a73f218e468c5892b + 919562130283931bdcd05a684af1421d1e962aa3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 590580628cf9b02219cca72a73f218e468c5892b + 919562130283931bdcd05a684af1421d1e962aa3 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 590580628cf9b02219cca72a73f218e468c5892b + 919562130283931bdcd05a684af1421d1e962aa3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 733440663a189f4c4de64f53bab82fd9382b9a3a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a42b2d13276bc8f012a09589ad13842cb2e14d7 + 17ea4a71a1adac805a17c272977139ddc6200bf9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a42b2d13276bc8f012a09589ad13842cb2e14d7 + 17ea4a71a1adac805a17c272977139ddc6200bf9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 876ba0c47b9b4fd4b7d729b8a0fe1bea8c9f765f + bcdb000de284571bf5267aa3d052dee7918c1e6e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 629fa4b5d72642eeb9a3931ad4d107594663c0f5 + 7a75fd34f53bc300206bd8cfc636527934dd17af https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index bbe8f7ed1..b115ad60d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.8-servicing.22363.7 + 6.0.8-servicing.22368.4 - 6.0.8-servicing.22363.8 + 6.0.8-servicing.22368.7 @@ -56,8 +56,8 @@ - 6.0.108-servicing.22368.7 - 6.0.108-servicing.22368.7 + 6.0.108-servicing.22368.19 + 6.0.108-servicing.22368.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.8-servicing.22363.10 - 6.0.8-servicing.22363.10 + 6.0.8-servicing.22368.4 + 6.0.8-servicing.22368.4 6.0.8 6.0.8 From 4e3a463d2b2ad382a04bdf570e9154c8ec7fe37e Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Wed, 20 Jul 2022 00:21:19 +0000 Subject: [PATCH 8/9] Merged PR 24267: Revert CoherentParentDependency and fix version of source-build externals --- 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 ebd08459f..1fc7fed18 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -170,9 +170,9 @@ https://github.com/dotnet/emsdk 52e9452f82e26f9fcae791e84c082ae22f1ef66f - + https://github.com/dotnet/source-build - 10d0f7e94aa45889155c312f51cfc01bf326b853 + 126aed9b11b5aece8ebcf7bdbb82d0654206d5a4 From f2498acf1650ddb5f752820b23e87f134f42ea5b Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Tue, 9 Aug 2022 16:05:31 -0700 Subject: [PATCH 9/9] update global.json and Versions.props for .NET SDK 6.0.108 (#14291) --- eng/Versions.props | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 0b829112c..7efbe79d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -174,7 +174,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 6.0.107 + 6.0.108 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index bb32ae2ff..3ba15beaa 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.107" + "dotnet": "6.0.108" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1",