From 995f7cd6e235fd91eba73ca2034cba923afaf92e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 5 Jul 2022 22:39:42 +0000 Subject: [PATCH 1/4] 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 2/4] 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 3/4] 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 d384f3f5f7aaa0a0bb2b8e0eae0b085b8d1b1a0b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 9 Jul 2022 00:56:00 +0000 Subject: [PATCH 4/4] 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)