From bf1b83196f3ce0c5e4a85ffb7826708f7d22083d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 4 Oct 2022 18:40:56 +0000 Subject: [PATCH 01/33] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20221004.4 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.11 --- NuGet.config | 26 ++++++++++++++++++++++++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2d77baa4a9f7..05339afbc34c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,25 +5,36 @@ + + + + + + + + + + + - + @@ -42,23 +53,34 @@ + + + + + + + + + + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1b38d659eca0..3becff5010c4 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 - 74607da18cfa95417e1bddf02c80fb97e48c7f46 + 769e1aa971ed2d6309e3b01ea097ad3a261d2686 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 74607da18cfa95417e1bddf02c80fb97e48c7f46 + 769e1aa971ed2d6309e3b01ea097ad3a261d2686 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 74607da18cfa95417e1bddf02c80fb97e48c7f46 + 769e1aa971ed2d6309e3b01ea097ad3a261d2686 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 74607da18cfa95417e1bddf02c80fb97e48c7f46 + 769e1aa971ed2d6309e3b01ea097ad3a261d2686 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf diff --git a/eng/Versions.props b/eng/Versions.props index 02684ac50517..8cffad5ade88 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,7 +149,7 @@ - 6.0.10-servicing.22476.6 + 6.0.11-servicing.22504.4 From 521bbd683d6dedb45788788f530f0fa74dd064ec Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 4 Oct 2022 20:43:12 +0000 Subject: [PATCH 02/33] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20221004.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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.10-servicing.22476.17 -> To Version 6.0.11-servicing.22504.10 --- 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 05339afbc34c..61824b6474ce 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,9 +4,7 @@ - - - + @@ -71,9 +69,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3becff5010c4..7b4decae3550 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 - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + f6c6435f9ce961b896f2d80b7a3eace477598d7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + f6c6435f9ce961b896f2d80b7a3eace477598d7a https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -186,46 +186,46 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 3bbc77257e3d51a2e19195523eafd262da1f5459 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + f6c6435f9ce961b896f2d80b7a3eace477598d7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + f6c6435f9ce961b896f2d80b7a3eace477598d7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + f6c6435f9ce961b896f2d80b7a3eace477598d7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + f6c6435f9ce961b896f2d80b7a3eace477598d7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + f6c6435f9ce961b896f2d80b7a3eace477598d7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + f6c6435f9ce961b896f2d80b7a3eace477598d7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + f6c6435f9ce961b896f2d80b7a3eace477598d7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + f6c6435f9ce961b896f2d80b7a3eace477598d7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + f6c6435f9ce961b896f2d80b7a3eace477598d7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + f6c6435f9ce961b896f2d80b7a3eace477598d7a https://github.com/dotnet/razor-compiler @@ -242,21 +242,21 @@ fde127ba1cbee8a15c4a1fb8e46e686f3caac8ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + f6c6435f9ce961b896f2d80b7a3eace477598d7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + f6c6435f9ce961b896f2d80b7a3eace477598d7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + f6c6435f9ce961b896f2d80b7a3eace477598d7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173 + f6c6435f9ce961b896f2d80b7a3eace477598d7a https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 8cffad5ade88..aa557e56166f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,12 +133,12 @@ - 6.0.10-servicing.22476.17 - 6.0.10 - 6.0.10-servicing.22476.17 - 6.0.10-servicing.22476.17 - 6.0.10-servicing.22476.17 - 6.0.10 + 6.0.11-servicing.22504.10 + 6.0.11 + 6.0.11-servicing.22504.10 + 6.0.11-servicing.22504.10 + 6.0.11-servicing.22504.10 + 6.0.11 6.0.3-1.22213.1 6.0.3-1.22213.1 6.0.3-1.22213.1 From e4e6e725a8e2ca204e99c0140f7bcd4d64e1bf86 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 4 Oct 2022 22:24:23 +0000 Subject: [PATCH 03/33] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20221004.17 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.10-servicing.22476.17 -> To Version 6.0.11-servicing.22504.17 --- 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 61824b6474ce..30037ca26123 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -69,7 +69,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7b4decae3550..23b61baa1f65 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 - f6c6435f9ce961b896f2d80b7a3eace477598d7a + 6a1f3e3ef10feeb470c2b9dd6d192a074da52b38 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f6c6435f9ce961b896f2d80b7a3eace477598d7a + 6a1f3e3ef10feeb470c2b9dd6d192a074da52b38 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f6c6435f9ce961b896f2d80b7a3eace477598d7a + 6a1f3e3ef10feeb470c2b9dd6d192a074da52b38 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f6c6435f9ce961b896f2d80b7a3eace477598d7a + 6a1f3e3ef10feeb470c2b9dd6d192a074da52b38 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f6c6435f9ce961b896f2d80b7a3eace477598d7a + 6a1f3e3ef10feeb470c2b9dd6d192a074da52b38 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f6c6435f9ce961b896f2d80b7a3eace477598d7a + 6a1f3e3ef10feeb470c2b9dd6d192a074da52b38 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f6c6435f9ce961b896f2d80b7a3eace477598d7a + 6a1f3e3ef10feeb470c2b9dd6d192a074da52b38 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f6c6435f9ce961b896f2d80b7a3eace477598d7a + 6a1f3e3ef10feeb470c2b9dd6d192a074da52b38 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f6c6435f9ce961b896f2d80b7a3eace477598d7a + 6a1f3e3ef10feeb470c2b9dd6d192a074da52b38 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f6c6435f9ce961b896f2d80b7a3eace477598d7a + 6a1f3e3ef10feeb470c2b9dd6d192a074da52b38 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f6c6435f9ce961b896f2d80b7a3eace477598d7a + 6a1f3e3ef10feeb470c2b9dd6d192a074da52b38 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f6c6435f9ce961b896f2d80b7a3eace477598d7a + 6a1f3e3ef10feeb470c2b9dd6d192a074da52b38 https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f6c6435f9ce961b896f2d80b7a3eace477598d7a + 6a1f3e3ef10feeb470c2b9dd6d192a074da52b38 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f6c6435f9ce961b896f2d80b7a3eace477598d7a + 6a1f3e3ef10feeb470c2b9dd6d192a074da52b38 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f6c6435f9ce961b896f2d80b7a3eace477598d7a + 6a1f3e3ef10feeb470c2b9dd6d192a074da52b38 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f6c6435f9ce961b896f2d80b7a3eace477598d7a + 6a1f3e3ef10feeb470c2b9dd6d192a074da52b38 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index aa557e56166f..1e29be160539 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,11 +133,11 @@ - 6.0.11-servicing.22504.10 + 6.0.11-servicing.22504.17 6.0.11 - 6.0.11-servicing.22504.10 - 6.0.11-servicing.22504.10 - 6.0.11-servicing.22504.10 + 6.0.11-servicing.22504.17 + 6.0.11-servicing.22504.17 + 6.0.11-servicing.22504.17 6.0.11 6.0.3-1.22213.1 6.0.3-1.22213.1 From 8cb69668fc27e02c66b9ed4a1f237078f2515bb7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 4 Oct 2022 23:59:20 +0000 Subject: [PATCH 04/33] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20221004.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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.10-servicing.22476.17 -> To Version 6.0.11-servicing.22504.21 --- 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 30037ca26123..7b42e4197f0f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -69,7 +69,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 23b61baa1f65..e8f5888d881c 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 - 6a1f3e3ef10feeb470c2b9dd6d192a074da52b38 + c23770a7dc0050d2ed18d276640fd17f1efcb873 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a1f3e3ef10feeb470c2b9dd6d192a074da52b38 + c23770a7dc0050d2ed18d276640fd17f1efcb873 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a1f3e3ef10feeb470c2b9dd6d192a074da52b38 + c23770a7dc0050d2ed18d276640fd17f1efcb873 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a1f3e3ef10feeb470c2b9dd6d192a074da52b38 + c23770a7dc0050d2ed18d276640fd17f1efcb873 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a1f3e3ef10feeb470c2b9dd6d192a074da52b38 + c23770a7dc0050d2ed18d276640fd17f1efcb873 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a1f3e3ef10feeb470c2b9dd6d192a074da52b38 + c23770a7dc0050d2ed18d276640fd17f1efcb873 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a1f3e3ef10feeb470c2b9dd6d192a074da52b38 + c23770a7dc0050d2ed18d276640fd17f1efcb873 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a1f3e3ef10feeb470c2b9dd6d192a074da52b38 + c23770a7dc0050d2ed18d276640fd17f1efcb873 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a1f3e3ef10feeb470c2b9dd6d192a074da52b38 + c23770a7dc0050d2ed18d276640fd17f1efcb873 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a1f3e3ef10feeb470c2b9dd6d192a074da52b38 + c23770a7dc0050d2ed18d276640fd17f1efcb873 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a1f3e3ef10feeb470c2b9dd6d192a074da52b38 + c23770a7dc0050d2ed18d276640fd17f1efcb873 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a1f3e3ef10feeb470c2b9dd6d192a074da52b38 + c23770a7dc0050d2ed18d276640fd17f1efcb873 https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a1f3e3ef10feeb470c2b9dd6d192a074da52b38 + c23770a7dc0050d2ed18d276640fd17f1efcb873 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a1f3e3ef10feeb470c2b9dd6d192a074da52b38 + c23770a7dc0050d2ed18d276640fd17f1efcb873 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a1f3e3ef10feeb470c2b9dd6d192a074da52b38 + c23770a7dc0050d2ed18d276640fd17f1efcb873 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a1f3e3ef10feeb470c2b9dd6d192a074da52b38 + c23770a7dc0050d2ed18d276640fd17f1efcb873 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 1e29be160539..50d49285c214 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,11 +133,11 @@ - 6.0.11-servicing.22504.17 + 6.0.11-servicing.22504.21 6.0.11 - 6.0.11-servicing.22504.17 - 6.0.11-servicing.22504.17 - 6.0.11-servicing.22504.17 + 6.0.11-servicing.22504.21 + 6.0.11-servicing.22504.21 + 6.0.11-servicing.22504.21 6.0.11 6.0.3-1.22213.1 6.0.3-1.22213.1 From ffc7c9cf8495dc54730a96a18e294b1bc1115b46 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 5 Oct 2022 01:44:54 +0000 Subject: [PATCH 05/33] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20221004.23 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.10-servicing.22476.17 -> To Version 6.0.11-servicing.22504.23 --- 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 7b42e4197f0f..5201f5541dcb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -69,7 +69,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e8f5888d881c..2a0433e2a4d8 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 - c23770a7dc0050d2ed18d276640fd17f1efcb873 + d4dcdec9149486e12f210765fe5a79c6eb968237 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c23770a7dc0050d2ed18d276640fd17f1efcb873 + d4dcdec9149486e12f210765fe5a79c6eb968237 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c23770a7dc0050d2ed18d276640fd17f1efcb873 + d4dcdec9149486e12f210765fe5a79c6eb968237 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c23770a7dc0050d2ed18d276640fd17f1efcb873 + d4dcdec9149486e12f210765fe5a79c6eb968237 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c23770a7dc0050d2ed18d276640fd17f1efcb873 + d4dcdec9149486e12f210765fe5a79c6eb968237 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c23770a7dc0050d2ed18d276640fd17f1efcb873 + d4dcdec9149486e12f210765fe5a79c6eb968237 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c23770a7dc0050d2ed18d276640fd17f1efcb873 + d4dcdec9149486e12f210765fe5a79c6eb968237 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c23770a7dc0050d2ed18d276640fd17f1efcb873 + d4dcdec9149486e12f210765fe5a79c6eb968237 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c23770a7dc0050d2ed18d276640fd17f1efcb873 + d4dcdec9149486e12f210765fe5a79c6eb968237 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c23770a7dc0050d2ed18d276640fd17f1efcb873 + d4dcdec9149486e12f210765fe5a79c6eb968237 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c23770a7dc0050d2ed18d276640fd17f1efcb873 + d4dcdec9149486e12f210765fe5a79c6eb968237 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c23770a7dc0050d2ed18d276640fd17f1efcb873 + d4dcdec9149486e12f210765fe5a79c6eb968237 https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c23770a7dc0050d2ed18d276640fd17f1efcb873 + d4dcdec9149486e12f210765fe5a79c6eb968237 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c23770a7dc0050d2ed18d276640fd17f1efcb873 + d4dcdec9149486e12f210765fe5a79c6eb968237 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c23770a7dc0050d2ed18d276640fd17f1efcb873 + d4dcdec9149486e12f210765fe5a79c6eb968237 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c23770a7dc0050d2ed18d276640fd17f1efcb873 + d4dcdec9149486e12f210765fe5a79c6eb968237 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 50d49285c214..7af7ff240028 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,11 +133,11 @@ - 6.0.11-servicing.22504.21 + 6.0.11-servicing.22504.23 6.0.11 - 6.0.11-servicing.22504.21 - 6.0.11-servicing.22504.21 - 6.0.11-servicing.22504.21 + 6.0.11-servicing.22504.23 + 6.0.11-servicing.22504.23 + 6.0.11-servicing.22504.23 6.0.11 6.0.3-1.22213.1 6.0.3-1.22213.1 From 7563b84e42497e942a11912bf9c3fd800d187e0d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 5 Oct 2022 03:19:19 +0000 Subject: [PATCH 06/33] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20221004.24 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.10-servicing.22476.17 -> To Version 6.0.11-servicing.22504.24 --- 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 5201f5541dcb..aad2c51f77a3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -69,7 +69,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2a0433e2a4d8..748e7130ff16 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 - d4dcdec9149486e12f210765fe5a79c6eb968237 + 091ba2899e3eb93e88a944cc2bac82fb90b5a74a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4dcdec9149486e12f210765fe5a79c6eb968237 + 091ba2899e3eb93e88a944cc2bac82fb90b5a74a https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4dcdec9149486e12f210765fe5a79c6eb968237 + 091ba2899e3eb93e88a944cc2bac82fb90b5a74a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4dcdec9149486e12f210765fe5a79c6eb968237 + 091ba2899e3eb93e88a944cc2bac82fb90b5a74a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4dcdec9149486e12f210765fe5a79c6eb968237 + 091ba2899e3eb93e88a944cc2bac82fb90b5a74a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4dcdec9149486e12f210765fe5a79c6eb968237 + 091ba2899e3eb93e88a944cc2bac82fb90b5a74a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4dcdec9149486e12f210765fe5a79c6eb968237 + 091ba2899e3eb93e88a944cc2bac82fb90b5a74a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4dcdec9149486e12f210765fe5a79c6eb968237 + 091ba2899e3eb93e88a944cc2bac82fb90b5a74a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4dcdec9149486e12f210765fe5a79c6eb968237 + 091ba2899e3eb93e88a944cc2bac82fb90b5a74a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4dcdec9149486e12f210765fe5a79c6eb968237 + 091ba2899e3eb93e88a944cc2bac82fb90b5a74a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4dcdec9149486e12f210765fe5a79c6eb968237 + 091ba2899e3eb93e88a944cc2bac82fb90b5a74a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4dcdec9149486e12f210765fe5a79c6eb968237 + 091ba2899e3eb93e88a944cc2bac82fb90b5a74a https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4dcdec9149486e12f210765fe5a79c6eb968237 + 091ba2899e3eb93e88a944cc2bac82fb90b5a74a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4dcdec9149486e12f210765fe5a79c6eb968237 + 091ba2899e3eb93e88a944cc2bac82fb90b5a74a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4dcdec9149486e12f210765fe5a79c6eb968237 + 091ba2899e3eb93e88a944cc2bac82fb90b5a74a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d4dcdec9149486e12f210765fe5a79c6eb968237 + 091ba2899e3eb93e88a944cc2bac82fb90b5a74a https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 7af7ff240028..08bc0c08f580 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,11 +133,11 @@ - 6.0.11-servicing.22504.23 + 6.0.11-servicing.22504.24 6.0.11 - 6.0.11-servicing.22504.23 - 6.0.11-servicing.22504.23 - 6.0.11-servicing.22504.23 + 6.0.11-servicing.22504.24 + 6.0.11-servicing.22504.24 + 6.0.11-servicing.22504.24 6.0.11 6.0.3-1.22213.1 6.0.3-1.22213.1 From 99a9afc673862137ae10de27ad0d38547ef886e8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 5 Oct 2022 09:42:11 +0000 Subject: [PATCH 07/33] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-templating build 20221005.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.305 -> To Version 6.0.306 --- NuGet.config | 8 ++------ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 10 +++++----- 3 files changed, 21 insertions(+), 25 deletions(-) diff --git a/NuGet.config b/NuGet.config index aad2c51f77a3..08485fa69c16 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,9 +27,7 @@ - - - + @@ -64,9 +62,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 748e7130ff16..cf0b57dbeee3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4c6436d0fb4378537a091f06432b306ea8ef383e + 0b1c2417a627b38e3f44be2eb14cf37ab28d9255 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4c6436d0fb4378537a091f06432b306ea8ef383e + 0b1c2417a627b38e3f44be2eb14cf37ab28d9255 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4c6436d0fb4378537a091f06432b306ea8ef383e + 0b1c2417a627b38e3f44be2eb14cf37ab28d9255 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4c6436d0fb4378537a091f06432b306ea8ef383e + 0b1c2417a627b38e3f44be2eb14cf37ab28d9255 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4c6436d0fb4378537a091f06432b306ea8ef383e + 0b1c2417a627b38e3f44be2eb14cf37ab28d9255 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4c6436d0fb4378537a091f06432b306ea8ef383e + 0b1c2417a627b38e3f44be2eb14cf37ab28d9255 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4c6436d0fb4378537a091f06432b306ea8ef383e + 0b1c2417a627b38e3f44be2eb14cf37ab28d9255 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 08bc0c08f580..6e237422350d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -112,11 +112,11 @@ - 6.0.305-servicing.22476.20 - 6.0.305 - 6.0.305 - 6.0.305 - 6.0.305 + 6.0.306-servicing.22505.8 + 6.0.306 + 6.0.306 + 6.0.306 + 6.0.306 From 6f6194449afa7cb62e4b91f5324f98f1cf8c4f3f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 5 Oct 2022 14:32:47 +0000 Subject: [PATCH 08/33] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20221005.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.10-servicing.22476.17 -> To Version 6.0.11-servicing.22505.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 08485fa69c16..f17583051a50 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -65,7 +65,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cf0b57dbeee3..a43fbe92937d 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 - 091ba2899e3eb93e88a944cc2bac82fb90b5a74a + 394d991b613f365d523b4f98d0105f581ab63ad0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 091ba2899e3eb93e88a944cc2bac82fb90b5a74a + 394d991b613f365d523b4f98d0105f581ab63ad0 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 091ba2899e3eb93e88a944cc2bac82fb90b5a74a + 394d991b613f365d523b4f98d0105f581ab63ad0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 091ba2899e3eb93e88a944cc2bac82fb90b5a74a + 394d991b613f365d523b4f98d0105f581ab63ad0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 091ba2899e3eb93e88a944cc2bac82fb90b5a74a + 394d991b613f365d523b4f98d0105f581ab63ad0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 091ba2899e3eb93e88a944cc2bac82fb90b5a74a + 394d991b613f365d523b4f98d0105f581ab63ad0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 091ba2899e3eb93e88a944cc2bac82fb90b5a74a + 394d991b613f365d523b4f98d0105f581ab63ad0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 091ba2899e3eb93e88a944cc2bac82fb90b5a74a + 394d991b613f365d523b4f98d0105f581ab63ad0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 091ba2899e3eb93e88a944cc2bac82fb90b5a74a + 394d991b613f365d523b4f98d0105f581ab63ad0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 091ba2899e3eb93e88a944cc2bac82fb90b5a74a + 394d991b613f365d523b4f98d0105f581ab63ad0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 091ba2899e3eb93e88a944cc2bac82fb90b5a74a + 394d991b613f365d523b4f98d0105f581ab63ad0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 091ba2899e3eb93e88a944cc2bac82fb90b5a74a + 394d991b613f365d523b4f98d0105f581ab63ad0 https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 091ba2899e3eb93e88a944cc2bac82fb90b5a74a + 394d991b613f365d523b4f98d0105f581ab63ad0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 091ba2899e3eb93e88a944cc2bac82fb90b5a74a + 394d991b613f365d523b4f98d0105f581ab63ad0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 091ba2899e3eb93e88a944cc2bac82fb90b5a74a + 394d991b613f365d523b4f98d0105f581ab63ad0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 091ba2899e3eb93e88a944cc2bac82fb90b5a74a + 394d991b613f365d523b4f98d0105f581ab63ad0 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 6e237422350d..05e2fadc0b1c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,11 +133,11 @@ - 6.0.11-servicing.22504.24 + 6.0.11-servicing.22505.2 6.0.11 - 6.0.11-servicing.22504.24 - 6.0.11-servicing.22504.24 - 6.0.11-servicing.22504.24 + 6.0.11-servicing.22505.2 + 6.0.11-servicing.22505.2 + 6.0.11-servicing.22505.2 6.0.11 6.0.3-1.22213.1 6.0.3-1.22213.1 From 97f7d60bc1258200a6355e4660e05c254c1f8617 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 6 Oct 2022 02:20:35 +0000 Subject: [PATCH 09/33] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20221005.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.10-servicing.22476.5 -> To Version 6.0.11-servicing.22505.10 --- 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 f17583051a50..dd9f32c79a6e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,6 +23,7 @@ + @@ -70,6 +71,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a43fbe92937d..c91d87cce452 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -30,41 +30,41 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 0b1c2417a627b38e3f44be2eb14cf37ab28d9255 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + e49bad1593f4235c68d114b17956db664c9143d2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + e49bad1593f4235c68d114b17956db664c9143d2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + e49bad1593f4235c68d114b17956db664c9143d2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + e49bad1593f4235c68d114b17956db664c9143d2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + e49bad1593f4235c68d114b17956db664c9143d2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + e49bad1593f4235c68d114b17956db664c9143d2 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + e49bad1593f4235c68d114b17956db664c9143d2 https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted diff --git a/eng/Versions.props b/eng/Versions.props index 05e2fadc0b1c..0eeb51141284 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,13 +43,13 @@ - 6.0.10 - 6.0.10-servicing.22476.5 - 6.0.10 + 6.0.11 + 6.0.11-servicing.22505.10 + 6.0.11 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 6.0.0 - 6.0.10 - 6.0.10-servicing.22476.5 + 6.0.11 + 6.0.11-servicing.22505.10 6.0.0-preview.7.21363.9 6.0.0 From 8f163bc0877779dcbd90f7c48d0c19513c9dd61e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 6 Oct 2022 06:40:53 +0000 Subject: [PATCH 10/33] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20221005.17 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.10-servicing.22476.5 -> To Version 6.0.11-servicing.22505.17 --- 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 dd9f32c79a6e..3cb37efd1940 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,7 +23,7 @@ - + @@ -71,7 +71,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c91d87cce452..7b8816f51031 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -32,31 +32,31 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e49bad1593f4235c68d114b17956db664c9143d2 + d45cd925747b350fa75b42288b4d496225cac812 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e49bad1593f4235c68d114b17956db664c9143d2 + d45cd925747b350fa75b42288b4d496225cac812 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e49bad1593f4235c68d114b17956db664c9143d2 + d45cd925747b350fa75b42288b4d496225cac812 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e49bad1593f4235c68d114b17956db664c9143d2 + d45cd925747b350fa75b42288b4d496225cac812 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e49bad1593f4235c68d114b17956db664c9143d2 + d45cd925747b350fa75b42288b4d496225cac812 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e49bad1593f4235c68d114b17956db664c9143d2 + d45cd925747b350fa75b42288b4d496225cac812 https://github.com/dotnet/runtime @@ -64,7 +64,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e49bad1593f4235c68d114b17956db664c9143d2 + d45cd925747b350fa75b42288b4d496225cac812 https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted diff --git a/eng/Versions.props b/eng/Versions.props index 0eeb51141284..99f7edee3e59 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,12 +44,12 @@ 6.0.11 - 6.0.11-servicing.22505.10 + 6.0.11-servicing.22505.17 6.0.11 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 6.0.0 6.0.11 - 6.0.11-servicing.22505.10 + 6.0.11-servicing.22505.17 6.0.0-preview.7.21363.9 6.0.0 From 63ca24f8fe34a91eaa9d19ea8e3a910206316060 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 6 Oct 2022 07:56:51 +0000 Subject: [PATCH 11/33] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20221005.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.10-servicing.22476.17 -> To Version 6.0.11-servicing.22505.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 3cb37efd1940..49668e351657 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -66,7 +66,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7b8816f51031..1e0880871d69 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 - 394d991b613f365d523b4f98d0105f581ab63ad0 + 149aa6e9ab3c0d805b6861cfdf0775acf67385f7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 394d991b613f365d523b4f98d0105f581ab63ad0 + 149aa6e9ab3c0d805b6861cfdf0775acf67385f7 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 394d991b613f365d523b4f98d0105f581ab63ad0 + 149aa6e9ab3c0d805b6861cfdf0775acf67385f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 394d991b613f365d523b4f98d0105f581ab63ad0 + 149aa6e9ab3c0d805b6861cfdf0775acf67385f7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 394d991b613f365d523b4f98d0105f581ab63ad0 + 149aa6e9ab3c0d805b6861cfdf0775acf67385f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 394d991b613f365d523b4f98d0105f581ab63ad0 + 149aa6e9ab3c0d805b6861cfdf0775acf67385f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 394d991b613f365d523b4f98d0105f581ab63ad0 + 149aa6e9ab3c0d805b6861cfdf0775acf67385f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 394d991b613f365d523b4f98d0105f581ab63ad0 + 149aa6e9ab3c0d805b6861cfdf0775acf67385f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 394d991b613f365d523b4f98d0105f581ab63ad0 + 149aa6e9ab3c0d805b6861cfdf0775acf67385f7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 394d991b613f365d523b4f98d0105f581ab63ad0 + 149aa6e9ab3c0d805b6861cfdf0775acf67385f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 394d991b613f365d523b4f98d0105f581ab63ad0 + 149aa6e9ab3c0d805b6861cfdf0775acf67385f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 394d991b613f365d523b4f98d0105f581ab63ad0 + 149aa6e9ab3c0d805b6861cfdf0775acf67385f7 https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 394d991b613f365d523b4f98d0105f581ab63ad0 + 149aa6e9ab3c0d805b6861cfdf0775acf67385f7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 394d991b613f365d523b4f98d0105f581ab63ad0 + 149aa6e9ab3c0d805b6861cfdf0775acf67385f7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 394d991b613f365d523b4f98d0105f581ab63ad0 + 149aa6e9ab3c0d805b6861cfdf0775acf67385f7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 394d991b613f365d523b4f98d0105f581ab63ad0 + 149aa6e9ab3c0d805b6861cfdf0775acf67385f7 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 99f7edee3e59..690dfaa6f7fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,11 +133,11 @@ - 6.0.11-servicing.22505.2 + 6.0.11-servicing.22505.8 6.0.11 - 6.0.11-servicing.22505.2 - 6.0.11-servicing.22505.2 - 6.0.11-servicing.22505.2 + 6.0.11-servicing.22505.8 + 6.0.11-servicing.22505.8 + 6.0.11-servicing.22505.8 6.0.11 6.0.3-1.22213.1 6.0.3-1.22213.1 From 7748563bcd4b8a64f8cd37db4cd5327dcf8bda05 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 6 Oct 2022 13:53:04 +0000 Subject: [PATCH 12/33] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-templating build 20221006.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.305 -> To Version 6.0.306 --- 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 49668e351657..3cbf6b3cdfdb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -28,7 +28,7 @@ - + @@ -63,7 +63,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e0880871d69..ad1c40e574f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0b1c2417a627b38e3f44be2eb14cf37ab28d9255 + 32ca60db015905169cc7770ee60ab99b494c3ff0 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0b1c2417a627b38e3f44be2eb14cf37ab28d9255 + 32ca60db015905169cc7770ee60ab99b494c3ff0 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0b1c2417a627b38e3f44be2eb14cf37ab28d9255 + 32ca60db015905169cc7770ee60ab99b494c3ff0 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0b1c2417a627b38e3f44be2eb14cf37ab28d9255 + 32ca60db015905169cc7770ee60ab99b494c3ff0 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0b1c2417a627b38e3f44be2eb14cf37ab28d9255 + 32ca60db015905169cc7770ee60ab99b494c3ff0 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0b1c2417a627b38e3f44be2eb14cf37ab28d9255 + 32ca60db015905169cc7770ee60ab99b494c3ff0 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0b1c2417a627b38e3f44be2eb14cf37ab28d9255 + 32ca60db015905169cc7770ee60ab99b494c3ff0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 690dfaa6f7fc..d7f9d1fb9599 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -112,7 +112,7 @@ - 6.0.306-servicing.22505.8 + 6.0.306-servicing.22506.4 6.0.306 6.0.306 6.0.306 From 27d7762bc0d40808da7141c526a58338ccb44ff0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 6 Oct 2022 15:53:27 +0000 Subject: [PATCH 13/33] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20221006.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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.10-servicing.22476.17 -> To Version 6.0.11-servicing.22506.4 --- 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 3cbf6b3cdfdb..c5ae9f3875c9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -66,7 +66,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ad1c40e574f8..d748dd00cb22 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 - 149aa6e9ab3c0d805b6861cfdf0775acf67385f7 + 9391408ac3498269e5cee7f1bb7b61a360595afc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 149aa6e9ab3c0d805b6861cfdf0775acf67385f7 + 9391408ac3498269e5cee7f1bb7b61a360595afc https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 149aa6e9ab3c0d805b6861cfdf0775acf67385f7 + 9391408ac3498269e5cee7f1bb7b61a360595afc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 149aa6e9ab3c0d805b6861cfdf0775acf67385f7 + 9391408ac3498269e5cee7f1bb7b61a360595afc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 149aa6e9ab3c0d805b6861cfdf0775acf67385f7 + 9391408ac3498269e5cee7f1bb7b61a360595afc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 149aa6e9ab3c0d805b6861cfdf0775acf67385f7 + 9391408ac3498269e5cee7f1bb7b61a360595afc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 149aa6e9ab3c0d805b6861cfdf0775acf67385f7 + 9391408ac3498269e5cee7f1bb7b61a360595afc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 149aa6e9ab3c0d805b6861cfdf0775acf67385f7 + 9391408ac3498269e5cee7f1bb7b61a360595afc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 149aa6e9ab3c0d805b6861cfdf0775acf67385f7 + 9391408ac3498269e5cee7f1bb7b61a360595afc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 149aa6e9ab3c0d805b6861cfdf0775acf67385f7 + 9391408ac3498269e5cee7f1bb7b61a360595afc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 149aa6e9ab3c0d805b6861cfdf0775acf67385f7 + 9391408ac3498269e5cee7f1bb7b61a360595afc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 149aa6e9ab3c0d805b6861cfdf0775acf67385f7 + 9391408ac3498269e5cee7f1bb7b61a360595afc https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 149aa6e9ab3c0d805b6861cfdf0775acf67385f7 + 9391408ac3498269e5cee7f1bb7b61a360595afc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 149aa6e9ab3c0d805b6861cfdf0775acf67385f7 + 9391408ac3498269e5cee7f1bb7b61a360595afc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 149aa6e9ab3c0d805b6861cfdf0775acf67385f7 + 9391408ac3498269e5cee7f1bb7b61a360595afc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 149aa6e9ab3c0d805b6861cfdf0775acf67385f7 + 9391408ac3498269e5cee7f1bb7b61a360595afc https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index d7f9d1fb9599..31bd0a5dcaf1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,11 +133,11 @@ - 6.0.11-servicing.22505.8 + 6.0.11-servicing.22506.4 6.0.11 - 6.0.11-servicing.22505.8 - 6.0.11-servicing.22505.8 - 6.0.11-servicing.22505.8 + 6.0.11-servicing.22506.4 + 6.0.11-servicing.22506.4 + 6.0.11-servicing.22506.4 6.0.11 6.0.3-1.22213.1 6.0.3-1.22213.1 From cddb576f004843f5aa657845a3f1cca6003e88d9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 7 Oct 2022 06:26:05 +0000 Subject: [PATCH 14/33] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20221006.9 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.10-servicing.22476.5 -> To Version 6.0.11-servicing.22506.9 --- 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 c5ae9f3875c9..e8008efe32ec 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,9 +23,9 @@ - + @@ -69,9 +69,9 @@ + - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d748dd00cb22..d68990af2773 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -32,31 +32,31 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d45cd925747b350fa75b42288b4d496225cac812 + 341b630c2278e2704334417d0cbcf249f5d61ba9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d45cd925747b350fa75b42288b4d496225cac812 + 341b630c2278e2704334417d0cbcf249f5d61ba9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d45cd925747b350fa75b42288b4d496225cac812 + 341b630c2278e2704334417d0cbcf249f5d61ba9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d45cd925747b350fa75b42288b4d496225cac812 + 341b630c2278e2704334417d0cbcf249f5d61ba9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d45cd925747b350fa75b42288b4d496225cac812 + 341b630c2278e2704334417d0cbcf249f5d61ba9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d45cd925747b350fa75b42288b4d496225cac812 + 341b630c2278e2704334417d0cbcf249f5d61ba9 https://github.com/dotnet/runtime @@ -64,7 +64,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d45cd925747b350fa75b42288b4d496225cac812 + 341b630c2278e2704334417d0cbcf249f5d61ba9 https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted diff --git a/eng/Versions.props b/eng/Versions.props index 31bd0a5dcaf1..31d1de56089b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,12 +44,12 @@ 6.0.11 - 6.0.11-servicing.22505.17 + 6.0.11-servicing.22506.9 6.0.11 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 6.0.0 6.0.11 - 6.0.11-servicing.22505.17 + 6.0.11-servicing.22506.9 6.0.0-preview.7.21363.9 6.0.0 From c0dc070fac63457e6bee9ad12763dda15abc812b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 7 Oct 2022 10:04:42 +0000 Subject: [PATCH 15/33] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20221007.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.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.10-servicing.22476.17 -> To Version 6.0.11-servicing.22507.1 --- 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 e8008efe32ec..199750549244 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -66,7 +66,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d68990af2773..87afac8254ca 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 - 9391408ac3498269e5cee7f1bb7b61a360595afc + 5d56e0ed88d86767cd80711a1642cbcfcda1c569 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9391408ac3498269e5cee7f1bb7b61a360595afc + 5d56e0ed88d86767cd80711a1642cbcfcda1c569 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9391408ac3498269e5cee7f1bb7b61a360595afc + 5d56e0ed88d86767cd80711a1642cbcfcda1c569 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9391408ac3498269e5cee7f1bb7b61a360595afc + 5d56e0ed88d86767cd80711a1642cbcfcda1c569 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9391408ac3498269e5cee7f1bb7b61a360595afc + 5d56e0ed88d86767cd80711a1642cbcfcda1c569 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9391408ac3498269e5cee7f1bb7b61a360595afc + 5d56e0ed88d86767cd80711a1642cbcfcda1c569 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9391408ac3498269e5cee7f1bb7b61a360595afc + 5d56e0ed88d86767cd80711a1642cbcfcda1c569 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9391408ac3498269e5cee7f1bb7b61a360595afc + 5d56e0ed88d86767cd80711a1642cbcfcda1c569 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9391408ac3498269e5cee7f1bb7b61a360595afc + 5d56e0ed88d86767cd80711a1642cbcfcda1c569 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9391408ac3498269e5cee7f1bb7b61a360595afc + 5d56e0ed88d86767cd80711a1642cbcfcda1c569 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9391408ac3498269e5cee7f1bb7b61a360595afc + 5d56e0ed88d86767cd80711a1642cbcfcda1c569 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9391408ac3498269e5cee7f1bb7b61a360595afc + 5d56e0ed88d86767cd80711a1642cbcfcda1c569 https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9391408ac3498269e5cee7f1bb7b61a360595afc + 5d56e0ed88d86767cd80711a1642cbcfcda1c569 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9391408ac3498269e5cee7f1bb7b61a360595afc + 5d56e0ed88d86767cd80711a1642cbcfcda1c569 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9391408ac3498269e5cee7f1bb7b61a360595afc + 5d56e0ed88d86767cd80711a1642cbcfcda1c569 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9391408ac3498269e5cee7f1bb7b61a360595afc + 5d56e0ed88d86767cd80711a1642cbcfcda1c569 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 31d1de56089b..bf57d1345951 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,11 +133,11 @@ - 6.0.11-servicing.22506.4 + 6.0.11-servicing.22507.1 6.0.11 - 6.0.11-servicing.22506.4 - 6.0.11-servicing.22506.4 - 6.0.11-servicing.22506.4 + 6.0.11-servicing.22507.1 + 6.0.11-servicing.22507.1 + 6.0.11-servicing.22507.1 6.0.11 6.0.3-1.22213.1 6.0.3-1.22213.1 From e94ad24db16ebce80a5a39190c0a428f3c8b5a0c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 7 Oct 2022 11:24:05 +0000 Subject: [PATCH 16/33] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-templating build 20221007.6 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.305 -> To Version 6.0.306 --- 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 199750549244..4b182352d7dd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -28,7 +28,7 @@ - + @@ -63,7 +63,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 87afac8254ca..04ed7a00b1be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 32ca60db015905169cc7770ee60ab99b494c3ff0 + e627d678d90915dc7f27230863ee6f53eb20b17c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 32ca60db015905169cc7770ee60ab99b494c3ff0 + e627d678d90915dc7f27230863ee6f53eb20b17c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 32ca60db015905169cc7770ee60ab99b494c3ff0 + e627d678d90915dc7f27230863ee6f53eb20b17c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 32ca60db015905169cc7770ee60ab99b494c3ff0 + e627d678d90915dc7f27230863ee6f53eb20b17c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 32ca60db015905169cc7770ee60ab99b494c3ff0 + e627d678d90915dc7f27230863ee6f53eb20b17c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 32ca60db015905169cc7770ee60ab99b494c3ff0 + e627d678d90915dc7f27230863ee6f53eb20b17c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 32ca60db015905169cc7770ee60ab99b494c3ff0 + e627d678d90915dc7f27230863ee6f53eb20b17c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index bf57d1345951..0bffd35cf19b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -112,7 +112,7 @@ - 6.0.306-servicing.22506.4 + 6.0.306-servicing.22507.6 6.0.306 6.0.306 6.0.306 From b7ce68b03494e01b8149fb772d407349ef8db878 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 7 Oct 2022 20:53:03 +0000 Subject: [PATCH 17/33] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20221007.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.10-servicing.22476.5 -> To Version 6.0.11-servicing.22507.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 4b182352d7dd..2cdc8361f30c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,9 +23,9 @@ + - @@ -69,9 +69,9 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 04ed7a00b1be..c1a722c72d4b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -32,31 +32,31 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 341b630c2278e2704334417d0cbcf249f5d61ba9 + dd7c928350a2f3f31dbf156ce308f9077a3715e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 341b630c2278e2704334417d0cbcf249f5d61ba9 + dd7c928350a2f3f31dbf156ce308f9077a3715e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 341b630c2278e2704334417d0cbcf249f5d61ba9 + dd7c928350a2f3f31dbf156ce308f9077a3715e4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 341b630c2278e2704334417d0cbcf249f5d61ba9 + dd7c928350a2f3f31dbf156ce308f9077a3715e4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 341b630c2278e2704334417d0cbcf249f5d61ba9 + dd7c928350a2f3f31dbf156ce308f9077a3715e4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 341b630c2278e2704334417d0cbcf249f5d61ba9 + dd7c928350a2f3f31dbf156ce308f9077a3715e4 https://github.com/dotnet/runtime @@ -64,7 +64,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 341b630c2278e2704334417d0cbcf249f5d61ba9 + dd7c928350a2f3f31dbf156ce308f9077a3715e4 https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted diff --git a/eng/Versions.props b/eng/Versions.props index 0bffd35cf19b..42c24b4ef833 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,12 +44,12 @@ 6.0.11 - 6.0.11-servicing.22506.9 + 6.0.11-servicing.22507.4 6.0.11 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 6.0.0 6.0.11 - 6.0.11-servicing.22506.9 + 6.0.11-servicing.22507.4 6.0.0-preview.7.21363.9 6.0.0 From fc5f3634f541f09c8064f94c7879ae52f0003109 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 12 Oct 2022 11:07:30 +0000 Subject: [PATCH 18/33] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-templating build 20221012.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.305 -> To Version 6.0.306 --- 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 2cdc8361f30c..01bc1f41c99d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,11 +24,9 @@ - - - + @@ -63,14 +61,12 @@ - + - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c1a722c72d4b..df14feb641e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e627d678d90915dc7f27230863ee6f53eb20b17c + 721ed1f62b270a39a3dfcd9bc67542f84931fe70 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e627d678d90915dc7f27230863ee6f53eb20b17c + 721ed1f62b270a39a3dfcd9bc67542f84931fe70 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e627d678d90915dc7f27230863ee6f53eb20b17c + 721ed1f62b270a39a3dfcd9bc67542f84931fe70 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e627d678d90915dc7f27230863ee6f53eb20b17c + 721ed1f62b270a39a3dfcd9bc67542f84931fe70 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e627d678d90915dc7f27230863ee6f53eb20b17c + 721ed1f62b270a39a3dfcd9bc67542f84931fe70 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e627d678d90915dc7f27230863ee6f53eb20b17c + 721ed1f62b270a39a3dfcd9bc67542f84931fe70 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e627d678d90915dc7f27230863ee6f53eb20b17c + 721ed1f62b270a39a3dfcd9bc67542f84931fe70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 42c24b4ef833..d205ab31f4f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -112,7 +112,7 @@ - 6.0.306-servicing.22507.6 + 6.0.306-servicing.22512.10 6.0.306 6.0.306 6.0.306 From 57f8ec24c150af2318f1c7668f35a8af7eacf55e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 13 Oct 2022 19:25:59 +0000 Subject: [PATCH 19/33] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20221013.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.10 -> To Version 6.0.11 --- 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 01bc1f41c99d..a27b679cb47d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -29,7 +29,7 @@ - + @@ -70,7 +70,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df14feb641e8..d1fa86c3f201 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -168,19 +168,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 769e1aa971ed2d6309e3b01ea097ad3a261d2686 + e47840c349795f815a0ad40dd0c7ff7374340617 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 769e1aa971ed2d6309e3b01ea097ad3a261d2686 + e47840c349795f815a0ad40dd0c7ff7374340617 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 769e1aa971ed2d6309e3b01ea097ad3a261d2686 + e47840c349795f815a0ad40dd0c7ff7374340617 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 769e1aa971ed2d6309e3b01ea097ad3a261d2686 + e47840c349795f815a0ad40dd0c7ff7374340617 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf diff --git a/eng/Versions.props b/eng/Versions.props index d205ab31f4f7..c02915bb2512 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,7 +149,7 @@ - 6.0.11-servicing.22504.4 + 6.0.11-servicing.22513.3 From 15857b3c4ee91e03f4202f611fdd3a3fd3e0de0c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 13 Oct 2022 23:55:25 +0000 Subject: [PATCH 20/33] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20221013.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.11 --- 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 a27b679cb47d..47d1c94cbb7f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -29,7 +29,7 @@ - + @@ -70,7 +70,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d1fa86c3f201..ec4690f8c939 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -168,19 +168,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e47840c349795f815a0ad40dd0c7ff7374340617 + c71eacb109f176eb6a8b15d32424fafceaba6142 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e47840c349795f815a0ad40dd0c7ff7374340617 + c71eacb109f176eb6a8b15d32424fafceaba6142 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e47840c349795f815a0ad40dd0c7ff7374340617 + c71eacb109f176eb6a8b15d32424fafceaba6142 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e47840c349795f815a0ad40dd0c7ff7374340617 + c71eacb109f176eb6a8b15d32424fafceaba6142 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf diff --git a/eng/Versions.props b/eng/Versions.props index c02915bb2512..17d7255a9426 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,7 +149,7 @@ - 6.0.11-servicing.22513.3 + 6.0.11-servicing.22513.9 From 63be4c97b6c3c2395e87581412507bcfeee1394f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Oct 2022 22:26:32 +0000 Subject: [PATCH 21/33] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20221014.6 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.22507.4 -> To Version 6.0.11-servicing.22514.6 --- NuGet.config | 5 +++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 47d1c94cbb7f..2978e993ff83 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -23,7 +24,7 @@ - + @@ -67,7 +68,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ec4690f8c939..1807e278c2f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -32,31 +32,31 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dd7c928350a2f3f31dbf156ce308f9077a3715e4 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dd7c928350a2f3f31dbf156ce308f9077a3715e4 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dd7c928350a2f3f31dbf156ce308f9077a3715e4 + c672e901c8819a22123da5c0cb7295d914e70627 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dd7c928350a2f3f31dbf156ce308f9077a3715e4 + c672e901c8819a22123da5c0cb7295d914e70627 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dd7c928350a2f3f31dbf156ce308f9077a3715e4 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a400c212afdf8e675c9a1d38442e6d2f19f7b74 + c672e901c8819a22123da5c0cb7295d914e70627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dd7c928350a2f3f31dbf156ce308f9077a3715e4 + c672e901c8819a22123da5c0cb7295d914e70627 https://github.com/dotnet/runtime @@ -64,7 +64,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dd7c928350a2f3f31dbf156ce308f9077a3715e4 + c672e901c8819a22123da5c0cb7295d914e70627 https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted diff --git a/eng/Versions.props b/eng/Versions.props index ce3da221cf4e..6dff3cdc0e3f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,12 +44,12 @@ 6.0.11 - 6.0.11-servicing.22507.4 + 6.0.11-servicing.22514.6 6.0.11 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 6.0.0 6.0.11 - 6.0.11-servicing.22507.4 + 6.0.11-servicing.22514.6 6.0.0-preview.7.21363.9 6.0.0 From 42e6abea218be76774c2e4caa795d8f39d448f03 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 17 Oct 2022 09:34:32 +0000 Subject: [PATCH 22/33] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-templating build 20221017.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.306 --- NuGet.config | 29 ++--------------------------- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2978e993ff83..67ccffbe402e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,19 +7,6 @@ - - - - - - - - - - - - - @@ -27,7 +14,7 @@ - + @@ -48,21 +35,9 @@ - - - - - - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1807e278c2f4..3b5fe70f8cdc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 721ed1f62b270a39a3dfcd9bc67542f84931fe70 + 9303db79522b69698068b6926d45b4c84fa6368f https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 721ed1f62b270a39a3dfcd9bc67542f84931fe70 + 9303db79522b69698068b6926d45b4c84fa6368f https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 721ed1f62b270a39a3dfcd9bc67542f84931fe70 + 9303db79522b69698068b6926d45b4c84fa6368f https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 721ed1f62b270a39a3dfcd9bc67542f84931fe70 + 9303db79522b69698068b6926d45b4c84fa6368f https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 721ed1f62b270a39a3dfcd9bc67542f84931fe70 + 9303db79522b69698068b6926d45b4c84fa6368f https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 721ed1f62b270a39a3dfcd9bc67542f84931fe70 + 9303db79522b69698068b6926d45b4c84fa6368f https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 721ed1f62b270a39a3dfcd9bc67542f84931fe70 + 9303db79522b69698068b6926d45b4c84fa6368f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 6dff3cdc0e3f..d4b34ff02ca5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -112,7 +112,7 @@ - 6.0.306-servicing.22512.10 + 6.0.306-servicing.22517.2 6.0.306 6.0.306 6.0.306 From 7a9f7daae15db5611a881fad3f94502a61f976c5 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 17 Oct 2022 21:20:08 +0000 Subject: [PATCH 23/33] Merged PR 26807: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-windowsdesktop 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.22476.4 to 6.0.11-servicing.22517.1 (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**: 20221017.3 - **Date Produced**: October 17, 2022 7:21:10 PM UTC - **Commit**: 7b9c4cbc4933814b305208b573e700e55c600a57 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][3] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22513.9 to 6.0.11-servicing.22517.3][3] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22513.9 to 6.0.11-servicing.22517.3][3] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.10-servicing.22476.4 to 6.0.11-servicing.22517.1][4] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCc71eacb&targetVersion=GC7b9c4cb&_a=files [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC3bbc772&targetVersion=GC8d60cc7&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:d1814f0c-875d-4709-e94c-08da181a39e5) --- 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 67ccffbe402e..56d810e64ee2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3b5fe70f8cdc..99e9288c4344 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -168,23 +168,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c71eacb109f176eb6a8b15d32424fafceaba6142 + 7b9c4cbc4933814b305208b573e700e55c600a57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c71eacb109f176eb6a8b15d32424fafceaba6142 + 7b9c4cbc4933814b305208b573e700e55c600a57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c71eacb109f176eb6a8b15d32424fafceaba6142 + 7b9c4cbc4933814b305208b573e700e55c600a57 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c71eacb109f176eb6a8b15d32424fafceaba6142 + 7b9c4cbc4933814b305208b573e700e55c600a57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 3bbc77257e3d51a2e19195523eafd262da1f5459 + 8d60cc76ff0cd2bc37b145dcb5bff097f990844f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index d4b34ff02ca5..303cb23f4f15 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -145,11 +145,11 @@ - 6.0.10-servicing.22476.4 + 6.0.11-servicing.22517.1 - 6.0.11-servicing.22513.9 + 6.0.11-servicing.22517.3 From 93c9fc7719b98f45bc14e13aa9fe93e97a447d89 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 17 Oct 2022 22:09:51 +0000 Subject: [PATCH 24/33] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20221017.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.22507.1 -> To Version 6.0.11-servicing.22517.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 56d810e64ee2..f8f833f16356 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 99e9288c4344..2d4637aa9828 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 - 5d56e0ed88d86767cd80711a1642cbcfcda1c569 + cb12e458e05385ddde3f1172aa1a9978ac9bc896 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5d56e0ed88d86767cd80711a1642cbcfcda1c569 + cb12e458e05385ddde3f1172aa1a9978ac9bc896 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5d56e0ed88d86767cd80711a1642cbcfcda1c569 + cb12e458e05385ddde3f1172aa1a9978ac9bc896 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5d56e0ed88d86767cd80711a1642cbcfcda1c569 + cb12e458e05385ddde3f1172aa1a9978ac9bc896 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5d56e0ed88d86767cd80711a1642cbcfcda1c569 + cb12e458e05385ddde3f1172aa1a9978ac9bc896 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5d56e0ed88d86767cd80711a1642cbcfcda1c569 + cb12e458e05385ddde3f1172aa1a9978ac9bc896 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5d56e0ed88d86767cd80711a1642cbcfcda1c569 + cb12e458e05385ddde3f1172aa1a9978ac9bc896 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5d56e0ed88d86767cd80711a1642cbcfcda1c569 + cb12e458e05385ddde3f1172aa1a9978ac9bc896 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5d56e0ed88d86767cd80711a1642cbcfcda1c569 + cb12e458e05385ddde3f1172aa1a9978ac9bc896 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5d56e0ed88d86767cd80711a1642cbcfcda1c569 + cb12e458e05385ddde3f1172aa1a9978ac9bc896 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5d56e0ed88d86767cd80711a1642cbcfcda1c569 + cb12e458e05385ddde3f1172aa1a9978ac9bc896 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5d56e0ed88d86767cd80711a1642cbcfcda1c569 + cb12e458e05385ddde3f1172aa1a9978ac9bc896 https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5d56e0ed88d86767cd80711a1642cbcfcda1c569 + cb12e458e05385ddde3f1172aa1a9978ac9bc896 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5d56e0ed88d86767cd80711a1642cbcfcda1c569 + cb12e458e05385ddde3f1172aa1a9978ac9bc896 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5d56e0ed88d86767cd80711a1642cbcfcda1c569 + cb12e458e05385ddde3f1172aa1a9978ac9bc896 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5d56e0ed88d86767cd80711a1642cbcfcda1c569 + cb12e458e05385ddde3f1172aa1a9978ac9bc896 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 303cb23f4f15..d10a38e5c15e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,11 +133,11 @@ - 6.0.11-servicing.22507.1 + 6.0.11-servicing.22517.15 6.0.11 - 6.0.11-servicing.22507.1 - 6.0.11-servicing.22507.1 - 6.0.11-servicing.22507.1 + 6.0.11-servicing.22517.15 + 6.0.11-servicing.22517.15 + 6.0.11-servicing.22517.15 6.0.11 6.0.3-1.22213.1 6.0.3-1.22213.1 From 6ee9b3cebbe71480945ec824535bd15ae2bb5158 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 18 Oct 2022 23:42:38 +0000 Subject: [PATCH 25/33] Merged PR 26851: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-windowsdesktop 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.11-servicing.22517.1 to 6.0.11-servicing.22517.6 (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**: 20221018.2 - **Date Produced**: October 18, 2022 9:41:09 PM UTC - **Commit**: d43b60fc06ed9c74bd1d39c9656d23beb6478091 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22518.2][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22518.2][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.11-servicing.22517.1 to 6.0.11-servicing.22517.6][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC7b9c4cb&targetVersion=GCd43b60f&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC8d60cc7&targetVersion=GC4e1581e&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:d1814f0c-875d-4709-e94c-08da181a39e5) --- 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 f8f833f16356..6472ef663563 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2d4637aa9828..d5b87ec927a5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -168,23 +168,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7b9c4cbc4933814b305208b573e700e55c600a57 + d43b60fc06ed9c74bd1d39c9656d23beb6478091 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7b9c4cbc4933814b305208b573e700e55c600a57 + d43b60fc06ed9c74bd1d39c9656d23beb6478091 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7b9c4cbc4933814b305208b573e700e55c600a57 + d43b60fc06ed9c74bd1d39c9656d23beb6478091 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7b9c4cbc4933814b305208b573e700e55c600a57 + d43b60fc06ed9c74bd1d39c9656d23beb6478091 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 8d60cc76ff0cd2bc37b145dcb5bff097f990844f + 4e1581efabe31037dbbae1a9c18a03f4e5ef53e3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index d10a38e5c15e..c868d7e3e419 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -145,11 +145,11 @@ - 6.0.11-servicing.22517.1 + 6.0.11-servicing.22517.6 - 6.0.11-servicing.22517.3 + 6.0.11-servicing.22518.2 From c2fc3bf5a4f2e769c80a6b38e13aad485eb0c366 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 14:36:46 +0000 Subject: [PATCH 26/33] Merged PR 26867: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-runtime dnceng/internal/dotnet-aspnetcore 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**: 20221018.9 - **Date Produced**: October 19, 2022 1:18:11 AM UTC - **Commit**: af5b37cd54cfdd15f14f854eafc34ed9c346ddde - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.HostModel**: [from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9][1] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.11 to 6.0.11][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.11 to 6.0.11][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][1] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.11 to 6.0.11][1] - **Microsoft.NETCore.Platforms**: [from 6.0.7 to 6.0.7][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9][1] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCc672e90&targetVersion=GCaf5b37c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:dc1c3afc-aa30-466e-4d3a-08da180de348) [marker]: <> (Begin:ffc11ea2-d045-4ff5-4d39-08da180de348) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: ffc11ea2-d045-4ff5-4d39-08da180de348 - **Build**: 20221018.17 - **Date Produced**: October 19, 2022 5:23:40 AM UTC - **Commit**: 1f928299b4f7543976248e5a96abf8aa45ea5605 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2] - **dotnet-user-secrets**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2] - **Microsoft.AspNetCore.Analyzers**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.11 to 6.0.11][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2] - **Microsoft.AspNetCore.Authorization**: [from 6.0.11 to 6.0.11][2] - **Microsoft.AspNetCore.Components.Analyzers**: [from 6.0.11 to 6.0.11][2] - **Microsoft.AspNetCore.Components.Web**: [from 6.0.11 to 6.0.11][2] - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2] - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2] - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2] - **Microsoft.AspNetCore.TestHost**: [from 6.0.11 to 6.0.11][2] - ... --- NuGet.config | 8 ++--- eng/Version.Details.xml | 70 ++++++++++++++++++++--------------------- eng/Versions.props | 12 +++---- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6472ef663563..27b743cffb66 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,14 +4,14 @@ - + - + @@ -40,10 +40,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d5b87ec927a5..3c98c9548e61 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -32,31 +32,31 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde https://github.com/dotnet/runtime @@ -64,7 +64,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c672e901c8819a22123da5c0cb7295d914e70627 + af5b37cd54cfdd15f14f854eafc34ed9c346ddde https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 432d17a83aa5623e4581756f4d642997048056bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb12e458e05385ddde3f1172aa1a9978ac9bc896 + 1f928299b4f7543976248e5a96abf8aa45ea5605 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index c868d7e3e419..8bbc1470ac04 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,12 +44,12 @@ 6.0.11 - 6.0.11-servicing.22514.6 + 6.0.11-servicing.22518.9 6.0.11 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 6.0.0 6.0.11 - 6.0.11-servicing.22514.6 + 6.0.11-servicing.22518.9 6.0.0-preview.7.21363.9 6.0.0 @@ -133,11 +133,11 @@ - 6.0.11-servicing.22517.15 + 6.0.11-servicing.22518.17 6.0.11 - 6.0.11-servicing.22517.15 - 6.0.11-servicing.22517.15 - 6.0.11-servicing.22517.15 + 6.0.11-servicing.22518.17 + 6.0.11-servicing.22518.17 + 6.0.11-servicing.22518.17 6.0.11 6.0.3-1.22213.1 6.0.3-1.22213.1 From de4ec83625cedeb7a6eba5d54e74c72382c29bbb Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 16:34:52 +0000 Subject: [PATCH 27/33] Merged PR 26886: [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**: 20221019.6 - **Date Produced**: October 19, 2022 2:15:46 PM UTC - **Commit**: 051afa20f7201629fd9bab065f81a4f185220493 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.306 to 6.0.306][1] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.306 to 6.0.306][1] - **Microsoft.TemplateEngine.Abstractions**: [from 6.0.306 to 6.0.306][1] - **Microsoft.TemplateEngine.Cli**: [from 6.0.306-servicing.22517.2 to 6.0.306-servicing.22519.6][1] - **Microsoft.TemplateEngine.Orchestrator.RunnableProjects**: [from 6.0.306 to 6.0.306][1] - **Microsoft.TemplateEngine.Utils**: [from 6.0.306 to 6.0.306][1] - **Microsoft.TemplateSearch.Common**: [from 6.0.306 to 6.0.306][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC9303db7&targetVersion=GC051afa2&_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 27b743cffb66..41992dcdb21f 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 3c98c9548e61..adc7d7d7cb2b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 9303db79522b69698068b6926d45b4c84fa6368f + 051afa20f7201629fd9bab065f81a4f185220493 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 9303db79522b69698068b6926d45b4c84fa6368f + 051afa20f7201629fd9bab065f81a4f185220493 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 9303db79522b69698068b6926d45b4c84fa6368f + 051afa20f7201629fd9bab065f81a4f185220493 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 9303db79522b69698068b6926d45b4c84fa6368f + 051afa20f7201629fd9bab065f81a4f185220493 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 9303db79522b69698068b6926d45b4c84fa6368f + 051afa20f7201629fd9bab065f81a4f185220493 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 9303db79522b69698068b6926d45b4c84fa6368f + 051afa20f7201629fd9bab065f81a4f185220493 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 9303db79522b69698068b6926d45b4c84fa6368f + 051afa20f7201629fd9bab065f81a4f185220493 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8bbc1470ac04..7efa80796070 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -112,7 +112,7 @@ - 6.0.306-servicing.22517.2 + 6.0.306-servicing.22519.6 6.0.306 6.0.306 6.0.306 From e154f5f69db41b0868744c5b852507310b07483d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 16:58:46 +0000 Subject: [PATCH 28/33] Merged PR 26894: [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**: 20221019.11 - **Date Produced**: October 19, 2022 4:15:14 PM UTC - **Commit**: 2198eb3a0ffe5e89b98096058f414f9a81dbe7a1 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.306 to 6.0.306][1] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.306 to 6.0.306][1] - **Microsoft.TemplateEngine.Abstractions**: [from 6.0.306 to 6.0.306][1] - **Microsoft.TemplateEngine.Cli**: [from 6.0.306-servicing.22519.6 to 6.0.306-servicing.22519.11][1] - **Microsoft.TemplateEngine.Orchestrator.RunnableProjects**: [from 6.0.306 to 6.0.306][1] - **Microsoft.TemplateEngine.Utils**: [from 6.0.306 to 6.0.306][1] - **Microsoft.TemplateSearch.Common**: [from 6.0.306 to 6.0.306][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC051afa2&targetVersion=GC2198eb3&_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 41992dcdb21f..7d1ae6619766 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 adc7d7d7cb2b..acccfeb39262 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 051afa20f7201629fd9bab065f81a4f185220493 + 2198eb3a0ffe5e89b98096058f414f9a81dbe7a1 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 051afa20f7201629fd9bab065f81a4f185220493 + 2198eb3a0ffe5e89b98096058f414f9a81dbe7a1 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 051afa20f7201629fd9bab065f81a4f185220493 + 2198eb3a0ffe5e89b98096058f414f9a81dbe7a1 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 051afa20f7201629fd9bab065f81a4f185220493 + 2198eb3a0ffe5e89b98096058f414f9a81dbe7a1 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 051afa20f7201629fd9bab065f81a4f185220493 + 2198eb3a0ffe5e89b98096058f414f9a81dbe7a1 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 051afa20f7201629fd9bab065f81a4f185220493 + 2198eb3a0ffe5e89b98096058f414f9a81dbe7a1 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 051afa20f7201629fd9bab065f81a4f185220493 + 2198eb3a0ffe5e89b98096058f414f9a81dbe7a1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 7efa80796070..65d750e5e093 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -112,7 +112,7 @@ - 6.0.306-servicing.22519.6 + 6.0.306-servicing.22519.11 6.0.306 6.0.306 6.0.306 From b003a1877b8b73a74c6d400e2373921d20767eb8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 19 Oct 2022 18:35:54 +0000 Subject: [PATCH 29/33] Merged PR 26905: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-windowsdesktop 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.11-servicing.22517.6 to 6.0.11-servicing.22519.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**: 20221019.3 - **Date Produced**: October 19, 2022 5:55:53 PM UTC - **Commit**: ab5b39eef72a8ecc6f678f17254b8348d7cbf250 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.11-servicing.22517.6 to 6.0.11-servicing.22519.2][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCd43b60f&targetVersion=GCab5b39e&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC4e1581e&targetVersion=GC37deaa0&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:d1814f0c-875d-4709-e94c-08da181a39e5) --- 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 7d1ae6619766..8143a2df4a3a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index acccfeb39262..00e6ed6b5eb2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -168,23 +168,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d43b60fc06ed9c74bd1d39c9656d23beb6478091 + ab5b39eef72a8ecc6f678f17254b8348d7cbf250 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d43b60fc06ed9c74bd1d39c9656d23beb6478091 + ab5b39eef72a8ecc6f678f17254b8348d7cbf250 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d43b60fc06ed9c74bd1d39c9656d23beb6478091 + ab5b39eef72a8ecc6f678f17254b8348d7cbf250 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d43b60fc06ed9c74bd1d39c9656d23beb6478091 + ab5b39eef72a8ecc6f678f17254b8348d7cbf250 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4e1581efabe31037dbbae1a9c18a03f4e5ef53e3 + 37deaa02f76fc3b8df620e305b450b06fe2b685d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 65d750e5e093..d8a28b427b7a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -145,11 +145,11 @@ - 6.0.11-servicing.22517.6 + 6.0.11-servicing.22519.2 - 6.0.11-servicing.22518.2 + 6.0.11-servicing.22519.3 From bcf774aca16d2d8493f05a521ce03819bd195448 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 23 Oct 2022 22:20:38 +0000 Subject: [PATCH 30/33] Merged PR 26991: [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**: 20221023.4 - **Date Produced**: October 23, 2022 9:20:00 PM UTC - **Commit**: 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.HostModel**: [from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4][1] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.11 to 6.0.11][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.11 to 6.0.11][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][1] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.11 to 6.0.11][1] - **Microsoft.NETCore.Platforms**: [from 6.0.7 to 6.0.7][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4][1] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCaf5b37c&targetVersion=GC943474c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:dc1c3afc-aa30-466e-4d3a-08da180de348) --- NuGet.config | 12 ++++++++++-- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8143a2df4a3a..712e535a7bf3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,19 +5,23 @@ + + - + + + @@ -37,15 +41,19 @@ + + + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 00e6ed6b5eb2..64cb4c980d07 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -32,31 +32,31 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://github.com/dotnet/runtime @@ -64,7 +64,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af5b37cd54cfdd15f14f854eafc34ed9c346ddde + 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted diff --git a/eng/Versions.props b/eng/Versions.props index d8a28b427b7a..2f42cd9e475e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,12 +44,12 @@ 6.0.11 - 6.0.11-servicing.22518.9 + 6.0.11-servicing.22523.4 6.0.11 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 6.0.0 6.0.11 - 6.0.11-servicing.22518.9 + 6.0.11-servicing.22523.4 6.0.0-preview.7.21363.9 6.0.0 From eeb998091f4302f58f636f1c75ee5150d5b940c1 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 24 Oct 2022 02:54:04 +0000 Subject: [PATCH 31/33] Merged PR 27000: [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**: 20221023.4 - **Date Produced**: October 23, 2022 11:17:54 PM UTC - **Commit**: 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][1] - **dotnet-user-secrets**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][1] - **Microsoft.AspNetCore.Analyzers**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.11 to 6.0.11][1] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][1] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][1] - **Microsoft.AspNetCore.Authorization**: [from 6.0.11 to 6.0.11][1] - **Microsoft.AspNetCore.Components.Analyzers**: [from 6.0.11 to 6.0.11][1] - **Microsoft.AspNetCore.Components.Web**: [from 6.0.11 to 6.0.11][1] - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][1] - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][1] - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][1] - **Microsoft.AspNetCore.TestHost**: [from 6.0.11 to 6.0.11][1] - **Microsoft.Extensions.FileProviders.Embedded**: [from 6.0.11 to 6.0.11][1] - **Microsoft.JSInterop**: [from 6.0.11 to 6.0.11][1] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC1f92829&targetVersion=GC617d594&_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**: 20221023.5 - **Date Produced**: October 23, 2022 11:19:08 PM UTC - **Commit**: 84fa0403a62bd95b9e1f29c00f4b4f8e605bfc7c - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.306 to 6.0.306][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.306 to 6.0.306][2] - **Microsoft.TemplateEngine.Abstractions**: [from 6.0.306 to 6.0.306][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.306-servicing.22519.11 to 6.0.306-servicing.22523.5][2] - **Microsoft.TemplateEngine.Orchestrator.RunnableProjects**: [from 6.0.306 t... --- NuGet.config | 14 +++------ eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++---- 3 files changed, 41 insertions(+), 47 deletions(-) diff --git a/NuGet.config b/NuGet.config index 712e535a7bf3..10f9f3582acd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,9 +4,7 @@ - - - + @@ -16,8 +14,7 @@ - - + @@ -41,13 +38,10 @@ - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 64cb4c980d07..cc039fc28bbb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2198eb3a0ffe5e89b98096058f414f9a81dbe7a1 + 84fa0403a62bd95b9e1f29c00f4b4f8e605bfc7c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2198eb3a0ffe5e89b98096058f414f9a81dbe7a1 + 84fa0403a62bd95b9e1f29c00f4b4f8e605bfc7c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2198eb3a0ffe5e89b98096058f414f9a81dbe7a1 + 84fa0403a62bd95b9e1f29c00f4b4f8e605bfc7c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2198eb3a0ffe5e89b98096058f414f9a81dbe7a1 + 84fa0403a62bd95b9e1f29c00f4b4f8e605bfc7c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2198eb3a0ffe5e89b98096058f414f9a81dbe7a1 + 84fa0403a62bd95b9e1f29c00f4b4f8e605bfc7c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2198eb3a0ffe5e89b98096058f414f9a81dbe7a1 + 84fa0403a62bd95b9e1f29c00f4b4f8e605bfc7c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2198eb3a0ffe5e89b98096058f414f9a81dbe7a1 + 84fa0403a62bd95b9e1f29c00f4b4f8e605bfc7c 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 - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,44 +188,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a https://github.com/dotnet/razor-compiler @@ -244,19 +244,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1f928299b4f7543976248e5a96abf8aa45ea5605 + 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 2f42cd9e475e..d64a49824f6b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -112,7 +112,7 @@ - 6.0.306-servicing.22519.11 + 6.0.306-servicing.22523.5 6.0.306 6.0.306 6.0.306 @@ -133,11 +133,11 @@ - 6.0.11-servicing.22518.17 + 6.0.11-servicing.22523.4 6.0.11 - 6.0.11-servicing.22518.17 - 6.0.11-servicing.22518.17 - 6.0.11-servicing.22518.17 + 6.0.11-servicing.22523.4 + 6.0.11-servicing.22523.4 + 6.0.11-servicing.22523.4 6.0.11 6.0.3-1.22213.1 6.0.3-1.22213.1 From 46b48e7a82d138728be2d24594b5ce98d6af92dc Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 24 Oct 2022 04:03:49 +0000 Subject: [PATCH 32/33] Merged PR 27007: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-windowsdesktop 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.11-servicing.22519.2 to 6.0.11-servicing.22523.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**: 20221023.3 - **Date Produced**: October 24, 2022 3:36:15 AM UTC - **Commit**: ee26d5bddd7cf13b37987de68fee12d9e50ff33d - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.11-servicing.22519.2 to 6.0.11-servicing.22523.2][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCab5b39e&targetVersion=GCee26d5b&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC37deaa0&targetVersion=GC96c5254&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:d1814f0c-875d-4709-e94c-08da181a39e5) --- NuGet.config | 6 ++---- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 10f9f3582acd..32a56d033347 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,8 +17,7 @@ - - + @@ -47,8 +46,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cc039fc28bbb..db60bce73ccc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -168,23 +168,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ab5b39eef72a8ecc6f678f17254b8348d7cbf250 + ee26d5bddd7cf13b37987de68fee12d9e50ff33d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ab5b39eef72a8ecc6f678f17254b8348d7cbf250 + ee26d5bddd7cf13b37987de68fee12d9e50ff33d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ab5b39eef72a8ecc6f678f17254b8348d7cbf250 + ee26d5bddd7cf13b37987de68fee12d9e50ff33d https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ab5b39eef72a8ecc6f678f17254b8348d7cbf250 + ee26d5bddd7cf13b37987de68fee12d9e50ff33d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 37deaa02f76fc3b8df620e305b450b06fe2b685d + 96c5254e5ca5040021caf779216b1b3641875b1e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index d64a49824f6b..8365bc5eeb51 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -145,11 +145,11 @@ - 6.0.11-servicing.22519.2 + 6.0.11-servicing.22523.2 - 6.0.11-servicing.22519.3 + 6.0.11-servicing.22523.3 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 33/33] 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" } }