From 2eaeea46973b06c56d668316dbde58ced40c558b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 5 Jul 2022 15:00:58 +0000 Subject: [PATCH 01/14] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220705.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22314.1 -> To Version 6.0.0-servicing.22355.1 --- NuGet.config | 16 ++++++++++++++++ eng/Version.Details.xml | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4f5d25388..208608d74 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,8 @@ + + @@ -15,12 +17,18 @@ + + + + + + @@ -39,14 +47,22 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 229d3fa85..d3ecfe824 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade fdd3a242bc813f371023adff4e4c05c0be705d2a - + https://github.com/dotnet/source-build-reference-packages - bc3b0a4c27b23d08ef00a6c4150fc73ebe80140b + ffa2b64e8de11f0d148b7167c647fead3f2c33cb From 995f7cd6e235fd91eba73ca2034cba923afaf92e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 5 Jul 2022 22:39:42 +0000 Subject: [PATCH 02/14] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220705.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.302-servicing.22323.12 -> To Version 6.0.303-servicing.22355.5 --- 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 4f5d25388..208608d74 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,8 @@ + + @@ -15,12 +17,18 @@ + + + + + + @@ -39,14 +47,22 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 229d3fa85..d92910dd8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 416d9a7ab914340b357cff31bf49ba7e708f5a41 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dc262f0c444d57181e580d4d5b9a517ea558c64a + 16dc9ea3af768b0b69594240d50d1c2f0617faf6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dc262f0c444d57181e580d4d5b9a517ea558c64a + 16dc9ea3af768b0b69594240d50d1c2f0617faf6 diff --git a/eng/Versions.props b/eng/Versions.props index 54076f4dd..c20453783 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.302-servicing.22323.12 - 6.0.302-servicing.22323.12 + 6.0.303-servicing.22355.5 + 6.0.303-servicing.22355.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2b4cdefbd14f12db31f6a04ad79e43a5f4231d42 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Jul 2022 08:20:55 +0000 Subject: [PATCH 03/14] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220706.2 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.302-servicing.22323.12 -> To Version 6.0.303-servicing.22356.2 --- 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 d92910dd8..bebf8bf52 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 416d9a7ab914340b357cff31bf49ba7e708f5a41 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 16dc9ea3af768b0b69594240d50d1c2f0617faf6 + cbe81c0092372df2b49caa53b57a41db8672a3be - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 16dc9ea3af768b0b69594240d50d1c2f0617faf6 + cbe81c0092372df2b49caa53b57a41db8672a3be diff --git a/eng/Versions.props b/eng/Versions.props index c20453783..88d5ef754 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.303-servicing.22355.5 - 6.0.303-servicing.22355.5 + 6.0.303-servicing.22356.2 + 6.0.303-servicing.22356.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 25bd4e7cbb619ec7af35966d97eaea491657355e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Jul 2022 22:48:10 +0000 Subject: [PATCH 04/14] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220706.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.302-servicing.22323.12 -> To Version 6.0.303-servicing.22356.21 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.0.4-beta.22274.4 -> To Version 12.0.4-beta.22329.1 (parent: Microsoft.NET.Sdk --- 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 bebf8bf52..f38be3d5d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 416d9a7ab914340b357cff31bf49ba7e708f5a41 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cbe81c0092372df2b49caa53b57a41db8672a3be + 4290bea9a3135ed888eb864fcb971c93b990ef61 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cbe81c0092372df2b49caa53b57a41db8672a3be + 4290bea9a3135ed888eb864fcb971c93b990ef61 @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 5063a17b211e70ca0ff6fed1b57e9d04727c25a8 - + https://github.com/dotnet/fsharp - 211fd760c2315d73cfa0d375fe64abb346bc1096 + 702b8e77f5fbfe21e6743324c1750503e02f182d - + https://github.com/dotnet/fsharp - 211fd760c2315d73cfa0d375fe64abb346bc1096 + 702b8e77f5fbfe21e6743324c1750503e02f182d diff --git a/eng/Versions.props b/eng/Versions.props index 88d5ef754..b1ac14e13 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.303-servicing.22356.2 - 6.0.303-servicing.22356.2 + 6.0.303-servicing.22356.21 + 6.0.303-servicing.22356.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f3f06aa629a4691321947c922683cabf7c550e50 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 7 Jul 2022 14:58:35 +0000 Subject: [PATCH 05/14] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220707.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22314.1 -> To Version 6.0.0-servicing.22357.1 --- 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 d3ecfe824..bae0da4eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade fdd3a242bc813f371023adff4e4c05c0be705d2a - + https://github.com/dotnet/source-build-reference-packages - ffa2b64e8de11f0d148b7167c647fead3f2c33cb + 9dc0c80c3c275ed32fa9aff1d86ef204550cc1f6 From d384f3f5f7aaa0a0bb2b8e0eae0b085b8d1b1a0b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 9 Jul 2022 00:56:00 +0000 Subject: [PATCH 06/14] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220708.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.302-servicing.22323.12 -> To Version 6.0.303-servicing.22358.14 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.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,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp 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 208608d74..c41d3eefb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,28 +7,20 @@ - - - + - - - + - - - + - - - + @@ -47,23 +39,15 @@ - - - + - - - + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f38be3d5d..f059b873f 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 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 416d9a7ab914340b357cff31bf49ba7e708f5a41 + 81ecdf910926159311fa54b902f574ce14157186 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 416d9a7ab914340b357cff31bf49ba7e708f5a41 + 81ecdf910926159311fa54b902f574ce14157186 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 416d9a7ab914340b357cff31bf49ba7e708f5a41 + 81ecdf910926159311fa54b902f574ce14157186 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4290bea9a3135ed888eb864fcb971c93b990ef61 + 8306089959e2e9a8d60145dbb09e6e97d78c088c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4290bea9a3135ed888eb864fcb971c93b990ef61 + 8306089959e2e9a8d60145dbb09e6e97d78c088c diff --git a/eng/Versions.props b/eng/Versions.props index b1ac14e13..df7d10319 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.302 + 6.0.303 @@ -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.303-servicing.22356.21 - 6.0.303-servicing.22356.21 + 6.0.303-servicing.22358.14 + 6.0.303-servicing.22358.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.302 + 6.0.303 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) From 5334c3f76c37ee2ae55018d547eb9b36a8b9e6fc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 12 Jul 2022 20:57:27 +0000 Subject: [PATCH 07/14] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220712.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.303-servicing.22358.14 -> To Version 6.0.303-servicing.22362.9 --- 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 f059b873f..bd1640496 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 81ecdf910926159311fa54b902f574ce14157186 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8306089959e2e9a8d60145dbb09e6e97d78c088c + 4d9c8c2a2188ca251ddddaa8fde44cc364925518 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8306089959e2e9a8d60145dbb09e6e97d78c088c + 4d9c8c2a2188ca251ddddaa8fde44cc364925518 diff --git a/eng/Versions.props b/eng/Versions.props index 5f8c17458..35fb95950 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.303-servicing.22358.14 - 6.0.303-servicing.22358.14 + 6.0.303-servicing.22362.9 + 6.0.303-servicing.22362.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8da36a991a37cf251851962fb37ebe8d1d3c4851 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 13 Jul 2022 15:07:16 +0000 Subject: [PATCH 08/14] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220713.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22314.1 -> To Version 6.0.0-servicing.22363.1 --- NuGet.config | 18 ------------------ eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 208608d74..a983e09b4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,19 +16,10 @@ - - - - - - - - - @@ -52,18 +43,9 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bae0da4eb..787c6311d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade fdd3a242bc813f371023adff4e4c05c0be705d2a - + https://github.com/dotnet/source-build-reference-packages - 9dc0c80c3c275ed32fa9aff1d86ef204550cc1f6 + 08e4967761f81c4c40b6872a0e639b4f588b4f00 From b1eed85a65a33fe8d745b6d5648f16b36e96e24c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 13 Jul 2022 17:12:46 +0000 Subject: [PATCH 09/14] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220713.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.303-servicing.22362.9 -> To Version 6.0.303-servicing.22363.14 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.WindowsDesktop.App.Runtime.win-x64 From Version 6.0.8 -> To Version 6.0.8 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 +++++------ eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++------- 3 files changed, 50 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index c41d3eefb..3d165bb66 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -39,15 +39,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bd1640496..55cc067fc 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 - 81ecdf910926159311fa54b902f574ce14157186 + 5e674670d0461ec2894fc16d17c0760cdd7570f4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 81ecdf910926159311fa54b902f574ce14157186 + 5e674670d0461ec2894fc16d17c0760cdd7570f4 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 81ecdf910926159311fa54b902f574ce14157186 + 5e674670d0461ec2894fc16d17c0760cdd7570f4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4d9c8c2a2188ca251ddddaa8fde44cc364925518 + 3d39f0cae51a3cb58dba3f1fd7b6407ba94eb1ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4d9c8c2a2188ca251ddddaa8fde44cc364925518 + 3d39f0cae51a3cb58dba3f1fd7b6407ba94eb1ca diff --git a/eng/Versions.props b/eng/Versions.props index 35fb95950..dd6ebbd08 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.303-servicing.22362.9 - 6.0.303-servicing.22362.9 + 6.0.303-servicing.22363.14 + 6.0.303-servicing.22363.14 $(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 9a230f07c92d38263cbc4003c5f79d8d91b2bacf Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Jul 2022 17:17:33 +0000 Subject: [PATCH 10/14] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220714.11 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.303-servicing.22362.9 -> To Version 6.0.303-servicing.22364.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 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 3d165bb66..1b143b39c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -39,15 +39,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 55cc067fc..1fbc10e11 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 - 5e674670d0461ec2894fc16d17c0760cdd7570f4 + 64dbf397fa03ca7ab5c4d1ff61136a6727f1287b - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5e674670d0461ec2894fc16d17c0760cdd7570f4 + 64dbf397fa03ca7ab5c4d1ff61136a6727f1287b https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5e674670d0461ec2894fc16d17c0760cdd7570f4 + 64dbf397fa03ca7ab5c4d1ff61136a6727f1287b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3d39f0cae51a3cb58dba3f1fd7b6407ba94eb1ca + 6d94e16b22eebd3cfbaad6681b71080dd38c75ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3d39f0cae51a3cb58dba3f1fd7b6407ba94eb1ca + 6d94e16b22eebd3cfbaad6681b71080dd38c75ff - + 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 dd6ebbd08..c87f0a85e 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.303-servicing.22363.14 - 6.0.303-servicing.22363.14 + 6.0.303-servicing.22364.11 + 6.0.303-servicing.22364.11 $(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 0933d6bb73866f1cbce73c3de1ad1ba0fbc86293 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 14 Jul 2022 16:42:40 -0700 Subject: [PATCH 11/14] Fix bad merge. --- NuGet.config | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5964b8145..bfbdd60d4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,7 @@ - - - + @@ -41,9 +39,7 @@ - - - + From 060275cd0b32e010d3647615e973b6b03de953ec Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 18 Jul 2022 18:57:07 +0000 Subject: [PATCH 12/14] [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.NETCore.Platforms: from 6.0.5 to 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 5acfa5b13..b8515744d 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 64dbf397fa03ca7ab5c4d1ff61136a6727f1287b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6d94e16b22eebd3cfbaad6681b71080dd38c75ff + 0aab6045f61934ee896ccfc140474660f9b7239f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6d94e16b22eebd3cfbaad6681b71080dd38c75ff + 0aab6045f61934ee896ccfc140474660f9b7239f diff --git a/eng/Versions.props b/eng/Versions.props index 28ae92a40..83aa43852 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.303-servicing.22364.11 - 6.0.303-servicing.22364.11 + 6.0.303-servicing.22368.10 + 6.0.303-servicing.22368.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0045a485a6911a875bbcd8c9f3e947441c501a6b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 18 Jul 2022 20:01:46 +0000 Subject: [PATCH 13/14] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220718.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.303-servicing.22368.10 -> To Version 6.0.303-servicing.22368.13 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.303 -> To Version 6.0.303 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1b143b39c..32e3ea5f6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -44,7 +44,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b8515744d..d757944dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 64dbf397fa03ca7ab5c4d1ff61136a6727f1287b + d251862fe81655a95aea81683f44ef49f84d3cd7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 64dbf397fa03ca7ab5c4d1ff61136a6727f1287b + d251862fe81655a95aea81683f44ef49f84d3cd7 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 64dbf397fa03ca7ab5c4d1ff61136a6727f1287b + d251862fe81655a95aea81683f44ef49f84d3cd7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0aab6045f61934ee896ccfc140474660f9b7239f + 79a32c021d4e3df6f87a3f92b159820aabd7fd62 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0aab6045f61934ee896ccfc140474660f9b7239f + 79a32c021d4e3df6f87a3f92b159820aabd7fd62 diff --git a/eng/Versions.props b/eng/Versions.props index 83aa43852..d2537c9a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.303-servicing.22368.10 - 6.0.303-servicing.22368.10 + 6.0.303-servicing.22368.13 + 6.0.303-servicing.22368.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7494fee64a69205fea68f86f541db829c3b82384 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 18 Jul 2022 22:23:02 +0000 Subject: [PATCH 14/14] Merged PR 24233: [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.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:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20220718.20 - **Date Produced**: July 18, 2022 9:40:52 PM UTC - **Commit**: c42e5ebf0d71359c76fa8465aacd1e2e6e9c7bac - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.303-servicing.22368.13 to 6.0.303-servicing.22368.20][1] - **Microsoft.NET.Sdk**: [from 6.0.303-servicing.22368.13 to 6.0.303-servicing.22368.20][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=GC79a32c0&targetVersion=GCc42e5eb&_a=files [2]: https://dev.azure.com/dnceng/internal/... --- 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 32e3ea5f6..139e6bcf1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d757944dd..8f97e57ec 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 d251862fe81655a95aea81683f44ef49f84d3cd7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 79a32c021d4e3df6f87a3f92b159820aabd7fd62 + c42e5ebf0d71359c76fa8465aacd1e2e6e9c7bac - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 79a32c021d4e3df6f87a3f92b159820aabd7fd62 + c42e5ebf0d71359c76fa8465aacd1e2e6e9c7bac - + 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 d2537c9a4..492b44178 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.303-servicing.22368.13 - 6.0.303-servicing.22368.13 + 6.0.303-servicing.22368.20 + 6.0.303-servicing.22368.20 $(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