From b3e3d2fcb9bdeabcf4e01786d960d9d89b60b335 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 1 Sep 2022 09:23:03 +0000 Subject: [PATCH 001/100] 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 002/100] 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 003/100] 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 004/100] 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 005/100] 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 006/100] 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 007/100] 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 008/100] 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 009/100] 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 010/100] [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 011/100] [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 012/100] 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 013/100] 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 014/100] 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 015/100] 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 016/100] 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 017/100] 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 018/100] 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 019/100] 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 020/100] 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 021/100] 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 022/100] 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 023/100] 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 024/100] 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 025/100] 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 026/100] 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 027/100] 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 028/100] 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 029/100] 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 030/100] 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 031/100] 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 032/100] 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 033/100] 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 034/100] 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 035/100] 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 036/100] 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 037/100] 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 038/100] 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 039/100] 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 040/100] 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 041/100] 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 042/100] 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 043/100] 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 044/100] 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 045/100] 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 d78c23de544f9b78e1742021c34f38815f2a1e7b Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 14 Oct 2022 15:45:00 -0700 Subject: [PATCH 046/100] Enable codeql in servicing --- .vsts-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index cbe9c6d51beb..2a61f1294d54 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -26,6 +26,8 @@ variables: - ${{ if ne(variables['System.TeamProject'], 'public') }}: - name: _DotNetPublishToBlobFeed value: true + - name: Codeql.Enabled + value: true - group: DotNetBuilds storage account read tokens - name: _InternalRuntimeDownloadArgs value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal From ead7c942cae116cb4d0ce4e3dad985c2ea5a764b Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 18 Oct 2022 11:05:38 -0700 Subject: [PATCH 047/100] 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: From 5f5509227f34a0ac374689834dfa07ac6c0321e0 Mon Sep 17 00:00:00 2001 From: Matt Galbraith Date: Mon, 24 Oct 2022 16:15:05 -0700 Subject: [PATCH 048/100] Arcade update- outcome of darc update-dependencies --id 153507 --- NuGet.config | 20 --- eng/Version.Details.xml | 16 +- eng/Versions.props | 4 +- eng/common/build.ps1 | 5 + eng/common/generate-sbom-prep.ps1 | 2 + eng/common/generate-sbom-prep.sh | 12 ++ eng/common/init-tools-native.ps1 | 145 ++++++++++++------ eng/common/internal/NuGet.config | 7 + eng/common/internal/Tools.csproj | 3 + eng/common/templates/job/execute-sdl.yml | 4 +- eng/common/templates/job/onelocbuild.yml | 4 +- eng/common/templates/job/source-build.yml | 4 +- eng/common/templates/jobs/jobs.yml | 4 +- .../templates/post-build/post-build.yml | 16 +- eng/common/tools.ps1 | 4 + global.json | 4 +- 16 files changed, 160 insertions(+), 94 deletions(-) create mode 100644 eng/common/internal/NuGet.config diff --git a/NuGet.config b/NuGet.config index 2d77baa4a9f7..adc36228c667 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,26 +4,16 @@ - - - - - - - - - - @@ -41,24 +31,14 @@ - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1b38d659eca0..651315c4c70d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -287,22 +287,22 @@ - + https://github.com/dotnet/arcade - 1a6b24397e50146d0fece9cfb9c0b87275691e6f + afc36a16c1ef79fd1969ca7effc7e99b61e4e9a6 - + https://github.com/dotnet/arcade - 1a6b24397e50146d0fece9cfb9c0b87275691e6f + afc36a16c1ef79fd1969ca7effc7e99b61e4e9a6 - + https://github.com/dotnet/arcade - 1a6b24397e50146d0fece9cfb9c0b87275691e6f + afc36a16c1ef79fd1969ca7effc7e99b61e4e9a6 - + https://github.com/dotnet/arcade - 1a6b24397e50146d0fece9cfb9c0b87275691e6f + afc36a16c1ef79fd1969ca7effc7e99b61e4e9a6 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index c91ea355763a..492e48d57810 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,7 +28,7 @@ $(NewtonsoftJsonPackageVersion) 4.0.0 5.0.0 - 6.0.0-beta.22212.5 + 6.0.0-beta.22517.1 3.1.0 6.0.0 4.3.0 @@ -168,7 +168,7 @@ 4.19.2 4.19.0 - 6.0.0-beta.22212.5 + 6.0.0-beta.22517.1 4.8.2 6.0.0-beta.22262.1 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 8943da242f6e..33a6f2d0e248 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -26,6 +26,7 @@ Param( [string] $runtimeSourceFeed = '', [string] $runtimeSourceFeedKey = '', [switch] $excludePrereleaseVS, + [switch] $nativeToolsOnMachine, [switch] $help, [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties ) @@ -67,6 +68,7 @@ function Print-Usage() { Write-Host " -warnAsError Sets warnaserror msbuild parameter ('true' or 'false')" Write-Host " -msbuildEngine Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)." Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio" + Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)" Write-Host "" Write-Host "Command line arguments not listed above are passed thru to msbuild." @@ -146,6 +148,9 @@ try { $nodeReuse = $false } + if ($nativeToolsOnMachine) { + $env:NativeToolsOnMachine = $true + } if ($restore) { InitializeNativeTools } diff --git a/eng/common/generate-sbom-prep.ps1 b/eng/common/generate-sbom-prep.ps1 index a733a8885824..3e5c1c74a1c5 100644 --- a/eng/common/generate-sbom-prep.ps1 +++ b/eng/common/generate-sbom-prep.ps1 @@ -2,6 +2,8 @@ Param( [Parameter(Mandatory=$true)][string] $ManifestDirPath # Manifest directory where sbom will be placed ) +. $PSScriptRoot\pipeline-logging-functions.ps1 + Write-Host "Creating dir $ManifestDirPath" # create directory for sbom manifest to be placed if (!(Test-Path -path $ManifestDirPath)) diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh index f6c77453142a..d5c76dc827b4 100644 --- a/eng/common/generate-sbom-prep.sh +++ b/eng/common/generate-sbom-prep.sh @@ -2,6 +2,18 @@ source="${BASH_SOURCE[0]}" +# resolve $SOURCE until the file is no longer a symlink +while [[ -h $source ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + + # if $source was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" +. $scriptroot/pipeline-logging-functions.sh + manifest_dir=$1 if [ ! -d "$manifest_dir" ] ; then diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1 index db830c00a6f8..6c7a851a8087 100644 --- a/eng/common/init-tools-native.ps1 +++ b/eng/common/init-tools-native.ps1 @@ -31,6 +31,10 @@ Wait time between retry attempts in seconds .PARAMETER GlobalJsonFile File path to global.json file +.PARAMETER PathPromotion +Optional switch to enable either promote native tools specified in the global.json to the path (in Azure Pipelines) +or break the build if a native tool is not found on the path (on a local dev machine) + .NOTES #> [CmdletBinding(PositionalBinding=$false)] @@ -41,7 +45,8 @@ Param ( [switch] $Force = $False, [int] $DownloadRetries = 5, [int] $RetryWaitTimeInSeconds = 30, - [string] $GlobalJsonFile + [string] $GlobalJsonFile, + [switch] $PathPromotion ) if (!$GlobalJsonFile) { @@ -77,53 +82,101 @@ try { ConvertFrom-Json | Select-Object -Expand 'native-tools' -ErrorAction SilentlyContinue if ($NativeTools) { - $NativeTools.PSObject.Properties | ForEach-Object { - $ToolName = $_.Name - $ToolVersion = $_.Value - $LocalInstallerArguments = @{ ToolName = "$ToolName" } - $LocalInstallerArguments += @{ InstallPath = "$InstallBin" } - $LocalInstallerArguments += @{ BaseUri = "$BaseUri" } - $LocalInstallerArguments += @{ CommonLibraryDirectory = "$EngCommonBaseDir" } - $LocalInstallerArguments += @{ Version = "$ToolVersion" } - - if ($Verbose) { - $LocalInstallerArguments += @{ Verbose = $True } - } - if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') { - if($Force) { - $LocalInstallerArguments += @{ Force = $True } - } - } - if ($Clean) { - $LocalInstallerArguments += @{ Clean = $True } - } - - Write-Verbose "Installing $ToolName version $ToolVersion" - Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ '$($LocalInstallerArguments.$_)'"}) -join ' ')'" - & $InstallerPath @LocalInstallerArguments - if ($LASTEXITCODE -Ne "0") { - $errMsg = "$ToolName installation failed" - if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) { - $showNativeToolsWarning = $true - if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) { - $showNativeToolsWarning = $false + if ($PathPromotion -eq $True) { + if ($env:SYSTEM_TEAMPROJECT) { # check to see if we're in an Azure pipelines build + $NativeTools.PSObject.Properties | ForEach-Object { + $ToolName = $_.Name + $ToolVersion = $_.Value + $InstalledTools = @{} + + if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) { + if ($ToolVersion -eq "latest") { + $ToolVersion = "" + } + $ArcadeToolsDirectory = "C:\arcade-tools" + if (-not (Test-Path $ArcadeToolsDirectory)) { + Write-Error "Arcade tools directory '$ArcadeToolsDirectory' was not found; artifacts were not properly installed." + exit 1 + } + $ToolDirectory = (Get-ChildItem -Path "$ArcadeToolsDirectory" -Filter "$ToolName-$ToolVersion*" | Sort-Object -Descending)[0] + if ([string]::IsNullOrWhiteSpace($ToolDirectory)) { + Write-Error "Unable to find directory for $ToolName $ToolVersion; please make sure the tool is installed on this image." + exit 1 } - if ($showNativeToolsWarning) { - Write-Warning $errMsg + $BinPathFile = "$($ToolDirectory.FullName)\binpath.txt" + if (-not (Test-Path -Path "$BinPathFile")) { + Write-Error "Unable to find binpath.txt in '$($ToolDirectory.FullName)' ($ToolName $ToolVersion); artifact is either installed incorrectly or is not a bootstrappable tool." + exit 1 } - $toolInstallationFailure = $true - } else { - # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482 - Write-Host $errMsg - exit 1 + $BinPath = Get-Content "$BinPathFile" + $ToolPath = Convert-Path -Path $BinPath + Write-Host "Adding $ToolName to the path ($ToolPath)..." + Write-Host "##vso[task.prependpath]$ToolPath" + $env:PATH = "$ToolPath;$env:PATH" + $InstalledTools += @{ $ToolName = $ToolDirectory.FullName } + } } + return $InstalledTools + } else { + $NativeTools.PSObject.Properties | ForEach-Object { + $ToolName = $_.Name + $ToolVersion = $_.Value + + if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) { + Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message "$ToolName not found on path. Please install $ToolName $ToolVersion before proceeding." + } + } + exit 0 + } + } else { + $NativeTools.PSObject.Properties | ForEach-Object { + $ToolName = $_.Name + $ToolVersion = $_.Value + $LocalInstallerArguments = @{ ToolName = "$ToolName" } + $LocalInstallerArguments += @{ InstallPath = "$InstallBin" } + $LocalInstallerArguments += @{ BaseUri = "$BaseUri" } + $LocalInstallerArguments += @{ CommonLibraryDirectory = "$EngCommonBaseDir" } + $LocalInstallerArguments += @{ Version = "$ToolVersion" } + + if ($Verbose) { + $LocalInstallerArguments += @{ Verbose = $True } + } + if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') { + if($Force) { + $LocalInstallerArguments += @{ Force = $True } + } + } + if ($Clean) { + $LocalInstallerArguments += @{ Clean = $True } + } + + Write-Verbose "Installing $ToolName version $ToolVersion" + Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ '$($LocalInstallerArguments.$_)'"}) -join ' ')'" + & $InstallerPath @LocalInstallerArguments + if ($LASTEXITCODE -Ne "0") { + $errMsg = "$ToolName installation failed" + if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) { + $showNativeToolsWarning = $true + if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) { + $showNativeToolsWarning = $false + } + if ($showNativeToolsWarning) { + Write-Warning $errMsg + } + $toolInstallationFailure = $true + } else { + # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482 + Write-Host $errMsg + exit 1 + } + } + } + + if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) { + # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482 + Write-Host 'Native tools bootstrap failed' + exit 1 } - } - - if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) { - # We cannot change this to Write-PipelineTelemetryError because of https://github.com/dotnet/arcade/issues/4482 - Write-Host 'Native tools bootstrap failed' - exit 1 } } else { @@ -139,7 +192,7 @@ try { Write-Host "##vso[task.prependpath]$(Convert-Path -Path $InstallBin)" return $InstallBin } - else { + elseif (-not ($PathPromotion)) { Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message 'Native tools install directory does not exist, installation failed' exit 1 } @@ -149,4 +202,4 @@ catch { Write-Host $_.ScriptStackTrace Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message $_ ExitWithExitCode 1 -} +} \ No newline at end of file diff --git a/eng/common/internal/NuGet.config b/eng/common/internal/NuGet.config new file mode 100644 index 000000000000..19d3d311b166 --- /dev/null +++ b/eng/common/internal/NuGet.config @@ -0,0 +1,7 @@ + + + + + + + diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj index beb9c4648ea1..7f5ce6d60813 100644 --- a/eng/common/internal/Tools.csproj +++ b/eng/common/internal/Tools.csproj @@ -8,6 +8,9 @@ + + + diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 24cec0424e5d..aaeb83b4dcbd 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -53,8 +53,8 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2019.amd64 steps: - checkout: self clean: true diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 9d1e3042d8a6..5b1b77d1c74a 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -40,8 +40,8 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2019.amd64 variables: - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index 88f6f75a622d..b6137f44ada1 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -46,10 +46,10 @@ jobs: # source-build builds run in Docker, including the default managed platform. pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Public + name: NetCore-Svc-Public demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }} diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 554e71cfc436..9c4becbc8592 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -89,8 +89,8 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2019.amd64 runAsPublic: ${{ parameters.runAsPublic }} publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 24e92a275a4f..fc022ca9b266 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -100,8 +100,8 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -137,8 +137,8 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml parameters: @@ -197,8 +197,8 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml parameters: @@ -254,8 +254,8 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml parameters: diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index f1e1cb53953b..81d7b0355e38 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -635,6 +635,10 @@ function InitializeNativeTools() { InstallDirectory = "$ToolsDir" } } + if ($env:NativeToolsOnMachine) { + Write-Host "Variable NativeToolsOnMachine detected, enabling native tool path promotion..." + $nativeArgs += @{ PathPromotion = $true } + } & "$PSScriptRoot/init-tools-native.ps1" @nativeArgs } } diff --git a/global.json b/global.json index e66fba4efbc4..f87a79cba639 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22212.5", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22212.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22517.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22517.1" } } From f258ac7174926c94deb8af7e7772d41b72687a9a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 31 Oct 2022 17:06:03 +0000 Subject: [PATCH 049/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-templating build 20221031.4 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.306 -> To Version 6.0.306 --- 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 32a56d033347..3db8866062df 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,8 @@ + + @@ -14,10 +16,12 @@ - + + + @@ -37,15 +41,19 @@ - + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index db60bce73ccc..484cbd269bf0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 84fa0403a62bd95b9e1f29c00f4b4f8e605bfc7c + 282de367b87872ca65d5582e39530ceac9f504c6 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 84fa0403a62bd95b9e1f29c00f4b4f8e605bfc7c + 282de367b87872ca65d5582e39530ceac9f504c6 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 84fa0403a62bd95b9e1f29c00f4b4f8e605bfc7c + 282de367b87872ca65d5582e39530ceac9f504c6 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 84fa0403a62bd95b9e1f29c00f4b4f8e605bfc7c + 282de367b87872ca65d5582e39530ceac9f504c6 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 84fa0403a62bd95b9e1f29c00f4b4f8e605bfc7c + 282de367b87872ca65d5582e39530ceac9f504c6 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 84fa0403a62bd95b9e1f29c00f4b4f8e605bfc7c + 282de367b87872ca65d5582e39530ceac9f504c6 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 84fa0403a62bd95b9e1f29c00f4b4f8e605bfc7c + 282de367b87872ca65d5582e39530ceac9f504c6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8365bc5eeb51..a25dc830518d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -112,7 +112,7 @@ - 6.0.306-servicing.22523.5 + 6.0.306-servicing.22531.4 6.0.306 6.0.306 6.0.306 From 27793d70c372b50fe265d7217c474b148072a530 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 1 Nov 2022 14:19:43 -0700 Subject: [PATCH 050/100] Update branding to 6.0.112 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index ea29480efa79..6cc2ccb32374 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ - 6.0.111 + 6.0.112 servicing From b51bafddbe8c1cb928e9961cb8326960b5e46fd3 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 1 Nov 2022 14:19:47 -0700 Subject: [PATCH 051/100] Update branding to 6.0.307 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index c91ea355763a..fc4672e3cc85 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ - 6.0.306 + 6.0.307 servicing true From ec290031b706ff8793bef8c2c6f38189fcdd4e4a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 2 Nov 2022 01:21:36 +0000 Subject: [PATCH 052/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20221101.8 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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.11-servicing.22523.4 -> To Version 6.0.12-servicing.22551.8 --- NuGet.config | 8 ++---- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 12 ++++---- 3 files changed, 40 insertions(+), 44 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3db8866062df..a76b8f42a4a2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,9 +4,7 @@ - - - + @@ -44,9 +42,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 484cbd269bf0..35d74bb16ff7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 432d17a83aa5623e4581756f4d642997048056bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 825d8e037659fd6b9a44e2b5a88c9c5f876db5ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 825d8e037659fd6b9a44e2b5a88c9c5f876db5ae https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -186,46 +186,46 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 96c5254e5ca5040021caf779216b1b3641875b1e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 825d8e037659fd6b9a44e2b5a88c9c5f876db5ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 825d8e037659fd6b9a44e2b5a88c9c5f876db5ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 825d8e037659fd6b9a44e2b5a88c9c5f876db5ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 825d8e037659fd6b9a44e2b5a88c9c5f876db5ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 825d8e037659fd6b9a44e2b5a88c9c5f876db5ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 825d8e037659fd6b9a44e2b5a88c9c5f876db5ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 825d8e037659fd6b9a44e2b5a88c9c5f876db5ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 825d8e037659fd6b9a44e2b5a88c9c5f876db5ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 825d8e037659fd6b9a44e2b5a88c9c5f876db5ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 825d8e037659fd6b9a44e2b5a88c9c5f876db5ae https://github.com/dotnet/razor-compiler @@ -242,21 +242,21 @@ fde127ba1cbee8a15c4a1fb8e46e686f3caac8ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 825d8e037659fd6b9a44e2b5a88c9c5f876db5ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 825d8e037659fd6b9a44e2b5a88c9c5f876db5ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 825d8e037659fd6b9a44e2b5a88c9c5f876db5ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a + 825d8e037659fd6b9a44e2b5a88c9c5f876db5ae https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index a25dc830518d..648c41cdfb40 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,12 +133,12 @@ - 6.0.11-servicing.22523.4 - 6.0.11 - 6.0.11-servicing.22523.4 - 6.0.11-servicing.22523.4 - 6.0.11-servicing.22523.4 - 6.0.11 + 6.0.12-servicing.22551.8 + 6.0.12 + 6.0.12-servicing.22551.8 + 6.0.12-servicing.22551.8 + 6.0.12-servicing.22551.8 + 6.0.12 6.0.3-1.22213.1 6.0.3-1.22213.1 6.0.3-1.22213.1 From 2680be914a173681ce61ccf21d1e42a19ff38bd7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 2 Nov 2022 04:35:39 +0000 Subject: [PATCH 053/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20221101.16 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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.11-servicing.22523.4 -> To Version 6.0.12-servicing.22551.16 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 8 +++---- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index a76b8f42a4a2..bddc2572d21f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 35d74bb16ff7..6e85e791e554 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 432d17a83aa5623e4581756f4d642997048056bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 825d8e037659fd6b9a44e2b5a88c9c5f876db5ae + 69f0ba8d1d2060db568474e53332c612639bdd32 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 825d8e037659fd6b9a44e2b5a88c9c5f876db5ae + 69f0ba8d1d2060db568474e53332c612639bdd32 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 825d8e037659fd6b9a44e2b5a88c9c5f876db5ae + 69f0ba8d1d2060db568474e53332c612639bdd32 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 825d8e037659fd6b9a44e2b5a88c9c5f876db5ae + 69f0ba8d1d2060db568474e53332c612639bdd32 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 825d8e037659fd6b9a44e2b5a88c9c5f876db5ae + 69f0ba8d1d2060db568474e53332c612639bdd32 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 825d8e037659fd6b9a44e2b5a88c9c5f876db5ae + 69f0ba8d1d2060db568474e53332c612639bdd32 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 825d8e037659fd6b9a44e2b5a88c9c5f876db5ae + 69f0ba8d1d2060db568474e53332c612639bdd32 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 825d8e037659fd6b9a44e2b5a88c9c5f876db5ae + 69f0ba8d1d2060db568474e53332c612639bdd32 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 825d8e037659fd6b9a44e2b5a88c9c5f876db5ae + 69f0ba8d1d2060db568474e53332c612639bdd32 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 825d8e037659fd6b9a44e2b5a88c9c5f876db5ae + 69f0ba8d1d2060db568474e53332c612639bdd32 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 825d8e037659fd6b9a44e2b5a88c9c5f876db5ae + 69f0ba8d1d2060db568474e53332c612639bdd32 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 825d8e037659fd6b9a44e2b5a88c9c5f876db5ae + 69f0ba8d1d2060db568474e53332c612639bdd32 https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 825d8e037659fd6b9a44e2b5a88c9c5f876db5ae + 69f0ba8d1d2060db568474e53332c612639bdd32 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 825d8e037659fd6b9a44e2b5a88c9c5f876db5ae + 69f0ba8d1d2060db568474e53332c612639bdd32 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 825d8e037659fd6b9a44e2b5a88c9c5f876db5ae + 69f0ba8d1d2060db568474e53332c612639bdd32 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 825d8e037659fd6b9a44e2b5a88c9c5f876db5ae + 69f0ba8d1d2060db568474e53332c612639bdd32 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 648c41cdfb40..a100d5c9652c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,11 +133,11 @@ - 6.0.12-servicing.22551.8 + 6.0.12-servicing.22551.16 6.0.12 - 6.0.12-servicing.22551.8 - 6.0.12-servicing.22551.8 - 6.0.12-servicing.22551.8 + 6.0.12-servicing.22551.16 + 6.0.12-servicing.22551.16 + 6.0.12-servicing.22551.16 6.0.12 6.0.3-1.22213.1 6.0.3-1.22213.1 From f7aaa31fc51f0288876b092ed65d5b76008e42fd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 2 Nov 2022 06:14:17 +0000 Subject: [PATCH 054/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20221101.18 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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.11-servicing.22523.4 -> To Version 6.0.12-servicing.22551.18 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 8 +++---- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index bddc2572d21f..c2ee8e647cbd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6e85e791e554..3862729d11bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 432d17a83aa5623e4581756f4d642997048056bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 69f0ba8d1d2060db568474e53332c612639bdd32 + 7a398a757e508146018c85398bd0131e515758fe https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 69f0ba8d1d2060db568474e53332c612639bdd32 + 7a398a757e508146018c85398bd0131e515758fe https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 69f0ba8d1d2060db568474e53332c612639bdd32 + 7a398a757e508146018c85398bd0131e515758fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 69f0ba8d1d2060db568474e53332c612639bdd32 + 7a398a757e508146018c85398bd0131e515758fe https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 69f0ba8d1d2060db568474e53332c612639bdd32 + 7a398a757e508146018c85398bd0131e515758fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 69f0ba8d1d2060db568474e53332c612639bdd32 + 7a398a757e508146018c85398bd0131e515758fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 69f0ba8d1d2060db568474e53332c612639bdd32 + 7a398a757e508146018c85398bd0131e515758fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 69f0ba8d1d2060db568474e53332c612639bdd32 + 7a398a757e508146018c85398bd0131e515758fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 69f0ba8d1d2060db568474e53332c612639bdd32 + 7a398a757e508146018c85398bd0131e515758fe https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 69f0ba8d1d2060db568474e53332c612639bdd32 + 7a398a757e508146018c85398bd0131e515758fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 69f0ba8d1d2060db568474e53332c612639bdd32 + 7a398a757e508146018c85398bd0131e515758fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 69f0ba8d1d2060db568474e53332c612639bdd32 + 7a398a757e508146018c85398bd0131e515758fe https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 69f0ba8d1d2060db568474e53332c612639bdd32 + 7a398a757e508146018c85398bd0131e515758fe https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 69f0ba8d1d2060db568474e53332c612639bdd32 + 7a398a757e508146018c85398bd0131e515758fe https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 69f0ba8d1d2060db568474e53332c612639bdd32 + 7a398a757e508146018c85398bd0131e515758fe https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 69f0ba8d1d2060db568474e53332c612639bdd32 + 7a398a757e508146018c85398bd0131e515758fe https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index a100d5c9652c..0ca52a24511c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,11 +133,11 @@ - 6.0.12-servicing.22551.16 + 6.0.12-servicing.22551.18 6.0.12 - 6.0.12-servicing.22551.16 - 6.0.12-servicing.22551.16 - 6.0.12-servicing.22551.16 + 6.0.12-servicing.22551.18 + 6.0.12-servicing.22551.18 + 6.0.12-servicing.22551.18 6.0.12 6.0.3-1.22213.1 6.0.3-1.22213.1 From fcae3290511219a77c49b216fa4bd36ce5ffcf4a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 2 Nov 2022 08:22:51 +0000 Subject: [PATCH 055/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20221101.22 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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.11-servicing.22523.4 -> To Version 6.0.12-servicing.22551.22 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 8 +++---- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index c2ee8e647cbd..1923eafbada1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3862729d11bf..4aa13fcece8c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 432d17a83aa5623e4581756f4d642997048056bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7a398a757e508146018c85398bd0131e515758fe + 381066d7c4624c00c3862de790ede599f6766d5c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7a398a757e508146018c85398bd0131e515758fe + 381066d7c4624c00c3862de790ede599f6766d5c https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7a398a757e508146018c85398bd0131e515758fe + 381066d7c4624c00c3862de790ede599f6766d5c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7a398a757e508146018c85398bd0131e515758fe + 381066d7c4624c00c3862de790ede599f6766d5c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7a398a757e508146018c85398bd0131e515758fe + 381066d7c4624c00c3862de790ede599f6766d5c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7a398a757e508146018c85398bd0131e515758fe + 381066d7c4624c00c3862de790ede599f6766d5c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7a398a757e508146018c85398bd0131e515758fe + 381066d7c4624c00c3862de790ede599f6766d5c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7a398a757e508146018c85398bd0131e515758fe + 381066d7c4624c00c3862de790ede599f6766d5c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7a398a757e508146018c85398bd0131e515758fe + 381066d7c4624c00c3862de790ede599f6766d5c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7a398a757e508146018c85398bd0131e515758fe + 381066d7c4624c00c3862de790ede599f6766d5c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7a398a757e508146018c85398bd0131e515758fe + 381066d7c4624c00c3862de790ede599f6766d5c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7a398a757e508146018c85398bd0131e515758fe + 381066d7c4624c00c3862de790ede599f6766d5c https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7a398a757e508146018c85398bd0131e515758fe + 381066d7c4624c00c3862de790ede599f6766d5c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7a398a757e508146018c85398bd0131e515758fe + 381066d7c4624c00c3862de790ede599f6766d5c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7a398a757e508146018c85398bd0131e515758fe + 381066d7c4624c00c3862de790ede599f6766d5c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7a398a757e508146018c85398bd0131e515758fe + 381066d7c4624c00c3862de790ede599f6766d5c https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 0ca52a24511c..61aa064e731d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,11 +133,11 @@ - 6.0.12-servicing.22551.18 + 6.0.12-servicing.22551.22 6.0.12 - 6.0.12-servicing.22551.18 - 6.0.12-servicing.22551.18 - 6.0.12-servicing.22551.18 + 6.0.12-servicing.22551.22 + 6.0.12-servicing.22551.22 + 6.0.12-servicing.22551.22 6.0.12 6.0.3-1.22213.1 6.0.3-1.22213.1 From e3a0ce3cb3acfce8a056a582885b9dba48964037 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 2 Nov 2022 11:34:10 +0000 Subject: [PATCH 056/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-templating build 20221102.16 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.306 -> To Version 6.0.307 --- 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 1923eafbada1..5f0f26162223 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -39,7 +39,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4aa13fcece8c..078cc608bc78 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 282de367b87872ca65d5582e39530ceac9f504c6 + 6d7a5dcf2d3f2f5bca953cd37dfeacbb18ca75ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 282de367b87872ca65d5582e39530ceac9f504c6 + 6d7a5dcf2d3f2f5bca953cd37dfeacbb18ca75ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 282de367b87872ca65d5582e39530ceac9f504c6 + 6d7a5dcf2d3f2f5bca953cd37dfeacbb18ca75ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 282de367b87872ca65d5582e39530ceac9f504c6 + 6d7a5dcf2d3f2f5bca953cd37dfeacbb18ca75ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 282de367b87872ca65d5582e39530ceac9f504c6 + 6d7a5dcf2d3f2f5bca953cd37dfeacbb18ca75ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 282de367b87872ca65d5582e39530ceac9f504c6 + 6d7a5dcf2d3f2f5bca953cd37dfeacbb18ca75ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 282de367b87872ca65d5582e39530ceac9f504c6 + 6d7a5dcf2d3f2f5bca953cd37dfeacbb18ca75ad https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 61aa064e731d..42df2afb3aa5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -112,11 +112,11 @@ - 6.0.306-servicing.22531.4 - 6.0.306 - 6.0.306 - 6.0.306 - 6.0.306 + 6.0.307-servicing.22552.16 + 6.0.307 + 6.0.307 + 6.0.307 + 6.0.307 From 7ce9c8aafd214010df71c27bb3c40f9e4cebd291 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 2 Nov 2022 15:01:59 +0000 Subject: [PATCH 057/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20221102.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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.11-servicing.22523.4 -> To Version 6.0.12-servicing.22552.3 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 8 +++---- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5f0f26162223..6256729ca713 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 078cc608bc78..86e1547f0963 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 432d17a83aa5623e4581756f4d642997048056bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 381066d7c4624c00c3862de790ede599f6766d5c + 79a025a247cb084d7e70fea4d8f072e486d21e3a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 381066d7c4624c00c3862de790ede599f6766d5c + 79a025a247cb084d7e70fea4d8f072e486d21e3a https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 381066d7c4624c00c3862de790ede599f6766d5c + 79a025a247cb084d7e70fea4d8f072e486d21e3a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 381066d7c4624c00c3862de790ede599f6766d5c + 79a025a247cb084d7e70fea4d8f072e486d21e3a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 381066d7c4624c00c3862de790ede599f6766d5c + 79a025a247cb084d7e70fea4d8f072e486d21e3a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 381066d7c4624c00c3862de790ede599f6766d5c + 79a025a247cb084d7e70fea4d8f072e486d21e3a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 381066d7c4624c00c3862de790ede599f6766d5c + 79a025a247cb084d7e70fea4d8f072e486d21e3a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 381066d7c4624c00c3862de790ede599f6766d5c + 79a025a247cb084d7e70fea4d8f072e486d21e3a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 381066d7c4624c00c3862de790ede599f6766d5c + 79a025a247cb084d7e70fea4d8f072e486d21e3a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 381066d7c4624c00c3862de790ede599f6766d5c + 79a025a247cb084d7e70fea4d8f072e486d21e3a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 381066d7c4624c00c3862de790ede599f6766d5c + 79a025a247cb084d7e70fea4d8f072e486d21e3a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 381066d7c4624c00c3862de790ede599f6766d5c + 79a025a247cb084d7e70fea4d8f072e486d21e3a https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 381066d7c4624c00c3862de790ede599f6766d5c + 79a025a247cb084d7e70fea4d8f072e486d21e3a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 381066d7c4624c00c3862de790ede599f6766d5c + 79a025a247cb084d7e70fea4d8f072e486d21e3a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 381066d7c4624c00c3862de790ede599f6766d5c + 79a025a247cb084d7e70fea4d8f072e486d21e3a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 381066d7c4624c00c3862de790ede599f6766d5c + 79a025a247cb084d7e70fea4d8f072e486d21e3a https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 42df2afb3aa5..88136ebec3d8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,11 +133,11 @@ - 6.0.12-servicing.22551.22 + 6.0.12-servicing.22552.3 6.0.12 - 6.0.12-servicing.22551.22 - 6.0.12-servicing.22551.22 - 6.0.12-servicing.22551.22 + 6.0.12-servicing.22552.3 + 6.0.12-servicing.22552.3 + 6.0.12-servicing.22552.3 6.0.12 6.0.3-1.22213.1 6.0.3-1.22213.1 From f11161984d6aa3984c1bd2202f51737cde34ecf8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 2 Nov 2022 15:40:32 +0000 Subject: [PATCH 058/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-templating build 20221102.23 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.306 -> To Version 6.0.307 --- 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 6256729ca713..6fec691d4d4e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -39,7 +39,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 86e1547f0963..c8bd61c236dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6d7a5dcf2d3f2f5bca953cd37dfeacbb18ca75ad + e92c1351ea0621ab52c1c5b5713fe3c242d69e48 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6d7a5dcf2d3f2f5bca953cd37dfeacbb18ca75ad + e92c1351ea0621ab52c1c5b5713fe3c242d69e48 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6d7a5dcf2d3f2f5bca953cd37dfeacbb18ca75ad + e92c1351ea0621ab52c1c5b5713fe3c242d69e48 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6d7a5dcf2d3f2f5bca953cd37dfeacbb18ca75ad + e92c1351ea0621ab52c1c5b5713fe3c242d69e48 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6d7a5dcf2d3f2f5bca953cd37dfeacbb18ca75ad + e92c1351ea0621ab52c1c5b5713fe3c242d69e48 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6d7a5dcf2d3f2f5bca953cd37dfeacbb18ca75ad + e92c1351ea0621ab52c1c5b5713fe3c242d69e48 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6d7a5dcf2d3f2f5bca953cd37dfeacbb18ca75ad + e92c1351ea0621ab52c1c5b5713fe3c242d69e48 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 88136ebec3d8..fa9e8ad4d770 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -112,7 +112,7 @@ - 6.0.307-servicing.22552.16 + 6.0.307-servicing.22552.23 6.0.307 6.0.307 6.0.307 From 7b0d95a3659ee1464ddcfc7bb97746eff932f442 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 2 Nov 2022 17:54:35 +0000 Subject: [PATCH 059/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20221102.8 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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.11-servicing.22523.4 -> To Version 6.0.12-servicing.22552.8 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 8 +++---- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6fec691d4d4e..4412f04e6f16 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c8bd61c236dd..7b79682168fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 432d17a83aa5623e4581756f4d642997048056bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 79a025a247cb084d7e70fea4d8f072e486d21e3a + 18dbbf5a34c100060cfe5f203d84bfda637b648f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 79a025a247cb084d7e70fea4d8f072e486d21e3a + 18dbbf5a34c100060cfe5f203d84bfda637b648f https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 79a025a247cb084d7e70fea4d8f072e486d21e3a + 18dbbf5a34c100060cfe5f203d84bfda637b648f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 79a025a247cb084d7e70fea4d8f072e486d21e3a + 18dbbf5a34c100060cfe5f203d84bfda637b648f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 79a025a247cb084d7e70fea4d8f072e486d21e3a + 18dbbf5a34c100060cfe5f203d84bfda637b648f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 79a025a247cb084d7e70fea4d8f072e486d21e3a + 18dbbf5a34c100060cfe5f203d84bfda637b648f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 79a025a247cb084d7e70fea4d8f072e486d21e3a + 18dbbf5a34c100060cfe5f203d84bfda637b648f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 79a025a247cb084d7e70fea4d8f072e486d21e3a + 18dbbf5a34c100060cfe5f203d84bfda637b648f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 79a025a247cb084d7e70fea4d8f072e486d21e3a + 18dbbf5a34c100060cfe5f203d84bfda637b648f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 79a025a247cb084d7e70fea4d8f072e486d21e3a + 18dbbf5a34c100060cfe5f203d84bfda637b648f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 79a025a247cb084d7e70fea4d8f072e486d21e3a + 18dbbf5a34c100060cfe5f203d84bfda637b648f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 79a025a247cb084d7e70fea4d8f072e486d21e3a + 18dbbf5a34c100060cfe5f203d84bfda637b648f https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 79a025a247cb084d7e70fea4d8f072e486d21e3a + 18dbbf5a34c100060cfe5f203d84bfda637b648f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 79a025a247cb084d7e70fea4d8f072e486d21e3a + 18dbbf5a34c100060cfe5f203d84bfda637b648f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 79a025a247cb084d7e70fea4d8f072e486d21e3a + 18dbbf5a34c100060cfe5f203d84bfda637b648f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 79a025a247cb084d7e70fea4d8f072e486d21e3a + 18dbbf5a34c100060cfe5f203d84bfda637b648f https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index fa9e8ad4d770..b0c995576ae8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,11 +133,11 @@ - 6.0.12-servicing.22552.3 + 6.0.12-servicing.22552.8 6.0.12 - 6.0.12-servicing.22552.3 - 6.0.12-servicing.22552.3 - 6.0.12-servicing.22552.3 + 6.0.12-servicing.22552.8 + 6.0.12-servicing.22552.8 + 6.0.12-servicing.22552.8 6.0.12 6.0.3-1.22213.1 6.0.3-1.22213.1 From cf32d322b97aa8bdf91db995e8ee724e039e7405 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 2 Nov 2022 19:39:55 +0000 Subject: [PATCH 060/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20221102.12 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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.11-servicing.22523.4 -> To Version 6.0.12-servicing.22552.12 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 8 +++---- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4412f04e6f16..70b5784c801a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7b79682168fe..90dc29cd23e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 432d17a83aa5623e4581756f4d642997048056bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 18dbbf5a34c100060cfe5f203d84bfda637b648f + b0af64d1d0e4e19ce800a6512d47a9138282d362 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 18dbbf5a34c100060cfe5f203d84bfda637b648f + b0af64d1d0e4e19ce800a6512d47a9138282d362 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 18dbbf5a34c100060cfe5f203d84bfda637b648f + b0af64d1d0e4e19ce800a6512d47a9138282d362 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 18dbbf5a34c100060cfe5f203d84bfda637b648f + b0af64d1d0e4e19ce800a6512d47a9138282d362 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 18dbbf5a34c100060cfe5f203d84bfda637b648f + b0af64d1d0e4e19ce800a6512d47a9138282d362 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 18dbbf5a34c100060cfe5f203d84bfda637b648f + b0af64d1d0e4e19ce800a6512d47a9138282d362 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 18dbbf5a34c100060cfe5f203d84bfda637b648f + b0af64d1d0e4e19ce800a6512d47a9138282d362 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 18dbbf5a34c100060cfe5f203d84bfda637b648f + b0af64d1d0e4e19ce800a6512d47a9138282d362 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 18dbbf5a34c100060cfe5f203d84bfda637b648f + b0af64d1d0e4e19ce800a6512d47a9138282d362 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 18dbbf5a34c100060cfe5f203d84bfda637b648f + b0af64d1d0e4e19ce800a6512d47a9138282d362 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 18dbbf5a34c100060cfe5f203d84bfda637b648f + b0af64d1d0e4e19ce800a6512d47a9138282d362 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 18dbbf5a34c100060cfe5f203d84bfda637b648f + b0af64d1d0e4e19ce800a6512d47a9138282d362 https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 18dbbf5a34c100060cfe5f203d84bfda637b648f + b0af64d1d0e4e19ce800a6512d47a9138282d362 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 18dbbf5a34c100060cfe5f203d84bfda637b648f + b0af64d1d0e4e19ce800a6512d47a9138282d362 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 18dbbf5a34c100060cfe5f203d84bfda637b648f + b0af64d1d0e4e19ce800a6512d47a9138282d362 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 18dbbf5a34c100060cfe5f203d84bfda637b648f + b0af64d1d0e4e19ce800a6512d47a9138282d362 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index b0c995576ae8..a63140fdfca6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,11 +133,11 @@ - 6.0.12-servicing.22552.8 + 6.0.12-servicing.22552.12 6.0.12 - 6.0.12-servicing.22552.8 - 6.0.12-servicing.22552.8 - 6.0.12-servicing.22552.8 + 6.0.12-servicing.22552.12 + 6.0.12-servicing.22552.12 + 6.0.12-servicing.22552.12 6.0.12 6.0.3-1.22213.1 6.0.3-1.22213.1 From 1ad65354ab75bb3e0181f80b9d195ecf3cadfa10 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 2 Nov 2022 22:11:51 +0000 Subject: [PATCH 061/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20221102.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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.11-servicing.22523.4 -> To Version 6.0.12-servicing.22552.15 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 8 +++---- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 70b5784c801a..e3191dd0343f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 90dc29cd23e2..d65832634bf8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 432d17a83aa5623e4581756f4d642997048056bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b0af64d1d0e4e19ce800a6512d47a9138282d362 + 6bd8d1f977bbd32beb4db6425e27c40c541b0101 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b0af64d1d0e4e19ce800a6512d47a9138282d362 + 6bd8d1f977bbd32beb4db6425e27c40c541b0101 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b0af64d1d0e4e19ce800a6512d47a9138282d362 + 6bd8d1f977bbd32beb4db6425e27c40c541b0101 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b0af64d1d0e4e19ce800a6512d47a9138282d362 + 6bd8d1f977bbd32beb4db6425e27c40c541b0101 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b0af64d1d0e4e19ce800a6512d47a9138282d362 + 6bd8d1f977bbd32beb4db6425e27c40c541b0101 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b0af64d1d0e4e19ce800a6512d47a9138282d362 + 6bd8d1f977bbd32beb4db6425e27c40c541b0101 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b0af64d1d0e4e19ce800a6512d47a9138282d362 + 6bd8d1f977bbd32beb4db6425e27c40c541b0101 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b0af64d1d0e4e19ce800a6512d47a9138282d362 + 6bd8d1f977bbd32beb4db6425e27c40c541b0101 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b0af64d1d0e4e19ce800a6512d47a9138282d362 + 6bd8d1f977bbd32beb4db6425e27c40c541b0101 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b0af64d1d0e4e19ce800a6512d47a9138282d362 + 6bd8d1f977bbd32beb4db6425e27c40c541b0101 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b0af64d1d0e4e19ce800a6512d47a9138282d362 + 6bd8d1f977bbd32beb4db6425e27c40c541b0101 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b0af64d1d0e4e19ce800a6512d47a9138282d362 + 6bd8d1f977bbd32beb4db6425e27c40c541b0101 https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b0af64d1d0e4e19ce800a6512d47a9138282d362 + 6bd8d1f977bbd32beb4db6425e27c40c541b0101 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b0af64d1d0e4e19ce800a6512d47a9138282d362 + 6bd8d1f977bbd32beb4db6425e27c40c541b0101 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b0af64d1d0e4e19ce800a6512d47a9138282d362 + 6bd8d1f977bbd32beb4db6425e27c40c541b0101 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b0af64d1d0e4e19ce800a6512d47a9138282d362 + 6bd8d1f977bbd32beb4db6425e27c40c541b0101 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index a63140fdfca6..52be6b4f102f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,11 +133,11 @@ - 6.0.12-servicing.22552.12 + 6.0.12-servicing.22552.15 6.0.12 - 6.0.12-servicing.22552.12 - 6.0.12-servicing.22552.12 - 6.0.12-servicing.22552.12 + 6.0.12-servicing.22552.15 + 6.0.12-servicing.22552.15 + 6.0.12-servicing.22552.15 6.0.12 6.0.3-1.22213.1 6.0.3-1.22213.1 From 29573b5aa6bcb0c93d4aaaf63db19206eefac569 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 3 Nov 2022 18:04:43 +0000 Subject: [PATCH 062/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20221103.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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.11-servicing.22523.4 -> To Version 6.0.12-servicing.22553.3 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 8 +++---- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index e3191dd0343f..f9a0bb3f9e59 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d65832634bf8..2268cd8f8c6f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 432d17a83aa5623e4581756f4d642997048056bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6bd8d1f977bbd32beb4db6425e27c40c541b0101 + 27b7edb3d70409811c07cf7f378ee21b87b13e80 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6bd8d1f977bbd32beb4db6425e27c40c541b0101 + 27b7edb3d70409811c07cf7f378ee21b87b13e80 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6bd8d1f977bbd32beb4db6425e27c40c541b0101 + 27b7edb3d70409811c07cf7f378ee21b87b13e80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6bd8d1f977bbd32beb4db6425e27c40c541b0101 + 27b7edb3d70409811c07cf7f378ee21b87b13e80 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6bd8d1f977bbd32beb4db6425e27c40c541b0101 + 27b7edb3d70409811c07cf7f378ee21b87b13e80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6bd8d1f977bbd32beb4db6425e27c40c541b0101 + 27b7edb3d70409811c07cf7f378ee21b87b13e80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6bd8d1f977bbd32beb4db6425e27c40c541b0101 + 27b7edb3d70409811c07cf7f378ee21b87b13e80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6bd8d1f977bbd32beb4db6425e27c40c541b0101 + 27b7edb3d70409811c07cf7f378ee21b87b13e80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6bd8d1f977bbd32beb4db6425e27c40c541b0101 + 27b7edb3d70409811c07cf7f378ee21b87b13e80 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6bd8d1f977bbd32beb4db6425e27c40c541b0101 + 27b7edb3d70409811c07cf7f378ee21b87b13e80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6bd8d1f977bbd32beb4db6425e27c40c541b0101 + 27b7edb3d70409811c07cf7f378ee21b87b13e80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6bd8d1f977bbd32beb4db6425e27c40c541b0101 + 27b7edb3d70409811c07cf7f378ee21b87b13e80 https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6bd8d1f977bbd32beb4db6425e27c40c541b0101 + 27b7edb3d70409811c07cf7f378ee21b87b13e80 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6bd8d1f977bbd32beb4db6425e27c40c541b0101 + 27b7edb3d70409811c07cf7f378ee21b87b13e80 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6bd8d1f977bbd32beb4db6425e27c40c541b0101 + 27b7edb3d70409811c07cf7f378ee21b87b13e80 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6bd8d1f977bbd32beb4db6425e27c40c541b0101 + 27b7edb3d70409811c07cf7f378ee21b87b13e80 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 52be6b4f102f..7253a58b3175 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,11 +133,11 @@ - 6.0.12-servicing.22552.15 + 6.0.12-servicing.22553.3 6.0.12 - 6.0.12-servicing.22552.15 - 6.0.12-servicing.22552.15 - 6.0.12-servicing.22552.15 + 6.0.12-servicing.22553.3 + 6.0.12-servicing.22553.3 + 6.0.12-servicing.22553.3 6.0.12 6.0.3-1.22213.1 6.0.3-1.22213.1 From 09e3997ca65f8b40713e29ef70f2f85b61701562 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 3 Nov 2022 23:17:55 +0000 Subject: [PATCH 063/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20221103.8 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.11-servicing.22523.4 -> To Version 6.0.11-servicing.22553.8 --- 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 f9a0bb3f9e59..5d8ee62fff4a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,7 +11,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2268cd8f8c6f..b75ae11e6f5a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -32,31 +32,31 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 4437f088ec63a72bdbc05a1792307415e45d20ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 4437f088ec63a72bdbc05a1792307415e45d20ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 4437f088ec63a72bdbc05a1792307415e45d20ad https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 4437f088ec63a72bdbc05a1792307415e45d20ad https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 4437f088ec63a72bdbc05a1792307415e45d20ad https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 4437f088ec63a72bdbc05a1792307415e45d20ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 4437f088ec63a72bdbc05a1792307415e45d20ad https://github.com/dotnet/runtime @@ -64,7 +64,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 4437f088ec63a72bdbc05a1792307415e45d20ad https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted diff --git a/eng/Versions.props b/eng/Versions.props index 7253a58b3175..641bbd7ec848 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,12 +44,12 @@ 6.0.11 - 6.0.11-servicing.22523.4 + 6.0.11-servicing.22553.8 6.0.11 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 6.0.0 6.0.11 - 6.0.11-servicing.22523.4 + 6.0.11-servicing.22553.8 6.0.0-preview.7.21363.9 6.0.0 From 2c78098d371d6621d165eebb179abc0c4bcf2838 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 4 Nov 2022 03:18:36 +0000 Subject: [PATCH 064/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20221103.8 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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.11-servicing.22523.4 -> To Version 6.0.12-servicing.22553.8 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 8 +++---- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5d8ee62fff4a..1bc01336b398 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b75ae11e6f5a..67e1ce55db6f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 432d17a83aa5623e4581756f4d642997048056bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 27b7edb3d70409811c07cf7f378ee21b87b13e80 + 99847bb3fe0af8f656cee4cc336b8c2f4f1d80e0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 27b7edb3d70409811c07cf7f378ee21b87b13e80 + 99847bb3fe0af8f656cee4cc336b8c2f4f1d80e0 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 27b7edb3d70409811c07cf7f378ee21b87b13e80 + 99847bb3fe0af8f656cee4cc336b8c2f4f1d80e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 27b7edb3d70409811c07cf7f378ee21b87b13e80 + 99847bb3fe0af8f656cee4cc336b8c2f4f1d80e0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 27b7edb3d70409811c07cf7f378ee21b87b13e80 + 99847bb3fe0af8f656cee4cc336b8c2f4f1d80e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 27b7edb3d70409811c07cf7f378ee21b87b13e80 + 99847bb3fe0af8f656cee4cc336b8c2f4f1d80e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 27b7edb3d70409811c07cf7f378ee21b87b13e80 + 99847bb3fe0af8f656cee4cc336b8c2f4f1d80e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 27b7edb3d70409811c07cf7f378ee21b87b13e80 + 99847bb3fe0af8f656cee4cc336b8c2f4f1d80e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 27b7edb3d70409811c07cf7f378ee21b87b13e80 + 99847bb3fe0af8f656cee4cc336b8c2f4f1d80e0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 27b7edb3d70409811c07cf7f378ee21b87b13e80 + 99847bb3fe0af8f656cee4cc336b8c2f4f1d80e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 27b7edb3d70409811c07cf7f378ee21b87b13e80 + 99847bb3fe0af8f656cee4cc336b8c2f4f1d80e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 27b7edb3d70409811c07cf7f378ee21b87b13e80 + 99847bb3fe0af8f656cee4cc336b8c2f4f1d80e0 https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 27b7edb3d70409811c07cf7f378ee21b87b13e80 + 99847bb3fe0af8f656cee4cc336b8c2f4f1d80e0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 27b7edb3d70409811c07cf7f378ee21b87b13e80 + 99847bb3fe0af8f656cee4cc336b8c2f4f1d80e0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 27b7edb3d70409811c07cf7f378ee21b87b13e80 + 99847bb3fe0af8f656cee4cc336b8c2f4f1d80e0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 27b7edb3d70409811c07cf7f378ee21b87b13e80 + 99847bb3fe0af8f656cee4cc336b8c2f4f1d80e0 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 641bbd7ec848..0860fee4f288 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,11 +133,11 @@ - 6.0.12-servicing.22553.3 + 6.0.12-servicing.22553.8 6.0.12 - 6.0.12-servicing.22553.3 - 6.0.12-servicing.22553.3 - 6.0.12-servicing.22553.3 + 6.0.12-servicing.22553.8 + 6.0.12-servicing.22553.8 + 6.0.12-servicing.22553.8 6.0.12 6.0.3-1.22213.1 6.0.3-1.22213.1 From f88959fc00b376a4042999fca8b366d4c099103c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 4 Nov 2022 03:30:06 +0000 Subject: [PATCH 065/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20221103.13 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.11-servicing.22523.4 -> To Version 6.0.12-servicing.22553.13 --- NuGet.config | 2 ++ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 10 +++++----- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1bc01336b398..b622e74428ce 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,6 +12,7 @@ + @@ -45,6 +46,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 67e1ce55db6f..e1235a3bee22 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -30,41 +30,41 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e92c1351ea0621ab52c1c5b5713fe3c242d69e48 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4437f088ec63a72bdbc05a1792307415e45d20ad + 018f72d828f46c5ef2c6f0d81f4150a9a0e3eb4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4437f088ec63a72bdbc05a1792307415e45d20ad + 018f72d828f46c5ef2c6f0d81f4150a9a0e3eb4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4437f088ec63a72bdbc05a1792307415e45d20ad + 018f72d828f46c5ef2c6f0d81f4150a9a0e3eb4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4437f088ec63a72bdbc05a1792307415e45d20ad + 018f72d828f46c5ef2c6f0d81f4150a9a0e3eb4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4437f088ec63a72bdbc05a1792307415e45d20ad + 018f72d828f46c5ef2c6f0d81f4150a9a0e3eb4e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 4437f088ec63a72bdbc05a1792307415e45d20ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4437f088ec63a72bdbc05a1792307415e45d20ad + 018f72d828f46c5ef2c6f0d81f4150a9a0e3eb4e https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4437f088ec63a72bdbc05a1792307415e45d20ad + 018f72d828f46c5ef2c6f0d81f4150a9a0e3eb4e https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted diff --git a/eng/Versions.props b/eng/Versions.props index 0860fee4f288..72da66a39cdd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,13 +43,13 @@ - 6.0.11 - 6.0.11-servicing.22553.8 - 6.0.11 + 6.0.12 + 6.0.12-servicing.22553.13 + 6.0.12 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 6.0.0 - 6.0.11 - 6.0.11-servicing.22553.8 + 6.0.12 + 6.0.12-servicing.22553.13 6.0.0-preview.7.21363.9 6.0.0 From 18afd1d70ca527be60ed968854778a081b07c8f5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 4 Nov 2022 07:17:12 +0000 Subject: [PATCH 066/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20221103.12 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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.11-servicing.22523.4 -> To Version 6.0.12-servicing.22553.12 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 8 +++---- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index b622e74428ce..d9fa83e13785 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e1235a3bee22..24bf756796ea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 432d17a83aa5623e4581756f4d642997048056bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 99847bb3fe0af8f656cee4cc336b8c2f4f1d80e0 + 8e6167ebcb95e1c31e9b1c1dc96c916a96f62f31 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 99847bb3fe0af8f656cee4cc336b8c2f4f1d80e0 + 8e6167ebcb95e1c31e9b1c1dc96c916a96f62f31 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 99847bb3fe0af8f656cee4cc336b8c2f4f1d80e0 + 8e6167ebcb95e1c31e9b1c1dc96c916a96f62f31 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 99847bb3fe0af8f656cee4cc336b8c2f4f1d80e0 + 8e6167ebcb95e1c31e9b1c1dc96c916a96f62f31 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 99847bb3fe0af8f656cee4cc336b8c2f4f1d80e0 + 8e6167ebcb95e1c31e9b1c1dc96c916a96f62f31 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 99847bb3fe0af8f656cee4cc336b8c2f4f1d80e0 + 8e6167ebcb95e1c31e9b1c1dc96c916a96f62f31 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 99847bb3fe0af8f656cee4cc336b8c2f4f1d80e0 + 8e6167ebcb95e1c31e9b1c1dc96c916a96f62f31 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 99847bb3fe0af8f656cee4cc336b8c2f4f1d80e0 + 8e6167ebcb95e1c31e9b1c1dc96c916a96f62f31 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 99847bb3fe0af8f656cee4cc336b8c2f4f1d80e0 + 8e6167ebcb95e1c31e9b1c1dc96c916a96f62f31 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 99847bb3fe0af8f656cee4cc336b8c2f4f1d80e0 + 8e6167ebcb95e1c31e9b1c1dc96c916a96f62f31 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 99847bb3fe0af8f656cee4cc336b8c2f4f1d80e0 + 8e6167ebcb95e1c31e9b1c1dc96c916a96f62f31 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 99847bb3fe0af8f656cee4cc336b8c2f4f1d80e0 + 8e6167ebcb95e1c31e9b1c1dc96c916a96f62f31 https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 99847bb3fe0af8f656cee4cc336b8c2f4f1d80e0 + 8e6167ebcb95e1c31e9b1c1dc96c916a96f62f31 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 99847bb3fe0af8f656cee4cc336b8c2f4f1d80e0 + 8e6167ebcb95e1c31e9b1c1dc96c916a96f62f31 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 99847bb3fe0af8f656cee4cc336b8c2f4f1d80e0 + 8e6167ebcb95e1c31e9b1c1dc96c916a96f62f31 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 99847bb3fe0af8f656cee4cc336b8c2f4f1d80e0 + 8e6167ebcb95e1c31e9b1c1dc96c916a96f62f31 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 72da66a39cdd..a22151dec317 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,11 +133,11 @@ - 6.0.12-servicing.22553.8 + 6.0.12-servicing.22553.12 6.0.12 - 6.0.12-servicing.22553.8 - 6.0.12-servicing.22553.8 - 6.0.12-servicing.22553.8 + 6.0.12-servicing.22553.12 + 6.0.12-servicing.22553.12 + 6.0.12-servicing.22553.12 6.0.12 6.0.3-1.22213.1 6.0.3-1.22213.1 From f722c1d7a8f79c1cab382c4efd7b28120da4cea0 Mon Sep 17 00:00:00 2001 From: Matt Galbraith Date: Fri, 4 Nov 2022 12:53:59 -0700 Subject: [PATCH 067/100] Update pool providers in eng/common to -Svc versions. Normally would be covered by darc trigger-subscriptions --id d0f0eb7b-5dae-4e5d-39b2-08d960f4ca81 but this subscription seems to be disabled. Any later Arcade updates will already include these changes --- eng/common/templates/job/execute-sdl.yml | 2 +- eng/common/templates/job/onelocbuild.yml | 2 +- eng/common/templates/job/source-build.yml | 4 ++-- eng/common/templates/jobs/jobs.yml | 2 +- eng/common/templates/post-build/post-build.yml | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 24cec0424e5d..7bcc13167e87 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -53,7 +53,7 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals Build.Server.Amd64.VS2019 steps: - checkout: self diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 9d1e3042d8a6..5437af476862 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -40,7 +40,7 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals Build.Server.Amd64.VS2019 variables: diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index 88f6f75a622d..b6137f44ada1 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -46,10 +46,10 @@ jobs: # source-build builds run in Docker, including the default managed platform. pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Public + name: NetCore-Svc-Public demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }} diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 554e71cfc436..a5f018e6c6f2 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -89,7 +89,7 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals Build.Server.Amd64.VS2019 runAsPublic: ${{ parameters.runAsPublic }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 24e92a275a4f..2f124f5acf81 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -100,7 +100,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals Build.Server.Amd64.VS2019 steps: @@ -137,7 +137,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals Build.Server.Amd64.VS2019 steps: - template: setup-maestro-vars.yml @@ -197,7 +197,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals Build.Server.Amd64.VS2019 steps: - template: setup-maestro-vars.yml @@ -254,7 +254,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals Build.Server.Amd64.VS2019 steps: - template: setup-maestro-vars.yml From c27d673c554bf7404fd2038c822c382ad5df9fc8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 4 Nov 2022 20:56:52 +0000 Subject: [PATCH 068/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20221104.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.11 -> To Version 6.0.12 --- 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 d9fa83e13785..426528a93525 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,9 +18,7 @@ - - - + @@ -50,9 +48,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 24bf756796ea..e47c8c83bf5e 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 - ee26d5bddd7cf13b37987de68fee12d9e50ff33d + fb084615fb24289d4a41753a27b326acdff496c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ee26d5bddd7cf13b37987de68fee12d9e50ff33d + fb084615fb24289d4a41753a27b326acdff496c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ee26d5bddd7cf13b37987de68fee12d9e50ff33d + fb084615fb24289d4a41753a27b326acdff496c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ee26d5bddd7cf13b37987de68fee12d9e50ff33d + fb084615fb24289d4a41753a27b326acdff496c6 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf diff --git a/eng/Versions.props b/eng/Versions.props index a22151dec317..62f4fef069e9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,7 +149,7 @@ - 6.0.11-servicing.22523.3 + 6.0.12-servicing.22554.3 From 146dd995cc1f9214909c5efd8049eefa966a0ec4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 7 Nov 2022 10:22:35 +0000 Subject: [PATCH 069/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-templating build 20221107.2 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.306 -> To Version 6.0.307 --- 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 426528a93525..8377ed5b7374 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + @@ -38,7 +38,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e47c8c83bf5e..c60528bebea2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e92c1351ea0621ab52c1c5b5713fe3c242d69e48 + 233140b693b19a07d9ee0be42c7548f9cc019121 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e92c1351ea0621ab52c1c5b5713fe3c242d69e48 + 233140b693b19a07d9ee0be42c7548f9cc019121 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e92c1351ea0621ab52c1c5b5713fe3c242d69e48 + 233140b693b19a07d9ee0be42c7548f9cc019121 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e92c1351ea0621ab52c1c5b5713fe3c242d69e48 + 233140b693b19a07d9ee0be42c7548f9cc019121 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e92c1351ea0621ab52c1c5b5713fe3c242d69e48 + 233140b693b19a07d9ee0be42c7548f9cc019121 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e92c1351ea0621ab52c1c5b5713fe3c242d69e48 + 233140b693b19a07d9ee0be42c7548f9cc019121 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e92c1351ea0621ab52c1c5b5713fe3c242d69e48 + 233140b693b19a07d9ee0be42c7548f9cc019121 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 62f4fef069e9..22169c81da7e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -112,7 +112,7 @@ - 6.0.307-servicing.22552.23 + 6.0.307-servicing.22557.2 6.0.307 6.0.307 6.0.307 From f69caaf74d776cd7c8f54f6b94be72fa32016877 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 8 Nov 2022 00:54:15 +0000 Subject: [PATCH 070/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20221107.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.11-servicing.22523.4 -> To Version 6.0.12-servicing.22557.7 --- NuGet.config | 6 ++---- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8377ed5b7374..9ad78ff3d451 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,8 +11,7 @@ - - + @@ -44,8 +43,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c60528bebea2..baeb52df532e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -32,31 +32,31 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 018f72d828f46c5ef2c6f0d81f4150a9a0e3eb4e + 74376f899d32e1b5710d84a437975ab7ed817077 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 018f72d828f46c5ef2c6f0d81f4150a9a0e3eb4e + 74376f899d32e1b5710d84a437975ab7ed817077 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 018f72d828f46c5ef2c6f0d81f4150a9a0e3eb4e + 74376f899d32e1b5710d84a437975ab7ed817077 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 018f72d828f46c5ef2c6f0d81f4150a9a0e3eb4e + 74376f899d32e1b5710d84a437975ab7ed817077 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 018f72d828f46c5ef2c6f0d81f4150a9a0e3eb4e + 74376f899d32e1b5710d84a437975ab7ed817077 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 4437f088ec63a72bdbc05a1792307415e45d20ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 018f72d828f46c5ef2c6f0d81f4150a9a0e3eb4e + 74376f899d32e1b5710d84a437975ab7ed817077 https://github.com/dotnet/runtime @@ -64,7 +64,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 018f72d828f46c5ef2c6f0d81f4150a9a0e3eb4e + 74376f899d32e1b5710d84a437975ab7ed817077 https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted diff --git a/eng/Versions.props b/eng/Versions.props index 22169c81da7e..b971832a7a16 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,12 +44,12 @@ 6.0.12 - 6.0.12-servicing.22553.13 + 6.0.12-servicing.22557.7 6.0.12 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 6.0.0 6.0.12 - 6.0.12-servicing.22553.13 + 6.0.12-servicing.22557.7 6.0.0-preview.7.21363.9 6.0.0 From b362ad329aeb10866a897b24ae426cd9f023d33e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 8 Nov 2022 04:45:42 +0000 Subject: [PATCH 071/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20221107.8 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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.11-servicing.22523.4 -> To Version 6.0.12-servicing.22557.8 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 8 +++---- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9ad78ff3d451..271ee92902ef 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index baeb52df532e..69cc1a739486 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 432d17a83aa5623e4581756f4d642997048056bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e6167ebcb95e1c31e9b1c1dc96c916a96f62f31 + 60dc2d03916886c2d59fdd3d663e41d5a8386bf6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e6167ebcb95e1c31e9b1c1dc96c916a96f62f31 + 60dc2d03916886c2d59fdd3d663e41d5a8386bf6 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e6167ebcb95e1c31e9b1c1dc96c916a96f62f31 + 60dc2d03916886c2d59fdd3d663e41d5a8386bf6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e6167ebcb95e1c31e9b1c1dc96c916a96f62f31 + 60dc2d03916886c2d59fdd3d663e41d5a8386bf6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e6167ebcb95e1c31e9b1c1dc96c916a96f62f31 + 60dc2d03916886c2d59fdd3d663e41d5a8386bf6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e6167ebcb95e1c31e9b1c1dc96c916a96f62f31 + 60dc2d03916886c2d59fdd3d663e41d5a8386bf6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e6167ebcb95e1c31e9b1c1dc96c916a96f62f31 + 60dc2d03916886c2d59fdd3d663e41d5a8386bf6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e6167ebcb95e1c31e9b1c1dc96c916a96f62f31 + 60dc2d03916886c2d59fdd3d663e41d5a8386bf6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e6167ebcb95e1c31e9b1c1dc96c916a96f62f31 + 60dc2d03916886c2d59fdd3d663e41d5a8386bf6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e6167ebcb95e1c31e9b1c1dc96c916a96f62f31 + 60dc2d03916886c2d59fdd3d663e41d5a8386bf6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e6167ebcb95e1c31e9b1c1dc96c916a96f62f31 + 60dc2d03916886c2d59fdd3d663e41d5a8386bf6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e6167ebcb95e1c31e9b1c1dc96c916a96f62f31 + 60dc2d03916886c2d59fdd3d663e41d5a8386bf6 https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e6167ebcb95e1c31e9b1c1dc96c916a96f62f31 + 60dc2d03916886c2d59fdd3d663e41d5a8386bf6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e6167ebcb95e1c31e9b1c1dc96c916a96f62f31 + 60dc2d03916886c2d59fdd3d663e41d5a8386bf6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e6167ebcb95e1c31e9b1c1dc96c916a96f62f31 + 60dc2d03916886c2d59fdd3d663e41d5a8386bf6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e6167ebcb95e1c31e9b1c1dc96c916a96f62f31 + 60dc2d03916886c2d59fdd3d663e41d5a8386bf6 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index b971832a7a16..72178158e6ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,11 +133,11 @@ - 6.0.12-servicing.22553.12 + 6.0.12-servicing.22557.8 6.0.12 - 6.0.12-servicing.22553.12 - 6.0.12-servicing.22553.12 - 6.0.12-servicing.22553.12 + 6.0.12-servicing.22557.8 + 6.0.12-servicing.22557.8 + 6.0.12-servicing.22557.8 6.0.12 6.0.3-1.22213.1 6.0.3-1.22213.1 From 9f08f6ce9607ffb39b1b68f6ac5e6e62f43cf89d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 8 Nov 2022 05:09:43 +0000 Subject: [PATCH 072/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20221107.10 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.11-servicing.22523.4 -> To Version 6.0.12-servicing.22557.10 --- 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 271ee92902ef..ebea60349c6f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,7 +11,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69cc1a739486..5de4abab5c68 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -32,31 +32,31 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 74376f899d32e1b5710d84a437975ab7ed817077 + c1f4696d01f2b5dfc28df2532953349ce26f6249 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 74376f899d32e1b5710d84a437975ab7ed817077 + c1f4696d01f2b5dfc28df2532953349ce26f6249 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 74376f899d32e1b5710d84a437975ab7ed817077 + c1f4696d01f2b5dfc28df2532953349ce26f6249 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 74376f899d32e1b5710d84a437975ab7ed817077 + c1f4696d01f2b5dfc28df2532953349ce26f6249 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 74376f899d32e1b5710d84a437975ab7ed817077 + c1f4696d01f2b5dfc28df2532953349ce26f6249 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 4437f088ec63a72bdbc05a1792307415e45d20ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 74376f899d32e1b5710d84a437975ab7ed817077 + c1f4696d01f2b5dfc28df2532953349ce26f6249 https://github.com/dotnet/runtime @@ -64,7 +64,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 74376f899d32e1b5710d84a437975ab7ed817077 + c1f4696d01f2b5dfc28df2532953349ce26f6249 https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted diff --git a/eng/Versions.props b/eng/Versions.props index 72178158e6ea..47f77ad93165 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,12 +44,12 @@ 6.0.12 - 6.0.12-servicing.22557.7 + 6.0.12-servicing.22557.10 6.0.12 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 6.0.0 6.0.12 - 6.0.12-servicing.22557.7 + 6.0.12-servicing.22557.10 6.0.0-preview.7.21363.9 6.0.0 From a37ad82f210fd8f73c4fa27bd389eac6d32fba9b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 8 Nov 2022 09:02:45 +0000 Subject: [PATCH 073/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20221107.12 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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.11-servicing.22523.4 -> To Version 6.0.12-servicing.22557.12 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 8 +++---- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index ebea60349c6f..3ad5010d8d86 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5de4abab5c68..4c6dd4a0c078 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 432d17a83aa5623e4581756f4d642997048056bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 60dc2d03916886c2d59fdd3d663e41d5a8386bf6 + 45c3112cd9f021ea7e7a7659dfbdbbfb24900e7d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 60dc2d03916886c2d59fdd3d663e41d5a8386bf6 + 45c3112cd9f021ea7e7a7659dfbdbbfb24900e7d https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 60dc2d03916886c2d59fdd3d663e41d5a8386bf6 + 45c3112cd9f021ea7e7a7659dfbdbbfb24900e7d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 60dc2d03916886c2d59fdd3d663e41d5a8386bf6 + 45c3112cd9f021ea7e7a7659dfbdbbfb24900e7d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 60dc2d03916886c2d59fdd3d663e41d5a8386bf6 + 45c3112cd9f021ea7e7a7659dfbdbbfb24900e7d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 60dc2d03916886c2d59fdd3d663e41d5a8386bf6 + 45c3112cd9f021ea7e7a7659dfbdbbfb24900e7d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 60dc2d03916886c2d59fdd3d663e41d5a8386bf6 + 45c3112cd9f021ea7e7a7659dfbdbbfb24900e7d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 60dc2d03916886c2d59fdd3d663e41d5a8386bf6 + 45c3112cd9f021ea7e7a7659dfbdbbfb24900e7d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 60dc2d03916886c2d59fdd3d663e41d5a8386bf6 + 45c3112cd9f021ea7e7a7659dfbdbbfb24900e7d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 60dc2d03916886c2d59fdd3d663e41d5a8386bf6 + 45c3112cd9f021ea7e7a7659dfbdbbfb24900e7d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 60dc2d03916886c2d59fdd3d663e41d5a8386bf6 + 45c3112cd9f021ea7e7a7659dfbdbbfb24900e7d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 60dc2d03916886c2d59fdd3d663e41d5a8386bf6 + 45c3112cd9f021ea7e7a7659dfbdbbfb24900e7d https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 60dc2d03916886c2d59fdd3d663e41d5a8386bf6 + 45c3112cd9f021ea7e7a7659dfbdbbfb24900e7d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 60dc2d03916886c2d59fdd3d663e41d5a8386bf6 + 45c3112cd9f021ea7e7a7659dfbdbbfb24900e7d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 60dc2d03916886c2d59fdd3d663e41d5a8386bf6 + 45c3112cd9f021ea7e7a7659dfbdbbfb24900e7d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 60dc2d03916886c2d59fdd3d663e41d5a8386bf6 + 45c3112cd9f021ea7e7a7659dfbdbbfb24900e7d https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 47f77ad93165..0045fded51b9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,11 +133,11 @@ - 6.0.12-servicing.22557.8 + 6.0.12-servicing.22557.12 6.0.12 - 6.0.12-servicing.22557.8 - 6.0.12-servicing.22557.8 - 6.0.12-servicing.22557.8 + 6.0.12-servicing.22557.12 + 6.0.12-servicing.22557.12 + 6.0.12-servicing.22557.12 6.0.12 6.0.3-1.22213.1 6.0.3-1.22213.1 From a3db50ceb0aa25b45d02d019feba59eb7a03e01b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 8 Nov 2022 18:56:22 +0000 Subject: [PATCH 074/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-templating build 20221108.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.306 -> To Version 6.0.307 --- 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 3ad5010d8d86..3024bf25c53e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -37,7 +37,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4c6dd4a0c078..10f5af9da46f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 233140b693b19a07d9ee0be42c7548f9cc019121 + 3a8b58c3a238ef13913d02d6de75dbe970ea5814 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 233140b693b19a07d9ee0be42c7548f9cc019121 + 3a8b58c3a238ef13913d02d6de75dbe970ea5814 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 233140b693b19a07d9ee0be42c7548f9cc019121 + 3a8b58c3a238ef13913d02d6de75dbe970ea5814 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 233140b693b19a07d9ee0be42c7548f9cc019121 + 3a8b58c3a238ef13913d02d6de75dbe970ea5814 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 233140b693b19a07d9ee0be42c7548f9cc019121 + 3a8b58c3a238ef13913d02d6de75dbe970ea5814 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 233140b693b19a07d9ee0be42c7548f9cc019121 + 3a8b58c3a238ef13913d02d6de75dbe970ea5814 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 233140b693b19a07d9ee0be42c7548f9cc019121 + 3a8b58c3a238ef13913d02d6de75dbe970ea5814 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 0045fded51b9..b53ba49cc28b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -112,7 +112,7 @@ - 6.0.307-servicing.22557.2 + 6.0.307-servicing.22558.12 6.0.307 6.0.307 6.0.307 From fe2ae9c3b4c7a956b97863ae575c940373abcf3f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 9 Nov 2022 00:53:12 +0000 Subject: [PATCH 075/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20221108.8 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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.11-servicing.22523.4 -> To Version 6.0.12-servicing.22558.8 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 8 +++---- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3024bf25c53e..7299a9a3020d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 10f5af9da46f..2ea57b0d59aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 432d17a83aa5623e4581756f4d642997048056bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 45c3112cd9f021ea7e7a7659dfbdbbfb24900e7d + e73500530124b2d7c75f467ee9f01e70e0703c8f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 45c3112cd9f021ea7e7a7659dfbdbbfb24900e7d + e73500530124b2d7c75f467ee9f01e70e0703c8f https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 45c3112cd9f021ea7e7a7659dfbdbbfb24900e7d + e73500530124b2d7c75f467ee9f01e70e0703c8f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 45c3112cd9f021ea7e7a7659dfbdbbfb24900e7d + e73500530124b2d7c75f467ee9f01e70e0703c8f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 45c3112cd9f021ea7e7a7659dfbdbbfb24900e7d + e73500530124b2d7c75f467ee9f01e70e0703c8f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 45c3112cd9f021ea7e7a7659dfbdbbfb24900e7d + e73500530124b2d7c75f467ee9f01e70e0703c8f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 45c3112cd9f021ea7e7a7659dfbdbbfb24900e7d + e73500530124b2d7c75f467ee9f01e70e0703c8f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 45c3112cd9f021ea7e7a7659dfbdbbfb24900e7d + e73500530124b2d7c75f467ee9f01e70e0703c8f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 45c3112cd9f021ea7e7a7659dfbdbbfb24900e7d + e73500530124b2d7c75f467ee9f01e70e0703c8f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 45c3112cd9f021ea7e7a7659dfbdbbfb24900e7d + e73500530124b2d7c75f467ee9f01e70e0703c8f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 45c3112cd9f021ea7e7a7659dfbdbbfb24900e7d + e73500530124b2d7c75f467ee9f01e70e0703c8f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 45c3112cd9f021ea7e7a7659dfbdbbfb24900e7d + e73500530124b2d7c75f467ee9f01e70e0703c8f https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 45c3112cd9f021ea7e7a7659dfbdbbfb24900e7d + e73500530124b2d7c75f467ee9f01e70e0703c8f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 45c3112cd9f021ea7e7a7659dfbdbbfb24900e7d + e73500530124b2d7c75f467ee9f01e70e0703c8f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 45c3112cd9f021ea7e7a7659dfbdbbfb24900e7d + e73500530124b2d7c75f467ee9f01e70e0703c8f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 45c3112cd9f021ea7e7a7659dfbdbbfb24900e7d + e73500530124b2d7c75f467ee9f01e70e0703c8f https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index b53ba49cc28b..111a24bf3ef1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,11 +133,11 @@ - 6.0.12-servicing.22557.12 + 6.0.12-servicing.22558.8 6.0.12 - 6.0.12-servicing.22557.12 - 6.0.12-servicing.22557.12 - 6.0.12-servicing.22557.12 + 6.0.12-servicing.22558.8 + 6.0.12-servicing.22558.8 + 6.0.12-servicing.22558.8 6.0.12 6.0.3-1.22213.1 6.0.3-1.22213.1 From aca16e6fb4ecc95859aab884cf963ba23a5d24c8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 9 Nov 2022 03:14:42 +0000 Subject: [PATCH 076/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20221108.14 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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.11-servicing.22523.4 -> To Version 6.0.12-servicing.22558.14 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 8 +++---- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7299a9a3020d..d357b52be500 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ea57b0d59aa..1baf25e1b896 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 432d17a83aa5623e4581756f4d642997048056bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e73500530124b2d7c75f467ee9f01e70e0703c8f + c1e47ac5bbb37f077d8e12554da85836982247dd https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e73500530124b2d7c75f467ee9f01e70e0703c8f + c1e47ac5bbb37f077d8e12554da85836982247dd https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e73500530124b2d7c75f467ee9f01e70e0703c8f + c1e47ac5bbb37f077d8e12554da85836982247dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e73500530124b2d7c75f467ee9f01e70e0703c8f + c1e47ac5bbb37f077d8e12554da85836982247dd https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e73500530124b2d7c75f467ee9f01e70e0703c8f + c1e47ac5bbb37f077d8e12554da85836982247dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e73500530124b2d7c75f467ee9f01e70e0703c8f + c1e47ac5bbb37f077d8e12554da85836982247dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e73500530124b2d7c75f467ee9f01e70e0703c8f + c1e47ac5bbb37f077d8e12554da85836982247dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e73500530124b2d7c75f467ee9f01e70e0703c8f + c1e47ac5bbb37f077d8e12554da85836982247dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e73500530124b2d7c75f467ee9f01e70e0703c8f + c1e47ac5bbb37f077d8e12554da85836982247dd https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e73500530124b2d7c75f467ee9f01e70e0703c8f + c1e47ac5bbb37f077d8e12554da85836982247dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e73500530124b2d7c75f467ee9f01e70e0703c8f + c1e47ac5bbb37f077d8e12554da85836982247dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e73500530124b2d7c75f467ee9f01e70e0703c8f + c1e47ac5bbb37f077d8e12554da85836982247dd https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e73500530124b2d7c75f467ee9f01e70e0703c8f + c1e47ac5bbb37f077d8e12554da85836982247dd https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e73500530124b2d7c75f467ee9f01e70e0703c8f + c1e47ac5bbb37f077d8e12554da85836982247dd https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e73500530124b2d7c75f467ee9f01e70e0703c8f + c1e47ac5bbb37f077d8e12554da85836982247dd https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e73500530124b2d7c75f467ee9f01e70e0703c8f + c1e47ac5bbb37f077d8e12554da85836982247dd https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 111a24bf3ef1..70214aa993f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,11 +133,11 @@ - 6.0.12-servicing.22558.8 + 6.0.12-servicing.22558.14 6.0.12 - 6.0.12-servicing.22558.8 - 6.0.12-servicing.22558.8 - 6.0.12-servicing.22558.8 + 6.0.12-servicing.22558.14 + 6.0.12-servicing.22558.14 + 6.0.12-servicing.22558.14 6.0.12 6.0.3-1.22213.1 6.0.3-1.22213.1 From e67401797cfbbe83ff5aa680a97ae01d307a9790 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 9 Nov 2022 11:40:41 +0000 Subject: [PATCH 077/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-templating build 20221109.9 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.306 -> To Version 6.0.307 --- 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 d357b52be500..14bd0782a7c6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -37,7 +37,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1baf25e1b896..8c005ea3fc5c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3a8b58c3a238ef13913d02d6de75dbe970ea5814 + 599ead6f5485440c8c38a9e725f7f567c5d20af4 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3a8b58c3a238ef13913d02d6de75dbe970ea5814 + 599ead6f5485440c8c38a9e725f7f567c5d20af4 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3a8b58c3a238ef13913d02d6de75dbe970ea5814 + 599ead6f5485440c8c38a9e725f7f567c5d20af4 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3a8b58c3a238ef13913d02d6de75dbe970ea5814 + 599ead6f5485440c8c38a9e725f7f567c5d20af4 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3a8b58c3a238ef13913d02d6de75dbe970ea5814 + 599ead6f5485440c8c38a9e725f7f567c5d20af4 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3a8b58c3a238ef13913d02d6de75dbe970ea5814 + 599ead6f5485440c8c38a9e725f7f567c5d20af4 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3a8b58c3a238ef13913d02d6de75dbe970ea5814 + 599ead6f5485440c8c38a9e725f7f567c5d20af4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 70214aa993f7..0ceaa599088d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -112,7 +112,7 @@ - 6.0.307-servicing.22558.12 + 6.0.307-servicing.22559.9 6.0.307 6.0.307 6.0.307 From 5e320b1a06a0e64f626cdb2c07d58e7308149fc9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 9 Nov 2022 13:34:15 +0000 Subject: [PATCH 078/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-templating build 20221109.15 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.306 -> To Version 6.0.307 --- 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 14bd0782a7c6..1082fe8ee2d4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -37,7 +37,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c005ea3fc5c..805235722988 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 599ead6f5485440c8c38a9e725f7f567c5d20af4 + af4726869798d0636d53692e894ce50fe23611bd https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 599ead6f5485440c8c38a9e725f7f567c5d20af4 + af4726869798d0636d53692e894ce50fe23611bd https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 599ead6f5485440c8c38a9e725f7f567c5d20af4 + af4726869798d0636d53692e894ce50fe23611bd https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 599ead6f5485440c8c38a9e725f7f567c5d20af4 + af4726869798d0636d53692e894ce50fe23611bd https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 599ead6f5485440c8c38a9e725f7f567c5d20af4 + af4726869798d0636d53692e894ce50fe23611bd https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 599ead6f5485440c8c38a9e725f7f567c5d20af4 + af4726869798d0636d53692e894ce50fe23611bd https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 599ead6f5485440c8c38a9e725f7f567c5d20af4 + af4726869798d0636d53692e894ce50fe23611bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 0ceaa599088d..aa8a9eb91124 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -112,7 +112,7 @@ - 6.0.307-servicing.22559.9 + 6.0.307-servicing.22559.15 6.0.307 6.0.307 6.0.307 From 0f7f010d6ed12032b0a8be3b1aaa1102b9720216 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 9 Nov 2022 22:59:29 +0000 Subject: [PATCH 079/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20221109.8 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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.11-servicing.22523.4 -> To Version 6.0.12-servicing.22559.8 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 8 +++---- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1082fe8ee2d4..9ee70da5e5ec 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 805235722988..44fbacad4898 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 432d17a83aa5623e4581756f4d642997048056bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e47ac5bbb37f077d8e12554da85836982247dd + 786cc17c2c5cf068a8362bb0056069bcb733ffd5 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e47ac5bbb37f077d8e12554da85836982247dd + 786cc17c2c5cf068a8362bb0056069bcb733ffd5 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e47ac5bbb37f077d8e12554da85836982247dd + 786cc17c2c5cf068a8362bb0056069bcb733ffd5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e47ac5bbb37f077d8e12554da85836982247dd + 786cc17c2c5cf068a8362bb0056069bcb733ffd5 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e47ac5bbb37f077d8e12554da85836982247dd + 786cc17c2c5cf068a8362bb0056069bcb733ffd5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e47ac5bbb37f077d8e12554da85836982247dd + 786cc17c2c5cf068a8362bb0056069bcb733ffd5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e47ac5bbb37f077d8e12554da85836982247dd + 786cc17c2c5cf068a8362bb0056069bcb733ffd5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e47ac5bbb37f077d8e12554da85836982247dd + 786cc17c2c5cf068a8362bb0056069bcb733ffd5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e47ac5bbb37f077d8e12554da85836982247dd + 786cc17c2c5cf068a8362bb0056069bcb733ffd5 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e47ac5bbb37f077d8e12554da85836982247dd + 786cc17c2c5cf068a8362bb0056069bcb733ffd5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e47ac5bbb37f077d8e12554da85836982247dd + 786cc17c2c5cf068a8362bb0056069bcb733ffd5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e47ac5bbb37f077d8e12554da85836982247dd + 786cc17c2c5cf068a8362bb0056069bcb733ffd5 https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e47ac5bbb37f077d8e12554da85836982247dd + 786cc17c2c5cf068a8362bb0056069bcb733ffd5 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e47ac5bbb37f077d8e12554da85836982247dd + 786cc17c2c5cf068a8362bb0056069bcb733ffd5 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e47ac5bbb37f077d8e12554da85836982247dd + 786cc17c2c5cf068a8362bb0056069bcb733ffd5 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e47ac5bbb37f077d8e12554da85836982247dd + 786cc17c2c5cf068a8362bb0056069bcb733ffd5 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index aa8a9eb91124..da1708d0f712 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,11 +133,11 @@ - 6.0.12-servicing.22558.14 + 6.0.12-servicing.22559.8 6.0.12 - 6.0.12-servicing.22558.14 - 6.0.12-servicing.22558.14 - 6.0.12-servicing.22558.14 + 6.0.12-servicing.22559.8 + 6.0.12-servicing.22559.8 + 6.0.12-servicing.22559.8 6.0.12 6.0.3-1.22213.1 6.0.3-1.22213.1 From d1e69bd225e5c798a3f89ffb60df84de0ed5e63f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 11 Nov 2022 15:12:58 +0000 Subject: [PATCH 080/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20221109.11 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.11-servicing.22523.4 -> To Version 6.0.12-servicing.22559.11 --- 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 9ee70da5e5ec..a58025693941 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,7 +11,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 44fbacad4898..38451099e902 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -32,31 +32,31 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c1f4696d01f2b5dfc28df2532953349ce26f6249 + 9b6c11d64db802f15d918e1631882f6b556b9445 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c1f4696d01f2b5dfc28df2532953349ce26f6249 + 9b6c11d64db802f15d918e1631882f6b556b9445 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c1f4696d01f2b5dfc28df2532953349ce26f6249 + 9b6c11d64db802f15d918e1631882f6b556b9445 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c1f4696d01f2b5dfc28df2532953349ce26f6249 + 9b6c11d64db802f15d918e1631882f6b556b9445 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c1f4696d01f2b5dfc28df2532953349ce26f6249 + 9b6c11d64db802f15d918e1631882f6b556b9445 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 4437f088ec63a72bdbc05a1792307415e45d20ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c1f4696d01f2b5dfc28df2532953349ce26f6249 + 9b6c11d64db802f15d918e1631882f6b556b9445 https://github.com/dotnet/runtime @@ -64,7 +64,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c1f4696d01f2b5dfc28df2532953349ce26f6249 + 9b6c11d64db802f15d918e1631882f6b556b9445 https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted diff --git a/eng/Versions.props b/eng/Versions.props index da1708d0f712..5366333d0721 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,12 +44,12 @@ 6.0.12 - 6.0.12-servicing.22557.10 + 6.0.12-servicing.22559.11 6.0.12 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 6.0.0 6.0.12 - 6.0.12-servicing.22557.10 + 6.0.12-servicing.22559.11 6.0.0-preview.7.21363.9 6.0.0 From e4d5315ec8ffc6f130954858417409fda6f6a83a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 11 Nov 2022 19:29:05 +0000 Subject: [PATCH 081/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20221111.2 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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.11-servicing.22523.4 -> To Version 6.0.12-servicing.22561.2 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 8 +++---- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index a58025693941..bda365eeadd7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 38451099e902..7ef1b12fc5b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 432d17a83aa5623e4581756f4d642997048056bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 786cc17c2c5cf068a8362bb0056069bcb733ffd5 + 4138b6996a7260270d5daa30e6d3d77a22b08767 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 786cc17c2c5cf068a8362bb0056069bcb733ffd5 + 4138b6996a7260270d5daa30e6d3d77a22b08767 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 786cc17c2c5cf068a8362bb0056069bcb733ffd5 + 4138b6996a7260270d5daa30e6d3d77a22b08767 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 786cc17c2c5cf068a8362bb0056069bcb733ffd5 + 4138b6996a7260270d5daa30e6d3d77a22b08767 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 786cc17c2c5cf068a8362bb0056069bcb733ffd5 + 4138b6996a7260270d5daa30e6d3d77a22b08767 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 786cc17c2c5cf068a8362bb0056069bcb733ffd5 + 4138b6996a7260270d5daa30e6d3d77a22b08767 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 786cc17c2c5cf068a8362bb0056069bcb733ffd5 + 4138b6996a7260270d5daa30e6d3d77a22b08767 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 786cc17c2c5cf068a8362bb0056069bcb733ffd5 + 4138b6996a7260270d5daa30e6d3d77a22b08767 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 786cc17c2c5cf068a8362bb0056069bcb733ffd5 + 4138b6996a7260270d5daa30e6d3d77a22b08767 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 786cc17c2c5cf068a8362bb0056069bcb733ffd5 + 4138b6996a7260270d5daa30e6d3d77a22b08767 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 786cc17c2c5cf068a8362bb0056069bcb733ffd5 + 4138b6996a7260270d5daa30e6d3d77a22b08767 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 786cc17c2c5cf068a8362bb0056069bcb733ffd5 + 4138b6996a7260270d5daa30e6d3d77a22b08767 https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 786cc17c2c5cf068a8362bb0056069bcb733ffd5 + 4138b6996a7260270d5daa30e6d3d77a22b08767 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 786cc17c2c5cf068a8362bb0056069bcb733ffd5 + 4138b6996a7260270d5daa30e6d3d77a22b08767 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 786cc17c2c5cf068a8362bb0056069bcb733ffd5 + 4138b6996a7260270d5daa30e6d3d77a22b08767 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 786cc17c2c5cf068a8362bb0056069bcb733ffd5 + 4138b6996a7260270d5daa30e6d3d77a22b08767 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 5366333d0721..6fb20bcd88e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,11 +133,11 @@ - 6.0.12-servicing.22559.8 + 6.0.12-servicing.22561.2 6.0.12 - 6.0.12-servicing.22559.8 - 6.0.12-servicing.22559.8 - 6.0.12-servicing.22559.8 + 6.0.12-servicing.22561.2 + 6.0.12-servicing.22561.2 + 6.0.12-servicing.22561.2 6.0.12 6.0.3-1.22213.1 6.0.3-1.22213.1 From 977c8cae924ae0ccf20ca09bfb29a638d628ec65 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 11 Nov 2022 21:52:13 +0000 Subject: [PATCH 082/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20221111.4 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.11-servicing.22523.4 -> To Version 6.0.12-servicing.22561.4 --- 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 bda365eeadd7..652f3a0f7890 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,7 +11,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7ef1b12fc5b7..9172d9ab5d33 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -32,31 +32,31 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9b6c11d64db802f15d918e1631882f6b556b9445 + 0b4c183eb071ab452c3fbe9b392e972507cbf24a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9b6c11d64db802f15d918e1631882f6b556b9445 + 0b4c183eb071ab452c3fbe9b392e972507cbf24a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9b6c11d64db802f15d918e1631882f6b556b9445 + 0b4c183eb071ab452c3fbe9b392e972507cbf24a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9b6c11d64db802f15d918e1631882f6b556b9445 + 0b4c183eb071ab452c3fbe9b392e972507cbf24a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9b6c11d64db802f15d918e1631882f6b556b9445 + 0b4c183eb071ab452c3fbe9b392e972507cbf24a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 4437f088ec63a72bdbc05a1792307415e45d20ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9b6c11d64db802f15d918e1631882f6b556b9445 + 0b4c183eb071ab452c3fbe9b392e972507cbf24a https://github.com/dotnet/runtime @@ -64,7 +64,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9b6c11d64db802f15d918e1631882f6b556b9445 + 0b4c183eb071ab452c3fbe9b392e972507cbf24a https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted diff --git a/eng/Versions.props b/eng/Versions.props index 6fb20bcd88e5..0f4544d0a510 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,12 +44,12 @@ 6.0.12 - 6.0.12-servicing.22559.11 + 6.0.12-servicing.22561.4 6.0.12 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 6.0.0 6.0.12 - 6.0.12-servicing.22559.11 + 6.0.12-servicing.22561.4 6.0.0-preview.7.21363.9 6.0.0 From fb78407d5d9818dbf32233ecd356948b57f6a40e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 12 Nov 2022 01:45:30 +0000 Subject: [PATCH 083/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20221111.5 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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.11-servicing.22523.4 -> To Version 6.0.12-servicing.22561.5 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 8 +++---- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 652f3a0f7890..a2325581b145 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9172d9ab5d33..a5cc6f4a955b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 432d17a83aa5623e4581756f4d642997048056bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4138b6996a7260270d5daa30e6d3d77a22b08767 + 8a8d8a1213e0022d7cf0dc918c3ed5d0474fc819 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4138b6996a7260270d5daa30e6d3d77a22b08767 + 8a8d8a1213e0022d7cf0dc918c3ed5d0474fc819 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4138b6996a7260270d5daa30e6d3d77a22b08767 + 8a8d8a1213e0022d7cf0dc918c3ed5d0474fc819 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4138b6996a7260270d5daa30e6d3d77a22b08767 + 8a8d8a1213e0022d7cf0dc918c3ed5d0474fc819 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4138b6996a7260270d5daa30e6d3d77a22b08767 + 8a8d8a1213e0022d7cf0dc918c3ed5d0474fc819 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4138b6996a7260270d5daa30e6d3d77a22b08767 + 8a8d8a1213e0022d7cf0dc918c3ed5d0474fc819 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4138b6996a7260270d5daa30e6d3d77a22b08767 + 8a8d8a1213e0022d7cf0dc918c3ed5d0474fc819 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4138b6996a7260270d5daa30e6d3d77a22b08767 + 8a8d8a1213e0022d7cf0dc918c3ed5d0474fc819 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4138b6996a7260270d5daa30e6d3d77a22b08767 + 8a8d8a1213e0022d7cf0dc918c3ed5d0474fc819 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4138b6996a7260270d5daa30e6d3d77a22b08767 + 8a8d8a1213e0022d7cf0dc918c3ed5d0474fc819 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4138b6996a7260270d5daa30e6d3d77a22b08767 + 8a8d8a1213e0022d7cf0dc918c3ed5d0474fc819 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4138b6996a7260270d5daa30e6d3d77a22b08767 + 8a8d8a1213e0022d7cf0dc918c3ed5d0474fc819 https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4138b6996a7260270d5daa30e6d3d77a22b08767 + 8a8d8a1213e0022d7cf0dc918c3ed5d0474fc819 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4138b6996a7260270d5daa30e6d3d77a22b08767 + 8a8d8a1213e0022d7cf0dc918c3ed5d0474fc819 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4138b6996a7260270d5daa30e6d3d77a22b08767 + 8a8d8a1213e0022d7cf0dc918c3ed5d0474fc819 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4138b6996a7260270d5daa30e6d3d77a22b08767 + 8a8d8a1213e0022d7cf0dc918c3ed5d0474fc819 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 0f4544d0a510..b868bd58b770 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,11 +133,11 @@ - 6.0.12-servicing.22561.2 + 6.0.12-servicing.22561.5 6.0.12 - 6.0.12-servicing.22561.2 - 6.0.12-servicing.22561.2 - 6.0.12-servicing.22561.2 + 6.0.12-servicing.22561.5 + 6.0.12-servicing.22561.5 + 6.0.12-servicing.22561.5 6.0.12 6.0.3-1.22213.1 6.0.3-1.22213.1 From b8cacac4d284c560f5b92846a611e537eeebfe46 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 12 Nov 2022 06:07:16 +0000 Subject: [PATCH 084/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20221111.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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.11-servicing.22523.4 -> To Version 6.0.12-servicing.22561.9 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 8 +++---- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index a2325581b145..b941065daeeb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a5cc6f4a955b..e0724c4d8f2d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 432d17a83aa5623e4581756f4d642997048056bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8a8d8a1213e0022d7cf0dc918c3ed5d0474fc819 + f118c9a3b70d928b4039f00f4502c524de099235 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8a8d8a1213e0022d7cf0dc918c3ed5d0474fc819 + f118c9a3b70d928b4039f00f4502c524de099235 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8a8d8a1213e0022d7cf0dc918c3ed5d0474fc819 + f118c9a3b70d928b4039f00f4502c524de099235 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8a8d8a1213e0022d7cf0dc918c3ed5d0474fc819 + f118c9a3b70d928b4039f00f4502c524de099235 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8a8d8a1213e0022d7cf0dc918c3ed5d0474fc819 + f118c9a3b70d928b4039f00f4502c524de099235 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8a8d8a1213e0022d7cf0dc918c3ed5d0474fc819 + f118c9a3b70d928b4039f00f4502c524de099235 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8a8d8a1213e0022d7cf0dc918c3ed5d0474fc819 + f118c9a3b70d928b4039f00f4502c524de099235 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8a8d8a1213e0022d7cf0dc918c3ed5d0474fc819 + f118c9a3b70d928b4039f00f4502c524de099235 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8a8d8a1213e0022d7cf0dc918c3ed5d0474fc819 + f118c9a3b70d928b4039f00f4502c524de099235 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8a8d8a1213e0022d7cf0dc918c3ed5d0474fc819 + f118c9a3b70d928b4039f00f4502c524de099235 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8a8d8a1213e0022d7cf0dc918c3ed5d0474fc819 + f118c9a3b70d928b4039f00f4502c524de099235 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8a8d8a1213e0022d7cf0dc918c3ed5d0474fc819 + f118c9a3b70d928b4039f00f4502c524de099235 https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8a8d8a1213e0022d7cf0dc918c3ed5d0474fc819 + f118c9a3b70d928b4039f00f4502c524de099235 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8a8d8a1213e0022d7cf0dc918c3ed5d0474fc819 + f118c9a3b70d928b4039f00f4502c524de099235 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8a8d8a1213e0022d7cf0dc918c3ed5d0474fc819 + f118c9a3b70d928b4039f00f4502c524de099235 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8a8d8a1213e0022d7cf0dc918c3ed5d0474fc819 + f118c9a3b70d928b4039f00f4502c524de099235 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index b868bd58b770..98f37d47e7bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,11 +133,11 @@ - 6.0.12-servicing.22561.5 + 6.0.12-servicing.22561.9 6.0.12 - 6.0.12-servicing.22561.5 - 6.0.12-servicing.22561.5 - 6.0.12-servicing.22561.5 + 6.0.12-servicing.22561.9 + 6.0.12-servicing.22561.9 + 6.0.12-servicing.22561.9 6.0.12 6.0.3-1.22213.1 6.0.3-1.22213.1 From 4b49d09f977bf1a5ae770bb71b85a7b39ddacd2f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 14 Nov 2022 10:10:00 +0000 Subject: [PATCH 085/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-templating build 20221114.5 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.306 -> To Version 6.0.307 --- 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 b941065daeeb..fe78783c905e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -37,7 +37,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e0724c4d8f2d..49ffeeff7004 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - af4726869798d0636d53692e894ce50fe23611bd + 81cb9e28ec69ef998841e5f2530a79bf1d9b6a6c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - af4726869798d0636d53692e894ce50fe23611bd + 81cb9e28ec69ef998841e5f2530a79bf1d9b6a6c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - af4726869798d0636d53692e894ce50fe23611bd + 81cb9e28ec69ef998841e5f2530a79bf1d9b6a6c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - af4726869798d0636d53692e894ce50fe23611bd + 81cb9e28ec69ef998841e5f2530a79bf1d9b6a6c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - af4726869798d0636d53692e894ce50fe23611bd + 81cb9e28ec69ef998841e5f2530a79bf1d9b6a6c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - af4726869798d0636d53692e894ce50fe23611bd + 81cb9e28ec69ef998841e5f2530a79bf1d9b6a6c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - af4726869798d0636d53692e894ce50fe23611bd + 81cb9e28ec69ef998841e5f2530a79bf1d9b6a6c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 98f37d47e7bd..6d761e937643 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -112,7 +112,7 @@ - 6.0.307-servicing.22559.15 + 6.0.307-servicing.22564.5 6.0.307 6.0.307 6.0.307 From 4627da0294de0a1a2f4d217d1156c9f258e0ba02 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 14 Nov 2022 20:29:50 +0000 Subject: [PATCH 086/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-templating build 20221114.26 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.306 -> To Version 6.0.307 --- 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 fe78783c905e..feda831c3e50 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -37,7 +37,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 49ffeeff7004..5af875a82365 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 81cb9e28ec69ef998841e5f2530a79bf1d9b6a6c + ffe7a61a1dbb1ec3c008d9781ef37cffaf1bd4bc https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 81cb9e28ec69ef998841e5f2530a79bf1d9b6a6c + ffe7a61a1dbb1ec3c008d9781ef37cffaf1bd4bc https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 81cb9e28ec69ef998841e5f2530a79bf1d9b6a6c + ffe7a61a1dbb1ec3c008d9781ef37cffaf1bd4bc https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 81cb9e28ec69ef998841e5f2530a79bf1d9b6a6c + ffe7a61a1dbb1ec3c008d9781ef37cffaf1bd4bc https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 81cb9e28ec69ef998841e5f2530a79bf1d9b6a6c + ffe7a61a1dbb1ec3c008d9781ef37cffaf1bd4bc https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 81cb9e28ec69ef998841e5f2530a79bf1d9b6a6c + ffe7a61a1dbb1ec3c008d9781ef37cffaf1bd4bc https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 81cb9e28ec69ef998841e5f2530a79bf1d9b6a6c + ffe7a61a1dbb1ec3c008d9781ef37cffaf1bd4bc https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 6d761e937643..fc35f7837485 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -112,7 +112,7 @@ - 6.0.307-servicing.22564.5 + 6.0.307-servicing.22564.26 6.0.307 6.0.307 6.0.307 From 7f816e33c7c57024fb2503e11627330b396e8bc7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Nov 2022 01:57:06 +0000 Subject: [PATCH 087/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20221114.25 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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.11-servicing.22523.4 -> To Version 6.0.12-servicing.22564.25 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 8 +++---- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index feda831c3e50..6fe32537c581 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5af875a82365..6eb22397e050 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 432d17a83aa5623e4581756f4d642997048056bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f118c9a3b70d928b4039f00f4502c524de099235 + 9675755502afcd4ad021243f92a03f0fffaf13de https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f118c9a3b70d928b4039f00f4502c524de099235 + 9675755502afcd4ad021243f92a03f0fffaf13de https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f118c9a3b70d928b4039f00f4502c524de099235 + 9675755502afcd4ad021243f92a03f0fffaf13de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f118c9a3b70d928b4039f00f4502c524de099235 + 9675755502afcd4ad021243f92a03f0fffaf13de https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f118c9a3b70d928b4039f00f4502c524de099235 + 9675755502afcd4ad021243f92a03f0fffaf13de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f118c9a3b70d928b4039f00f4502c524de099235 + 9675755502afcd4ad021243f92a03f0fffaf13de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f118c9a3b70d928b4039f00f4502c524de099235 + 9675755502afcd4ad021243f92a03f0fffaf13de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f118c9a3b70d928b4039f00f4502c524de099235 + 9675755502afcd4ad021243f92a03f0fffaf13de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f118c9a3b70d928b4039f00f4502c524de099235 + 9675755502afcd4ad021243f92a03f0fffaf13de https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f118c9a3b70d928b4039f00f4502c524de099235 + 9675755502afcd4ad021243f92a03f0fffaf13de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f118c9a3b70d928b4039f00f4502c524de099235 + 9675755502afcd4ad021243f92a03f0fffaf13de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f118c9a3b70d928b4039f00f4502c524de099235 + 9675755502afcd4ad021243f92a03f0fffaf13de https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f118c9a3b70d928b4039f00f4502c524de099235 + 9675755502afcd4ad021243f92a03f0fffaf13de https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f118c9a3b70d928b4039f00f4502c524de099235 + 9675755502afcd4ad021243f92a03f0fffaf13de https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f118c9a3b70d928b4039f00f4502c524de099235 + 9675755502afcd4ad021243f92a03f0fffaf13de https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f118c9a3b70d928b4039f00f4502c524de099235 + 9675755502afcd4ad021243f92a03f0fffaf13de https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index fc35f7837485..8885dcb229ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,11 +133,11 @@ - 6.0.12-servicing.22561.9 + 6.0.12-servicing.22564.25 6.0.12 - 6.0.12-servicing.22561.9 - 6.0.12-servicing.22561.9 - 6.0.12-servicing.22561.9 + 6.0.12-servicing.22564.25 + 6.0.12-servicing.22564.25 + 6.0.12-servicing.22564.25 6.0.12 6.0.3-1.22213.1 6.0.3-1.22213.1 From bbd562194d7dbfd5a72a1636efb61de49bc5b6ea Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Nov 2022 03:37:42 +0000 Subject: [PATCH 088/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20221114.27 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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.11-servicing.22523.4 -> To Version 6.0.12-servicing.22564.27 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 8 +++---- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6fe32537c581..ca88287a6f5d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6eb22397e050..afcb1b4b4305 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 432d17a83aa5623e4581756f4d642997048056bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9675755502afcd4ad021243f92a03f0fffaf13de + 740cdf5a376794c9e6b84707028aa07a31e9fcbc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9675755502afcd4ad021243f92a03f0fffaf13de + 740cdf5a376794c9e6b84707028aa07a31e9fcbc https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9675755502afcd4ad021243f92a03f0fffaf13de + 740cdf5a376794c9e6b84707028aa07a31e9fcbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9675755502afcd4ad021243f92a03f0fffaf13de + 740cdf5a376794c9e6b84707028aa07a31e9fcbc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9675755502afcd4ad021243f92a03f0fffaf13de + 740cdf5a376794c9e6b84707028aa07a31e9fcbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9675755502afcd4ad021243f92a03f0fffaf13de + 740cdf5a376794c9e6b84707028aa07a31e9fcbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9675755502afcd4ad021243f92a03f0fffaf13de + 740cdf5a376794c9e6b84707028aa07a31e9fcbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9675755502afcd4ad021243f92a03f0fffaf13de + 740cdf5a376794c9e6b84707028aa07a31e9fcbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9675755502afcd4ad021243f92a03f0fffaf13de + 740cdf5a376794c9e6b84707028aa07a31e9fcbc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9675755502afcd4ad021243f92a03f0fffaf13de + 740cdf5a376794c9e6b84707028aa07a31e9fcbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9675755502afcd4ad021243f92a03f0fffaf13de + 740cdf5a376794c9e6b84707028aa07a31e9fcbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9675755502afcd4ad021243f92a03f0fffaf13de + 740cdf5a376794c9e6b84707028aa07a31e9fcbc https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9675755502afcd4ad021243f92a03f0fffaf13de + 740cdf5a376794c9e6b84707028aa07a31e9fcbc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9675755502afcd4ad021243f92a03f0fffaf13de + 740cdf5a376794c9e6b84707028aa07a31e9fcbc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9675755502afcd4ad021243f92a03f0fffaf13de + 740cdf5a376794c9e6b84707028aa07a31e9fcbc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9675755502afcd4ad021243f92a03f0fffaf13de + 740cdf5a376794c9e6b84707028aa07a31e9fcbc https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 8885dcb229ed..36420e2bc3d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,11 +133,11 @@ - 6.0.12-servicing.22564.25 + 6.0.12-servicing.22564.27 6.0.12 - 6.0.12-servicing.22564.25 - 6.0.12-servicing.22564.25 - 6.0.12-servicing.22564.25 + 6.0.12-servicing.22564.27 + 6.0.12-servicing.22564.27 + 6.0.12-servicing.22564.27 6.0.12 6.0.3-1.22213.1 6.0.3-1.22213.1 From 186206cb788f9a89cb4cdae3b83caf3149f958f1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Nov 2022 05:18:29 +0000 Subject: [PATCH 089/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20221114.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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.11-servicing.22523.4 -> To Version 6.0.12-servicing.22564.30 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 8 +++---- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index ca88287a6f5d..8992a4034686 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index afcb1b4b4305..cd1d0c80d932 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 432d17a83aa5623e4581756f4d642997048056bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 740cdf5a376794c9e6b84707028aa07a31e9fcbc + 621e64b82e11eedd145a57a898d62bcfedcba5f9 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 740cdf5a376794c9e6b84707028aa07a31e9fcbc + 621e64b82e11eedd145a57a898d62bcfedcba5f9 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 740cdf5a376794c9e6b84707028aa07a31e9fcbc + 621e64b82e11eedd145a57a898d62bcfedcba5f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 740cdf5a376794c9e6b84707028aa07a31e9fcbc + 621e64b82e11eedd145a57a898d62bcfedcba5f9 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 740cdf5a376794c9e6b84707028aa07a31e9fcbc + 621e64b82e11eedd145a57a898d62bcfedcba5f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 740cdf5a376794c9e6b84707028aa07a31e9fcbc + 621e64b82e11eedd145a57a898d62bcfedcba5f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 740cdf5a376794c9e6b84707028aa07a31e9fcbc + 621e64b82e11eedd145a57a898d62bcfedcba5f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 740cdf5a376794c9e6b84707028aa07a31e9fcbc + 621e64b82e11eedd145a57a898d62bcfedcba5f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 740cdf5a376794c9e6b84707028aa07a31e9fcbc + 621e64b82e11eedd145a57a898d62bcfedcba5f9 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 740cdf5a376794c9e6b84707028aa07a31e9fcbc + 621e64b82e11eedd145a57a898d62bcfedcba5f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 740cdf5a376794c9e6b84707028aa07a31e9fcbc + 621e64b82e11eedd145a57a898d62bcfedcba5f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 740cdf5a376794c9e6b84707028aa07a31e9fcbc + 621e64b82e11eedd145a57a898d62bcfedcba5f9 https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 740cdf5a376794c9e6b84707028aa07a31e9fcbc + 621e64b82e11eedd145a57a898d62bcfedcba5f9 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 740cdf5a376794c9e6b84707028aa07a31e9fcbc + 621e64b82e11eedd145a57a898d62bcfedcba5f9 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 740cdf5a376794c9e6b84707028aa07a31e9fcbc + 621e64b82e11eedd145a57a898d62bcfedcba5f9 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 740cdf5a376794c9e6b84707028aa07a31e9fcbc + 621e64b82e11eedd145a57a898d62bcfedcba5f9 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 36420e2bc3d9..7b47b4b7ec88 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,11 +133,11 @@ - 6.0.12-servicing.22564.27 + 6.0.12-servicing.22564.30 6.0.12 - 6.0.12-servicing.22564.27 - 6.0.12-servicing.22564.27 - 6.0.12-servicing.22564.27 + 6.0.12-servicing.22564.30 + 6.0.12-servicing.22564.30 + 6.0.12-servicing.22564.30 6.0.12 6.0.3-1.22213.1 6.0.3-1.22213.1 From 137c287ee9439176a1ed0673a609db46f802471c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Nov 2022 00:46:44 +0000 Subject: [PATCH 090/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20221115.8 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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.12-servicing.22564.30 -> To Version 6.0.12-servicing.22565.8 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 8 +++---- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8992a4034686..d89d096973cd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9f7593810631..0045a50db68a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 432d17a83aa5623e4581756f4d642997048056bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 621e64b82e11eedd145a57a898d62bcfedcba5f9 + 441cb920757ccb55d6ed2748a12d432af6ec8b91 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 621e64b82e11eedd145a57a898d62bcfedcba5f9 + 441cb920757ccb55d6ed2748a12d432af6ec8b91 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 621e64b82e11eedd145a57a898d62bcfedcba5f9 + 441cb920757ccb55d6ed2748a12d432af6ec8b91 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 621e64b82e11eedd145a57a898d62bcfedcba5f9 + 441cb920757ccb55d6ed2748a12d432af6ec8b91 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 621e64b82e11eedd145a57a898d62bcfedcba5f9 + 441cb920757ccb55d6ed2748a12d432af6ec8b91 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 621e64b82e11eedd145a57a898d62bcfedcba5f9 + 441cb920757ccb55d6ed2748a12d432af6ec8b91 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 621e64b82e11eedd145a57a898d62bcfedcba5f9 + 441cb920757ccb55d6ed2748a12d432af6ec8b91 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 621e64b82e11eedd145a57a898d62bcfedcba5f9 + 441cb920757ccb55d6ed2748a12d432af6ec8b91 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 621e64b82e11eedd145a57a898d62bcfedcba5f9 + 441cb920757ccb55d6ed2748a12d432af6ec8b91 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 621e64b82e11eedd145a57a898d62bcfedcba5f9 + 441cb920757ccb55d6ed2748a12d432af6ec8b91 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 621e64b82e11eedd145a57a898d62bcfedcba5f9 + 441cb920757ccb55d6ed2748a12d432af6ec8b91 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 621e64b82e11eedd145a57a898d62bcfedcba5f9 + 441cb920757ccb55d6ed2748a12d432af6ec8b91 https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 621e64b82e11eedd145a57a898d62bcfedcba5f9 + 441cb920757ccb55d6ed2748a12d432af6ec8b91 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 621e64b82e11eedd145a57a898d62bcfedcba5f9 + 441cb920757ccb55d6ed2748a12d432af6ec8b91 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 621e64b82e11eedd145a57a898d62bcfedcba5f9 + 441cb920757ccb55d6ed2748a12d432af6ec8b91 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 621e64b82e11eedd145a57a898d62bcfedcba5f9 + 441cb920757ccb55d6ed2748a12d432af6ec8b91 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index c0c81f20c906..84c8a2150b0b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,11 +133,11 @@ - 6.0.12-servicing.22564.30 + 6.0.12-servicing.22565.8 6.0.12 - 6.0.12-servicing.22564.30 - 6.0.12-servicing.22564.30 - 6.0.12-servicing.22564.30 + 6.0.12-servicing.22565.8 + 6.0.12-servicing.22565.8 + 6.0.12-servicing.22565.8 6.0.12 6.0.3-1.22213.1 6.0.3-1.22213.1 From 509fa7c873f2bb6bc47cd42025fa61e5aa7b8c39 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 17 Nov 2022 14:46:34 +0000 Subject: [PATCH 091/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20221116.2 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.12-servicing.22561.4 -> To Version 6.0.12-servicing.22566.2 --- 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 d89d096973cd..e0f0b1e12929 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,7 +11,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0045a50db68a..11401aecfe8e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -32,31 +32,31 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0b4c183eb071ab452c3fbe9b392e972507cbf24a + 301f9272ad73bdc61612d730a910af914c64ab0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0b4c183eb071ab452c3fbe9b392e972507cbf24a + 301f9272ad73bdc61612d730a910af914c64ab0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0b4c183eb071ab452c3fbe9b392e972507cbf24a + 301f9272ad73bdc61612d730a910af914c64ab0e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0b4c183eb071ab452c3fbe9b392e972507cbf24a + 301f9272ad73bdc61612d730a910af914c64ab0e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0b4c183eb071ab452c3fbe9b392e972507cbf24a + 301f9272ad73bdc61612d730a910af914c64ab0e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 4437f088ec63a72bdbc05a1792307415e45d20ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0b4c183eb071ab452c3fbe9b392e972507cbf24a + 301f9272ad73bdc61612d730a910af914c64ab0e https://github.com/dotnet/runtime @@ -64,7 +64,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0b4c183eb071ab452c3fbe9b392e972507cbf24a + 301f9272ad73bdc61612d730a910af914c64ab0e https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted diff --git a/eng/Versions.props b/eng/Versions.props index 84c8a2150b0b..f16fd20c6796 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,12 +44,12 @@ 6.0.12 - 6.0.12-servicing.22561.4 + 6.0.12-servicing.22566.2 6.0.12 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 6.0.0 6.0.12 - 6.0.12-servicing.22561.4 + 6.0.12-servicing.22566.2 6.0.0-preview.7.21363.9 6.0.0 From e789925ced2f9dcd47ed2721acacd6aef1812471 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 17 Nov 2022 18:29:37 +0000 Subject: [PATCH 092/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20221117.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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.12-servicing.22565.8 -> To Version 6.0.12-servicing.22567.3 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 8 +++---- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index e0f0b1e12929..3d38d9765612 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 11401aecfe8e..9656ce9a7602 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 432d17a83aa5623e4581756f4d642997048056bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 441cb920757ccb55d6ed2748a12d432af6ec8b91 + 086f577cc27d90ddb24e2fffd5edba24f277ae0f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 441cb920757ccb55d6ed2748a12d432af6ec8b91 + 086f577cc27d90ddb24e2fffd5edba24f277ae0f https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 441cb920757ccb55d6ed2748a12d432af6ec8b91 + 086f577cc27d90ddb24e2fffd5edba24f277ae0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 441cb920757ccb55d6ed2748a12d432af6ec8b91 + 086f577cc27d90ddb24e2fffd5edba24f277ae0f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 441cb920757ccb55d6ed2748a12d432af6ec8b91 + 086f577cc27d90ddb24e2fffd5edba24f277ae0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 441cb920757ccb55d6ed2748a12d432af6ec8b91 + 086f577cc27d90ddb24e2fffd5edba24f277ae0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 441cb920757ccb55d6ed2748a12d432af6ec8b91 + 086f577cc27d90ddb24e2fffd5edba24f277ae0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 441cb920757ccb55d6ed2748a12d432af6ec8b91 + 086f577cc27d90ddb24e2fffd5edba24f277ae0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 441cb920757ccb55d6ed2748a12d432af6ec8b91 + 086f577cc27d90ddb24e2fffd5edba24f277ae0f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 441cb920757ccb55d6ed2748a12d432af6ec8b91 + 086f577cc27d90ddb24e2fffd5edba24f277ae0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 441cb920757ccb55d6ed2748a12d432af6ec8b91 + 086f577cc27d90ddb24e2fffd5edba24f277ae0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 441cb920757ccb55d6ed2748a12d432af6ec8b91 + 086f577cc27d90ddb24e2fffd5edba24f277ae0f https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 441cb920757ccb55d6ed2748a12d432af6ec8b91 + 086f577cc27d90ddb24e2fffd5edba24f277ae0f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 441cb920757ccb55d6ed2748a12d432af6ec8b91 + 086f577cc27d90ddb24e2fffd5edba24f277ae0f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 441cb920757ccb55d6ed2748a12d432af6ec8b91 + 086f577cc27d90ddb24e2fffd5edba24f277ae0f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 441cb920757ccb55d6ed2748a12d432af6ec8b91 + 086f577cc27d90ddb24e2fffd5edba24f277ae0f https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index f16fd20c6796..9fa6289f40cb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,11 +133,11 @@ - 6.0.12-servicing.22565.8 + 6.0.12-servicing.22567.3 6.0.12 - 6.0.12-servicing.22565.8 - 6.0.12-servicing.22565.8 - 6.0.12-servicing.22565.8 + 6.0.12-servicing.22567.3 + 6.0.12-servicing.22567.3 + 6.0.12-servicing.22567.3 6.0.12 6.0.3-1.22213.1 6.0.3-1.22213.1 From 1b0267420e26b3623b834c5bd08deef4ba9f1c3f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 17 Nov 2022 19:25:27 +0000 Subject: [PATCH 093/100] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-templating build 20221114.36 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.307 -> To Version 6.0.307 --- 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 3d38d9765612..ea6199c65fd1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -37,7 +37,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9656ce9a7602..d9f1f614d442 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ffe7a61a1dbb1ec3c008d9781ef37cffaf1bd4bc + 7f5bdb95e7e1e16d07aeb6ca18e984f529566077 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ffe7a61a1dbb1ec3c008d9781ef37cffaf1bd4bc + 7f5bdb95e7e1e16d07aeb6ca18e984f529566077 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ffe7a61a1dbb1ec3c008d9781ef37cffaf1bd4bc + 7f5bdb95e7e1e16d07aeb6ca18e984f529566077 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ffe7a61a1dbb1ec3c008d9781ef37cffaf1bd4bc + 7f5bdb95e7e1e16d07aeb6ca18e984f529566077 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ffe7a61a1dbb1ec3c008d9781ef37cffaf1bd4bc + 7f5bdb95e7e1e16d07aeb6ca18e984f529566077 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ffe7a61a1dbb1ec3c008d9781ef37cffaf1bd4bc + 7f5bdb95e7e1e16d07aeb6ca18e984f529566077 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ffe7a61a1dbb1ec3c008d9781ef37cffaf1bd4bc + 7f5bdb95e7e1e16d07aeb6ca18e984f529566077 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 9fa6289f40cb..0f8bb75f7a5d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -112,7 +112,7 @@ - 6.0.307-servicing.22564.26 + 6.0.307-servicing.22564.36 6.0.307 6.0.307 6.0.307 From 68caa23a95462cda1e340e8fe4789125422fcda1 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 18 Nov 2022 02:29:18 +0000 Subject: [PATCH 094/100] Merged PR 27625: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-templating This pull request updates the following dependencies [marker]: <> (Begin:2e2c41e3-4520-418e-d824-08da180b2c46) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-templating - **Subscription**: 2e2c41e3-4520-418e-d824-08da180b2c46 - **Build**: 20221117.7 - **Date Produced**: November 17, 2022 10:25:33 PM UTC - **Commit**: 42a1b9e51dcf979120f8ea33ad8d302e4341578c - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.307 to 6.0.307][1] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.307 to 6.0.307][1] - **Microsoft.TemplateEngine.Abstractions**: [from 6.0.307 to 6.0.307][1] - **Microsoft.TemplateEngine.Cli**: [from 6.0.307-servicing.22564.36 to 6.0.307-servicing.22567.7][1] - **Microsoft.TemplateEngine.Orchestrator.RunnableProjects**: [from 6.0.307 to 6.0.307][1] - **Microsoft.TemplateEngine.Utils**: [from 6.0.307 to 6.0.307][1] - **Microsoft.TemplateSearch.Common**: [from 6.0.307 to 6.0.307][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC7f5bdb9&targetVersion=GC42a1b9e&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:2e2c41e3-4520-418e-d824-08da180b2c46) --- 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 ea6199c65fd1..298b2575825f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -37,7 +37,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d9f1f614d442..02ae7bdd228d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7f5bdb95e7e1e16d07aeb6ca18e984f529566077 + 42a1b9e51dcf979120f8ea33ad8d302e4341578c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7f5bdb95e7e1e16d07aeb6ca18e984f529566077 + 42a1b9e51dcf979120f8ea33ad8d302e4341578c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7f5bdb95e7e1e16d07aeb6ca18e984f529566077 + 42a1b9e51dcf979120f8ea33ad8d302e4341578c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7f5bdb95e7e1e16d07aeb6ca18e984f529566077 + 42a1b9e51dcf979120f8ea33ad8d302e4341578c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7f5bdb95e7e1e16d07aeb6ca18e984f529566077 + 42a1b9e51dcf979120f8ea33ad8d302e4341578c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7f5bdb95e7e1e16d07aeb6ca18e984f529566077 + 42a1b9e51dcf979120f8ea33ad8d302e4341578c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7f5bdb95e7e1e16d07aeb6ca18e984f529566077 + 42a1b9e51dcf979120f8ea33ad8d302e4341578c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 0f8bb75f7a5d..5f0a05d37207 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -112,7 +112,7 @@ - 6.0.307-servicing.22564.36 + 6.0.307-servicing.22567.7 6.0.307 6.0.307 6.0.307 From c284ce8cb09f9db92864075de95e05ecd1e032db Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 18 Nov 2022 10:21:20 -0800 Subject: [PATCH 095/100] Update dependencies from https://github.com/dotnet/arcade build 20221114.9 (#29125) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 6.0.0-beta.22517.1 -> To Version 6.0.0-beta.22564.9 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 8 --- eng/Version.Details.xml | 16 +++--- eng/Versions.props | 4 +- eng/common/dotnet-install.sh | 4 +- eng/common/sdl/sdl.ps1 | 38 +++++++++++++ eng/common/templates/steps/execute-sdl.yml | 60 ++++++++++++++------- eng/common/templates/steps/source-build.yml | 6 +++ global.json | 4 +- 8 files changed, 98 insertions(+), 42 deletions(-) create mode 100644 eng/common/sdl/sdl.ps1 diff --git a/NuGet.config b/NuGet.config index 32a56d033347..adc36228c667 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,20 +4,16 @@ - - - - @@ -37,16 +33,12 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ffc9d072454c..e9c59ec729b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -287,22 +287,22 @@ - + https://github.com/dotnet/arcade - afc36a16c1ef79fd1969ca7effc7e99b61e4e9a6 + 3a5fc99d467769acc6f951cfefef5a9718ecfc42 - + https://github.com/dotnet/arcade - afc36a16c1ef79fd1969ca7effc7e99b61e4e9a6 + 3a5fc99d467769acc6f951cfefef5a9718ecfc42 - + https://github.com/dotnet/arcade - afc36a16c1ef79fd1969ca7effc7e99b61e4e9a6 + 3a5fc99d467769acc6f951cfefef5a9718ecfc42 - + https://github.com/dotnet/arcade - afc36a16c1ef79fd1969ca7effc7e99b61e4e9a6 + 3a5fc99d467769acc6f951cfefef5a9718ecfc42 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index d295cbcb9d36..b381b139db97 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,7 +28,7 @@ $(NewtonsoftJsonPackageVersion) 4.0.0 5.0.0 - 6.0.0-beta.22517.1 + 6.0.0-beta.22564.9 3.1.0 6.0.0 4.3.0 @@ -168,7 +168,7 @@ 4.19.2 4.19.0 - 6.0.0-beta.22517.1 + 6.0.0-beta.22564.9 4.8.2 6.0.0-beta.22262.1 diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index fdfeea66e7d4..b09ea669f9c0 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -52,7 +52,7 @@ done # Use uname to determine what the CPU is, see https://en.wikipedia.org/wiki/Uname#Examples cpuname=$(uname -m) case $cpuname in - aarch64) + arm64|aarch64) buildarch=arm64 ;; amd64|x86_64) @@ -61,7 +61,7 @@ case $cpuname in armv*l) buildarch=arm ;; - i686) + i[3-6]86) buildarch=x86 ;; *) diff --git a/eng/common/sdl/sdl.ps1 b/eng/common/sdl/sdl.ps1 new file mode 100644 index 000000000000..648c5068d7d6 --- /dev/null +++ b/eng/common/sdl/sdl.ps1 @@ -0,0 +1,38 @@ + +function Install-Gdn { + param( + [Parameter(Mandatory=$true)] + [string]$Path, + + # If omitted, install the latest version of Guardian, otherwise install that specific version. + [string]$Version + ) + + $ErrorActionPreference = 'Stop' + Set-StrictMode -Version 2.0 + $disableConfigureToolsetImport = $true + $global:LASTEXITCODE = 0 + + # `tools.ps1` checks $ci to perform some actions. Since the SDL + # scripts don't necessarily execute in the same agent that run the + # build.ps1/sh script this variable isn't automatically set. + $ci = $true + . $PSScriptRoot\..\tools.ps1 + + $argumentList = @("install", "Microsoft.Guardian.Cli", "-Source https://securitytools.pkgs.visualstudio.com/_packaging/Guardian/nuget/v3/index.json", "-OutputDirectory $Path", "-NonInteractive", "-NoCache") + + if ($Version) { + $argumentList += "-Version $Version" + } + + Start-Process nuget -Verbose -ArgumentList $argumentList -NoNewWindow -Wait + + $gdnCliPath = Get-ChildItem -Filter guardian.cmd -Recurse -Path $Path + + if (!$gdnCliPath) + { + Write-PipelineTelemetryError -Category 'Sdl' -Message 'Failure installing Guardian' + } + + return $gdnCliPath.FullName +} \ No newline at end of file diff --git a/eng/common/templates/steps/execute-sdl.yml b/eng/common/templates/steps/execute-sdl.yml index 7b8ee18a28d7..9dd5709f66dc 100644 --- a/eng/common/templates/steps/execute-sdl.yml +++ b/eng/common/templates/steps/execute-sdl.yml @@ -8,29 +8,28 @@ parameters: condition: '' steps: -- ${{ if ne(parameters.overrideGuardianVersion, '') }}: - - powershell: | - $content = Get-Content $(GuardianPackagesConfigFile) - - Write-Host "packages.config content was:`n$content" - - $content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)') - $content | Set-Content $(GuardianPackagesConfigFile) - - Write-Host "packages.config content updated to:`n$content" - displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }} +- task: NuGetAuthenticate@1 + inputs: + nuGetServiceConnections: GuardianConnect - task: NuGetToolInstaller@1 displayName: 'Install NuGet.exe' -- task: NuGetCommand@2 - displayName: 'Install Guardian' - inputs: - restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config - feedsToUse: config - nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config - externalFeedCredentials: GuardianConnect - restoreDirectory: $(Build.SourcesDirectory)\.packages +- ${{ if ne(parameters.overrideGuardianVersion, '') }}: + - pwsh: | + Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl + . .\sdl.ps1 + $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts -Version ${{ parameters.overrideGuardianVersion }} + Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" + displayName: Install Guardian (Overridden) + +- ${{ if eq(parameters.overrideGuardianVersion, '') }}: + - pwsh: | + Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl + . .\sdl.ps1 + $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts + Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" + displayName: Install Guardian - ${{ if ne(parameters.overrideParameters, '') }}: - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }} @@ -40,7 +39,7 @@ steps: - ${{ if eq(parameters.overrideParameters, '') }}: - powershell: ${{ parameters.executeAllSdlToolsScript }} - -GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion) + -GuardianCliLocation $(GuardianCliLocation) -NugetPackageDirectory $(Build.SourcesDirectory)\.packages -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) ${{ parameters.additionalParameters }} @@ -62,7 +61,28 @@ steps: c i condition: succeededOrFailed() + - publish: $(Agent.BuildDirectory)/.gdn artifact: GuardianConfiguration displayName: Publish GuardianConfiguration + condition: succeededOrFailed() + + # Publish the SARIF files in a container named CodeAnalysisLogs to enable integration + # with the "SARIF SAST Scans Tab" Azure DevOps extension + - task: CopyFiles@2 + displayName: Copy SARIF files + inputs: + flattenFolders: true + sourceFolder: $(Agent.BuildDirectory)/.gdn/rc/ + contents: '**/*.sarif' + targetFolder: $(Build.SourcesDirectory)/CodeAnalysisLogs + condition: succeededOrFailed() + + # Use PublishBuildArtifacts because the SARIF extension only checks this case + # see microsoft/sarif-azuredevops-extension#4 + - task: PublishBuildArtifacts@1 + displayName: Publish SARIF files to CodeAnalysisLogs container + inputs: + pathToPublish: $(Build.SourcesDirectory)/CodeAnalysisLogs + artifactName: CodeAnalysisLogs condition: succeededOrFailed() \ No newline at end of file diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index abb1b2bcda42..b5b3e5aeb3b9 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -63,6 +63,11 @@ steps: targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' fi + runtimeOsArgs= + if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then + runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' + fi + publishArgs= if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then publishArgs='--publish' @@ -75,6 +80,7 @@ steps: $internalRuntimeDownloadArgs \ $internalRestoreArgs \ $targetRidArgs \ + $runtimeOsArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ /p:ArcadeBuildFromSource=true displayName: Build diff --git a/global.json b/global.json index f87a79cba639..6e4ab3442d46 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22517.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22517.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22564.9", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22564.9" } } From 29446135579155de38441de881bf1f2b3ee42548 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 19 Nov 2022 00:33:06 +0000 Subject: [PATCH 096/100] Merged PR 27674: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:dc1c3afc-aa30-466e-4d3a-08da180de348) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: dc1c3afc-aa30-466e-4d3a-08da180de348 - **Build**: 20221118.7 - **Date Produced**: November 18, 2022 10:05:46 PM UTC - **Commit**: 02e45a41b756dd147fc39297df7649d86fa245e7 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.HostModel**: [from 6.0.12-servicing.22566.2 to 6.0.12-servicing.22568.7][1] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.12 to 6.0.12][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.12 to 6.0.12][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.12 to 6.0.12][1] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.12 to 6.0.12][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22566.2 to 6.0.12-servicing.22568.7][1] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.12-servicing.22566.2 to 6.0.12-servicing.22568.7][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC301f927&targetVersion=GC02e45a4&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:dc1c3afc-aa30-466e-4d3a-08da180de348) --- 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 298b2575825f..1e192b893e99 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,7 +11,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bf07a1d4d52e..5d1d709c20ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -32,31 +32,31 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 4437f088ec63a72bdbc05a1792307415e45d20ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 https://github.com/dotnet/runtime @@ -64,7 +64,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 301f9272ad73bdc61612d730a910af914c64ab0e + 02e45a41b756dd147fc39297df7649d86fa245e7 https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted diff --git a/eng/Versions.props b/eng/Versions.props index 4edff57d0a64..6e0446709427 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,12 +44,12 @@ 6.0.12 - 6.0.12-servicing.22566.2 + 6.0.12-servicing.22568.7 6.0.12 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 6.0.0 6.0.12 - 6.0.12-servicing.22566.2 + 6.0.12-servicing.22568.7 6.0.0-preview.7.21363.9 6.0.0 From 088530583952a8bc3348eedca0403b7e8dc37012 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 19 Nov 2022 17:31:16 +0000 Subject: [PATCH 097/100] Merged PR 27690: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-aspnetcore dnceng/internal/dotnet-templating This pull request updates the following dependencies [marker]: <> (Begin:ffc11ea2-d045-4ff5-4d39-08da180de348) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: ffc11ea2-d045-4ff5-4d39-08da180de348 - **Build**: 20221118.11 - **Date Produced**: November 19, 2022 1:37:39 AM UTC - **Commit**: 6a747bbcc3c3cffac5ee537791157e33bd373119 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 6.0.12-servicing.22567.3 to 6.0.12-servicing.22568.11][1] - **dotnet-user-secrets**: [from 6.0.12-servicing.22567.3 to 6.0.12-servicing.22568.11][1] - **Microsoft.AspNetCore.Analyzers**: [from 6.0.12-servicing.22567.3 to 6.0.12-servicing.22568.11][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.12 to 6.0.12][1] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.12-servicing.22567.3 to 6.0.12-servicing.22568.11][1] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.12 to 6.0.12][1] - **Microsoft.AspNetCore.Authorization**: [from 6.0.12 to 6.0.12][1] - **Microsoft.AspNetCore.Components.Analyzers**: [from 6.0.12 to 6.0.12][1] - **Microsoft.AspNetCore.Components.Web**: [from 6.0.12 to 6.0.12][1] - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 6.0.12-servicing.22567.3 to 6.0.12-servicing.22568.11][1] - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 6.0.12-servicing.22567.3 to 6.0.12-servicing.22568.11][1] - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 6.0.12-servicing.22567.3 to 6.0.12-servicing.22568.11][1] - **Microsoft.AspNetCore.TestHost**: [from 6.0.12 to 6.0.12][1] - **Microsoft.Extensions.FileProviders.Embedded**: [from 6.0.12 to 6.0.12][1] - **Microsoft.JSInterop**: [from 6.0.12 to 6.0.12][1] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22567.3 to 6.0.12-servicing.22568.11][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC086f577&targetVersion=GC6a747bb&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:ffc11ea2-d045-4ff5-4d39-08da180de348) [marker]: <> (Begin:2e2c41e3-4520-418e-d824-08da180b2c46) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-templating - **Subscription**: 2e2c41e3-4520-418e-d824-08da180b2c46 - **Build**: 20221118.6 - **Date Produced**: November 19, 2022 1:41:34 AM UTC - **Commit**: 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.307 to 6.0.307][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.307 to 6.0.307][2] - **Microsoft.TemplateEngine.Abstractions**: [from 6.0.307 to 6.0.307][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.307-servicing.22567.7 to 6.0.307-servicing.22568.6][2] - **Microsoft.TemplateEngine.Orchestrator.RunnableProjects**: [from 6.0.307 t... --- NuGet.config | 8 +++--- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++---- 3 files changed, 41 insertions(+), 41 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1e192b893e99..6029878752e0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -37,10 +37,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5d1d709c20ad..0f9d65489b62 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 42a1b9e51dcf979120f8ea33ad8d302e4341578c + 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 42a1b9e51dcf979120f8ea33ad8d302e4341578c + 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 42a1b9e51dcf979120f8ea33ad8d302e4341578c + 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 42a1b9e51dcf979120f8ea33ad8d302e4341578c + 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 42a1b9e51dcf979120f8ea33ad8d302e4341578c + 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 42a1b9e51dcf979120f8ea33ad8d302e4341578c + 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 42a1b9e51dcf979120f8ea33ad8d302e4341578c + 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 432d17a83aa5623e4581756f4d642997048056bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 086f577cc27d90ddb24e2fffd5edba24f277ae0f + 6a747bbcc3c3cffac5ee537791157e33bd373119 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 6e0446709427..0a32629dbb2a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -112,7 +112,7 @@ - 6.0.307-servicing.22567.7 + 6.0.307-servicing.22568.6 6.0.307 6.0.307 6.0.307 @@ -133,11 +133,11 @@ - 6.0.12-servicing.22567.3 + 6.0.12-servicing.22568.11 6.0.12 - 6.0.12-servicing.22567.3 - 6.0.12-servicing.22567.3 - 6.0.12-servicing.22567.3 + 6.0.12-servicing.22568.11 + 6.0.12-servicing.22568.11 + 6.0.12-servicing.22568.11 6.0.12 6.0.3-1.22213.1 6.0.3-1.22213.1 From 923a0bd20698ff7e1109ee8f639240bc089d1ebc Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 21 Nov 2022 22:06:05 +0000 Subject: [PATCH 098/100] Merged PR 27720: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-aspnetcore dnceng/internal/dotnet-templating This pull request updates the following dependencies [marker]: <> (Begin:ffc11ea2-d045-4ff5-4d39-08da180de348) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: ffc11ea2-d045-4ff5-4d39-08da180de348 - **Build**: 20221121.9 - **Date Produced**: November 21, 2022 6:14:15 PM UTC - **Commit**: 54142bcb25544b72fac28b1b061e7788c91c4f49 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][1] - **dotnet-user-secrets**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][1] - **Microsoft.AspNetCore.Analyzers**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.12 to 6.0.12][1] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][1] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.12 to 6.0.12][1] - **Microsoft.AspNetCore.Authorization**: [from 6.0.12 to 6.0.12][1] - **Microsoft.AspNetCore.Components.Analyzers**: [from 6.0.12 to 6.0.12][1] - **Microsoft.AspNetCore.Components.Web**: [from 6.0.12 to 6.0.12][1] - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][1] - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][1] - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][1] - **Microsoft.AspNetCore.TestHost**: [from 6.0.12 to 6.0.12][1] - **Microsoft.Extensions.FileProviders.Embedded**: [from 6.0.12 to 6.0.12][1] - **Microsoft.JSInterop**: [from 6.0.12 to 6.0.12][1] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC6a747bb&targetVersion=GC54142bc&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:ffc11ea2-d045-4ff5-4d39-08da180de348) [marker]: <> (Begin:2e2c41e3-4520-418e-d824-08da180b2c46) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-templating - **Subscription**: 2e2c41e3-4520-418e-d824-08da180b2c46 - **Build**: 20221121.12 - **Date Produced**: November 21, 2022 6:14:57 PM UTC - **Commit**: 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.307 to 6.0.307][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.307 to 6.0.307][2] - **Microsoft.TemplateEngine.Abstractions**: [from 6.0.307 to 6.0.307][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.307-servicing.22568.6 to 6.0.307-servicing.22571.12][2] - **Microsoft.TemplateEngine.Orchestrator.RunnableProjects**: [from 6.0.307 ... --- NuGet.config | 8 +++--- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++---- 3 files changed, 41 insertions(+), 41 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6029878752e0..db747e45e236 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -37,10 +37,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0f9d65489b62..353e9f918025 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 + 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 + 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 + 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 + 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 + 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 + 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 + 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 432d17a83aa5623e4581756f4d642997048056bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 0a32629dbb2a..deecb1c72db1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -112,7 +112,7 @@ - 6.0.307-servicing.22568.6 + 6.0.307-servicing.22571.12 6.0.307 6.0.307 6.0.307 @@ -133,11 +133,11 @@ - 6.0.12-servicing.22568.11 + 6.0.12-servicing.22571.9 6.0.12 - 6.0.12-servicing.22568.11 - 6.0.12-servicing.22568.11 - 6.0.12-servicing.22568.11 + 6.0.12-servicing.22571.9 + 6.0.12-servicing.22571.9 + 6.0.12-servicing.22571.9 6.0.12 6.0.3-1.22213.1 6.0.3-1.22213.1 From 1f6220ecb4f61ace28461f611ab1caeb618d2473 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 22 Nov 2022 16:58:35 +0000 Subject: [PATCH 099/100] Merged PR 27749: Fixup shas that were flowed after final build Fixup shas that were flowed after final build --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 353e9f918025..0a34e495f262 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,7 +52,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4437f088ec63a72bdbc05a1792307415e45d20ad + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 9a2ae60264377b0ead2ddbaf4ecc0a307488a22e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 28 Nov 2022 23:10:39 +0000 Subject: [PATCH 100/100] Merged PR 27806: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-templating dnceng/internal/dotnet-windowsdesktop This pull request updates the following dependencies [marker]: <> (Begin:2e2c41e3-4520-418e-d824-08da180b2c46) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-templating - **Subscription**: 2e2c41e3-4520-418e-d824-08da180b2c46 - **Build**: 20221125.5 - **Date Produced**: November 25, 2022 7:24:32 PM UTC - **Commit**: 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.307 to 6.0.307][1] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.307 to 6.0.307][1] - **Microsoft.TemplateEngine.Abstractions**: [from 6.0.307 to 6.0.307][1] - **Microsoft.TemplateEngine.Cli**: [from 6.0.307-servicing.22571.12 to 6.0.307-servicing.22575.5][1] - **Microsoft.TemplateEngine.Orchestrator.RunnableProjects**: [from 6.0.307 to 6.0.307][1] - **Microsoft.TemplateEngine.Utils**: [from 6.0.307 to 6.0.307][1] - **Microsoft.TemplateSearch.Common**: [from 6.0.307 to 6.0.307][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC4a811df&targetVersion=GC3ef5e36&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:2e2c41e3-4520-418e-d824-08da180b2c46) [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.11-servicing.22523.2 to 6.0.12-servicing.22569.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:d1814f0c-875d-4709-e94c-08da181a39e5) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: d1814f0c-875d-4709-e94c-08da181a39e5 - **Build**: 20221128.4 - **Date Produced**: November 28, 2022 10:38:36 PM UTC - **Commit**: e8b4ef2cfc595ccca430b7a3c31cad2855e003eb - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.12 to 6.0.12][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.12 to 6.0.12][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22554.3 to 6.0.12-servicing.22578.4][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.12-servicing.22554.3 to 6.0.12-servicing.22578.4][2] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.11-servicing.22523.2 to 6.0.12-servicing.22569.2][3] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVers... --- NuGet.config | 10 ++++++---- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 6 +++--- 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index db747e45e236..46a503589894 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,7 @@ + @@ -14,10 +15,10 @@ - + - + @@ -37,16 +38,17 @@ - + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a34e495f262..88addcf9979f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 + 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 + 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 + 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 + 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 + 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 + 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 + 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -168,23 +168,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fb084615fb24289d4a41753a27b326acdff496c6 + e8b4ef2cfc595ccca430b7a3c31cad2855e003eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fb084615fb24289d4a41753a27b326acdff496c6 + e8b4ef2cfc595ccca430b7a3c31cad2855e003eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fb084615fb24289d4a41753a27b326acdff496c6 + e8b4ef2cfc595ccca430b7a3c31cad2855e003eb https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fb084615fb24289d4a41753a27b326acdff496c6 + e8b4ef2cfc595ccca430b7a3c31cad2855e003eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 96c5254e5ca5040021caf779216b1b3641875b1e + 4178d795849932702f98b7f375f6341267510326 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index deecb1c72db1..6dbdeddba08a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -112,7 +112,7 @@ - 6.0.307-servicing.22571.12 + 6.0.307-servicing.22575.5 6.0.307 6.0.307 6.0.307 @@ -145,11 +145,11 @@ - 6.0.11-servicing.22523.2 + 6.0.12-servicing.22569.2 - 6.0.12-servicing.22554.3 + 6.0.12-servicing.22578.4