From b3e3d2fcb9bdeabcf4e01786d960d9d89b60b335 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 1 Sep 2022 09:23:03 +0000 Subject: [PATCH 01/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-templating build 20220901.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.Common.ProjectTemplates.6.0 , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Cli , Microsoft.TemplateEngine.Orchestrator.RunnableProjects , Microsoft.TemplateEngine.Utils , Microsoft.TemplateSearch.Common From Version 6.0.109 -> To Version 6.0.109 --- NuGet.config | 12 ++++++++++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index db0f6a2ea69c..6b76bdfc3bad 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,8 @@ + + @@ -14,10 +16,12 @@ - + + + @@ -34,15 +38,19 @@ + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c86347a2b1ed..fdb37dfad0ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2410d6496db6fd9153ffac85eedfd80f57390999 + 96d8167e4d8bac7845309598e4e07d31a06e31be https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2410d6496db6fd9153ffac85eedfd80f57390999 + 96d8167e4d8bac7845309598e4e07d31a06e31be https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2410d6496db6fd9153ffac85eedfd80f57390999 + 96d8167e4d8bac7845309598e4e07d31a06e31be https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2410d6496db6fd9153ffac85eedfd80f57390999 + 96d8167e4d8bac7845309598e4e07d31a06e31be https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2410d6496db6fd9153ffac85eedfd80f57390999 + 96d8167e4d8bac7845309598e4e07d31a06e31be https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2410d6496db6fd9153ffac85eedfd80f57390999 + 96d8167e4d8bac7845309598e4e07d31a06e31be https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2410d6496db6fd9153ffac85eedfd80f57390999 + 96d8167e4d8bac7845309598e4e07d31a06e31be https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index ef49bef14c37..fb9dc98e83c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -109,7 +109,7 @@ - 6.0.109-servicing.22420.11 + 6.0.109-servicing.22451.10 6.0.109 6.0.109 6.0.109 From 376293ab11ed5c7f465ef6a7208c0c38544f3a88 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 1 Sep 2022 17:44:07 +0000 Subject: [PATCH 02/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20220901.7 Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , VS.Redist.Common.NetCore.SharedFramework.x64.6.0 , VS.Redist.Common.NetCore.TargetingPack.x64.6.0 From Version 6.0.9-servicing.22419.5 -> To Version 6.0.9-servicing.22451.7 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6b76bdfc3bad..75776b748ed5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fdb37dfad0ac..f7018249a42a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -32,31 +32,31 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 5e2d96cd9b05142c3cccc4092d6f69744a538668 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 5e2d96cd9b05142c3cccc4092d6f69744a538668 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 5e2d96cd9b05142c3cccc4092d6f69744a538668 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 5e2d96cd9b05142c3cccc4092d6f69744a538668 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 5e2d96cd9b05142c3cccc4092d6f69744a538668 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 5e2d96cd9b05142c3cccc4092d6f69744a538668 https://github.com/dotnet/runtime @@ -64,7 +64,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 163a63591cf9e9b682063cf3995948c2b885a042 + 5e2d96cd9b05142c3cccc4092d6f69744a538668 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index fb9dc98e83c3..62440d32f969 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,12 +41,12 @@ 6.0.9 - 6.0.9-servicing.22419.5 + 6.0.9-servicing.22451.7 6.0.9 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 6.0.0 6.0.9 - 6.0.9-servicing.22419.5 + 6.0.9-servicing.22451.7 6.0.0-preview.7.21363.9 6.0.0 From 596a3505c242ee57c0a36851fc7074968fe6bdbe Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 1 Sep 2022 21:39:50 +0000 Subject: [PATCH 03/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20220901.7 dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.9-servicing.22419.26 -> To Version 6.0.9-servicing.22451.7 --- NuGet.config | 8 ++---- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++---- 3 files changed, 36 insertions(+), 40 deletions(-) diff --git a/NuGet.config b/NuGet.config index 75776b748ed5..c90b2a10e849 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,9 +4,7 @@ - - - + @@ -38,9 +36,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f7018249a42a..5b67183d33da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 484264129d4ed5ec94593a4c670fb24b0201b5bc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 484264129d4ed5ec94593a4c670fb24b0201b5bc https://github.com/nuget/nuget.client @@ -188,76 +188,76 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 484264129d4ed5ec94593a4c670fb24b0201b5bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 484264129d4ed5ec94593a4c670fb24b0201b5bc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 484264129d4ed5ec94593a4c670fb24b0201b5bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 484264129d4ed5ec94593a4c670fb24b0201b5bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 484264129d4ed5ec94593a4c670fb24b0201b5bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 484264129d4ed5ec94593a4c670fb24b0201b5bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 484264129d4ed5ec94593a4c670fb24b0201b5bc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 484264129d4ed5ec94593a4c670fb24b0201b5bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 484264129d4ed5ec94593a4c670fb24b0201b5bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 484264129d4ed5ec94593a4c670fb24b0201b5bc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 484264129d4ed5ec94593a4c670fb24b0201b5bc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 484264129d4ed5ec94593a4c670fb24b0201b5bc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 484264129d4ed5ec94593a4c670fb24b0201b5bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 484264129d4ed5ec94593a4c670fb24b0201b5bc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 484264129d4ed5ec94593a4c670fb24b0201b5bc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 484264129d4ed5ec94593a4c670fb24b0201b5bc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 484264129d4ed5ec94593a4c670fb24b0201b5bc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fe12b935c03138f76364dc877a7e069e254b5b2 + 484264129d4ed5ec94593a4c670fb24b0201b5bc https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 62440d32f969..3ab20cb39777 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -130,16 +130,16 @@ - 6.0.9-servicing.22419.26 + 6.0.9-servicing.22451.7 6.0.9 - 6.0.9-servicing.22419.26 - 6.0.9-servicing.22419.26 - 6.0.9-servicing.22419.26 + 6.0.9-servicing.22451.7 + 6.0.9-servicing.22451.7 + 6.0.9-servicing.22451.7 6.0.9 6.0.9 6.0.9 6.0.9 - 6.0.9-servicing.22419.26 + 6.0.9-servicing.22451.7 From d02d258a16c99b2b94843c35912019a4e07b7ff7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 6 Sep 2022 09:37:54 +0000 Subject: [PATCH 04/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-templating build 20220906.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.Common.ProjectTemplates.6.0 , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Cli , Microsoft.TemplateEngine.Orchestrator.RunnableProjects , Microsoft.TemplateEngine.Utils , Microsoft.TemplateSearch.Common From Version 6.0.109 -> To Version 6.0.109 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index c90b2a10e849..ad8e6fe3d8d0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5b67183d33da..f36325773e5c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 96d8167e4d8bac7845309598e4e07d31a06e31be + 5596891e1eb70a8d5c9d61569f227f2483ac91b4 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 96d8167e4d8bac7845309598e4e07d31a06e31be + 5596891e1eb70a8d5c9d61569f227f2483ac91b4 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 96d8167e4d8bac7845309598e4e07d31a06e31be + 5596891e1eb70a8d5c9d61569f227f2483ac91b4 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 96d8167e4d8bac7845309598e4e07d31a06e31be + 5596891e1eb70a8d5c9d61569f227f2483ac91b4 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 96d8167e4d8bac7845309598e4e07d31a06e31be + 5596891e1eb70a8d5c9d61569f227f2483ac91b4 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 96d8167e4d8bac7845309598e4e07d31a06e31be + 5596891e1eb70a8d5c9d61569f227f2483ac91b4 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 96d8167e4d8bac7845309598e4e07d31a06e31be + 5596891e1eb70a8d5c9d61569f227f2483ac91b4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 3ab20cb39777..b0f8268a8608 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -109,7 +109,7 @@ - 6.0.109-servicing.22451.10 + 6.0.109-servicing.22456.3 6.0.109 6.0.109 6.0.109 From c5250e15362ac9f51ab92ac097076e12339e68f2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 7 Sep 2022 05:38:33 +0000 Subject: [PATCH 05/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20220906.15 Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , VS.Redist.Common.NetCore.SharedFramework.x64.6.0 , VS.Redist.Common.NetCore.TargetingPack.x64.6.0 From Version 6.0.9-servicing.22419.5 -> To Version 6.0.10-servicing.22456.15 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 10 +++++----- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index ad8e6fe3d8d0..3c40719ed105 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,7 +11,7 @@ - + @@ -39,7 +39,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f36325773e5c..e9ccc4cdec31 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -30,41 +30,41 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 5596891e1eb70a8d5c9d61569f227f2483ac91b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5e2d96cd9b05142c3cccc4092d6f69744a538668 + 3a842c00f6db7b2a5f4ac43941ff54a9b9f9be78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5e2d96cd9b05142c3cccc4092d6f69744a538668 + 3a842c00f6db7b2a5f4ac43941ff54a9b9f9be78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5e2d96cd9b05142c3cccc4092d6f69744a538668 + 3a842c00f6db7b2a5f4ac43941ff54a9b9f9be78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5e2d96cd9b05142c3cccc4092d6f69744a538668 + 3a842c00f6db7b2a5f4ac43941ff54a9b9f9be78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5e2d96cd9b05142c3cccc4092d6f69744a538668 + 3a842c00f6db7b2a5f4ac43941ff54a9b9f9be78 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5e2d96cd9b05142c3cccc4092d6f69744a538668 + 3a842c00f6db7b2a5f4ac43941ff54a9b9f9be78 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5e2d96cd9b05142c3cccc4092d6f69744a538668 + 3a842c00f6db7b2a5f4ac43941ff54a9b9f9be78 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index b0f8268a8608..124e1f6d508f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,13 +40,13 @@ - 6.0.9 - 6.0.9-servicing.22451.7 - 6.0.9 + 6.0.10 + 6.0.10-servicing.22456.15 + 6.0.10 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 6.0.0 - 6.0.9 - 6.0.9-servicing.22451.7 + 6.0.10 + 6.0.10-servicing.22456.15 6.0.0-preview.7.21363.9 6.0.0 From 8c4282b53fe3bf51b71b33cd1d336daab880c557 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 7 Sep 2022 09:10:57 +0000 Subject: [PATCH 06/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20220907.1 dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.9-servicing.22419.26 -> To Version 6.0.9-servicing.22457.1 --- NuGet.config | 4 +-- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++---- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3c40719ed105..32ff43394c92 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -36,7 +36,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e9ccc4cdec31..8969e476cae6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 484264129d4ed5ec94593a4c670fb24b0201b5bc + a8368a3f7f43456131303791586d5a7fdfdf8487 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 484264129d4ed5ec94593a4c670fb24b0201b5bc + a8368a3f7f43456131303791586d5a7fdfdf8487 https://github.com/nuget/nuget.client @@ -188,76 +188,76 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 484264129d4ed5ec94593a4c670fb24b0201b5bc + a8368a3f7f43456131303791586d5a7fdfdf8487 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 484264129d4ed5ec94593a4c670fb24b0201b5bc + a8368a3f7f43456131303791586d5a7fdfdf8487 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 484264129d4ed5ec94593a4c670fb24b0201b5bc + a8368a3f7f43456131303791586d5a7fdfdf8487 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 484264129d4ed5ec94593a4c670fb24b0201b5bc + a8368a3f7f43456131303791586d5a7fdfdf8487 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 484264129d4ed5ec94593a4c670fb24b0201b5bc + a8368a3f7f43456131303791586d5a7fdfdf8487 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 484264129d4ed5ec94593a4c670fb24b0201b5bc + a8368a3f7f43456131303791586d5a7fdfdf8487 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 484264129d4ed5ec94593a4c670fb24b0201b5bc + a8368a3f7f43456131303791586d5a7fdfdf8487 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 484264129d4ed5ec94593a4c670fb24b0201b5bc + a8368a3f7f43456131303791586d5a7fdfdf8487 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 484264129d4ed5ec94593a4c670fb24b0201b5bc + a8368a3f7f43456131303791586d5a7fdfdf8487 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 484264129d4ed5ec94593a4c670fb24b0201b5bc + a8368a3f7f43456131303791586d5a7fdfdf8487 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 484264129d4ed5ec94593a4c670fb24b0201b5bc + a8368a3f7f43456131303791586d5a7fdfdf8487 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 484264129d4ed5ec94593a4c670fb24b0201b5bc + a8368a3f7f43456131303791586d5a7fdfdf8487 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 484264129d4ed5ec94593a4c670fb24b0201b5bc + a8368a3f7f43456131303791586d5a7fdfdf8487 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 484264129d4ed5ec94593a4c670fb24b0201b5bc + a8368a3f7f43456131303791586d5a7fdfdf8487 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 484264129d4ed5ec94593a4c670fb24b0201b5bc + a8368a3f7f43456131303791586d5a7fdfdf8487 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 484264129d4ed5ec94593a4c670fb24b0201b5bc + a8368a3f7f43456131303791586d5a7fdfdf8487 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 484264129d4ed5ec94593a4c670fb24b0201b5bc + a8368a3f7f43456131303791586d5a7fdfdf8487 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 484264129d4ed5ec94593a4c670fb24b0201b5bc + a8368a3f7f43456131303791586d5a7fdfdf8487 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 124e1f6d508f..afd08cd03de6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -130,16 +130,16 @@ - 6.0.9-servicing.22451.7 + 6.0.9-servicing.22457.1 6.0.9 - 6.0.9-servicing.22451.7 - 6.0.9-servicing.22451.7 - 6.0.9-servicing.22451.7 + 6.0.9-servicing.22457.1 + 6.0.9-servicing.22457.1 + 6.0.9-servicing.22457.1 6.0.9 6.0.9 6.0.9 6.0.9 - 6.0.9-servicing.22451.7 + 6.0.9-servicing.22457.1 From 7bf989847d364412e00008e509293536b8fc6f46 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 7 Sep 2022 11:28:47 +0000 Subject: [PATCH 07/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20220907.10 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0 From Version 6.0.9 -> To Version 6.0.10 --- NuGet.config | 8 ++------ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 32ff43394c92..4b2bbfebd78e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,9 +17,7 @@ - - - + @@ -45,9 +43,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8969e476cae6..5defbd470a8d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -166,21 +166,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 70ae3df4a6f3c92fb6b315afc405edd10ff38579 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f40e7ceff0e19c1383a2613030a5b78da8bcfed3 + 359e99c5711a3db71d621b77d7209514498620a5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f40e7ceff0e19c1383a2613030a5b78da8bcfed3 + 359e99c5711a3db71d621b77d7209514498620a5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f40e7ceff0e19c1383a2613030a5b78da8bcfed3 + 359e99c5711a3db71d621b77d7209514498620a5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f40e7ceff0e19c1383a2613030a5b78da8bcfed3 + 359e99c5711a3db71d621b77d7209514498620a5 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf diff --git a/eng/Versions.props b/eng/Versions.props index afd08cd03de6..dd1f23420b5c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ - 6.0.9-servicing.22420.3 + 6.0.10-servicing.22457.10 From e8c34a9c90c2ebcd7255d322e1e01162e2aed088 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 7 Sep 2022 11:59:50 +0000 Subject: [PATCH 08/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-templating build 20220907.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.Common.ProjectTemplates.6.0 , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Cli , Microsoft.TemplateEngine.Orchestrator.RunnableProjects , Microsoft.TemplateEngine.Utils , Microsoft.TemplateSearch.Common From Version 6.0.109 -> To Version 6.0.110 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 10 +++++----- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4b2bbfebd78e..2bea23466468 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5defbd470a8d..cea419328f58 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5596891e1eb70a8d5c9d61569f227f2483ac91b4 + ddbb921eebb8d69f66946c73e2ae31fb04baac91 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5596891e1eb70a8d5c9d61569f227f2483ac91b4 + ddbb921eebb8d69f66946c73e2ae31fb04baac91 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5596891e1eb70a8d5c9d61569f227f2483ac91b4 + ddbb921eebb8d69f66946c73e2ae31fb04baac91 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5596891e1eb70a8d5c9d61569f227f2483ac91b4 + ddbb921eebb8d69f66946c73e2ae31fb04baac91 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5596891e1eb70a8d5c9d61569f227f2483ac91b4 + ddbb921eebb8d69f66946c73e2ae31fb04baac91 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5596891e1eb70a8d5c9d61569f227f2483ac91b4 + ddbb921eebb8d69f66946c73e2ae31fb04baac91 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5596891e1eb70a8d5c9d61569f227f2483ac91b4 + ddbb921eebb8d69f66946c73e2ae31fb04baac91 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index dd1f23420b5c..aa506095572d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -109,11 +109,11 @@ - 6.0.109-servicing.22456.3 - 6.0.109 - 6.0.109 - 6.0.109 - 6.0.109 + 6.0.110-servicing.22457.8 + 6.0.110 + 6.0.110 + 6.0.110 + 6.0.110 From 68bbb514ea9071fab7dab58c36bbd29746a75f28 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 7 Sep 2022 15:30:57 +0000 Subject: [PATCH 09/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20220907.4 dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.9-servicing.22419.26 -> To Version 6.0.9-servicing.22457.4 --- NuGet.config | 4 +-- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++---- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2bea23466468..eca1bf7698d9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -34,7 +34,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cea419328f58..31e24548a7d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a8368a3f7f43456131303791586d5a7fdfdf8487 + 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a8368a3f7f43456131303791586d5a7fdfdf8487 + 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 https://github.com/nuget/nuget.client @@ -188,76 +188,76 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a8368a3f7f43456131303791586d5a7fdfdf8487 + 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a8368a3f7f43456131303791586d5a7fdfdf8487 + 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a8368a3f7f43456131303791586d5a7fdfdf8487 + 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a8368a3f7f43456131303791586d5a7fdfdf8487 + 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a8368a3f7f43456131303791586d5a7fdfdf8487 + 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a8368a3f7f43456131303791586d5a7fdfdf8487 + 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a8368a3f7f43456131303791586d5a7fdfdf8487 + 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a8368a3f7f43456131303791586d5a7fdfdf8487 + 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a8368a3f7f43456131303791586d5a7fdfdf8487 + 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a8368a3f7f43456131303791586d5a7fdfdf8487 + 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a8368a3f7f43456131303791586d5a7fdfdf8487 + 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a8368a3f7f43456131303791586d5a7fdfdf8487 + 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a8368a3f7f43456131303791586d5a7fdfdf8487 + 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a8368a3f7f43456131303791586d5a7fdfdf8487 + 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a8368a3f7f43456131303791586d5a7fdfdf8487 + 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a8368a3f7f43456131303791586d5a7fdfdf8487 + 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a8368a3f7f43456131303791586d5a7fdfdf8487 + 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a8368a3f7f43456131303791586d5a7fdfdf8487 + 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index aa506095572d..d8d160d2213d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -130,16 +130,16 @@ - 6.0.9-servicing.22457.1 + 6.0.9-servicing.22457.4 6.0.9 - 6.0.9-servicing.22457.1 - 6.0.9-servicing.22457.1 - 6.0.9-servicing.22457.1 + 6.0.9-servicing.22457.4 + 6.0.9-servicing.22457.4 + 6.0.9-servicing.22457.4 6.0.9 6.0.9 6.0.9 6.0.9 - 6.0.9-servicing.22457.1 + 6.0.9-servicing.22457.4 From 8963ffabbeb541c9ff6ecaf4bae4884020871645 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Wed, 7 Sep 2022 09:55:38 -0700 Subject: [PATCH 10/46] [Backport] Fix Temp Paths for MSRC --- .../Internal/MsBuildFileSetFactory.cs | 2 +- .../dotnet-watch/dotnet-watch.csproj | 1 + .../DirectoryWrapper.cs | 7 +- .../FilePath.cs | 2 +- .../IDirectory.cs | 4 + ...crosoft.DotNet.InternalAbstractions.csproj | 3 + .../TemporaryDirectory.cs | 6 +- .../dotnet/ShellShim/ShellShimRepository.cs | 14 +- .../SudoEnvironmentDirectoryOverride.cs | 46 +--- .../ToolPackage/ToolPackageInstaller.cs | 48 ++-- .../commands/InstallingWorkloadCommand.cs | 245 ++++++++++++++++++ .../ToolInstallGlobalOrToolPathCommand.cs | 6 +- .../dotnet-workload/WorkloadCommandBase.cs | 146 +++++++++++ .../install/NetSdkManagedInstaller.cs | 32 ++- .../install/NetSdkMsiInstallerClient.cs | 2 +- .../install/WorkloadInstallCommand.cs | 4 +- .../install/WorkloadManifestUpdater.cs | 6 +- .../DotnetCommonLocalizableStrings.resx | 63 +++++ src/Common/PathUtilities.cs | 51 ++++ src/Tasks/Common/FileUtilities.cs | 1 - .../GivenAFirstTimeUseNoticeSentinel.cs | 7 +- ...nAFunctionReturnStringAndFakeFileSystem.cs | 5 + .../ToolPackageInstallerTests.cs | 1 + .../Mock/FileSystemMockBuilder.cs | 17 +- 24 files changed, 611 insertions(+), 108 deletions(-) create mode 100644 src/Cli/dotnet/commands/InstallingWorkloadCommand.cs create mode 100644 src/Cli/dotnet/commands/dotnet-workload/WorkloadCommandBase.cs create mode 100644 src/Common/DotnetCommonLocalizableStrings.resx create mode 100644 src/Common/PathUtilities.cs diff --git a/src/BuiltInTools/dotnet-watch/Internal/MsBuildFileSetFactory.cs b/src/BuiltInTools/dotnet-watch/Internal/MsBuildFileSetFactory.cs index 1fbb5db9b2f6..097514822dfb 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/MsBuildFileSetFactory.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/MsBuildFileSetFactory.cs @@ -66,7 +66,7 @@ internal MsBuildFileSetFactory( public async Task CreateAsync(CancellationToken cancellationToken) { - var watchList = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName()); + var watchList = Path.GetTempFileName(); try { var projectDir = Path.GetDirectoryName(_projectFile); diff --git a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj index 636f43d119b4..065f750f7200 100644 --- a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj +++ b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj @@ -23,6 +23,7 @@ + diff --git a/src/Cli/Microsoft.DotNet.InternalAbstractions/DirectoryWrapper.cs b/src/Cli/Microsoft.DotNet.InternalAbstractions/DirectoryWrapper.cs index 312d6fecd7d4..b063b9fc4a08 100644 --- a/src/Cli/Microsoft.DotNet.InternalAbstractions/DirectoryWrapper.cs +++ b/src/Cli/Microsoft.DotNet.InternalAbstractions/DirectoryWrapper.cs @@ -7,7 +7,7 @@ namespace Microsoft.Extensions.EnvironmentAbstractions { - internal class DirectoryWrapper: IDirectory + internal class DirectoryWrapper : IDirectory { public bool Exists(string path) { @@ -19,6 +19,11 @@ public ITemporaryDirectory CreateTemporaryDirectory() return new TemporaryDirectory(); } + public string CreateTemporarySubdirectory() + { + return CreateTemporaryDirectory().DirectoryPath; + } + public IEnumerable EnumerateDirectories(string path) { return Directory.EnumerateDirectories(path); diff --git a/src/Cli/Microsoft.DotNet.InternalAbstractions/FilePath.cs b/src/Cli/Microsoft.DotNet.InternalAbstractions/FilePath.cs index 06ed28ab76d7..cf69976a0844 100644 --- a/src/Cli/Microsoft.DotNet.InternalAbstractions/FilePath.cs +++ b/src/Cli/Microsoft.DotNet.InternalAbstractions/FilePath.cs @@ -30,7 +30,7 @@ public string ToQuotedString() public override string ToString() { - return ToQuotedString(); + return Value; } public DirectoryPath GetDirectoryPath() diff --git a/src/Cli/Microsoft.DotNet.InternalAbstractions/IDirectory.cs b/src/Cli/Microsoft.DotNet.InternalAbstractions/IDirectory.cs index 983bba34afc3..0a2e4e31e09f 100644 --- a/src/Cli/Microsoft.DotNet.InternalAbstractions/IDirectory.cs +++ b/src/Cli/Microsoft.DotNet.InternalAbstractions/IDirectory.cs @@ -24,5 +24,9 @@ internal interface IDirectory void Delete(string path, bool recursive); void Move(string source, string destination); + + + /// Returns a new directory created under the temp folder. Can be on the mock under test or the real temp file folder. + string CreateTemporarySubdirectory(); } } diff --git a/src/Cli/Microsoft.DotNet.InternalAbstractions/Microsoft.DotNet.InternalAbstractions.csproj b/src/Cli/Microsoft.DotNet.InternalAbstractions/Microsoft.DotNet.InternalAbstractions.csproj index d82e1b61d0ec..1ac773f2f90e 100644 --- a/src/Cli/Microsoft.DotNet.InternalAbstractions/Microsoft.DotNet.InternalAbstractions.csproj +++ b/src/Cli/Microsoft.DotNet.InternalAbstractions/Microsoft.DotNet.InternalAbstractions.csproj @@ -12,4 +12,7 @@ true + + + diff --git a/src/Cli/Microsoft.DotNet.InternalAbstractions/TemporaryDirectory.cs b/src/Cli/Microsoft.DotNet.InternalAbstractions/TemporaryDirectory.cs index d43683e156f5..9ce8241c8967 100644 --- a/src/Cli/Microsoft.DotNet.InternalAbstractions/TemporaryDirectory.cs +++ b/src/Cli/Microsoft.DotNet.InternalAbstractions/TemporaryDirectory.cs @@ -1,8 +1,9 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using Microsoft.Extensions.EnvironmentAbstractions; using System.IO; +using Microsoft.Extensions.EnvironmentAbstractions; +using Microsoft.DotNet; namespace Microsoft.DotNet.InternalAbstractions { @@ -12,8 +13,7 @@ internal class TemporaryDirectory : ITemporaryDirectory public TemporaryDirectory() { - DirectoryPath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName()); - Directory.CreateDirectory(DirectoryPath); + DirectoryPath = Path.Combine(PathUtilities.CreateTempSubdirectory()); } public void Dispose() diff --git a/src/Cli/dotnet/ShellShim/ShellShimRepository.cs b/src/Cli/dotnet/ShellShim/ShellShimRepository.cs index 4dee9748d079..68390f1f2ce2 100644 --- a/src/Cli/dotnet/ShellShim/ShellShimRepository.cs +++ b/src/Cli/dotnet/ShellShim/ShellShimRepository.cs @@ -85,7 +85,8 @@ public void CreateShim(FilePath targetExecutablePath, ToolCommandName commandNam ex); } }, - rollback: () => { + rollback: () => + { foreach (var file in GetShimFiles(commandName).Where(f => _fileSystem.File.Exists(f.Value))) { File.Delete(file.Value); @@ -97,12 +98,13 @@ public void RemoveShim(ToolCommandName commandName) { var files = new Dictionary(); TransactionalAction.Run( - action: () => { + action: () => + { try { foreach (var file in GetShimFiles(commandName).Where(f => _fileSystem.File.Exists(f.Value))) { - var tempPath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName()); + var tempPath = Path.Combine(_fileSystem.Directory.CreateTemporarySubdirectory(), Path.GetRandomFileName()); FileAccessRetrier.RetryOnMoveAccessFailure(() => _fileSystem.File.Move(file.Value, tempPath)); files[file.Value] = tempPath; } @@ -118,13 +120,15 @@ public void RemoveShim(ToolCommandName commandName) ex); } }, - commit: () => { + commit: () => + { foreach (var value in files.Values) { _fileSystem.File.Delete(value); } }, - rollback: () => { + rollback: () => + { foreach (var kvp in files) { FileAccessRetrier.RetryOnMoveAccessFailure(() => _fileSystem.File.Move(kvp.Value, kvp.Key)); diff --git a/src/Cli/dotnet/SudoEnvironmentDirectoryOverride.cs b/src/Cli/dotnet/SudoEnvironmentDirectoryOverride.cs index 78ef7f3811b6..7d1e87d1c5e5 100644 --- a/src/Cli/dotnet/SudoEnvironmentDirectoryOverride.cs +++ b/src/Cli/dotnet/SudoEnvironmentDirectoryOverride.cs @@ -6,7 +6,6 @@ using System.IO; using System.Linq; using Microsoft.DotNet.Cli.Utils; -using Microsoft.DotNet.Tools.Common; using NuGet.Common; using NuGet.Configuration; @@ -17,8 +16,6 @@ namespace Microsoft.DotNet.Cli /// public static class SudoEnvironmentDirectoryOverride { - private const string SudoHomeDirectory = "/tmp/dotnet_sudo_home/"; - /// /// Not for security use. Detect if command is running under sudo /// via if SUDO_UID being set. @@ -37,22 +34,9 @@ public static void OverrideEnvironmentVariableToTmp(ParseResult parseResult) { if (!OperatingSystem.IsWindows() && IsRunningUnderSudo() && IsRunningWorkloadCommand(parseResult)) { - if (!TempHomeIsOnlyRootWritable(SudoHomeDirectory)) - { - try - { - Directory.Delete(SudoHomeDirectory, recursive: true); - } - catch (DirectoryNotFoundException) - { - // Avoid read after write race condition - } - } - - Directory.CreateDirectory(SudoHomeDirectory); - + string sudoHome = PathUtilities.CreateTempSubdirectory(); var homeBeforeOverride = Path.Combine(Environment.GetEnvironmentVariable("HOME")); - Environment.SetEnvironmentVariable("HOME", SudoHomeDirectory); + Environment.SetEnvironmentVariable("HOME", sudoHome); CopyUserNuGetConfigToOverriddenHome(homeBeforeOverride); } @@ -106,31 +90,5 @@ private static void CopyUserNuGetConfigToOverriddenHome(string homeBeforeOverrid private static bool IsRunningWorkloadCommand(ParseResult parseResult) => parseResult.RootSubCommandResult() == (WorkloadCommandParser.GetCommand().Name); - - private static bool TempHomeIsOnlyRootWritable(string path) - { - if (StatInterop.LStat(path, out StatInterop.FileStatus fileStat) != 0) - { - return false; - } - - return IsOwnedByRoot(fileStat) && GroupCannotWrite(fileStat) && - OtherUserCannotWrite(fileStat); - } - - private static bool OtherUserCannotWrite(StatInterop.FileStatus fileStat) - { - return (fileStat.Mode & (int) StatInterop.Permissions.S_IWOTH) == 0; - } - - private static bool GroupCannotWrite(StatInterop.FileStatus fileStat) - { - return (fileStat.Mode & (int) StatInterop.Permissions.S_IWGRP) == 0; - } - - private static bool IsOwnedByRoot(StatInterop.FileStatus fileStat) - { - return fileStat.Uid == 0; - } } } diff --git a/src/Cli/dotnet/ToolPackage/ToolPackageInstaller.cs b/src/Cli/dotnet/ToolPackage/ToolPackageInstaller.cs index 1f3a37d9ee0f..f9d20bf96648 100644 --- a/src/Cli/dotnet/ToolPackage/ToolPackageInstaller.cs +++ b/src/Cli/dotnet/ToolPackage/ToolPackageInstaller.cs @@ -11,7 +11,6 @@ using Microsoft.DotNet.Configurer; using Microsoft.DotNet.Tools; using Microsoft.Extensions.EnvironmentAbstractions; -using NuGet.ProjectModel; using NuGet.Versioning; namespace Microsoft.DotNet.ToolPackage @@ -46,17 +45,18 @@ public IToolPackage InstallPackage( string rollbackDirectory = null; return TransactionalAction.Run( - action: () => { + action: () => + { try { var stageDirectory = _store.GetRandomStagingDirectory(); Directory.CreateDirectory(stageDirectory.Value); rollbackDirectory = stageDirectory.Value; - var tempProject = CreateTempProject( + string tempProject = CreateDirectoryWithTempProject( packageId: packageId, versionRange: versionRange, - targetFramework: string.IsNullOrEmpty(targetFramework) ? BundledTargetFramework.GetTargetFrameworkMoniker() : targetFramework, + targetFramework: string.IsNullOrEmpty(targetFramework) ? BundledTargetFramework.GetTargetFrameworkMoniker() : targetFramework, restoreDirectory: stageDirectory, assetJsonOutputDirectory: stageDirectory, rootConfigDirectory: packageLocation.RootConfigDirectory, @@ -65,13 +65,13 @@ public IToolPackage InstallPackage( try { _projectRestorer.Restore( - tempProject, + new FilePath(tempProject), packageLocation, verbosity: verbosity); } finally { - File.Delete(tempProject.Value); + File.Delete(tempProject); } var version = _store.GetStagedPackageVersion(stageDirectory, packageId); @@ -104,7 +104,8 @@ public IToolPackage InstallPackage( ex); } }, - rollback: () => { + rollback: () => + { if (!string.IsNullOrEmpty(rollbackDirectory) && Directory.Exists(rollbackDirectory)) { Directory.Delete(rollbackDirectory, true); @@ -126,16 +127,13 @@ public IToolPackage InstallPackageToExternalManagedLocation( string targetFramework = null, string verbosity = null) { - var tempDirectoryForAssetJson = new DirectoryPath(Path.GetTempPath()) - .WithSubDirectories(Path.GetRandomFileName()); - - Directory.CreateDirectory(tempDirectoryForAssetJson.Value); + var tempDirectoryForAssetJson = PathUtilities.CreateTempSubdirectory(); - var tempProject = CreateTempProject( + string tempProject = CreateDirectoryWithTempProject( packageId: packageId, versionRange: versionRange, targetFramework: string.IsNullOrEmpty(targetFramework) ? BundledTargetFramework.GetTargetFrameworkMoniker() : targetFramework, - assetJsonOutputDirectory: tempDirectoryForAssetJson, + assetJsonOutputDirectory: new DirectoryPath(tempDirectoryForAssetJson), restoreDirectory: null, rootConfigDirectory: packageLocation.RootConfigDirectory, additionalFeeds: packageLocation.AdditionalFeeds); @@ -143,19 +141,19 @@ public IToolPackage InstallPackageToExternalManagedLocation( try { _projectRestorer.Restore( - tempProject, + new FilePath(tempProject), packageLocation, verbosity: verbosity); } finally { - File.Delete(tempProject.Value); + File.Delete(tempProject); } - return ToolPackageInstance.CreateFromAssetFile(packageId, tempDirectoryForAssetJson); + return ToolPackageInstance.CreateFromAssetFile(packageId, new DirectoryPath(tempDirectoryForAssetJson)); } - private FilePath CreateTempProject( + private string CreateDirectoryWithTempProject( PackageId packageId, VersionRange versionRange, string targetFramework, @@ -164,16 +162,14 @@ private FilePath CreateTempProject( DirectoryPath? rootConfigDirectory, string[] additionalFeeds) { - var tempProject = _tempProject ?? new DirectoryPath(Path.GetTempPath()) - .WithSubDirectories(Path.GetRandomFileName()) - .WithFile("restore.csproj"); - - if (Path.GetExtension(tempProject.Value) != "csproj") + string tempProject; + if (_tempProject != null && _tempProject.HasValue) { - tempProject = new FilePath(Path.ChangeExtension(tempProject.Value, "csproj")); + tempProject = _tempProject.Value.Value; + Directory.CreateDirectory(Path.GetDirectoryName(tempProject)); } - - Directory.CreateDirectory(tempProject.GetDirectoryPath().Value); + else + tempProject = Path.Combine(PathUtilities.CreateTempSubdirectory(), "restore.csproj"); var tempProjectContent = new XDocument( new XElement("Project", @@ -203,7 +199,7 @@ private FilePath CreateTempProject( new XAttribute("Project", "Sdk.targets"), new XAttribute("Sdk", "Microsoft.NET.Sdk")))); - File.WriteAllText(tempProject.Value, tempProjectContent.ToString()); + File.WriteAllText(tempProject, tempProjectContent.ToString()); return tempProject; } diff --git a/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs b/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs new file mode 100644 index 000000000000..52c7432fb321 --- /dev/null +++ b/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs @@ -0,0 +1,245 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. +// + +using System; +using System.Collections.Generic; +using System.CommandLine; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.Deployment.DotNet.Releases; +using Microsoft.DotNet.Cli; +using Microsoft.DotNet.Cli.NuGetPackageDownloader; +using Microsoft.DotNet.Cli.Utils; +using Microsoft.DotNet.Configurer; +using Microsoft.DotNet.ToolPackage; +using Microsoft.DotNet.Workloads.Workload.Install; +using Microsoft.Extensions.EnvironmentAbstractions; +using Microsoft.NET.Sdk.WorkloadManifestReader; +using NuGet.Versioning; +using Command = System.CommandLine.Command; +using Product = Microsoft.DotNet.Cli.Utils.Product; +using Strings = Microsoft.DotNet.Workloads.Workload.Install.LocalizableStrings; + +namespace Microsoft.DotNet.Workloads.Workload +{ + internal abstract class InstallingWorkloadCommand : WorkloadCommandBase + { + protected readonly bool _printDownloadLinkOnly; + protected readonly string _fromCacheOption; + protected readonly bool _includePreviews; + protected readonly string _downloadToCacheOption; + protected readonly string _dotnetPath; + protected readonly string _userProfileDir; + protected readonly bool _checkIfManifestExist; + protected readonly ReleaseVersion _sdkVersion; + protected readonly ReleaseVersion _installedSdkVersion; + protected readonly SdkFeatureBand _sdkFeatureBand; + protected readonly SdkFeatureBand _installedFeatureBand; + protected readonly string _fromRollbackDefinition; + protected readonly PackageSourceLocation _packageSourceLocation; + protected IWorkloadResolver _workloadResolver; + protected readonly IInstaller _workloadInstallerFromConstructor; + protected readonly IWorkloadManifestUpdater _workloadManifestUpdaterFromConstructor; + protected IInstaller _workloadInstaller; + protected IWorkloadManifestUpdater _workloadManifestUpdater; + + public InstallingWorkloadCommand( + ParseResult parseResult, + IReporter reporter, + IWorkloadResolver workloadResolver, + IInstaller workloadInstaller, + INuGetPackageDownloader nugetPackageDownloader, + IWorkloadManifestUpdater workloadManifestUpdater, + string dotnetDir, + string userProfileDir, + string tempDirPath, + string version, + string installedFeatureBand = null) + : base(parseResult, reporter: reporter, tempDirPath: tempDirPath, nugetPackageDownloader: nugetPackageDownloader) + { + _printDownloadLinkOnly = parseResult.GetValueForOption(InstallingWorkloadCommandParser.PrintDownloadLinkOnlyOption); + _fromCacheOption = parseResult.GetValueForOption(InstallingWorkloadCommandParser.FromCacheOption); + _includePreviews = parseResult.GetValueForOption(InstallingWorkloadCommandParser.IncludePreviewOption); + _downloadToCacheOption = parseResult.GetValueForOption(InstallingWorkloadCommandParser.DownloadToCacheOption); + _dotnetPath = dotnetDir ?? Path.GetDirectoryName(Environment.ProcessPath); + _userProfileDir = userProfileDir ?? CliFolderPathCalculator.DotnetUserProfileFolderPath; + _checkIfManifestExist = !(_printDownloadLinkOnly); // don't check for manifest existence when print download link is passed + _sdkVersion = WorkloadOptionsExtensions.GetValidatedSdkVersion(parseResult.GetValueForOption(InstallingWorkloadCommandParser.VersionOption), version, _dotnetPath, _userProfileDir, _checkIfManifestExist); + _sdkFeatureBand = new SdkFeatureBand(_sdkVersion); + _installedSdkVersion = new ReleaseVersion(version ?? Product.Version); + _installedFeatureBand = new SdkFeatureBand(installedFeatureBand ?? Product.Version); + + _fromRollbackDefinition = parseResult.GetValueForOption(InstallingWorkloadCommandParser.FromRollbackFileOption); + var configOption = parseResult.GetValueForOption(InstallingWorkloadCommandParser.ConfigOption); + var sourceOption = parseResult.GetValueForOption(InstallingWorkloadCommandParser.SourceOption); + _packageSourceLocation = string.IsNullOrEmpty(configOption) && (sourceOption == null || !sourceOption.Any()) ? null : + new PackageSourceLocation(string.IsNullOrEmpty(configOption) ? null : new FilePath(configOption), sourceFeedOverrides: sourceOption); + + var sdkWorkloadManifestProvider = new SdkDirectoryWorkloadManifestProvider(_dotnetPath, _installedSdkVersion.ToString(), userProfileDir); + _workloadResolver = workloadResolver ?? WorkloadResolver.Create(sdkWorkloadManifestProvider, _dotnetPath, _installedSdkVersion.ToString(), _userProfileDir); + + _workloadInstallerFromConstructor = workloadInstaller; + _workloadManifestUpdaterFromConstructor = workloadManifestUpdater; + } + + protected async Task> GetDownloads(IEnumerable workloadIds, bool skipManifestUpdate, bool includePreview, string downloadFolder = null) + { + List ret = new(); + + DirectoryPath? tempPath = null; + + try + { + if (!skipManifestUpdate) + { + DirectoryPath folderForManifestDownloads; + tempPath = new DirectoryPath(Path.Combine(TempDirectoryPath, "dotnet-manifest-extraction")); + string extractedManifestsPath = Path.Combine(tempPath.Value.Value, "manifests"); + + if (downloadFolder != null) + { + folderForManifestDownloads = new DirectoryPath(downloadFolder); + } + else + { + folderForManifestDownloads = tempPath.Value; + } + + var manifestDownloads = await _workloadManifestUpdater.GetManifestPackageDownloadsAsync(includePreview, _sdkFeatureBand, _installedFeatureBand); + + if (!manifestDownloads.Any()) + { + Reporter.WriteLine(Strings.SkippingManifestUpdate); + } + + foreach (var download in manifestDownloads) + { + // Add package to the list of downloads + ret.Add(download); + + // Download package + var downloadedPackagePath = await PackageDownloader.DownloadPackageAsync(new PackageId(download.NuGetPackageId), new NuGetVersion(download.NuGetPackageVersion), + _packageSourceLocation, downloadFolder: folderForManifestDownloads); + + // Extract manifest from package + await _workloadInstaller.ExtractManifestAsync(downloadedPackagePath, Path.Combine(extractedManifestsPath, download.Id)); + } + + // Use updated, extracted manifests to resolve packs + var overlayProvider = new TempDirectoryWorkloadManifestProvider(extractedManifestsPath, _sdkFeatureBand.ToString()); + + var newResolver = _workloadResolver.CreateOverlayResolver(overlayProvider); + _workloadInstaller.ReplaceWorkloadResolver(newResolver); + } + + var packDownloads = _workloadInstaller.GetDownloads(workloadIds, _sdkFeatureBand, false); + ret.AddRange(packDownloads); + + if (downloadFolder != null) + { + DirectoryPath downloadFolderDirectoryPath = new DirectoryPath(downloadFolder); + foreach (var packDownload in packDownloads) + { + Reporter.WriteLine(string.Format(Install.LocalizableStrings.DownloadingPackToCacheMessage, packDownload.NuGetPackageId, packDownload.NuGetPackageVersion, downloadFolder)); + + await PackageDownloader.DownloadPackageAsync(new PackageId(packDownload.NuGetPackageId), new NuGetVersion(packDownload.NuGetPackageVersion), + _packageSourceLocation, downloadFolder: downloadFolderDirectoryPath); + } + } + } + finally + { + if (tempPath != null && Directory.Exists(tempPath.Value.Value)) + { + Directory.Delete(tempPath.Value.Value, true); + } + } + + return ret; + } + + protected IEnumerable GetInstalledWorkloads(bool fromPreviousSdk) + { + //var currentFeatureBand = new SdkFeatureBand(_installedFeatureBand.ToString()); + if (fromPreviousSdk) + { + var priorFeatureBands = _workloadInstaller.GetWorkloadInstallationRecordRepository().GetFeatureBandsWithInstallationRecords() + .Where(featureBand => featureBand.CompareTo(_installedFeatureBand) < 0); + if (priorFeatureBands.Any()) + { + var maxPriorFeatureBand = priorFeatureBands.Max(); + return _workloadInstaller.GetWorkloadInstallationRecordRepository().GetInstalledWorkloads(maxPriorFeatureBand); + } + return new List(); + } + else + { + var workloads = _workloadInstaller.GetWorkloadInstallationRecordRepository().GetInstalledWorkloads(_installedFeatureBand); + + return workloads ?? Enumerable.Empty(); + } + } + } + + internal static class InstallingWorkloadCommandParser + { + public static readonly Option PrintDownloadLinkOnlyOption = + new Option("--print-download-link-only", Strings.PrintDownloadLinkOnlyDescription) + { + IsHidden = true + }; + + public static readonly Option FromCacheOption = new Option("--from-cache", Strings.FromCacheOptionDescription) + { + ArgumentHelpName = Strings.FromCacheOptionArgumentName, + IsHidden = true + }; + + public static readonly Option IncludePreviewOption = + new Option("--include-previews", Strings.IncludePreviewOptionDescription); + + public static readonly Option DownloadToCacheOption = new Option("--download-to-cache", Strings.DownloadToCacheOptionDescription) + { + ArgumentHelpName = Strings.DownloadToCacheOptionArgumentName, + IsHidden = true + }; + + public static readonly Option VersionOption = + new Option("--sdk-version", Strings.VersionOptionDescription) + { + ArgumentHelpName = Strings.VersionOptionName, + IsHidden = true + }; + + public static readonly Option FromRollbackFileOption = new Option("--from-rollback-file", Update.LocalizableStrings.FromRollbackDefinitionOptionDescription) + { + IsHidden = true + }; + + public static readonly Option ConfigOption = + new Option("--configfile", Strings.ConfigFileOptionDescription) + { + ArgumentHelpName = Strings.ConfigFileOptionName + }; + + public static readonly Option SourceOption = + new Option(new string[] { "-s", "--source" }, Strings.SourceOptionDescription) + { + ArgumentHelpName = Strings.SourceOptionName + }.AllowSingleArgPerToken(); + + internal static void AddWorkloadInstallCommandOptions(Command command) + { + command.AddOption(VersionOption); + command.AddOption(ConfigOption); + command.AddOption(SourceOption); + command.AddOption(PrintDownloadLinkOnlyOption); + command.AddOption(FromCacheOption); + command.AddOption(DownloadToCacheOption); + command.AddOption(IncludePreviewOption); + command.AddOption(FromRollbackFileOption); + } + } +} diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs b/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs index 50641b1aaea2..e06537b2d73e 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs @@ -72,9 +72,9 @@ public ToolInstallGlobalOrToolPathCommand( _environmentPathInstruction = environmentPathInstruction ?? EnvironmentPathFactory.CreateEnvironmentPathInstruction(); _createShellShimRepository = createShellShimRepository ?? ShellShimRepositoryFactory.CreateShellShimRepository; - var tempDir = new DirectoryPath(Path.Combine(Path.GetTempPath(), "dotnet-tool-install")); - var configOption = parseResult.ValueForOption(ToolInstallCommandParser.ConfigOption); - var sourceOption = parseResult.ValueForOption(ToolInstallCommandParser.AddSourceOption); + var tempDir = new DirectoryPath(PathUtilities.CreateTempSubdirectory()); + var configOption = parseResult.GetValueForOption(ToolInstallCommandParser.ConfigOption); + var sourceOption = parseResult.GetValueForOption(ToolInstallCommandParser.AddSourceOption); var packageSourceLocation = new PackageSourceLocation(string.IsNullOrEmpty(configOption) ? null : new FilePath(configOption), additionalSourceFeeds: sourceOption); var restoreAction = new RestoreActionConfig(DisableParallel: parseResult.ValueForOption(ToolCommandRestorePassThroughOptions.DisableParallelOption), NoCache: parseResult.ValueForOption(ToolCommandRestorePassThroughOptions.NoCacheOption), diff --git a/src/Cli/dotnet/commands/dotnet-workload/WorkloadCommandBase.cs b/src/Cli/dotnet/commands/dotnet-workload/WorkloadCommandBase.cs new file mode 100644 index 000000000000..c4ea1b781620 --- /dev/null +++ b/src/Cli/dotnet/commands/dotnet-workload/WorkloadCommandBase.cs @@ -0,0 +1,146 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System.CommandLine; +using System.IO; +using Microsoft.DotNet.Cli; +using Microsoft.DotNet.Cli.NuGetPackageDownloader; +using Microsoft.DotNet.Cli.Utils; +using Microsoft.Extensions.EnvironmentAbstractions; +using NuGet.Common; + +namespace Microsoft.DotNet.Workloads.Workload +{ + /// + /// Base class for workload related commands. + /// + internal abstract class WorkloadCommandBase : CommandBase + { + /// + /// The package downloader to use for acquiring NuGet packages. + /// + protected INuGetPackageDownloader PackageDownloader + { + get; + } + + /// + /// Provides basic output primitives for the command. + /// + protected IReporter Reporter + { + get; + } + + /// + /// Configuration options used by NuGet when performing a restore. + /// + protected RestoreActionConfig RestoreActionConfiguration + { + get; + } + + /// + /// Temporary directory used for downloading NuGet packages. + /// + protected DirectoryPath TempPackagesDirectory + { + get; + } + + /// + /// The path of the temporary temporary directory to use. + /// + protected string TempDirectoryPath + { + get; + } + + /// + /// The verbosity level to use when reporting output from the command. + /// + protected VerbosityOptions Verbosity + { + get; + } + + /// + /// Gets whether signatures for workload packages and installers should be verified. + /// + protected bool VerifySignatures + { + get; + } + + /// + /// Initializes a new instance. + /// + /// The results of parsing the command line. + /// The command line option used to define the verbosity level. + /// The reporter to use for output. + /// The directory to use for volatile output. If no value is specified, the commandline + /// option is used if present, otherwise the default temp directory used. + /// The package downloader to use for acquiring NuGet packages. + public WorkloadCommandBase(ParseResult parseResult, + Option verbosityOptions = null, + IReporter reporter = null, + string tempDirPath = null, + INuGetPackageDownloader nugetPackageDownloader = null) : base(parseResult) + { + VerifySignatures = ShouldVerifySignatures(parseResult); + + RestoreActionConfiguration = _parseResult.ToRestoreActionConfig(); + + Verbosity = verbosityOptions == null + ? parseResult.GetValueForOption(CommonOptions.VerbosityOption) + : parseResult.GetValueForOption(verbosityOptions); + + ILogger nugetLogger = Verbosity.VerbosityIsDetailedOrDiagnostic() ? new NuGetConsoleLogger() : new NullLogger(); + + Reporter = reporter ?? Cli.Utils.Reporter.Output; + + TempDirectoryPath = !string.IsNullOrWhiteSpace(tempDirPath) + ? tempDirPath + : !string.IsNullOrWhiteSpace(parseResult.GetValueForOption(WorkloadInstallCommandParser.TempDirOption)) + ? parseResult.GetValueForOption(WorkloadInstallCommandParser.TempDirOption) + : PathUtilities.CreateTempSubdirectory(); + + TempPackagesDirectory = new DirectoryPath(Path.Combine(TempDirectoryPath, "dotnet-sdk-advertising-temp")); + + PackageDownloader = nugetPackageDownloader ?? new NuGetPackageDownloader(TempPackagesDirectory, + filePermissionSetter: null, + new FirstPartyNuGetPackageSigningVerifier(), + nugetLogger, + restoreActionConfig: RestoreActionConfiguration, + verifySignatures: VerifySignatures); + } + + /// + /// Determines whether workload packs and installer signatures should be verified based on whether + /// dotnet is signed, the skip option was specified, and whether a global policy enforcing verification + /// was set. + /// + /// The results of parsing the command line. + /// if signatures of packages and installers should be verified. + /// + private static bool ShouldVerifySignatures(ParseResult parseResult) + { + if (!SignCheck.IsDotNetSigned()) + { + // Can't enforce anything if we already allowed an unsigned dotnet to be installed. + return false; + } + + bool skipSignCheck = parseResult.GetValueForOption(WorkloadInstallCommandParser.SkipSignCheckOption); + bool policyEnabled = SignCheck.IsWorkloadSignVerificationPolicySet(); + + if (skipSignCheck && policyEnabled) + { + // Can't override the global policy by using the skip option. + throw new GracefulException(LocalizableStrings.SkipSignCheckInvalidOption); + } + + return !skipSignCheck; + } + } +} diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkManagedInstaller.cs b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkManagedInstaller.cs index 30dd78018ee4..3d19fed48440 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkManagedInstaller.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkManagedInstaller.cs @@ -5,11 +5,13 @@ using System.Collections.Generic; using System.IO; using System.Linq; +using System.Text.Json; +using System.Threading.Tasks; using Microsoft.DotNet.Cli; using Microsoft.DotNet.Cli.NuGetPackageDownloader; using Microsoft.DotNet.Cli.Utils; -using Microsoft.DotNet.Configurer; using Microsoft.DotNet.ToolPackage; +using Microsoft.DotNet.Workloads.Workload.Install.InstallRecord; using Microsoft.Extensions.EnvironmentAbstractions; using Microsoft.NET.Sdk.WorkloadManifestReader; using NuGet.Common; @@ -50,7 +52,7 @@ public NetSdkManagedInstaller(IReporter reporter, { _userProfileDir = userProfileDir; _dotnetDir = dotnetDir ?? Path.GetDirectoryName(Environment.ProcessPath); - _tempPackagesDir = new DirectoryPath(tempDirPath ?? Path.GetTempPath()); + _tempPackagesDir = new DirectoryPath(tempDirPath ?? PathUtilities.CreateTempSubdirectory()); ILogger logger = verbosity.VerbosityIsDetailedOrDiagnostic() ? new NuGetConsoleLogger() : new NullLogger(); _restoreActionConfig = restoreActionConfig; _nugetPackageDownloader = nugetPackageDownloader ?? @@ -163,16 +165,22 @@ public void InstallWorkloadPack(PackInfo packInfo, SdkFeatureBand sdkFeatureBand { if (File.Exists(file)) { - File.Delete(file); - } - } - foreach (var dir in tempDirsToDelete) - { - if (Directory.Exists(dir)) - { - Directory.Delete(dir, true); - } - } + // Delete leftover dirs and files + foreach (var file in tempFilesToDelete) + { + if (File.Exists(file)) + { + File.Delete(file); + } + } + foreach (var dir in tempDirsToDelete) + { + if (Directory.Exists(dir)) + { + Directory.Delete(dir, true); + } + } + }); } } diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs index 34b54ac1a263..0879e93fe9ac 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs @@ -839,7 +839,7 @@ public static NetSdkMsiInstallerClient Create( if (nugetPackageDownloader == null) { - DirectoryPath tempPackagesDir = new(string.IsNullOrWhiteSpace(tempDirPath) ? Path.GetTempPath() : tempDirPath); + DirectoryPath tempPackagesDir = new(string.IsNullOrWhiteSpace(tempDirPath) ? PathUtilities.CreateTempSubdirectory() : tempDirPath); nugetPackageDownloader = new NuGetPackageDownloader(tempPackagesDir, filePermissionSetter: null, new FirstPartyNuGetPackageSigningVerifier(tempPackagesDir), diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs index 629b0f940b66..65faac488d24 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs @@ -74,7 +74,7 @@ public WorkloadInstallCommand( _sdkVersion = WorkloadOptionsExtensions.GetValidatedSdkVersion(parseResult.ValueForOption(WorkloadInstallCommandParser.VersionOption), version, _dotnetPath, _userProfileDir); _sdkFeatureBand = new SdkFeatureBand(string.Join('.', _sdkVersion.Major, _sdkVersion.Minor, _sdkVersion.SdkFeatureBand)); _tempDirPath = tempDirPath ?? (string.IsNullOrWhiteSpace(parseResult.ValueForOption(WorkloadInstallCommandParser.TempDirOption)) ? - Path.GetTempPath() : + PathUtilities.GetTempPath() : parseResult.ValueForOption(WorkloadInstallCommandParser.TempDirOption)); _fromRollbackDefinition = parseResult.ValueForOption(WorkloadInstallCommandParser.FromRollbackFileOption); @@ -97,7 +97,7 @@ public WorkloadInstallCommand( WorkloadInstallerFactory.GetWorkloadInstaller(_reporter, sdkFeatureBand, _workloadResolver, _verbosity, _userProfileDir, _nugetPackageDownloader, _dotnetPath, _tempDirPath, _packageSourceLocation, restoreActionConfig, elevationRequired: !_printDownloadLinkOnly && string.IsNullOrWhiteSpace(_downloadToCacheOption)); - _workloadManifestUpdater = workloadManifestUpdater ?? new WorkloadManifestUpdater(_reporter, _workloadResolver, _nugetPackageDownloader, _userProfileDir, _tempDirPath, + _workloadManifestUpdater = workloadManifestUpdater ?? new WorkloadManifestUpdater(_reporter, _workloadResolver, _nugetPackageDownloader, _userProfileDir, _tempDirPath, _workloadInstaller.GetWorkloadInstallationRecordRepository(), _packageSourceLocation); ValidateWorkloadIdsInput(); diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs index 1bf57d66343f..85571dcf019c 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs @@ -7,6 +7,10 @@ using Microsoft.NET.Sdk.WorkloadManifestReader; using System.IO; using System.Linq; +using System.Net.Http; +using System.Text.Json; +using System.Threading.Tasks; +using Microsoft.DotNet.Cli; using Microsoft.DotNet.Cli.NuGetPackageDownloader; using Microsoft.DotNet.ToolPackage; using System.Threading.Tasks; @@ -62,7 +66,7 @@ private static WorkloadManifestUpdater GetInstance(string userProfileDir) var sdkVersion = Product.Version; var workloadManifestProvider = new SdkDirectoryWorkloadManifestProvider(dotnetPath, sdkVersion, userProfileDir); var workloadResolver = WorkloadResolver.Create(workloadManifestProvider, dotnetPath, sdkVersion, userProfileDir); - var tempPackagesDir = new DirectoryPath(Path.Combine(Path.GetTempPath(), "dotnet-sdk-advertising-temp")); + var tempPackagesDir = new DirectoryPath(PathUtilities.CreateTempSubdirectory()); var nugetPackageDownloader = new NuGetPackageDownloader(tempPackagesDir, filePermissionSetter: null, new FirstPartyNuGetPackageSigningVerifier(tempPackagesDir, new NullLogger()), diff --git a/src/Common/DotnetCommonLocalizableStrings.resx b/src/Common/DotnetCommonLocalizableStrings.resx new file mode 100644 index 000000000000..e24e18f0f14e --- /dev/null +++ b/src/Common/DotnetCommonLocalizableStrings.resx @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Failed to create a temporary sub-directory '{0}' with mkdir, error code: '{1}'. + \ No newline at end of file diff --git a/src/Common/PathUtilities.cs b/src/Common/PathUtilities.cs new file mode 100644 index 000000000000..3dd303a6c4ec --- /dev/null +++ b/src/Common/PathUtilities.cs @@ -0,0 +1,51 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +#nullable disable + +using System; +using System.IO; +using System.Runtime.InteropServices; + +namespace Microsoft.DotNet; + +static class PathUtilities +{ + const int S_IRUSR = 256; + const int S_IWUSR = 128; + const int S_IXUSR = 64; + const int S_IRWXU = S_IRUSR | S_IWUSR | S_IXUSR; // 700 (octal) Permissions + + const int MAX_NUM_DIRECTORY_CREATE_RETRIES = 2; + + public static string CreateTempSubdirectory() + { + return CreateTempSubdirectoryRetry(0); + } + + [DllImport("libc", SetLastError = true)] + private static extern int mkdir(string pathname, int mode); + private static string CreateTempSubdirectoryRetry(int attemptNo) + { + string path = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()); + if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + int mkdirStatusCode = mkdir(path, S_IRWXU); + if (mkdirStatusCode != 0) + { + int errno = Marshal.GetLastWin32Error(); + if (Directory.Exists(path) && attemptNo < MAX_NUM_DIRECTORY_CREATE_RETRIES) + { + return CreateTempSubdirectoryRetry(attemptNo + 1); + } + else + throw new IOException($"Failed to create a temporary subdirectory {path} with mkdir, error code: {errno}"); + } + } + else + { + Directory.CreateDirectory(path); + } + return path; + } +} diff --git a/src/Tasks/Common/FileUtilities.cs b/src/Tasks/Common/FileUtilities.cs index e3d4644c243f..eb0f35b339f3 100644 --- a/src/Tasks/Common/FileUtilities.cs +++ b/src/Tasks/Common/FileUtilities.cs @@ -32,6 +32,5 @@ public static Version TryGetAssemblyVersion(string sourcePath) return s_assemblyExtensions.Contains(extension) ? GetAssemblyVersion(sourcePath) : null; } - } } diff --git a/src/Tests/Microsoft.DotNet.Configurer.UnitTests/GivenAFirstTimeUseNoticeSentinel.cs b/src/Tests/Microsoft.DotNet.Configurer.UnitTests/GivenAFirstTimeUseNoticeSentinel.cs index 843f882ffdb6..31cbcfe77881 100644 --- a/src/Tests/Microsoft.DotNet.Configurer.UnitTests/GivenAFirstTimeUseNoticeSentinel.cs +++ b/src/Tests/Microsoft.DotNet.Configurer.UnitTests/GivenAFirstTimeUseNoticeSentinel.cs @@ -26,7 +26,7 @@ public GivenAFirstTimeUseNoticeSentinel() _fileSystemMockBuilder = FileSystemMockBuilder.Create(); } - [Fact(Skip ="Product.Version not set correctly when running tests")] + [Fact(Skip = "Product.Version not set correctly when running tests")] public void TheSentinelHasTheCurrentVersionInItsName() { FirstTimeUseNoticeSentinel.SENTINEL.Should().Contain($"{Product.Version}"); @@ -174,6 +174,11 @@ public ITemporaryDirectory CreateTemporaryDirectory() throw new NotImplementedException(); } + public string CreateTemporarySubdirectory() + { + throw new NotImplementedException(); + } + public IEnumerable EnumerateDirectories(string path) { throw new NotImplementedException(); diff --git a/src/Tests/Microsoft.DotNet.Configurer.UnitTests/GivenAFunctionReturnStringAndFakeFileSystem.cs b/src/Tests/Microsoft.DotNet.Configurer.UnitTests/GivenAFunctionReturnStringAndFakeFileSystem.cs index 10e3f1930814..6802977214b2 100644 --- a/src/Tests/Microsoft.DotNet.Configurer.UnitTests/GivenAFunctionReturnStringAndFakeFileSystem.cs +++ b/src/Tests/Microsoft.DotNet.Configurer.UnitTests/GivenAFunctionReturnStringAndFakeFileSystem.cs @@ -173,6 +173,11 @@ public IEnumerable EnumerateFileSystemEntries(string path) throw new UnauthorizedAccessException(); } + public string CreateTemporarySubdirectory() + { + throw new NotImplementedException(); + } + public string GetCurrentDirectory() { throw new NotImplementedException(); diff --git a/src/Tests/Microsoft.DotNet.PackageInstall.Tests/ToolPackageInstallerTests.cs b/src/Tests/Microsoft.DotNet.PackageInstall.Tests/ToolPackageInstallerTests.cs index c70702c3a5e2..e33e8c0d4833 100644 --- a/src/Tests/Microsoft.DotNet.PackageInstall.Tests/ToolPackageInstallerTests.cs +++ b/src/Tests/Microsoft.DotNet.PackageInstall.Tests/ToolPackageInstallerTests.cs @@ -1054,6 +1054,7 @@ private static string GetTestLocalFeedPath() => private readonly string _testTargetframework = BundledTargetFramework.GetTargetFrameworkMoniker(); private const string TestPackageVersion = "1.0.4"; private static readonly PackageId TestPackageId = new PackageId("global.tool.console.demo"); + private static readonly IEnumerable TestFrameworks = new NuGetFramework[] { NuGetFramework.Parse("netcoreapp2.1") }; public ToolPackageInstallerTests(ITestOutputHelper log) : base(log) { diff --git a/src/Tests/Microsoft.NET.TestFramework/Mock/FileSystemMockBuilder.cs b/src/Tests/Microsoft.NET.TestFramework/Mock/FileSystemMockBuilder.cs index 7eb9e5381989..0c47207c56f5 100644 --- a/src/Tests/Microsoft.NET.TestFramework/Mock/FileSystemMockBuilder.cs +++ b/src/Tests/Microsoft.NET.TestFramework/Mock/FileSystemMockBuilder.cs @@ -154,7 +154,7 @@ public void CreateDirectory(string path) else { DirectoryNode directoryNode = new DirectoryNode(); - directoryNode = (DirectoryNode) current.Subs.GetOrAdd(p , directoryNode); + directoryNode = (DirectoryNode)current.Subs.GetOrAdd(p, directoryNode); current = directoryNode; } } @@ -237,7 +237,7 @@ public DirectoryNode GetParentOfDirectoryNode(string path) } PathModel pathModel = CreateFullPathModel(path); - if (current.Subs.TryGetValue(pathModel.FileOrDirectoryName(), out var node) ) + if (current.Subs.TryGetValue(pathModel.FileOrDirectoryName(), out var node)) { if (node is FileNode) { @@ -283,7 +283,7 @@ public PathModel(string path) } string[] pathArray = path.Split( - new[] {directorySeparatorChar, altDirectorySeparatorChar}, + new[] { directorySeparatorChar, altDirectorySeparatorChar }, StringSplitOptions.RemoveEmptyEntries); Volume = volume; PathArray = pathArray; @@ -451,7 +451,7 @@ public void Move(string source, string destination) if (_files.TryGetNodeParent(destination, out DirectoryNode current) && current != null) { - sourceFileNode = (FileNode) current.Subs.GetOrAdd(new PathModel(destination).FileOrDirectoryName(), sourceFileNode); + sourceFileNode = (FileNode)current.Subs.GetOrAdd(new PathModel(destination).FileOrDirectoryName(), sourceFileNode); sourceParent.Subs.TryRemove(new PathModel(source).FileOrDirectoryName(), out _); } else @@ -525,9 +525,9 @@ public bool Exists(string path) if (_files.TryGetNodeParent(path, out DirectoryNode current)) { - PathModel pathModel = new PathModel(path); + PathModel pathModel = new PathModel(path); - return current.Subs.TryGetValue(pathModel.FileOrDirectoryName(), out var node) + return current.Subs.TryGetValue(pathModel.FileOrDirectoryName(), out var node) && node is DirectoryNode; } @@ -579,6 +579,11 @@ public void CreateDirectory(string path) _files.CreateDirectory(path); } + public string CreateTemporarySubdirectory() + { + return CreateTemporaryDirectory().DirectoryPath; + } + public void Delete(string path, bool recursive) { if (path == null) throw new ArgumentNullException(nameof(path)); From 7e72f233a63cea6f1233165d1cfae7fbb6ea11b9 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Wed, 7 Sep 2022 10:22:37 -0700 Subject: [PATCH 11/46] [Backport] Apply extra change since WorkloadCommandBase Doesn't exist --- .../FirstPartyNuGetPackageSigningVerifier.cs | 6 +++--- .../install/NetSdkMsiInstallerClient.cs | 2 +- .../install/WorkloadInstallCommand.cs | 2 +- .../dotnet-workload/list/WorkloadListCommand.cs | 6 +++--- .../dotnet-workload/repair/WorkloadRepairCommand.cs | 2 +- .../uninstall/WorkloadUninstallCommand.cs | 2 +- .../dotnet-workload/update/WorkloadUpdateCommand.cs | 13 +++++++------ 7 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/Cli/dotnet/NugetPackageDownloader/FirstPartyNuGetPackageSigningVerifier.cs b/src/Cli/dotnet/NugetPackageDownloader/FirstPartyNuGetPackageSigningVerifier.cs index db5d59ca2cae..e8cb50b7664c 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/FirstPartyNuGetPackageSigningVerifier.cs +++ b/src/Cli/dotnet/NugetPackageDownloader/FirstPartyNuGetPackageSigningVerifier.cs @@ -27,7 +27,7 @@ internal class FirstPartyNuGetPackageSigningVerifier : IFirstPartyNuGetPackageSi }; private readonly HashSet _upperFirstPartyCertificateThumbprints = - new(StringComparer.OrdinalIgnoreCase) {"51044706BD237B91B89B781337E6D62656C69F0FCFFBE8E43741367948127862"}; + new(StringComparer.OrdinalIgnoreCase) { "51044706BD237B91B89B781337E6D62656C69F0FCFFBE8E43741367948127862" }; private const string FirstPartyCertificateSubject = "CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"; @@ -37,7 +37,7 @@ internal class FirstPartyNuGetPackageSigningVerifier : IFirstPartyNuGetPackageSi public FirstPartyNuGetPackageSigningVerifier(DirectoryPath? tempDirectory = null, ILogger logger = null) { - _tempDirectory = tempDirectory ?? new DirectoryPath(Path.GetTempPath()); + _tempDirectory = tempDirectory ?? new DirectoryPath(PathUtilities.CreateTempSubdirectory()); _logger = logger ?? new NullLogger(); } @@ -84,7 +84,7 @@ internal bool IsFirstParty(FilePath nupkgToVerify) private static bool NuGetVerify(FilePath nupkgToVerify, out string commandOutput) { - var args = new[] {"verify", "--all", nupkgToVerify.Value}; + var args = new[] { "verify", "--all", nupkgToVerify.Value }; var command = new DotNetCommandFactory(alwaysRunOutOfProc: true) .Create("nuget", args); diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs index 0879e93fe9ac..495358624728 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs @@ -670,7 +670,7 @@ private string ExtractPackage(string packageId, string packageVersion, Directory // Extract the contents to a random folder to avoid potential file injection/hijacking // shenanigans before moving it to the final cache directory. - string extractionDirectory = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()); + string extractionDirectory = Path.Combine(PathUtilities.CreateTempSubdirectory(), Guid.NewGuid().ToString()); Directory.CreateDirectory(extractionDirectory); Log?.LogMessage($"Extracting '{packageId}' to '{extractionDirectory}'"); _ = _nugetPackageDownloader.ExtractPackageAsync(packagePath, new DirectoryPath(extractionDirectory)).Result; diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs index 65faac488d24..bb5210bfffd2 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs @@ -74,7 +74,7 @@ public WorkloadInstallCommand( _sdkVersion = WorkloadOptionsExtensions.GetValidatedSdkVersion(parseResult.ValueForOption(WorkloadInstallCommandParser.VersionOption), version, _dotnetPath, _userProfileDir); _sdkFeatureBand = new SdkFeatureBand(string.Join('.', _sdkVersion.Major, _sdkVersion.Minor, _sdkVersion.SdkFeatureBand)); _tempDirPath = tempDirPath ?? (string.IsNullOrWhiteSpace(parseResult.ValueForOption(WorkloadInstallCommandParser.TempDirOption)) ? - PathUtilities.GetTempPath() : + PathUtilities.CreateTempSubdirectory() : parseResult.ValueForOption(WorkloadInstallCommandParser.TempDirOption)); _fromRollbackDefinition = parseResult.ValueForOption(WorkloadInstallCommandParser.FromRollbackFileOption); diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/WorkloadListCommand.cs b/src/Cli/dotnet/commands/dotnet-workload/list/WorkloadListCommand.cs index 109a49d1a7c7..d77a81680aa5 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/list/WorkloadListCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/list/WorkloadListCommand.cs @@ -56,12 +56,12 @@ public WorkloadListCommand( _dotnetPath = dotnetDir ?? Path.GetDirectoryName(Environment.ProcessPath); ReleaseVersion currentSdkReleaseVersion = new(currentSdkVersion ?? Product.Version); _currentSdkFeatureBand = new SdkFeatureBand(currentSdkReleaseVersion); - + _includePreviews = result.ValueForOption(WorkloadListCommandParser.IncludePreviewsOption); _tempDirPath = tempDirPath ?? (string.IsNullOrWhiteSpace( result.ValueForOption(WorkloadListCommandParser.TempDirOption)) - ? Path.GetTempPath() + ? PathUtilities.CreateTempSubdirectory() : result.ValueForOption(WorkloadListCommandParser.TempDirOption)); _targetSdkVersion = result.ValueForOption(WorkloadListCommandParser.VersionOption); _userProfileDir = userProfileDir ?? CliFolderPathCalculator.DotnetUserProfileFolderPath; @@ -110,7 +110,7 @@ public override int Execute() _reporter.WriteLine("==workloadListJsonOutputStart=="); _reporter.WriteLine( JsonSerializer.Serialize(listOutput, - new JsonSerializerOptions {PropertyNamingPolicy = JsonNamingPolicy.CamelCase})); + new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase })); _reporter.WriteLine("==workloadListJsonOutputEnd=="); } else diff --git a/src/Cli/dotnet/commands/dotnet-workload/repair/WorkloadRepairCommand.cs b/src/Cli/dotnet/commands/dotnet-workload/repair/WorkloadRepairCommand.cs index f6d90a13d902..409a2a916a08 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/repair/WorkloadRepairCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/repair/WorkloadRepairCommand.cs @@ -56,7 +56,7 @@ public WorkloadRepairCommand( _workloadResolver = workloadResolver ?? WorkloadResolver.Create(workloadManifestProvider, _dotnetPath, _sdkVersion.ToString(), userProfileDir); var sdkFeatureBand = new SdkFeatureBand(_sdkVersion); tempDirPath = tempDirPath ?? (string.IsNullOrWhiteSpace(parseResult.ValueForOption(WorkloadInstallCommandParser.TempDirOption)) ? - Path.GetTempPath() : + PathUtilities.CreateTempSubdirectory() : parseResult.ValueForOption(WorkloadInstallCommandParser.TempDirOption)); var tempPackagesDir = new DirectoryPath(Path.Combine(tempDirPath, "dotnet-sdk-advertising-temp")); NullLogger nullLogger = new NullLogger(); diff --git a/src/Cli/dotnet/commands/dotnet-workload/uninstall/WorkloadUninstallCommand.cs b/src/Cli/dotnet/commands/dotnet-workload/uninstall/WorkloadUninstallCommand.cs index 7c978970fd1c..4314f2c8db1d 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/uninstall/WorkloadUninstallCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/uninstall/WorkloadUninstallCommand.cs @@ -46,7 +46,7 @@ public WorkloadUninstallCommand( var verbosity = parseResult.ValueForOption(WorkloadUninstallCommandParser.VerbosityOption); var workloadManifestProvider = new SdkDirectoryWorkloadManifestProvider(dotnetPath, _sdkVersion.ToString(), userProfileDir); workloadResolver ??= WorkloadResolver.Create(workloadManifestProvider, dotnetPath, _sdkVersion.ToString(), userProfileDir); - nugetPackageDownloader ??= new NuGetPackageDownloader(new DirectoryPath(Path.GetTempPath()), filePermissionSetter: null, verboseLogger: new NullLogger()); + nugetPackageDownloader ??= new NuGetPackageDownloader(new DirectoryPath(PathUtilities.CreateTempSubdirectory()), filePermissionSetter: null, verboseLogger: new NullLogger()); var sdkFeatureBand = new SdkFeatureBand(_sdkVersion); _workloadInstaller = WorkloadInstallerFactory.GetWorkloadInstaller(_reporter, sdkFeatureBand, workloadResolver, verbosity, userProfileDir, nugetPackageDownloader, dotnetPath); } diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs b/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs index fe763ee20b43..549c5aca9e27 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs @@ -72,7 +72,7 @@ public WorkloadUpdateCommand( _userProfileDir = userProfileDir ?? CliFolderPathCalculator.DotnetUserProfileFolderPath; _sdkVersion = WorkloadOptionsExtensions.GetValidatedSdkVersion(parseResult.ValueForOption(WorkloadUpdateCommandParser.VersionOption), version, _dotnetPath, _userProfileDir); _tempDirPath = tempDirPath ?? (string.IsNullOrWhiteSpace(parseResult.ValueForOption(WorkloadUpdateCommandParser.TempDirOption)) ? - Path.GetTempPath() : + PathUtilities.CreateTempSubdirectory() : parseResult.ValueForOption(WorkloadUpdateCommandParser.TempDirOption)); _printRollbackDefinitionOnly = parseResult.ValueForOption(WorkloadUpdateCommandParser.PrintRollbackOption); _fromRollbackDefinition = parseResult.ValueForOption(WorkloadUpdateCommandParser.FromRollbackFileOption); @@ -80,7 +80,7 @@ public WorkloadUpdateCommand( var configOption = parseResult.ValueForOption(WorkloadUpdateCommandParser.ConfigOption); var sourceOption = parseResult.ValueForOption(WorkloadUpdateCommandParser.SourceOption); _packageSourceLocation = string.IsNullOrEmpty(configOption) && (sourceOption == null || !sourceOption.Any()) ? null : - new PackageSourceLocation(string.IsNullOrEmpty(configOption) ? null : new FilePath(configOption), sourceFeedOverrides: sourceOption); + new PackageSourceLocation(string.IsNullOrEmpty(configOption) ? null : new FilePath(configOption), sourceFeedOverrides: sourceOption); var workloadManifestProvider = new SdkDirectoryWorkloadManifestProvider(_dotnetPath, _sdkVersion.ToString(), _userProfileDir); _workloadResolver = workloadResolver ?? WorkloadResolver.Create(workloadManifestProvider, _dotnetPath, _sdkVersion.ToString(), _userProfileDir); @@ -94,7 +94,7 @@ public WorkloadUpdateCommand( _nugetPackageDownloader = nugetPackageDownloader ?? new NuGetPackageDownloader(tempPackagesDir, filePermissionSetter: null, new FirstPartyNuGetPackageSigningVerifier(tempPackagesDir, _verbosity.VerbosityIsDetailedOrDiagnostic() ? new NuGetConsoleLogger() : new NullLogger()), _verbosity.VerbosityIsDetailedOrDiagnostic() ? new NuGetConsoleLogger() : new NullLogger(), restoreActionConfig: restoreActionConfig); - _workloadManifestUpdater = workloadManifestUpdater ?? new WorkloadManifestUpdater(_reporter, _workloadResolver, _nugetPackageDownloader, _userProfileDir, _tempDirPath, + _workloadManifestUpdater = workloadManifestUpdater ?? new WorkloadManifestUpdater(_reporter, _workloadResolver, _nugetPackageDownloader, _userProfileDir, _tempDirPath, _workloadInstaller.GetWorkloadInstallationRecordRepository(), _packageSourceLocation); } @@ -157,7 +157,7 @@ public void UpdateWorkloads(bool includePreviews = false, DirectoryPath? offline var workloadIds = GetUpdatableWorkloads(); _workloadManifestUpdater.UpdateAdvertisingManifestsAsync(includePreviews, offlineCache).Wait(); - + var manifestsToUpdate = string.IsNullOrWhiteSpace(_fromRollbackDefinition) ? _workloadManifestUpdater.CalculateManifestUpdates().Select(m => (m.manifestId, m.existingVersion, m.newVersion)) : _workloadManifestUpdater.CalculateManifestRollbacks(_fromRollbackDefinition); @@ -203,7 +203,8 @@ private void UpdateWorkloadsWithInstallRecord( installer.InstallWorkloadPack(packId, sdkFeatureBand, offlineCache); } }, - rollback: () => { + rollback: () => + { try { _reporter.WriteLine(LocalizableStrings.RollingBackInstall); @@ -263,7 +264,7 @@ private async Task DownloadToOfflineCacheAsync(DirectoryPath offlineCache, bool { if (!string.IsNullOrWhiteSpace(tempManifestDir) && Directory.Exists(tempManifestDir)) { - Directory.Delete(tempManifestDir, true); + Directory.Delete(tempManifestDir, true); } } } From 7480eb509e4343bd7a069fe22569fb59612ea00e Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Wed, 7 Sep 2022 11:38:33 -0700 Subject: [PATCH 12/46] Fix merge conflict I didn't merge correctly --- .../install/NetSdkManagedInstaller.cs | 29 ++++++++----------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkManagedInstaller.cs b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkManagedInstaller.cs index 3d19fed48440..59284e974bef 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkManagedInstaller.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkManagedInstaller.cs @@ -145,7 +145,8 @@ public void InstallWorkloadPack(PackInfo packInfo, SdkFeatureBand sdkFeatureBand WritePackInstallationRecord(packInfo, sdkFeatureBand); }, - rollback: () => { + rollback: () => + { try { _reporter.WriteLine(string.Format(LocalizableStrings.RollingBackPackInstall, packInfo.Id)); @@ -165,22 +166,16 @@ public void InstallWorkloadPack(PackInfo packInfo, SdkFeatureBand sdkFeatureBand { if (File.Exists(file)) { - // Delete leftover dirs and files - foreach (var file in tempFilesToDelete) - { - if (File.Exists(file)) - { - File.Delete(file); - } - } - foreach (var dir in tempDirsToDelete) - { - if (Directory.Exists(dir)) - { - Directory.Delete(dir, true); - } - } - }); + File.Delete(file); + } + } + foreach (var dir in tempDirsToDelete) + { + if (Directory.Exists(dir)) + { + Directory.Delete(dir, true); + } + } } } From 22e579c1f50558612c0bd623e3e09591aabb97cc Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Wed, 7 Sep 2022 11:51:42 -0700 Subject: [PATCH 13/46] Apply more fixes to the merge --- .../commands/InstallingWorkloadCommand.cs | 245 ------------------ .../dotnet-workload/WorkloadCommandBase.cs | 146 ----------- .../install/NetSdkManagedInstaller.cs | 7 - .../install/WorkloadManifestUpdater.cs | 15 +- 4 files changed, 3 insertions(+), 410 deletions(-) delete mode 100644 src/Cli/dotnet/commands/InstallingWorkloadCommand.cs delete mode 100644 src/Cli/dotnet/commands/dotnet-workload/WorkloadCommandBase.cs diff --git a/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs b/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs deleted file mode 100644 index 52c7432fb321..000000000000 --- a/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs +++ /dev/null @@ -1,245 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. -// - -using System; -using System.Collections.Generic; -using System.CommandLine; -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.Deployment.DotNet.Releases; -using Microsoft.DotNet.Cli; -using Microsoft.DotNet.Cli.NuGetPackageDownloader; -using Microsoft.DotNet.Cli.Utils; -using Microsoft.DotNet.Configurer; -using Microsoft.DotNet.ToolPackage; -using Microsoft.DotNet.Workloads.Workload.Install; -using Microsoft.Extensions.EnvironmentAbstractions; -using Microsoft.NET.Sdk.WorkloadManifestReader; -using NuGet.Versioning; -using Command = System.CommandLine.Command; -using Product = Microsoft.DotNet.Cli.Utils.Product; -using Strings = Microsoft.DotNet.Workloads.Workload.Install.LocalizableStrings; - -namespace Microsoft.DotNet.Workloads.Workload -{ - internal abstract class InstallingWorkloadCommand : WorkloadCommandBase - { - protected readonly bool _printDownloadLinkOnly; - protected readonly string _fromCacheOption; - protected readonly bool _includePreviews; - protected readonly string _downloadToCacheOption; - protected readonly string _dotnetPath; - protected readonly string _userProfileDir; - protected readonly bool _checkIfManifestExist; - protected readonly ReleaseVersion _sdkVersion; - protected readonly ReleaseVersion _installedSdkVersion; - protected readonly SdkFeatureBand _sdkFeatureBand; - protected readonly SdkFeatureBand _installedFeatureBand; - protected readonly string _fromRollbackDefinition; - protected readonly PackageSourceLocation _packageSourceLocation; - protected IWorkloadResolver _workloadResolver; - protected readonly IInstaller _workloadInstallerFromConstructor; - protected readonly IWorkloadManifestUpdater _workloadManifestUpdaterFromConstructor; - protected IInstaller _workloadInstaller; - protected IWorkloadManifestUpdater _workloadManifestUpdater; - - public InstallingWorkloadCommand( - ParseResult parseResult, - IReporter reporter, - IWorkloadResolver workloadResolver, - IInstaller workloadInstaller, - INuGetPackageDownloader nugetPackageDownloader, - IWorkloadManifestUpdater workloadManifestUpdater, - string dotnetDir, - string userProfileDir, - string tempDirPath, - string version, - string installedFeatureBand = null) - : base(parseResult, reporter: reporter, tempDirPath: tempDirPath, nugetPackageDownloader: nugetPackageDownloader) - { - _printDownloadLinkOnly = parseResult.GetValueForOption(InstallingWorkloadCommandParser.PrintDownloadLinkOnlyOption); - _fromCacheOption = parseResult.GetValueForOption(InstallingWorkloadCommandParser.FromCacheOption); - _includePreviews = parseResult.GetValueForOption(InstallingWorkloadCommandParser.IncludePreviewOption); - _downloadToCacheOption = parseResult.GetValueForOption(InstallingWorkloadCommandParser.DownloadToCacheOption); - _dotnetPath = dotnetDir ?? Path.GetDirectoryName(Environment.ProcessPath); - _userProfileDir = userProfileDir ?? CliFolderPathCalculator.DotnetUserProfileFolderPath; - _checkIfManifestExist = !(_printDownloadLinkOnly); // don't check for manifest existence when print download link is passed - _sdkVersion = WorkloadOptionsExtensions.GetValidatedSdkVersion(parseResult.GetValueForOption(InstallingWorkloadCommandParser.VersionOption), version, _dotnetPath, _userProfileDir, _checkIfManifestExist); - _sdkFeatureBand = new SdkFeatureBand(_sdkVersion); - _installedSdkVersion = new ReleaseVersion(version ?? Product.Version); - _installedFeatureBand = new SdkFeatureBand(installedFeatureBand ?? Product.Version); - - _fromRollbackDefinition = parseResult.GetValueForOption(InstallingWorkloadCommandParser.FromRollbackFileOption); - var configOption = parseResult.GetValueForOption(InstallingWorkloadCommandParser.ConfigOption); - var sourceOption = parseResult.GetValueForOption(InstallingWorkloadCommandParser.SourceOption); - _packageSourceLocation = string.IsNullOrEmpty(configOption) && (sourceOption == null || !sourceOption.Any()) ? null : - new PackageSourceLocation(string.IsNullOrEmpty(configOption) ? null : new FilePath(configOption), sourceFeedOverrides: sourceOption); - - var sdkWorkloadManifestProvider = new SdkDirectoryWorkloadManifestProvider(_dotnetPath, _installedSdkVersion.ToString(), userProfileDir); - _workloadResolver = workloadResolver ?? WorkloadResolver.Create(sdkWorkloadManifestProvider, _dotnetPath, _installedSdkVersion.ToString(), _userProfileDir); - - _workloadInstallerFromConstructor = workloadInstaller; - _workloadManifestUpdaterFromConstructor = workloadManifestUpdater; - } - - protected async Task> GetDownloads(IEnumerable workloadIds, bool skipManifestUpdate, bool includePreview, string downloadFolder = null) - { - List ret = new(); - - DirectoryPath? tempPath = null; - - try - { - if (!skipManifestUpdate) - { - DirectoryPath folderForManifestDownloads; - tempPath = new DirectoryPath(Path.Combine(TempDirectoryPath, "dotnet-manifest-extraction")); - string extractedManifestsPath = Path.Combine(tempPath.Value.Value, "manifests"); - - if (downloadFolder != null) - { - folderForManifestDownloads = new DirectoryPath(downloadFolder); - } - else - { - folderForManifestDownloads = tempPath.Value; - } - - var manifestDownloads = await _workloadManifestUpdater.GetManifestPackageDownloadsAsync(includePreview, _sdkFeatureBand, _installedFeatureBand); - - if (!manifestDownloads.Any()) - { - Reporter.WriteLine(Strings.SkippingManifestUpdate); - } - - foreach (var download in manifestDownloads) - { - // Add package to the list of downloads - ret.Add(download); - - // Download package - var downloadedPackagePath = await PackageDownloader.DownloadPackageAsync(new PackageId(download.NuGetPackageId), new NuGetVersion(download.NuGetPackageVersion), - _packageSourceLocation, downloadFolder: folderForManifestDownloads); - - // Extract manifest from package - await _workloadInstaller.ExtractManifestAsync(downloadedPackagePath, Path.Combine(extractedManifestsPath, download.Id)); - } - - // Use updated, extracted manifests to resolve packs - var overlayProvider = new TempDirectoryWorkloadManifestProvider(extractedManifestsPath, _sdkFeatureBand.ToString()); - - var newResolver = _workloadResolver.CreateOverlayResolver(overlayProvider); - _workloadInstaller.ReplaceWorkloadResolver(newResolver); - } - - var packDownloads = _workloadInstaller.GetDownloads(workloadIds, _sdkFeatureBand, false); - ret.AddRange(packDownloads); - - if (downloadFolder != null) - { - DirectoryPath downloadFolderDirectoryPath = new DirectoryPath(downloadFolder); - foreach (var packDownload in packDownloads) - { - Reporter.WriteLine(string.Format(Install.LocalizableStrings.DownloadingPackToCacheMessage, packDownload.NuGetPackageId, packDownload.NuGetPackageVersion, downloadFolder)); - - await PackageDownloader.DownloadPackageAsync(new PackageId(packDownload.NuGetPackageId), new NuGetVersion(packDownload.NuGetPackageVersion), - _packageSourceLocation, downloadFolder: downloadFolderDirectoryPath); - } - } - } - finally - { - if (tempPath != null && Directory.Exists(tempPath.Value.Value)) - { - Directory.Delete(tempPath.Value.Value, true); - } - } - - return ret; - } - - protected IEnumerable GetInstalledWorkloads(bool fromPreviousSdk) - { - //var currentFeatureBand = new SdkFeatureBand(_installedFeatureBand.ToString()); - if (fromPreviousSdk) - { - var priorFeatureBands = _workloadInstaller.GetWorkloadInstallationRecordRepository().GetFeatureBandsWithInstallationRecords() - .Where(featureBand => featureBand.CompareTo(_installedFeatureBand) < 0); - if (priorFeatureBands.Any()) - { - var maxPriorFeatureBand = priorFeatureBands.Max(); - return _workloadInstaller.GetWorkloadInstallationRecordRepository().GetInstalledWorkloads(maxPriorFeatureBand); - } - return new List(); - } - else - { - var workloads = _workloadInstaller.GetWorkloadInstallationRecordRepository().GetInstalledWorkloads(_installedFeatureBand); - - return workloads ?? Enumerable.Empty(); - } - } - } - - internal static class InstallingWorkloadCommandParser - { - public static readonly Option PrintDownloadLinkOnlyOption = - new Option("--print-download-link-only", Strings.PrintDownloadLinkOnlyDescription) - { - IsHidden = true - }; - - public static readonly Option FromCacheOption = new Option("--from-cache", Strings.FromCacheOptionDescription) - { - ArgumentHelpName = Strings.FromCacheOptionArgumentName, - IsHidden = true - }; - - public static readonly Option IncludePreviewOption = - new Option("--include-previews", Strings.IncludePreviewOptionDescription); - - public static readonly Option DownloadToCacheOption = new Option("--download-to-cache", Strings.DownloadToCacheOptionDescription) - { - ArgumentHelpName = Strings.DownloadToCacheOptionArgumentName, - IsHidden = true - }; - - public static readonly Option VersionOption = - new Option("--sdk-version", Strings.VersionOptionDescription) - { - ArgumentHelpName = Strings.VersionOptionName, - IsHidden = true - }; - - public static readonly Option FromRollbackFileOption = new Option("--from-rollback-file", Update.LocalizableStrings.FromRollbackDefinitionOptionDescription) - { - IsHidden = true - }; - - public static readonly Option ConfigOption = - new Option("--configfile", Strings.ConfigFileOptionDescription) - { - ArgumentHelpName = Strings.ConfigFileOptionName - }; - - public static readonly Option SourceOption = - new Option(new string[] { "-s", "--source" }, Strings.SourceOptionDescription) - { - ArgumentHelpName = Strings.SourceOptionName - }.AllowSingleArgPerToken(); - - internal static void AddWorkloadInstallCommandOptions(Command command) - { - command.AddOption(VersionOption); - command.AddOption(ConfigOption); - command.AddOption(SourceOption); - command.AddOption(PrintDownloadLinkOnlyOption); - command.AddOption(FromCacheOption); - command.AddOption(DownloadToCacheOption); - command.AddOption(IncludePreviewOption); - command.AddOption(FromRollbackFileOption); - } - } -} diff --git a/src/Cli/dotnet/commands/dotnet-workload/WorkloadCommandBase.cs b/src/Cli/dotnet/commands/dotnet-workload/WorkloadCommandBase.cs deleted file mode 100644 index c4ea1b781620..000000000000 --- a/src/Cli/dotnet/commands/dotnet-workload/WorkloadCommandBase.cs +++ /dev/null @@ -1,146 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -using System.CommandLine; -using System.IO; -using Microsoft.DotNet.Cli; -using Microsoft.DotNet.Cli.NuGetPackageDownloader; -using Microsoft.DotNet.Cli.Utils; -using Microsoft.Extensions.EnvironmentAbstractions; -using NuGet.Common; - -namespace Microsoft.DotNet.Workloads.Workload -{ - /// - /// Base class for workload related commands. - /// - internal abstract class WorkloadCommandBase : CommandBase - { - /// - /// The package downloader to use for acquiring NuGet packages. - /// - protected INuGetPackageDownloader PackageDownloader - { - get; - } - - /// - /// Provides basic output primitives for the command. - /// - protected IReporter Reporter - { - get; - } - - /// - /// Configuration options used by NuGet when performing a restore. - /// - protected RestoreActionConfig RestoreActionConfiguration - { - get; - } - - /// - /// Temporary directory used for downloading NuGet packages. - /// - protected DirectoryPath TempPackagesDirectory - { - get; - } - - /// - /// The path of the temporary temporary directory to use. - /// - protected string TempDirectoryPath - { - get; - } - - /// - /// The verbosity level to use when reporting output from the command. - /// - protected VerbosityOptions Verbosity - { - get; - } - - /// - /// Gets whether signatures for workload packages and installers should be verified. - /// - protected bool VerifySignatures - { - get; - } - - /// - /// Initializes a new instance. - /// - /// The results of parsing the command line. - /// The command line option used to define the verbosity level. - /// The reporter to use for output. - /// The directory to use for volatile output. If no value is specified, the commandline - /// option is used if present, otherwise the default temp directory used. - /// The package downloader to use for acquiring NuGet packages. - public WorkloadCommandBase(ParseResult parseResult, - Option verbosityOptions = null, - IReporter reporter = null, - string tempDirPath = null, - INuGetPackageDownloader nugetPackageDownloader = null) : base(parseResult) - { - VerifySignatures = ShouldVerifySignatures(parseResult); - - RestoreActionConfiguration = _parseResult.ToRestoreActionConfig(); - - Verbosity = verbosityOptions == null - ? parseResult.GetValueForOption(CommonOptions.VerbosityOption) - : parseResult.GetValueForOption(verbosityOptions); - - ILogger nugetLogger = Verbosity.VerbosityIsDetailedOrDiagnostic() ? new NuGetConsoleLogger() : new NullLogger(); - - Reporter = reporter ?? Cli.Utils.Reporter.Output; - - TempDirectoryPath = !string.IsNullOrWhiteSpace(tempDirPath) - ? tempDirPath - : !string.IsNullOrWhiteSpace(parseResult.GetValueForOption(WorkloadInstallCommandParser.TempDirOption)) - ? parseResult.GetValueForOption(WorkloadInstallCommandParser.TempDirOption) - : PathUtilities.CreateTempSubdirectory(); - - TempPackagesDirectory = new DirectoryPath(Path.Combine(TempDirectoryPath, "dotnet-sdk-advertising-temp")); - - PackageDownloader = nugetPackageDownloader ?? new NuGetPackageDownloader(TempPackagesDirectory, - filePermissionSetter: null, - new FirstPartyNuGetPackageSigningVerifier(), - nugetLogger, - restoreActionConfig: RestoreActionConfiguration, - verifySignatures: VerifySignatures); - } - - /// - /// Determines whether workload packs and installer signatures should be verified based on whether - /// dotnet is signed, the skip option was specified, and whether a global policy enforcing verification - /// was set. - /// - /// The results of parsing the command line. - /// if signatures of packages and installers should be verified. - /// - private static bool ShouldVerifySignatures(ParseResult parseResult) - { - if (!SignCheck.IsDotNetSigned()) - { - // Can't enforce anything if we already allowed an unsigned dotnet to be installed. - return false; - } - - bool skipSignCheck = parseResult.GetValueForOption(WorkloadInstallCommandParser.SkipSignCheckOption); - bool policyEnabled = SignCheck.IsWorkloadSignVerificationPolicySet(); - - if (skipSignCheck && policyEnabled) - { - // Can't override the global policy by using the skip option. - throw new GracefulException(LocalizableStrings.SkipSignCheckInvalidOption); - } - - return !skipSignCheck; - } - } -} diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkManagedInstaller.cs b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkManagedInstaller.cs index 59284e974bef..12db6d5b3570 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkManagedInstaller.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkManagedInstaller.cs @@ -6,19 +6,12 @@ using System.IO; using System.Linq; using System.Text.Json; -using System.Threading.Tasks; using Microsoft.DotNet.Cli; using Microsoft.DotNet.Cli.NuGetPackageDownloader; -using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.ToolPackage; using Microsoft.DotNet.Workloads.Workload.Install.InstallRecord; -using Microsoft.Extensions.EnvironmentAbstractions; -using Microsoft.NET.Sdk.WorkloadManifestReader; using NuGet.Common; using NuGet.Versioning; -using static Microsoft.NET.Sdk.WorkloadManifestReader.WorkloadResolver; -using Microsoft.DotNet.Workloads.Workload.Install.InstallRecord; -using System.Text.Json; namespace Microsoft.DotNet.Workloads.Workload.Install { diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs index 85571dcf019c..e0ff0074c6c3 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs @@ -3,27 +3,18 @@ using System; using System.Collections.Generic; -using Microsoft.DotNet.Cli.Utils; -using Microsoft.NET.Sdk.WorkloadManifestReader; using System.IO; using System.Linq; using System.Net.Http; +using System.Runtime.InteropServices; using System.Text.Json; using System.Threading.Tasks; using Microsoft.DotNet.Cli; using Microsoft.DotNet.Cli.NuGetPackageDownloader; using Microsoft.DotNet.ToolPackage; -using System.Threading.Tasks; using Microsoft.DotNet.Workloads.Workload.Install.InstallRecord; -using Microsoft.Extensions.EnvironmentAbstractions; -using NuGet.Versioning; -using Microsoft.DotNet.Configurer; using NuGet.Common; -using System.Text.Json; -using System.Runtime.InteropServices; -using Microsoft.DotNet.Cli; -using System.Net; -using System.Net.Http; +using NuGet.Versioning; namespace Microsoft.DotNet.Workloads.Workload.Install { @@ -451,7 +442,7 @@ private async Task NewerManifestPackageExists(ManifestId manifest) else { throw new ArgumentException(string.Format(LocalizableStrings.RollbackDefinitionFileDoesNotExist, rollbackDefinitionFilePath)); - } + } } return JsonSerializer.Deserialize>(fileContent) .Select(manifest => (new ManifestId(manifest.Key), new ManifestVersion(manifest.Value))); From 79585230658eb8a122124cc2ea26a581ab70d03c Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Wed, 7 Sep 2022 14:57:17 -0700 Subject: [PATCH 14/46] Update dependencies --- .../install/NetSdkManagedInstaller.cs | 9 +++++++-- .../install/WorkloadManifestUpdater.cs | 17 +++++++++++------ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkManagedInstaller.cs b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkManagedInstaller.cs index 12db6d5b3570..529aa925a0ab 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkManagedInstaller.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkManagedInstaller.cs @@ -5,13 +5,18 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using System.Text.Json; using Microsoft.DotNet.Cli; using Microsoft.DotNet.Cli.NuGetPackageDownloader; +using Microsoft.DotNet.Cli.Utils; +using Microsoft.DotNet.Configurer; using Microsoft.DotNet.ToolPackage; -using Microsoft.DotNet.Workloads.Workload.Install.InstallRecord; +using Microsoft.Extensions.EnvironmentAbstractions; +using Microsoft.NET.Sdk.WorkloadManifestReader; using NuGet.Common; using NuGet.Versioning; +using static Microsoft.NET.Sdk.WorkloadManifestReader.WorkloadResolver; +using Microsoft.DotNet.Workloads.Workload.Install.InstallRecord; +using System.Text.Json; namespace Microsoft.DotNet.Workloads.Workload.Install { diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs index e0ff0074c6c3..f1160421ffcf 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs @@ -3,18 +3,23 @@ using System; using System.Collections.Generic; +using Microsoft.DotNet.Cli.Utils; +using Microsoft.NET.Sdk.WorkloadManifestReader; using System.IO; using System.Linq; -using System.Net.Http; -using System.Runtime.InteropServices; -using System.Text.Json; -using System.Threading.Tasks; -using Microsoft.DotNet.Cli; using Microsoft.DotNet.Cli.NuGetPackageDownloader; using Microsoft.DotNet.ToolPackage; +using System.Threading.Tasks; using Microsoft.DotNet.Workloads.Workload.Install.InstallRecord; -using NuGet.Common; +using Microsoft.Extensions.EnvironmentAbstractions; using NuGet.Versioning; +using Microsoft.DotNet.Configurer; +using NuGet.Common; +using System.Text.Json; +using System.Runtime.InteropServices; +using Microsoft.DotNet.Cli; +using System.Net; +using System.Net.Http; namespace Microsoft.DotNet.Workloads.Workload.Install { From 33b28aaad63cacfd47c766bdb5b3a6e2291d64fc Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Wed, 7 Sep 2022 15:04:37 -0700 Subject: [PATCH 15/46] Accept half merged old change --- .../install/ToolInstallGlobalOrToolPathCommand.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs b/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs index e06537b2d73e..d66397a185da 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs @@ -24,8 +24,8 @@ namespace Microsoft.DotNet.Tools.Tool.Install { internal delegate IShellShimRepository CreateShellShimRepository(string appHostSourceDirectory, DirectoryPath? nonGlobalLocation = null); internal delegate (IToolPackageStore, IToolPackageStoreQuery, IToolPackageInstaller) CreateToolPackageStoresAndInstaller( - DirectoryPath? nonGlobalLocation = null, - IEnumerable forwardRestoreArguments = null); + DirectoryPath? nonGlobalLocation = null, + IEnumerable forwardRestoreArguments = null); internal class ToolInstallGlobalOrToolPathCommand : CommandBase { @@ -67,14 +67,14 @@ public ToolInstallGlobalOrToolPathCommand( _architectureOption = parseResult.ValueForOption(ToolInstallCommandParser.ArchitectureOption); _createToolPackageStoresAndInstaller = createToolPackageStoreAndInstaller ?? ToolPackageFactory.CreateToolPackageStoresAndInstaller; - _forwardRestoreArguments = parseResult.OptionValuesToBeForwarded(ToolInstallCommandParser.GetCommand()); + _forwardRestoreArguments = parseResult.OptionValuesToBeForwarded(ToolInstallCommandParser.GetCommand()); _environmentPathInstruction = environmentPathInstruction ?? EnvironmentPathFactory.CreateEnvironmentPathInstruction(); _createShellShimRepository = createShellShimRepository ?? ShellShimRepositoryFactory.CreateShellShimRepository; var tempDir = new DirectoryPath(PathUtilities.CreateTempSubdirectory()); - var configOption = parseResult.GetValueForOption(ToolInstallCommandParser.ConfigOption); - var sourceOption = parseResult.GetValueForOption(ToolInstallCommandParser.AddSourceOption); + var configOption = parseResult.ValueForOption(ToolInstallCommandParser.ConfigOption); + var sourceOption = parseResult.ValueForOption(ToolInstallCommandParser.AddSourceOption); var packageSourceLocation = new PackageSourceLocation(string.IsNullOrEmpty(configOption) ? null : new FilePath(configOption), additionalSourceFeeds: sourceOption); var restoreAction = new RestoreActionConfig(DisableParallel: parseResult.ValueForOption(ToolCommandRestorePassThroughOptions.DisableParallelOption), NoCache: parseResult.ValueForOption(ToolCommandRestorePassThroughOptions.NoCacheOption), @@ -167,7 +167,7 @@ public override int Execute() { throw new GracefulException( messages: InstallToolCommandLowLevelErrorConverter.GetUserFacingMessages(ex, _packageId), - verboseMessages: new[] {ex.ToString()}, + verboseMessages: new[] { ex.ToString() }, isUserError: false); } } From 6bfa34b6a2acdf596ffdeda992293b4e1f1cc3f1 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Wed, 7 Sep 2022 15:29:46 -0700 Subject: [PATCH 16/46] Remove new test added in merge --- .../ToolPackageInstallerTests.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Tests/Microsoft.DotNet.PackageInstall.Tests/ToolPackageInstallerTests.cs b/src/Tests/Microsoft.DotNet.PackageInstall.Tests/ToolPackageInstallerTests.cs index e33e8c0d4833..c70702c3a5e2 100644 --- a/src/Tests/Microsoft.DotNet.PackageInstall.Tests/ToolPackageInstallerTests.cs +++ b/src/Tests/Microsoft.DotNet.PackageInstall.Tests/ToolPackageInstallerTests.cs @@ -1054,7 +1054,6 @@ private static string GetTestLocalFeedPath() => private readonly string _testTargetframework = BundledTargetFramework.GetTargetFrameworkMoniker(); private const string TestPackageVersion = "1.0.4"; private static readonly PackageId TestPackageId = new PackageId("global.tool.console.demo"); - private static readonly IEnumerable TestFrameworks = new NuGetFramework[] { NuGetFramework.Parse("netcoreapp2.1") }; public ToolPackageInstallerTests(ITestOutputHelper log) : base(log) { From eaaa9b570d6f3d2750d40af0477f3e7dc7b91e52 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 8 Sep 2022 02:18:16 +0000 Subject: [PATCH 17/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20220907.11 Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , VS.Redist.Common.NetCore.SharedFramework.x64.6.0 , VS.Redist.Common.NetCore.TargetingPack.x64.6.0 From Version 6.0.9-servicing.22419.5 -> To Version 6.0.10-servicing.22457.11 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index eca1bf7698d9..b6250a918d0b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,7 +11,7 @@ - + @@ -37,7 +37,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 31e24548a7d6..75bc58d8eaf0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -32,31 +32,31 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3a842c00f6db7b2a5f4ac43941ff54a9b9f9be78 + c222ff33bf7b1075a7d4867b733965211e9c2ef9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3a842c00f6db7b2a5f4ac43941ff54a9b9f9be78 + c222ff33bf7b1075a7d4867b733965211e9c2ef9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3a842c00f6db7b2a5f4ac43941ff54a9b9f9be78 + c222ff33bf7b1075a7d4867b733965211e9c2ef9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3a842c00f6db7b2a5f4ac43941ff54a9b9f9be78 + c222ff33bf7b1075a7d4867b733965211e9c2ef9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3a842c00f6db7b2a5f4ac43941ff54a9b9f9be78 + c222ff33bf7b1075a7d4867b733965211e9c2ef9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0ec02c8c96e2eda06dc5b5edfdbdba0f36415082 + c222ff33bf7b1075a7d4867b733965211e9c2ef9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3a842c00f6db7b2a5f4ac43941ff54a9b9f9be78 + c222ff33bf7b1075a7d4867b733965211e9c2ef9 https://github.com/dotnet/runtime @@ -64,7 +64,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3a842c00f6db7b2a5f4ac43941ff54a9b9f9be78 + c222ff33bf7b1075a7d4867b733965211e9c2ef9 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index d8d160d2213d..5f7f386c23ce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,12 +41,12 @@ 6.0.10 - 6.0.10-servicing.22456.15 + 6.0.10-servicing.22457.11 6.0.10 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 6.0.0 6.0.10 - 6.0.10-servicing.22456.15 + 6.0.10-servicing.22457.11 6.0.0-preview.7.21363.9 6.0.0 From 74b521609abab8a5695518fb1a1e4873cd46360a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 8 Sep 2022 05:58:42 +0000 Subject: [PATCH 18/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20220907.30 dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.9-servicing.22419.26 -> To Version 6.0.9-servicing.22457.30 --- NuGet.config | 4 +-- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++---- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index b6250a918d0b..733291a3fa6a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -34,7 +34,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 75bc58d8eaf0..3fc5a71b2941 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 + 9ddf95292ffd2ad4e192532a248082cd25fb9463 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 + 9ddf95292ffd2ad4e192532a248082cd25fb9463 https://github.com/nuget/nuget.client @@ -188,76 +188,76 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 + 9ddf95292ffd2ad4e192532a248082cd25fb9463 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 + 9ddf95292ffd2ad4e192532a248082cd25fb9463 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 + 9ddf95292ffd2ad4e192532a248082cd25fb9463 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 + 9ddf95292ffd2ad4e192532a248082cd25fb9463 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 + 9ddf95292ffd2ad4e192532a248082cd25fb9463 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 + 9ddf95292ffd2ad4e192532a248082cd25fb9463 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 + 9ddf95292ffd2ad4e192532a248082cd25fb9463 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 + 9ddf95292ffd2ad4e192532a248082cd25fb9463 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 + 9ddf95292ffd2ad4e192532a248082cd25fb9463 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 + 9ddf95292ffd2ad4e192532a248082cd25fb9463 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 + 9ddf95292ffd2ad4e192532a248082cd25fb9463 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 + 9ddf95292ffd2ad4e192532a248082cd25fb9463 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 + 9ddf95292ffd2ad4e192532a248082cd25fb9463 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 + 9ddf95292ffd2ad4e192532a248082cd25fb9463 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 + 9ddf95292ffd2ad4e192532a248082cd25fb9463 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 + 9ddf95292ffd2ad4e192532a248082cd25fb9463 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 + 9ddf95292ffd2ad4e192532a248082cd25fb9463 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6cb3bc1186cc26aa1de8b32ca3bfe98d420a96b7 + 9ddf95292ffd2ad4e192532a248082cd25fb9463 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 5f7f386c23ce..95463207d771 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -130,16 +130,16 @@ - 6.0.9-servicing.22457.4 + 6.0.9-servicing.22457.30 6.0.9 - 6.0.9-servicing.22457.4 - 6.0.9-servicing.22457.4 - 6.0.9-servicing.22457.4 + 6.0.9-servicing.22457.30 + 6.0.9-servicing.22457.30 + 6.0.9-servicing.22457.30 6.0.9 6.0.9 6.0.9 6.0.9 - 6.0.9-servicing.22457.4 + 6.0.9-servicing.22457.30 From 8ee5a120eb8600116b2206bf9502dc5cec1a84b3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 8 Sep 2022 07:51:42 +0000 Subject: [PATCH 19/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20220907.35 dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.9-servicing.22419.26 -> To Version 6.0.9-servicing.22457.35 --- NuGet.config | 4 +-- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++---- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index 733291a3fa6a..73703302fbfa 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -34,7 +34,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3fc5a71b2941..69740a0d107d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9ddf95292ffd2ad4e192532a248082cd25fb9463 + 1dc2623012bc575e8dd1f8a51f3811545ee2110b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9ddf95292ffd2ad4e192532a248082cd25fb9463 + 1dc2623012bc575e8dd1f8a51f3811545ee2110b https://github.com/nuget/nuget.client @@ -188,76 +188,76 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9ddf95292ffd2ad4e192532a248082cd25fb9463 + 1dc2623012bc575e8dd1f8a51f3811545ee2110b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9ddf95292ffd2ad4e192532a248082cd25fb9463 + 1dc2623012bc575e8dd1f8a51f3811545ee2110b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9ddf95292ffd2ad4e192532a248082cd25fb9463 + 1dc2623012bc575e8dd1f8a51f3811545ee2110b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9ddf95292ffd2ad4e192532a248082cd25fb9463 + 1dc2623012bc575e8dd1f8a51f3811545ee2110b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9ddf95292ffd2ad4e192532a248082cd25fb9463 + 1dc2623012bc575e8dd1f8a51f3811545ee2110b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9ddf95292ffd2ad4e192532a248082cd25fb9463 + 1dc2623012bc575e8dd1f8a51f3811545ee2110b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9ddf95292ffd2ad4e192532a248082cd25fb9463 + 1dc2623012bc575e8dd1f8a51f3811545ee2110b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9ddf95292ffd2ad4e192532a248082cd25fb9463 + 1dc2623012bc575e8dd1f8a51f3811545ee2110b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9ddf95292ffd2ad4e192532a248082cd25fb9463 + 1dc2623012bc575e8dd1f8a51f3811545ee2110b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9ddf95292ffd2ad4e192532a248082cd25fb9463 + 1dc2623012bc575e8dd1f8a51f3811545ee2110b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9ddf95292ffd2ad4e192532a248082cd25fb9463 + 1dc2623012bc575e8dd1f8a51f3811545ee2110b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9ddf95292ffd2ad4e192532a248082cd25fb9463 + 1dc2623012bc575e8dd1f8a51f3811545ee2110b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9ddf95292ffd2ad4e192532a248082cd25fb9463 + 1dc2623012bc575e8dd1f8a51f3811545ee2110b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9ddf95292ffd2ad4e192532a248082cd25fb9463 + 1dc2623012bc575e8dd1f8a51f3811545ee2110b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9ddf95292ffd2ad4e192532a248082cd25fb9463 + 1dc2623012bc575e8dd1f8a51f3811545ee2110b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9ddf95292ffd2ad4e192532a248082cd25fb9463 + 1dc2623012bc575e8dd1f8a51f3811545ee2110b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9ddf95292ffd2ad4e192532a248082cd25fb9463 + 1dc2623012bc575e8dd1f8a51f3811545ee2110b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9ddf95292ffd2ad4e192532a248082cd25fb9463 + 1dc2623012bc575e8dd1f8a51f3811545ee2110b https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 95463207d771..8df7108eb8cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -130,16 +130,16 @@ - 6.0.9-servicing.22457.30 + 6.0.9-servicing.22457.35 6.0.9 - 6.0.9-servicing.22457.30 - 6.0.9-servicing.22457.30 - 6.0.9-servicing.22457.30 + 6.0.9-servicing.22457.35 + 6.0.9-servicing.22457.35 + 6.0.9-servicing.22457.35 6.0.9 6.0.9 6.0.9 6.0.9 - 6.0.9-servicing.22457.30 + 6.0.9-servicing.22457.35 From fef9ddf8e333bae710d0456d666375df0fecf47a Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Thu, 8 Sep 2022 14:33:55 -0700 Subject: [PATCH 20/46] Remove localiz string --- .../DotnetCommonLocalizableStrings.resx | 63 ------------------- 1 file changed, 63 deletions(-) delete mode 100644 src/Common/DotnetCommonLocalizableStrings.resx diff --git a/src/Common/DotnetCommonLocalizableStrings.resx b/src/Common/DotnetCommonLocalizableStrings.resx deleted file mode 100644 index e24e18f0f14e..000000000000 --- a/src/Common/DotnetCommonLocalizableStrings.resx +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Failed to create a temporary sub-directory '{0}' with mkdir, error code: '{1}'. - \ No newline at end of file From 756a33b6488dafc42fa4add31943be92134d175c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 8 Sep 2022 23:18:36 +0000 Subject: [PATCH 21/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20220908.21 dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.9-servicing.22419.26 -> To Version 6.0.10-servicing.22458.21 --- NuGet.config | 4 +-- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++------ 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/NuGet.config b/NuGet.config index 73703302fbfa..d676e0b3cec3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -34,7 +34,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69740a0d107d..e1cb3e5cf8e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dc2623012bc575e8dd1f8a51f3811545ee2110b + 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dc2623012bc575e8dd1f8a51f3811545ee2110b + 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e https://github.com/nuget/nuget.client @@ -186,78 +186,78 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf a97bb2af3c7d400dfe8aca3fa3d47ba83d925d6c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dc2623012bc575e8dd1f8a51f3811545ee2110b + 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dc2623012bc575e8dd1f8a51f3811545ee2110b + 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dc2623012bc575e8dd1f8a51f3811545ee2110b + 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dc2623012bc575e8dd1f8a51f3811545ee2110b + 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dc2623012bc575e8dd1f8a51f3811545ee2110b + 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dc2623012bc575e8dd1f8a51f3811545ee2110b + 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dc2623012bc575e8dd1f8a51f3811545ee2110b + 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dc2623012bc575e8dd1f8a51f3811545ee2110b + 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dc2623012bc575e8dd1f8a51f3811545ee2110b + 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dc2623012bc575e8dd1f8a51f3811545ee2110b + 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dc2623012bc575e8dd1f8a51f3811545ee2110b + 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dc2623012bc575e8dd1f8a51f3811545ee2110b + 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dc2623012bc575e8dd1f8a51f3811545ee2110b + 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dc2623012bc575e8dd1f8a51f3811545ee2110b + 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dc2623012bc575e8dd1f8a51f3811545ee2110b + 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dc2623012bc575e8dd1f8a51f3811545ee2110b + 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dc2623012bc575e8dd1f8a51f3811545ee2110b + 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dc2623012bc575e8dd1f8a51f3811545ee2110b + 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 8df7108eb8cc..f2c9f52bb728 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -130,16 +130,16 @@ - 6.0.9-servicing.22457.35 - 6.0.9 - 6.0.9-servicing.22457.35 - 6.0.9-servicing.22457.35 - 6.0.9-servicing.22457.35 - 6.0.9 - 6.0.9 - 6.0.9 - 6.0.9 - 6.0.9-servicing.22457.35 + 6.0.10-servicing.22458.21 + 6.0.10 + 6.0.10-servicing.22458.21 + 6.0.10-servicing.22458.21 + 6.0.10-servicing.22458.21 + 6.0.10 + 6.0.10 + 6.0.10 + 6.0.10 + 6.0.10-servicing.22458.21 From 68e73042240c6e50b2f71a95bc13365c19e6765e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 9 Sep 2022 00:55:56 +0000 Subject: [PATCH 22/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20220908.26 dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.9-servicing.22419.26 -> To Version 6.0.10-servicing.22458.26 --- NuGet.config | 4 +-- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++---- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index d676e0b3cec3..36f68ac4aa19 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -34,7 +34,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e1cb3e5cf8e9..bdf3407418ae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e + d9591c9a7a5f8cd42ff84b3f14048d274f9db15c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e + d9591c9a7a5f8cd42ff84b3f14048d274f9db15c https://github.com/nuget/nuget.client @@ -188,76 +188,76 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e + d9591c9a7a5f8cd42ff84b3f14048d274f9db15c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e + d9591c9a7a5f8cd42ff84b3f14048d274f9db15c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e + d9591c9a7a5f8cd42ff84b3f14048d274f9db15c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e + d9591c9a7a5f8cd42ff84b3f14048d274f9db15c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e + d9591c9a7a5f8cd42ff84b3f14048d274f9db15c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e + d9591c9a7a5f8cd42ff84b3f14048d274f9db15c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e + d9591c9a7a5f8cd42ff84b3f14048d274f9db15c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e + d9591c9a7a5f8cd42ff84b3f14048d274f9db15c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e + d9591c9a7a5f8cd42ff84b3f14048d274f9db15c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e + d9591c9a7a5f8cd42ff84b3f14048d274f9db15c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e + d9591c9a7a5f8cd42ff84b3f14048d274f9db15c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e + d9591c9a7a5f8cd42ff84b3f14048d274f9db15c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e + d9591c9a7a5f8cd42ff84b3f14048d274f9db15c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e + d9591c9a7a5f8cd42ff84b3f14048d274f9db15c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e + d9591c9a7a5f8cd42ff84b3f14048d274f9db15c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e + d9591c9a7a5f8cd42ff84b3f14048d274f9db15c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e + d9591c9a7a5f8cd42ff84b3f14048d274f9db15c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4d5b0d55e70b5cda204c7d32ad8e8bc24dce3d3e + d9591c9a7a5f8cd42ff84b3f14048d274f9db15c https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index f2c9f52bb728..817a33ca037a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -130,16 +130,16 @@ - 6.0.10-servicing.22458.21 + 6.0.10-servicing.22458.26 6.0.10 - 6.0.10-servicing.22458.21 - 6.0.10-servicing.22458.21 - 6.0.10-servicing.22458.21 + 6.0.10-servicing.22458.26 + 6.0.10-servicing.22458.26 + 6.0.10-servicing.22458.26 6.0.10 6.0.10 6.0.10 6.0.10 - 6.0.10-servicing.22458.21 + 6.0.10-servicing.22458.26 From 7ce9675dd9166e152228961141ae267a299046c1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 10 Sep 2022 15:34:12 +0000 Subject: [PATCH 23/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20220910.9 dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.9-servicing.22419.26 -> To Version 6.0.10-servicing.22460.9 --- NuGet.config | 4 +-- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++---- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index 36f68ac4aa19..fc8c48eeb6ce 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -34,7 +34,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bdf3407418ae..4306f6e2839c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9591c9a7a5f8cd42ff84b3f14048d274f9db15c + 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9591c9a7a5f8cd42ff84b3f14048d274f9db15c + 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 https://github.com/nuget/nuget.client @@ -188,76 +188,76 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9591c9a7a5f8cd42ff84b3f14048d274f9db15c + 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9591c9a7a5f8cd42ff84b3f14048d274f9db15c + 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9591c9a7a5f8cd42ff84b3f14048d274f9db15c + 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9591c9a7a5f8cd42ff84b3f14048d274f9db15c + 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9591c9a7a5f8cd42ff84b3f14048d274f9db15c + 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9591c9a7a5f8cd42ff84b3f14048d274f9db15c + 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9591c9a7a5f8cd42ff84b3f14048d274f9db15c + 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9591c9a7a5f8cd42ff84b3f14048d274f9db15c + 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9591c9a7a5f8cd42ff84b3f14048d274f9db15c + 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9591c9a7a5f8cd42ff84b3f14048d274f9db15c + 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9591c9a7a5f8cd42ff84b3f14048d274f9db15c + 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9591c9a7a5f8cd42ff84b3f14048d274f9db15c + 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9591c9a7a5f8cd42ff84b3f14048d274f9db15c + 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9591c9a7a5f8cd42ff84b3f14048d274f9db15c + 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9591c9a7a5f8cd42ff84b3f14048d274f9db15c + 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9591c9a7a5f8cd42ff84b3f14048d274f9db15c + 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9591c9a7a5f8cd42ff84b3f14048d274f9db15c + 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d9591c9a7a5f8cd42ff84b3f14048d274f9db15c + 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 817a33ca037a..f67c9f3ab601 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -130,16 +130,16 @@ - 6.0.10-servicing.22458.26 + 6.0.10-servicing.22460.9 6.0.10 - 6.0.10-servicing.22458.26 - 6.0.10-servicing.22458.26 - 6.0.10-servicing.22458.26 + 6.0.10-servicing.22460.9 + 6.0.10-servicing.22460.9 + 6.0.10-servicing.22460.9 6.0.10 6.0.10 6.0.10 6.0.10 - 6.0.10-servicing.22458.26 + 6.0.10-servicing.22460.9 From 9536c9f85dab53b6e4061d00e48c2a31d59208da Mon Sep 17 00:00:00 2001 From: Kartheek Penagamuri Date: Sat, 10 Sep 2022 18:27:02 -0700 Subject: [PATCH 24/46] Insert nuget.client 6.0.3-rc.1 to dotnet sdk 6.0.1xx --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c86347a2b1ed..8018538b4b9c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -121,13 +121,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3fe12b935c03138f76364dc877a7e069e254b5b2 - - https://github.com/nuget/nuget.client - 75551652b352f860ea0b29095b64fa63715dd672 + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + c60eee85ec0109bdda894806b167bb4d55f75183 - - https://github.com/nuget/nuget.client - 75551652b352f860ea0b29095b64fa63715dd672 + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + c60eee85ec0109bdda894806b167bb4d55f75183 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index f6438faebdd4..8e9a7e9c4623 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,13 +52,13 @@ - 6.0.2-rc.5 + 6.0.3-rc.1 $(NuGetBuildTasksPackageVersion) 6.0.0 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) - 6.0.2-rc.5 + 6.0.3-rc.1 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 0c496b6aa6e99a8fda3dc32306ac453681cde871 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 13 Sep 2022 13:01:35 +0000 Subject: [PATCH 25/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-templating build 20220913.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.Common.ProjectTemplates.6.0 , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Cli , Microsoft.TemplateEngine.Orchestrator.RunnableProjects , Microsoft.TemplateEngine.Utils , Microsoft.TemplateSearch.Common From Version 6.0.109 -> To Version 6.0.110 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index fc8c48eeb6ce..7af1d1feb898 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4306f6e2839c..1b8d411fa51d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ddbb921eebb8d69f66946c73e2ae31fb04baac91 + 90641b7c85431a10811440b785d073ba4e5e7f36 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ddbb921eebb8d69f66946c73e2ae31fb04baac91 + 90641b7c85431a10811440b785d073ba4e5e7f36 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ddbb921eebb8d69f66946c73e2ae31fb04baac91 + 90641b7c85431a10811440b785d073ba4e5e7f36 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ddbb921eebb8d69f66946c73e2ae31fb04baac91 + 90641b7c85431a10811440b785d073ba4e5e7f36 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ddbb921eebb8d69f66946c73e2ae31fb04baac91 + 90641b7c85431a10811440b785d073ba4e5e7f36 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ddbb921eebb8d69f66946c73e2ae31fb04baac91 + 90641b7c85431a10811440b785d073ba4e5e7f36 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ddbb921eebb8d69f66946c73e2ae31fb04baac91 + 90641b7c85431a10811440b785d073ba4e5e7f36 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index f67c9f3ab601..dd57d957e555 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -109,7 +109,7 @@ - 6.0.110-servicing.22457.8 + 6.0.110-servicing.22463.12 6.0.110 6.0.110 6.0.110 From bd263e66ce75a12c14af31ee7330e03339ce12cf Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 13 Sep 2022 22:11:00 +0000 Subject: [PATCH 26/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-templating build 20220913.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.Common.ProjectTemplates.6.0 , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Cli , Microsoft.TemplateEngine.Orchestrator.RunnableProjects , Microsoft.TemplateEngine.Utils , Microsoft.TemplateSearch.Common From Version 6.0.109 -> To Version 6.0.110 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7af1d1feb898..30643d6429da 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1b8d411fa51d..077dbdcb478e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 90641b7c85431a10811440b785d073ba4e5e7f36 + 56ceac9d1d4d0afaefb01263b815d2a01ba870ce https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 90641b7c85431a10811440b785d073ba4e5e7f36 + 56ceac9d1d4d0afaefb01263b815d2a01ba870ce https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 90641b7c85431a10811440b785d073ba4e5e7f36 + 56ceac9d1d4d0afaefb01263b815d2a01ba870ce https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 90641b7c85431a10811440b785d073ba4e5e7f36 + 56ceac9d1d4d0afaefb01263b815d2a01ba870ce https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 90641b7c85431a10811440b785d073ba4e5e7f36 + 56ceac9d1d4d0afaefb01263b815d2a01ba870ce https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 90641b7c85431a10811440b785d073ba4e5e7f36 + 56ceac9d1d4d0afaefb01263b815d2a01ba870ce https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 90641b7c85431a10811440b785d073ba4e5e7f36 + 56ceac9d1d4d0afaefb01263b815d2a01ba870ce https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index dd57d957e555..3e4071f662e4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -109,7 +109,7 @@ - 6.0.110-servicing.22463.12 + 6.0.110-servicing.22463.20 6.0.110 6.0.110 6.0.110 From 877b4543a95b9c7b4b50581c8cb68dc7047e98dc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 13 Sep 2022 22:12:45 +0000 Subject: [PATCH 27/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20220913.10 dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.9-servicing.22419.26 -> To Version 6.0.10-servicing.22463.10 --- NuGet.config | 4 +-- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++---- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index 30643d6429da..d3bacb9942b5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -34,7 +34,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 077dbdcb478e..2d4bd36470ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 + df430934f9ab49e7b7a394746a30d74116704b81 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 + df430934f9ab49e7b7a394746a30d74116704b81 https://github.com/nuget/nuget.client @@ -188,76 +188,76 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 + df430934f9ab49e7b7a394746a30d74116704b81 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 + df430934f9ab49e7b7a394746a30d74116704b81 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 + df430934f9ab49e7b7a394746a30d74116704b81 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 + df430934f9ab49e7b7a394746a30d74116704b81 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 + df430934f9ab49e7b7a394746a30d74116704b81 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 + df430934f9ab49e7b7a394746a30d74116704b81 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 + df430934f9ab49e7b7a394746a30d74116704b81 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 + df430934f9ab49e7b7a394746a30d74116704b81 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 + df430934f9ab49e7b7a394746a30d74116704b81 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 + df430934f9ab49e7b7a394746a30d74116704b81 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 + df430934f9ab49e7b7a394746a30d74116704b81 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 + df430934f9ab49e7b7a394746a30d74116704b81 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 + df430934f9ab49e7b7a394746a30d74116704b81 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 + df430934f9ab49e7b7a394746a30d74116704b81 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 + df430934f9ab49e7b7a394746a30d74116704b81 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 + df430934f9ab49e7b7a394746a30d74116704b81 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 + df430934f9ab49e7b7a394746a30d74116704b81 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7bc94de6e9b91fd528ebc8bff9b9dc473b665d27 + df430934f9ab49e7b7a394746a30d74116704b81 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 3e4071f662e4..b8f9f25556ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -130,16 +130,16 @@ - 6.0.10-servicing.22460.9 + 6.0.10-servicing.22463.10 6.0.10 - 6.0.10-servicing.22460.9 - 6.0.10-servicing.22460.9 - 6.0.10-servicing.22460.9 + 6.0.10-servicing.22463.10 + 6.0.10-servicing.22463.10 + 6.0.10-servicing.22463.10 6.0.10 6.0.10 6.0.10 6.0.10 - 6.0.10-servicing.22460.9 + 6.0.10-servicing.22463.10 From fa07d3e790eddd0088bddd6a758664595dec06ff Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 14 Sep 2022 00:47:25 +0000 Subject: [PATCH 28/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20220913.10 Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , VS.Redist.Common.NetCore.SharedFramework.x64.6.0 , VS.Redist.Common.NetCore.TargetingPack.x64.6.0 From Version 6.0.9-servicing.22419.5 -> To Version 6.0.10-servicing.22463.10 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index d3bacb9942b5..9665e17a17a8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,7 +11,7 @@ - + @@ -37,7 +37,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2d4bd36470ed..0e1057e077ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -32,31 +32,31 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c222ff33bf7b1075a7d4867b733965211e9c2ef9 + e0d1082a6458ad8d91a431895c2b5ec14616d5e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c222ff33bf7b1075a7d4867b733965211e9c2ef9 + e0d1082a6458ad8d91a431895c2b5ec14616d5e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c222ff33bf7b1075a7d4867b733965211e9c2ef9 + e0d1082a6458ad8d91a431895c2b5ec14616d5e4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c222ff33bf7b1075a7d4867b733965211e9c2ef9 + e0d1082a6458ad8d91a431895c2b5ec14616d5e4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c222ff33bf7b1075a7d4867b733965211e9c2ef9 + e0d1082a6458ad8d91a431895c2b5ec14616d5e4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c222ff33bf7b1075a7d4867b733965211e9c2ef9 + e0d1082a6458ad8d91a431895c2b5ec14616d5e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c222ff33bf7b1075a7d4867b733965211e9c2ef9 + e0d1082a6458ad8d91a431895c2b5ec14616d5e4 https://github.com/dotnet/runtime @@ -64,7 +64,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c222ff33bf7b1075a7d4867b733965211e9c2ef9 + e0d1082a6458ad8d91a431895c2b5ec14616d5e4 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index b8f9f25556ad..58aad8f1ffac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,12 +41,12 @@ 6.0.10 - 6.0.10-servicing.22457.11 + 6.0.10-servicing.22463.10 6.0.10 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 6.0.0 6.0.10 - 6.0.10-servicing.22457.11 + 6.0.10-servicing.22463.10 6.0.0-preview.7.21363.9 6.0.0 From a44efcea86bf13a9201ed8ee2ce36da13f202a93 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 14 Sep 2022 01:32:40 +0000 Subject: [PATCH 29/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20220913.3 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0 From Version 6.0.9 -> To Version 6.0.10 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9665e17a17a8..8cfc9abaed1e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e1057e077ef..6bcf71e06720 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -168,19 +168,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 359e99c5711a3db71d621b77d7209514498620a5 + c939db3de33a0c5f8e25bca227864fa08c21892d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 359e99c5711a3db71d621b77d7209514498620a5 + c939db3de33a0c5f8e25bca227864fa08c21892d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 359e99c5711a3db71d621b77d7209514498620a5 + c939db3de33a0c5f8e25bca227864fa08c21892d https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 359e99c5711a3db71d621b77d7209514498620a5 + c939db3de33a0c5f8e25bca227864fa08c21892d https://dev.azure.com/dnceng/internal/_git/dotnet-wpf diff --git a/eng/Versions.props b/eng/Versions.props index 58aad8f1ffac..c95d0fa1a75c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ - 6.0.10-servicing.22457.10 + 6.0.10-servicing.22463.3 From fc46098ce4264e15c267117e159d05bcc3ab1ef0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 14 Sep 2022 01:33:29 +0000 Subject: [PATCH 30/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20220913.15 dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.9-servicing.22419.26 -> To Version 6.0.10-servicing.22463.15 --- NuGet.config | 4 +-- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++---- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8cfc9abaed1e..b48e0cdb9406 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -34,7 +34,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6bcf71e06720..f2f42f1e654a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - df430934f9ab49e7b7a394746a30d74116704b81 + ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - df430934f9ab49e7b7a394746a30d74116704b81 + ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 https://github.com/nuget/nuget.client @@ -188,76 +188,76 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - df430934f9ab49e7b7a394746a30d74116704b81 + ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - df430934f9ab49e7b7a394746a30d74116704b81 + ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - df430934f9ab49e7b7a394746a30d74116704b81 + ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - df430934f9ab49e7b7a394746a30d74116704b81 + ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - df430934f9ab49e7b7a394746a30d74116704b81 + ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - df430934f9ab49e7b7a394746a30d74116704b81 + ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - df430934f9ab49e7b7a394746a30d74116704b81 + ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - df430934f9ab49e7b7a394746a30d74116704b81 + ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - df430934f9ab49e7b7a394746a30d74116704b81 + ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - df430934f9ab49e7b7a394746a30d74116704b81 + ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - df430934f9ab49e7b7a394746a30d74116704b81 + ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - df430934f9ab49e7b7a394746a30d74116704b81 + ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - df430934f9ab49e7b7a394746a30d74116704b81 + ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - df430934f9ab49e7b7a394746a30d74116704b81 + ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - df430934f9ab49e7b7a394746a30d74116704b81 + ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - df430934f9ab49e7b7a394746a30d74116704b81 + ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - df430934f9ab49e7b7a394746a30d74116704b81 + ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - df430934f9ab49e7b7a394746a30d74116704b81 + ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index c95d0fa1a75c..cf91c7c18dc7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -130,16 +130,16 @@ - 6.0.10-servicing.22463.10 + 6.0.10-servicing.22463.15 6.0.10 - 6.0.10-servicing.22463.10 - 6.0.10-servicing.22463.10 - 6.0.10-servicing.22463.10 + 6.0.10-servicing.22463.15 + 6.0.10-servicing.22463.15 + 6.0.10-servicing.22463.15 6.0.10 6.0.10 6.0.10 6.0.10 - 6.0.10-servicing.22463.10 + 6.0.10-servicing.22463.15 From 75a5661f0e193c5bf09ab12a9dc869c19e295a5c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 14 Sep 2022 05:35:22 +0000 Subject: [PATCH 31/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20220913.19 dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.9-servicing.22419.26 -> To Version 6.0.10-servicing.22463.19 --- NuGet.config | 4 +-- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++---- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index b48e0cdb9406..5e9c2de0f1e3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -34,7 +34,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f2f42f1e654a..3e780497db96 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 + ac4c8349905cb22dda89ee7afd975858d7681c78 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 + ac4c8349905cb22dda89ee7afd975858d7681c78 https://github.com/nuget/nuget.client @@ -188,76 +188,76 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 + ac4c8349905cb22dda89ee7afd975858d7681c78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 + ac4c8349905cb22dda89ee7afd975858d7681c78 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 + ac4c8349905cb22dda89ee7afd975858d7681c78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 + ac4c8349905cb22dda89ee7afd975858d7681c78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 + ac4c8349905cb22dda89ee7afd975858d7681c78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 + ac4c8349905cb22dda89ee7afd975858d7681c78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 + ac4c8349905cb22dda89ee7afd975858d7681c78 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 + ac4c8349905cb22dda89ee7afd975858d7681c78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 + ac4c8349905cb22dda89ee7afd975858d7681c78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 + ac4c8349905cb22dda89ee7afd975858d7681c78 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 + ac4c8349905cb22dda89ee7afd975858d7681c78 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 + ac4c8349905cb22dda89ee7afd975858d7681c78 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 + ac4c8349905cb22dda89ee7afd975858d7681c78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 + ac4c8349905cb22dda89ee7afd975858d7681c78 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 + ac4c8349905cb22dda89ee7afd975858d7681c78 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 + ac4c8349905cb22dda89ee7afd975858d7681c78 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 + ac4c8349905cb22dda89ee7afd975858d7681c78 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee54fb0bf3d50c663895ce9afb8eb7fd2ed77225 + ac4c8349905cb22dda89ee7afd975858d7681c78 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index cf91c7c18dc7..8163bff7de3e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -130,16 +130,16 @@ - 6.0.10-servicing.22463.15 + 6.0.10-servicing.22463.19 6.0.10 - 6.0.10-servicing.22463.15 - 6.0.10-servicing.22463.15 - 6.0.10-servicing.22463.15 + 6.0.10-servicing.22463.19 + 6.0.10-servicing.22463.19 + 6.0.10-servicing.22463.19 6.0.10 6.0.10 6.0.10 6.0.10 - 6.0.10-servicing.22463.15 + 6.0.10-servicing.22463.19 From 0de76c99b8a38f88351254987f0a32475fb2aa04 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 14 Sep 2022 05:40:59 +0000 Subject: [PATCH 32/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20220913.20 Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , VS.Redist.Common.NetCore.SharedFramework.x64.6.0 , VS.Redist.Common.NetCore.TargetingPack.x64.6.0 From Version 6.0.9-servicing.22419.5 -> To Version 6.0.10-servicing.22463.20 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5e9c2de0f1e3..f90fa266d89c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,7 +11,7 @@ - + @@ -37,7 +37,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3e780497db96..fed11b60333d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -32,31 +32,31 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0d1082a6458ad8d91a431895c2b5ec14616d5e4 + 00ae92888ed9fec29636897b0dca996dc8c57356 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0d1082a6458ad8d91a431895c2b5ec14616d5e4 + 00ae92888ed9fec29636897b0dca996dc8c57356 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0d1082a6458ad8d91a431895c2b5ec14616d5e4 + 00ae92888ed9fec29636897b0dca996dc8c57356 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0d1082a6458ad8d91a431895c2b5ec14616d5e4 + 00ae92888ed9fec29636897b0dca996dc8c57356 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0d1082a6458ad8d91a431895c2b5ec14616d5e4 + 00ae92888ed9fec29636897b0dca996dc8c57356 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0d1082a6458ad8d91a431895c2b5ec14616d5e4 + 00ae92888ed9fec29636897b0dca996dc8c57356 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0d1082a6458ad8d91a431895c2b5ec14616d5e4 + 00ae92888ed9fec29636897b0dca996dc8c57356 https://github.com/dotnet/runtime @@ -64,7 +64,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0d1082a6458ad8d91a431895c2b5ec14616d5e4 + 00ae92888ed9fec29636897b0dca996dc8c57356 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 8163bff7de3e..ff6aa8585e01 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,12 +41,12 @@ 6.0.10 - 6.0.10-servicing.22463.10 + 6.0.10-servicing.22463.20 6.0.10 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 6.0.0 6.0.10 - 6.0.10-servicing.22463.10 + 6.0.10-servicing.22463.20 6.0.0-preview.7.21363.9 6.0.0 From c71724f9911de2a49dd8839128f76b00c1ca3b98 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 14 Sep 2022 08:40:13 +0000 Subject: [PATCH 33/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20220914.1 dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.9-servicing.22419.26 -> To Version 6.0.10-servicing.22464.1 --- NuGet.config | 4 +-- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++---- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index f90fa266d89c..6a2f531eed11 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -34,7 +34,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fed11b60333d..117ed46582fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ac4c8349905cb22dda89ee7afd975858d7681c78 + d4936d8439196d73cdd7cf808b523dc314237521 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ac4c8349905cb22dda89ee7afd975858d7681c78 + d4936d8439196d73cdd7cf808b523dc314237521 https://github.com/nuget/nuget.client @@ -188,76 +188,76 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ac4c8349905cb22dda89ee7afd975858d7681c78 + d4936d8439196d73cdd7cf808b523dc314237521 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ac4c8349905cb22dda89ee7afd975858d7681c78 + d4936d8439196d73cdd7cf808b523dc314237521 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ac4c8349905cb22dda89ee7afd975858d7681c78 + d4936d8439196d73cdd7cf808b523dc314237521 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ac4c8349905cb22dda89ee7afd975858d7681c78 + d4936d8439196d73cdd7cf808b523dc314237521 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ac4c8349905cb22dda89ee7afd975858d7681c78 + d4936d8439196d73cdd7cf808b523dc314237521 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ac4c8349905cb22dda89ee7afd975858d7681c78 + d4936d8439196d73cdd7cf808b523dc314237521 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ac4c8349905cb22dda89ee7afd975858d7681c78 + d4936d8439196d73cdd7cf808b523dc314237521 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ac4c8349905cb22dda89ee7afd975858d7681c78 + d4936d8439196d73cdd7cf808b523dc314237521 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ac4c8349905cb22dda89ee7afd975858d7681c78 + d4936d8439196d73cdd7cf808b523dc314237521 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ac4c8349905cb22dda89ee7afd975858d7681c78 + d4936d8439196d73cdd7cf808b523dc314237521 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ac4c8349905cb22dda89ee7afd975858d7681c78 + d4936d8439196d73cdd7cf808b523dc314237521 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ac4c8349905cb22dda89ee7afd975858d7681c78 + d4936d8439196d73cdd7cf808b523dc314237521 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ac4c8349905cb22dda89ee7afd975858d7681c78 + d4936d8439196d73cdd7cf808b523dc314237521 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ac4c8349905cb22dda89ee7afd975858d7681c78 + d4936d8439196d73cdd7cf808b523dc314237521 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ac4c8349905cb22dda89ee7afd975858d7681c78 + d4936d8439196d73cdd7cf808b523dc314237521 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ac4c8349905cb22dda89ee7afd975858d7681c78 + d4936d8439196d73cdd7cf808b523dc314237521 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ac4c8349905cb22dda89ee7afd975858d7681c78 + d4936d8439196d73cdd7cf808b523dc314237521 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ac4c8349905cb22dda89ee7afd975858d7681c78 + d4936d8439196d73cdd7cf808b523dc314237521 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index ff6aa8585e01..ef56ff7fefa3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -130,16 +130,16 @@ - 6.0.10-servicing.22463.19 + 6.0.10-servicing.22464.1 6.0.10 - 6.0.10-servicing.22463.19 - 6.0.10-servicing.22463.19 - 6.0.10-servicing.22463.19 + 6.0.10-servicing.22464.1 + 6.0.10-servicing.22464.1 + 6.0.10-servicing.22464.1 6.0.10 6.0.10 6.0.10 6.0.10 - 6.0.10-servicing.22463.19 + 6.0.10-servicing.22464.1 From 516b20e17e85e49d5695a884f9bd73e6da1bdb9f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 14 Sep 2022 10:44:35 +0000 Subject: [PATCH 34/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20220914.3 dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.9-servicing.22419.26 -> To Version 6.0.10-servicing.22464.3 --- NuGet.config | 4 +-- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++---- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6a2f531eed11..b877f896eec5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -34,7 +34,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 117ed46582fa..63ed57e62527 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4936d8439196d73cdd7cf808b523dc314237521 + d76d272b767103c50f1f93fede3b3e49fe56b6d6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4936d8439196d73cdd7cf808b523dc314237521 + d76d272b767103c50f1f93fede3b3e49fe56b6d6 https://github.com/nuget/nuget.client @@ -188,76 +188,76 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4936d8439196d73cdd7cf808b523dc314237521 + d76d272b767103c50f1f93fede3b3e49fe56b6d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4936d8439196d73cdd7cf808b523dc314237521 + d76d272b767103c50f1f93fede3b3e49fe56b6d6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4936d8439196d73cdd7cf808b523dc314237521 + d76d272b767103c50f1f93fede3b3e49fe56b6d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4936d8439196d73cdd7cf808b523dc314237521 + d76d272b767103c50f1f93fede3b3e49fe56b6d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4936d8439196d73cdd7cf808b523dc314237521 + d76d272b767103c50f1f93fede3b3e49fe56b6d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4936d8439196d73cdd7cf808b523dc314237521 + d76d272b767103c50f1f93fede3b3e49fe56b6d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4936d8439196d73cdd7cf808b523dc314237521 + d76d272b767103c50f1f93fede3b3e49fe56b6d6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4936d8439196d73cdd7cf808b523dc314237521 + d76d272b767103c50f1f93fede3b3e49fe56b6d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4936d8439196d73cdd7cf808b523dc314237521 + d76d272b767103c50f1f93fede3b3e49fe56b6d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4936d8439196d73cdd7cf808b523dc314237521 + d76d272b767103c50f1f93fede3b3e49fe56b6d6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4936d8439196d73cdd7cf808b523dc314237521 + d76d272b767103c50f1f93fede3b3e49fe56b6d6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4936d8439196d73cdd7cf808b523dc314237521 + d76d272b767103c50f1f93fede3b3e49fe56b6d6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4936d8439196d73cdd7cf808b523dc314237521 + d76d272b767103c50f1f93fede3b3e49fe56b6d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4936d8439196d73cdd7cf808b523dc314237521 + d76d272b767103c50f1f93fede3b3e49fe56b6d6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4936d8439196d73cdd7cf808b523dc314237521 + d76d272b767103c50f1f93fede3b3e49fe56b6d6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4936d8439196d73cdd7cf808b523dc314237521 + d76d272b767103c50f1f93fede3b3e49fe56b6d6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4936d8439196d73cdd7cf808b523dc314237521 + d76d272b767103c50f1f93fede3b3e49fe56b6d6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4936d8439196d73cdd7cf808b523dc314237521 + d76d272b767103c50f1f93fede3b3e49fe56b6d6 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index ef56ff7fefa3..db306ec97786 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -130,16 +130,16 @@ - 6.0.10-servicing.22464.1 + 6.0.10-servicing.22464.3 6.0.10 - 6.0.10-servicing.22464.1 - 6.0.10-servicing.22464.1 - 6.0.10-servicing.22464.1 + 6.0.10-servicing.22464.3 + 6.0.10-servicing.22464.3 + 6.0.10-servicing.22464.3 6.0.10 6.0.10 6.0.10 6.0.10 - 6.0.10-servicing.22464.1 + 6.0.10-servicing.22464.3 From a966823e1f64831e8a83f8c7df81796467d0c077 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 14 Sep 2022 12:49:52 +0000 Subject: [PATCH 35/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20220914.7 dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.9-servicing.22419.26 -> To Version 6.0.10-servicing.22464.7 --- NuGet.config | 4 +-- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++---- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index b877f896eec5..698448002292 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -34,7 +34,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 63ed57e62527..bb2c852043c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d76d272b767103c50f1f93fede3b3e49fe56b6d6 + 34a823f875e0229f685849c9e8f09ebb5ca89a34 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d76d272b767103c50f1f93fede3b3e49fe56b6d6 + 34a823f875e0229f685849c9e8f09ebb5ca89a34 https://github.com/nuget/nuget.client @@ -188,76 +188,76 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d76d272b767103c50f1f93fede3b3e49fe56b6d6 + 34a823f875e0229f685849c9e8f09ebb5ca89a34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d76d272b767103c50f1f93fede3b3e49fe56b6d6 + 34a823f875e0229f685849c9e8f09ebb5ca89a34 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d76d272b767103c50f1f93fede3b3e49fe56b6d6 + 34a823f875e0229f685849c9e8f09ebb5ca89a34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d76d272b767103c50f1f93fede3b3e49fe56b6d6 + 34a823f875e0229f685849c9e8f09ebb5ca89a34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d76d272b767103c50f1f93fede3b3e49fe56b6d6 + 34a823f875e0229f685849c9e8f09ebb5ca89a34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d76d272b767103c50f1f93fede3b3e49fe56b6d6 + 34a823f875e0229f685849c9e8f09ebb5ca89a34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d76d272b767103c50f1f93fede3b3e49fe56b6d6 + 34a823f875e0229f685849c9e8f09ebb5ca89a34 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d76d272b767103c50f1f93fede3b3e49fe56b6d6 + 34a823f875e0229f685849c9e8f09ebb5ca89a34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d76d272b767103c50f1f93fede3b3e49fe56b6d6 + 34a823f875e0229f685849c9e8f09ebb5ca89a34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d76d272b767103c50f1f93fede3b3e49fe56b6d6 + 34a823f875e0229f685849c9e8f09ebb5ca89a34 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d76d272b767103c50f1f93fede3b3e49fe56b6d6 + 34a823f875e0229f685849c9e8f09ebb5ca89a34 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d76d272b767103c50f1f93fede3b3e49fe56b6d6 + 34a823f875e0229f685849c9e8f09ebb5ca89a34 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d76d272b767103c50f1f93fede3b3e49fe56b6d6 + 34a823f875e0229f685849c9e8f09ebb5ca89a34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d76d272b767103c50f1f93fede3b3e49fe56b6d6 + 34a823f875e0229f685849c9e8f09ebb5ca89a34 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d76d272b767103c50f1f93fede3b3e49fe56b6d6 + 34a823f875e0229f685849c9e8f09ebb5ca89a34 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d76d272b767103c50f1f93fede3b3e49fe56b6d6 + 34a823f875e0229f685849c9e8f09ebb5ca89a34 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d76d272b767103c50f1f93fede3b3e49fe56b6d6 + 34a823f875e0229f685849c9e8f09ebb5ca89a34 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d76d272b767103c50f1f93fede3b3e49fe56b6d6 + 34a823f875e0229f685849c9e8f09ebb5ca89a34 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index db306ec97786..311ba6f3702f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -130,16 +130,16 @@ - 6.0.10-servicing.22464.3 + 6.0.10-servicing.22464.7 6.0.10 - 6.0.10-servicing.22464.3 - 6.0.10-servicing.22464.3 - 6.0.10-servicing.22464.3 + 6.0.10-servicing.22464.7 + 6.0.10-servicing.22464.7 + 6.0.10-servicing.22464.7 6.0.10 6.0.10 6.0.10 6.0.10 - 6.0.10-servicing.22464.3 + 6.0.10-servicing.22464.7 From bbed738a172e193768a8a9e75d64c164bb6dd9ae Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 14 Sep 2022 14:46:45 +0000 Subject: [PATCH 36/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-templating build 20220914.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.Common.ProjectTemplates.6.0 , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Cli , Microsoft.TemplateEngine.Orchestrator.RunnableProjects , Microsoft.TemplateEngine.Utils , Microsoft.TemplateSearch.Common From Version 6.0.109 -> To Version 6.0.110 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 698448002292..637093a00139 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bb2c852043c4..a29ae57fe00b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 56ceac9d1d4d0afaefb01263b815d2a01ba870ce + 206182630cd3e6b1ea1482928f056007d6fb60e1 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 56ceac9d1d4d0afaefb01263b815d2a01ba870ce + 206182630cd3e6b1ea1482928f056007d6fb60e1 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 56ceac9d1d4d0afaefb01263b815d2a01ba870ce + 206182630cd3e6b1ea1482928f056007d6fb60e1 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 56ceac9d1d4d0afaefb01263b815d2a01ba870ce + 206182630cd3e6b1ea1482928f056007d6fb60e1 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 56ceac9d1d4d0afaefb01263b815d2a01ba870ce + 206182630cd3e6b1ea1482928f056007d6fb60e1 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 56ceac9d1d4d0afaefb01263b815d2a01ba870ce + 206182630cd3e6b1ea1482928f056007d6fb60e1 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 56ceac9d1d4d0afaefb01263b815d2a01ba870ce + 206182630cd3e6b1ea1482928f056007d6fb60e1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 311ba6f3702f..369a3cfd1daf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -109,7 +109,7 @@ - 6.0.110-servicing.22463.20 + 6.0.110-servicing.22464.11 6.0.110 6.0.110 6.0.110 From 0138f7d47ebbea34d015c5f058b7864588879f23 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 14 Sep 2022 16:45:18 +0000 Subject: [PATCH 37/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-templating build 20220914.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.Common.ProjectTemplates.6.0 , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Cli , Microsoft.TemplateEngine.Orchestrator.RunnableProjects , Microsoft.TemplateEngine.Utils , Microsoft.TemplateSearch.Common From Version 6.0.109 -> To Version 6.0.110 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 637093a00139..b6ca6c8d9146 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a29ae57fe00b..fbf0c1bafabc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 206182630cd3e6b1ea1482928f056007d6fb60e1 + 91c300fc9d5214eff6830ea3ec3c83930aea7236 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 206182630cd3e6b1ea1482928f056007d6fb60e1 + 91c300fc9d5214eff6830ea3ec3c83930aea7236 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 206182630cd3e6b1ea1482928f056007d6fb60e1 + 91c300fc9d5214eff6830ea3ec3c83930aea7236 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 206182630cd3e6b1ea1482928f056007d6fb60e1 + 91c300fc9d5214eff6830ea3ec3c83930aea7236 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 206182630cd3e6b1ea1482928f056007d6fb60e1 + 91c300fc9d5214eff6830ea3ec3c83930aea7236 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 206182630cd3e6b1ea1482928f056007d6fb60e1 + 91c300fc9d5214eff6830ea3ec3c83930aea7236 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 206182630cd3e6b1ea1482928f056007d6fb60e1 + 91c300fc9d5214eff6830ea3ec3c83930aea7236 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 369a3cfd1daf..b2451316d4a6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -109,7 +109,7 @@ - 6.0.110-servicing.22464.11 + 6.0.110-servicing.22464.25 6.0.110 6.0.110 6.0.110 From 51ab166343ffce32508a273ce7e74f9910511728 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 14 Sep 2022 20:21:41 +0000 Subject: [PATCH 38/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20220914.6 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0 From Version 6.0.10 -> To Version 6.0.10 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 6.0.9-servicing.22420.4 -> To Version 6.0.10-servicing.22456.13 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64 --- 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 b6ca6c8d9146..880bbc9b90d0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ccc3783c5a6f..4ef527a79b42 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -168,23 +168,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c939db3de33a0c5f8e25bca227864fa08c21892d + fa5704d1c3ee9d8f1419f917e6a4dfba6133d653 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c939db3de33a0c5f8e25bca227864fa08c21892d + fa5704d1c3ee9d8f1419f917e6a4dfba6133d653 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c939db3de33a0c5f8e25bca227864fa08c21892d + fa5704d1c3ee9d8f1419f917e6a4dfba6133d653 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c939db3de33a0c5f8e25bca227864fa08c21892d + fa5704d1c3ee9d8f1419f917e6a4dfba6133d653 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - a97bb2af3c7d400dfe8aca3fa3d47ba83d925d6c + ee8dec2e3ed2d73d8f7b7bea5662c2222d1fd182 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 9916575f0cb2..e8286fc3d582 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,11 +143,11 @@ - 6.0.9-servicing.22420.4 + 6.0.10-servicing.22456.13 - 6.0.10-servicing.22463.3 + 6.0.10-servicing.22464.6 From a58336381fb97253fceeae3c13dde1380c029bd6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 14 Sep 2022 21:33:05 +0000 Subject: [PATCH 39/46] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20220914.9 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0 From Version 6.0.10 -> To Version 6.0.10 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 6.0.9-servicing.22420.4 -> To Version 6.0.10-servicing.22456.13 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 880bbc9b90d0..1dd8ab3c20ab 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4ef527a79b42..de1dc098dd82 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -168,19 +168,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fa5704d1c3ee9d8f1419f917e6a4dfba6133d653 + e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fa5704d1c3ee9d8f1419f917e6a4dfba6133d653 + e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fa5704d1c3ee9d8f1419f917e6a4dfba6133d653 + e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fa5704d1c3ee9d8f1419f917e6a4dfba6133d653 + e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf diff --git a/eng/Versions.props b/eng/Versions.props index e8286fc3d582..3585f0bf1962 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ - 6.0.10-servicing.22464.6 + 6.0.10-servicing.22464.9 From 37de95213e750c5d0c599198781ed061f506a716 Mon Sep 17 00:00:00 2001 From: Forgind Date: Thu, 15 Sep 2022 15:45:11 -0700 Subject: [PATCH 40/46] update dependencies --- NuGet.config | 4 ++++ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1dd8ab3c20ab..61c394966621 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -34,6 +35,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index de1dc098dd82..7b4a4764c6a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -66,13 +66,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 00ae92888ed9fec29636897b0dca996dc8c57356 - - https://github.com/dotnet/msbuild - c9eb9dd64e9a2e8a433900a1a626d65a2bce4428 + + https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted + b177f8fa703370c80b2e56469208c2bb099efba0 - - https://github.com/dotnet/msbuild - c9eb9dd64e9a2e8a433900a1a626d65a2bce4428 + + https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted + b177f8fa703370c80b2e56469208c2bb099efba0 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 3585f0bf1962..001a97d35c57 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -95,10 +95,10 @@ - 17.0.0 + 17.0.1 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 17.0.0-preview-21521-04 + 17.0.1-preview-22463-07 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From 2668f96d3e038cd6fc2a3269d9ba04648d841f2f Mon Sep 17 00:00:00 2001 From: Forgind Date: Thu, 15 Sep 2022 16:20:08 -0700 Subject: [PATCH 41/46] update --- NuGet.config | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index 61c394966621..05ccf25d91f2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -35,10 +36,11 @@ + + - From aa67ae078f3df70e5b3d6b77b07af9f77ebc2e13 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 20 Sep 2022 21:12:14 +0000 Subject: [PATCH 42/46] Merged PR 26021: [internal/release/6.0.1xx] Update dependencies from 4 repositories This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NET.Sdk.WindowsDesktop**: from 6.0.10-servicing.22456.13 to 6.0.10-servicing.22470.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:258d4206-cc1e-4c20-39b6-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: 258d4206-cc1e-4c20-39b6-08d960f4ca81 - **Build**: 20220920.9 - **Date Produced**: September 20, 2022 6:47:58 PM UTC - **Commit**: 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.10 to 6.0.10][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22464.9 to 6.0.10-servicing.22470.9][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.10-servicing.22464.9 to 6.0.10-servicing.22470.9][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.10-servicing.22456.13 to 6.0.10-servicing.22470.7][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCe2b5cfb&targetVersion=GC6281f2d&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCee8dec2&targetVersion=GCbbe6a9e&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:258d4206-cc1e-4c20-39b6-08d960f4ca81) [marker]: <> (Begin:ffa022ec-0654-4a20-3a4e-08d961c5a689) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: ffa022ec-0654-4a20-3a4e-08d961c5a689 - **Build**: 20220919.29 - **Date Produced**: September 20, 2022 5:41:07 PM UTC - **Commit**: 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29][3] - **dotnet-user-secrets**: [from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29][3] - **Microsoft.AspNetCore.Analyzers**: [from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29][3] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.10 to 6.0.10][3] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29][3] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.1... --- NuGet.config | 16 +++--- eng/Version.Details.xml | 112 ++++++++++++++++++++-------------------- eng/Versions.props | 20 +++---- 3 files changed, 74 insertions(+), 74 deletions(-) diff --git a/NuGet.config b/NuGet.config index 05ccf25d91f2..585b8b5372f7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -13,13 +13,13 @@ - + - + - + @@ -36,20 +36,20 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7b4a4764c6a0..9db750ad770d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 91c300fc9d5214eff6830ea3ec3c83930aea7236 + e974c52ac3a074586f4be165c1ba00618dca95dc https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 91c300fc9d5214eff6830ea3ec3c83930aea7236 + e974c52ac3a074586f4be165c1ba00618dca95dc https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 91c300fc9d5214eff6830ea3ec3c83930aea7236 + e974c52ac3a074586f4be165c1ba00618dca95dc https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 91c300fc9d5214eff6830ea3ec3c83930aea7236 + e974c52ac3a074586f4be165c1ba00618dca95dc https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 91c300fc9d5214eff6830ea3ec3c83930aea7236 + e974c52ac3a074586f4be165c1ba00618dca95dc https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 91c300fc9d5214eff6830ea3ec3c83930aea7236 + e974c52ac3a074586f4be165c1ba00618dca95dc https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 91c300fc9d5214eff6830ea3ec3c83930aea7236 + e974c52ac3a074586f4be165c1ba00618dca95dc https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 00ae92888ed9fec29636897b0dca996dc8c57356 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 00ae92888ed9fec29636897b0dca996dc8c57356 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 00ae92888ed9fec29636897b0dca996dc8c57356 + 3bd501a063af406167e0195844048a3c222afd29 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 00ae92888ed9fec29636897b0dca996dc8c57356 + 3bd501a063af406167e0195844048a3c222afd29 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 00ae92888ed9fec29636897b0dca996dc8c57356 + 3bd501a063af406167e0195844048a3c222afd29 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 00ae92888ed9fec29636897b0dca996dc8c57356 + 3bd501a063af406167e0195844048a3c222afd29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 00ae92888ed9fec29636897b0dca996dc8c57356 + 3bd501a063af406167e0195844048a3c222afd29 https://github.com/dotnet/runtime @@ -64,7 +64,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 00ae92888ed9fec29636897b0dca996dc8c57356 + 3bd501a063af406167e0195844048a3c222afd29 https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 34a823f875e0229f685849c9e8f09ebb5ca89a34 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 34a823f875e0229f685849c9e8f09ebb5ca89a34 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -168,96 +168,96 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e2b5cfb682bc53fc8f229f5bc403affe0c7bca70 + 6281f2d8b6fdec03cffc91e31a134f6f6cc855df - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - ee8dec2e3ed2d73d8f7b7bea5662c2222d1fd182 + bbe6a9e6d0da0f80a57f80914177691fd1f1b97e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 34a823f875e0229f685849c9e8f09ebb5ca89a34 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 34a823f875e0229f685849c9e8f09ebb5ca89a34 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 34a823f875e0229f685849c9e8f09ebb5ca89a34 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 34a823f875e0229f685849c9e8f09ebb5ca89a34 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 34a823f875e0229f685849c9e8f09ebb5ca89a34 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 34a823f875e0229f685849c9e8f09ebb5ca89a34 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 34a823f875e0229f685849c9e8f09ebb5ca89a34 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 34a823f875e0229f685849c9e8f09ebb5ca89a34 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 34a823f875e0229f685849c9e8f09ebb5ca89a34 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 34a823f875e0229f685849c9e8f09ebb5ca89a34 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 34a823f875e0229f685849c9e8f09ebb5ca89a34 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 34a823f875e0229f685849c9e8f09ebb5ca89a34 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 34a823f875e0229f685849c9e8f09ebb5ca89a34 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 34a823f875e0229f685849c9e8f09ebb5ca89a34 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 34a823f875e0229f685849c9e8f09ebb5ca89a34 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 34a823f875e0229f685849c9e8f09ebb5ca89a34 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 34a823f875e0229f685849c9e8f09ebb5ca89a34 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 34a823f875e0229f685849c9e8f09ebb5ca89a34 + 3678930d3590d1e4dd7b675dfba72f8b1cf621bf https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 001a97d35c57..e080d0887f37 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,12 +41,12 @@ 6.0.10 - 6.0.10-servicing.22463.20 + 6.0.10-servicing.22469.10 6.0.10 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 6.0.0 6.0.10 - 6.0.10-servicing.22463.20 + 6.0.10-servicing.22469.10 6.0.0-preview.7.21363.9 6.0.0 @@ -109,7 +109,7 @@ - 6.0.110-servicing.22464.25 + 6.0.110-servicing.22470.2 6.0.110 6.0.110 6.0.110 @@ -130,24 +130,24 @@ - 6.0.10-servicing.22464.7 + 6.0.10-servicing.22469.29 6.0.10 - 6.0.10-servicing.22464.7 - 6.0.10-servicing.22464.7 - 6.0.10-servicing.22464.7 + 6.0.10-servicing.22469.29 + 6.0.10-servicing.22469.29 + 6.0.10-servicing.22469.29 6.0.10 6.0.10 6.0.10 6.0.10 - 6.0.10-servicing.22464.7 + 6.0.10-servicing.22469.29 - 6.0.10-servicing.22456.13 + 6.0.10-servicing.22470.7 - 6.0.10-servicing.22464.9 + 6.0.10-servicing.22470.9 From 4041520e714b4334789706bde25e61ff91cf6c2b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 26 Sep 2022 22:43:05 +0000 Subject: [PATCH 43/46] Merged PR 26193: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-templating dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:b9edc696-13f4-406c-3a51-08d961c5a689) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-templating - **Subscription**: b9edc696-13f4-406c-3a51-08d961c5a689 - **Build**: 20220926.12 - **Date Produced**: September 26, 2022 2:38:52 PM UTC - **Commit**: 1a0fd809ede0c9c2cd405d06e0767e07dd01ec99 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.110 to 6.0.110][1] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.110 to 6.0.110][1] - **Microsoft.TemplateEngine.Abstractions**: [from 6.0.110 to 6.0.110][1] - **Microsoft.TemplateEngine.Cli**: [from 6.0.110-servicing.22470.2 to 6.0.110-servicing.22476.12][1] - **Microsoft.TemplateEngine.Orchestrator.RunnableProjects**: [from 6.0.110 to 6.0.110][1] - **Microsoft.TemplateEngine.Utils**: [from 6.0.110 to 6.0.110][1] - **Microsoft.TemplateSearch.Common**: [from 6.0.110 to 6.0.110][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCe974c52&targetVersion=GC1a0fd80&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b9edc696-13f4-406c-3a51-08d961c5a689) [marker]: <> (Begin:499cebc0-3291-4ec8-3a4f-08d961c5a689) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 499cebc0-3291-4ec8-3a4f-08d961c5a689 - **Build**: 20220926.5 - **Date Produced**: September 26, 2022 9:30:53 PM UTC - **Commit**: 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.HostModel**: [from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.10 to 6.0.10][2] - **Microsoft.NETCore.Platforms**: [from 6.0.6 to 6.0.6][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5][2] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC3bd501a&targetVersion=GC5a400c2&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:499cebc0-3291-4ec8-3a4f-08d961c5a689) --- NuGet.config | 24 ++++++++++++++++++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 6 +++--- 3 files changed, 42 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 585b8b5372f7..6f6ce880543e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,21 +5,29 @@ + + + + + + - + - + + + @@ -36,19 +44,27 @@ + + + + + + - + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9db750ad770d..f05ef8ec8262 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e974c52ac3a074586f4be165c1ba00618dca95dc + 1a0fd809ede0c9c2cd405d06e0767e07dd01ec99 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e974c52ac3a074586f4be165c1ba00618dca95dc + 1a0fd809ede0c9c2cd405d06e0767e07dd01ec99 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e974c52ac3a074586f4be165c1ba00618dca95dc + 1a0fd809ede0c9c2cd405d06e0767e07dd01ec99 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e974c52ac3a074586f4be165c1ba00618dca95dc + 1a0fd809ede0c9c2cd405d06e0767e07dd01ec99 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e974c52ac3a074586f4be165c1ba00618dca95dc + 1a0fd809ede0c9c2cd405d06e0767e07dd01ec99 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e974c52ac3a074586f4be165c1ba00618dca95dc + 1a0fd809ede0c9c2cd405d06e0767e07dd01ec99 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e974c52ac3a074586f4be165c1ba00618dca95dc + 1a0fd809ede0c9c2cd405d06e0767e07dd01ec99 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://github.com/dotnet/runtime @@ -64,7 +64,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3bd501a063af406167e0195844048a3c222afd29 + 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted diff --git a/eng/Versions.props b/eng/Versions.props index e080d0887f37..6cebe0c2c69b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,12 +41,12 @@ 6.0.10 - 6.0.10-servicing.22469.10 + 6.0.10-servicing.22476.5 6.0.10 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 6.0.0 6.0.10 - 6.0.10-servicing.22469.10 + 6.0.10-servicing.22476.5 6.0.0-preview.7.21363.9 6.0.0 @@ -109,7 +109,7 @@ - 6.0.110-servicing.22470.2 + 6.0.110-servicing.22476.12 6.0.110 6.0.110 6.0.110 From cb11e73629ffbf6eee418a40fc602ceb752794fa Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 27 Sep 2022 01:06:53 +0000 Subject: [PATCH 44/46] Merged PR 26217: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-aspnetcore dnceng/internal/dotnet-templating This pull request updates the following dependencies [marker]: <> (Begin:ffa022ec-0654-4a20-3a4e-08d961c5a689) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: ffa022ec-0654-4a20-3a4e-08d961c5a689 - **Build**: 20220926.12 - **Date Produced**: September 26, 2022 11:42:31 PM UTC - **Commit**: 9efc206d0eec75172819678bbc4899d55ba01e9c - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][1] - **dotnet-user-secrets**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][1] - **Microsoft.AspNetCore.Analyzers**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.10 to 6.0.10][1] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][1] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][1] - **Microsoft.AspNetCore.Authorization**: [from 6.0.10 to 6.0.10][1] - **Microsoft.AspNetCore.Components.Analyzers**: [from 6.0.10 to 6.0.10][1] - **Microsoft.AspNetCore.Components.Web**: [from 6.0.10 to 6.0.10][1] - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][1] - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][1] - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][1] - **Microsoft.AspNetCore.Mvc.Razor.Extensions**: [from 6.0.10 to 6.0.10][1] - **Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][1] - **Microsoft.AspNetCore.Razor.Language**: [from 6.0.10 to 6.0.10][1] - **Microsoft.AspNetCore.TestHost**: [from 6.0.10 to 6.0.10][1] - **Microsoft.CodeAnalysis.Razor**: [from 6.0.10 to 6.0.10][1] - **Microsoft.Extensions.FileProviders.Embedded**: [from 6.0.10 to 6.0.10][1] - **Microsoft.JSInterop**: [from 6.0.10 to 6.0.10][1] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC3678930&targetVersion=GC9efc206&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:ffa022ec-0654-4a20-3a4e-08d961c5a689) [marker]: <> (Begin:b9edc696-13f4-406c-3a51-08d961c5a689) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-templating - **Subscription**: b9edc696-13f4-406c-3a51-08d961c5a689 - **Build**: 20220926.19 - **Date Produced**: September 26, 2022 11:52:46 PM UTC - **Commit**: abad6c0ec8f1f7f65a233956f4d02bbfd3cd0c27 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from ... --- NuGet.config | 12 +++---- eng/Version.Details.xml | 74 ++++++++++++++++++++--------------------- eng/Versions.props | 12 +++---- 3 files changed, 47 insertions(+), 51 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6f6ce880543e..8ad108327162 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,9 +4,7 @@ - - - + @@ -22,7 +20,7 @@ - + @@ -44,9 +42,7 @@ - - - + @@ -60,7 +56,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f05ef8ec8262..bf37c21e9ffd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1a0fd809ede0c9c2cd405d06e0767e07dd01ec99 + abad6c0ec8f1f7f65a233956f4d02bbfd3cd0c27 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1a0fd809ede0c9c2cd405d06e0767e07dd01ec99 + abad6c0ec8f1f7f65a233956f4d02bbfd3cd0c27 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1a0fd809ede0c9c2cd405d06e0767e07dd01ec99 + abad6c0ec8f1f7f65a233956f4d02bbfd3cd0c27 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1a0fd809ede0c9c2cd405d06e0767e07dd01ec99 + abad6c0ec8f1f7f65a233956f4d02bbfd3cd0c27 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1a0fd809ede0c9c2cd405d06e0767e07dd01ec99 + abad6c0ec8f1f7f65a233956f4d02bbfd3cd0c27 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1a0fd809ede0c9c2cd405d06e0767e07dd01ec99 + abad6c0ec8f1f7f65a233956f4d02bbfd3cd0c27 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1a0fd809ede0c9c2cd405d06e0767e07dd01ec99 + abad6c0ec8f1f7f65a233956f4d02bbfd3cd0c27 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,76 +188,76 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3678930d3590d1e4dd7b675dfba72f8b1cf621bf + 9efc206d0eec75172819678bbc4899d55ba01e9c https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 6cebe0c2c69b..43fa6e8df9fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -109,7 +109,7 @@ - 6.0.110-servicing.22476.12 + 6.0.110-servicing.22476.19 6.0.110 6.0.110 6.0.110 @@ -130,16 +130,16 @@ - 6.0.10-servicing.22469.29 + 6.0.10-servicing.22476.12 6.0.10 - 6.0.10-servicing.22469.29 - 6.0.10-servicing.22469.29 - 6.0.10-servicing.22469.29 + 6.0.10-servicing.22476.12 + 6.0.10-servicing.22476.12 + 6.0.10-servicing.22476.12 6.0.10 6.0.10 6.0.10 6.0.10 - 6.0.10-servicing.22469.29 + 6.0.10-servicing.22476.12 From a886cd6214c92f6a5d955c056014820c35591e7b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 27 Sep 2022 03:16:27 +0000 Subject: [PATCH 45/46] Merged PR 26232: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-aspnetcore dnceng/internal/dotnet-windowsdesktop This pull request updates the following dependencies [marker]: <> (Begin:ffa022ec-0654-4a20-3a4e-08d961c5a689) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: ffa022ec-0654-4a20-3a4e-08d961c5a689 - **Build**: 20220926.17 - **Date Produced**: September 27, 2022 2:14:59 AM UTC - **Commit**: 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17][1] - **dotnet-user-secrets**: [from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17][1] - **Microsoft.AspNetCore.Analyzers**: [from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.10 to 6.0.10][1] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17][1] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][1] - **Microsoft.AspNetCore.Authorization**: [from 6.0.10 to 6.0.10][1] - **Microsoft.AspNetCore.Components.Analyzers**: [from 6.0.10 to 6.0.10][1] - **Microsoft.AspNetCore.Components.Web**: [from 6.0.10 to 6.0.10][1] - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17][1] - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17][1] - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17][1] - **Microsoft.AspNetCore.Mvc.Razor.Extensions**: [from 6.0.10 to 6.0.10][1] - **Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport**: [from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17][1] - **Microsoft.AspNetCore.Razor.Language**: [from 6.0.10 to 6.0.10][1] - **Microsoft.AspNetCore.TestHost**: [from 6.0.10 to 6.0.10][1] - **Microsoft.CodeAnalysis.Razor**: [from 6.0.10 to 6.0.10][1] - **Microsoft.Extensions.FileProviders.Embedded**: [from 6.0.10 to 6.0.10][1] - **Microsoft.JSInterop**: [from 6.0.10 to 6.0.10][1] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC9efc206&targetVersion=GC32e8c8c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:ffa022ec-0654-4a20-3a4e-08d961c5a689) [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NET.Sdk.Windows... --- NuGet.config | 12 +++---- eng/Version.Details.xml | 74 ++++++++++++++++++++--------------------- eng/Versions.props | 14 ++++---- 3 files changed, 48 insertions(+), 52 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8ad108327162..f65d688248a6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -23,9 +23,7 @@ - - - + @@ -42,7 +40,7 @@ - + @@ -59,9 +57,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bf37c21e9ffd..88a362a7e998 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -168,96 +168,96 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6281f2d8b6fdec03cffc91e31a134f6f6cc855df + 74607da18cfa95417e1bddf02c80fb97e48c7f46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6281f2d8b6fdec03cffc91e31a134f6f6cc855df + 74607da18cfa95417e1bddf02c80fb97e48c7f46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6281f2d8b6fdec03cffc91e31a134f6f6cc855df + 74607da18cfa95417e1bddf02c80fb97e48c7f46 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6281f2d8b6fdec03cffc91e31a134f6f6cc855df + 74607da18cfa95417e1bddf02c80fb97e48c7f46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - bbe6a9e6d0da0f80a57f80914177691fd1f1b97e + 3bbc77257e3d51a2e19195523eafd262da1f5459 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9efc206d0eec75172819678bbc4899d55ba01e9c + 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 43fa6e8df9fe..744c306c0c76 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -130,24 +130,24 @@ - 6.0.10-servicing.22476.12 + 6.0.10-servicing.22476.17 6.0.10 - 6.0.10-servicing.22476.12 - 6.0.10-servicing.22476.12 - 6.0.10-servicing.22476.12 + 6.0.10-servicing.22476.17 + 6.0.10-servicing.22476.17 + 6.0.10-servicing.22476.17 6.0.10 6.0.10 6.0.10 6.0.10 - 6.0.10-servicing.22476.12 + 6.0.10-servicing.22476.17 - 6.0.10-servicing.22470.7 + 6.0.10-servicing.22476.4 - 6.0.10-servicing.22470.9 + 6.0.10-servicing.22476.6 From ead7c942cae116cb4d0ce4e3dad985c2ea5a764b Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 18 Oct 2022 11:05:38 -0700 Subject: [PATCH 46/46] Trim away FullFramework release leg The failure rates for Debug vs. Release are essentially identical. Keep the Debug one (we have lots of release). --- .vsts-ci.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index cbe9c6d51beb..5e911120aebc 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -101,11 +101,6 @@ stages: _PublishArgs: '' _SignType: test _Test: -test - Build_Release: - _BuildConfig: Release - _PublishArgs: '' - _SignType: test - _Test: -test - template: /eng/build.yml parameters: