From 5203a93f735a56cdd2c22f40845bf6aead99c3ea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Jul 2023 18:52:28 +0000 Subject: [PATCH] [main] Update dependencies from dotnet/source-build-externals (#17027) [main] Update dependencies from dotnet/source-build-externals - Merge branch 'main' into darc-main-27d2fa97-ca93-48c6-bb62-54890c79ba08 - Merge branch 'main' into darc-main-27d2fa97-ca93-48c6-bb62-54890c79ba08 - Remove patch to unblock sync - Merge branch 'darc-main-27d2fa97-ca93-48c6-bb62-54890c79ba08' of https://github.com/dotnet/installer into darc-main-27d2fa97-ca93-48c6-bb62-54890c79ba08 --- eng/Version.Details.xml | 4 +-- .../0001-remove-comment-2671.patch | 33 ------------------- 2 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 src/SourceBuild/patches/source-build-externals/0001-remove-comment-2671.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9c4611e90..b340fbb2e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -181,9 +181,9 @@ 9e870996b8bf0b91a791edd1039bfd23bdd01af8 - + https://github.com/dotnet/source-build-externals - 76026f9224bd83ede7b2f494912694a30169c233 + b9eb9bc83da8a0dc5b62e67d576867f7f11e7c0c diff --git a/src/SourceBuild/patches/source-build-externals/0001-remove-comment-2671.patch b/src/SourceBuild/patches/source-build-externals/0001-remove-comment-2671.patch deleted file mode 100644 index e44db4816..000000000 --- a/src/SourceBuild/patches/source-build-externals/0001-remove-comment-2671.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 7ce38a6434c502213e2652dc15afa5cf392a60f3 Mon Sep 17 00:00:00 2001 -From: Timothy Mothra -Date: Tue, 6 Sep 2022 11:38:11 -0700 -Subject: [PATCH] remove comment (#2671) - -Backport: https://github.com/microsoft/ApplicationInsights-dotnet/pull/2671 - -The patch in question removes a licensing declaration that is incompatable with the VMR. -If the patch would be applied in source-build-externals directly, the change would be made onto -the inner source-build (i.e. the package produced), while the VMR entry for it would still be -affected. - -This can be removed once a new release version of the package is available and used by the .NET repos: -https://github.com/microsoft/ApplicationInsights-dotnet/issues/2792 ---- - src/application-insights/LOGGING/test/Shared/CustomTelemetryChannel.cs | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/application-insights/LOGGING/test/Shared/CustomTelemetryChannel.cs b/src/application-insights/LOGGING/test/Shared/CustomTelemetryChannel.cs -index 807da59c..0a95bce9 100644 ---- a/src/application-insights/LOGGING/test/Shared/CustomTelemetryChannel.cs -+++ b/src/application-insights/LOGGING/test/Shared/CustomTelemetryChannel.cs -@@ -1,7 +1,6 @@ - //----------------------------------------------------------------------------------- - // - // Copyright (c) Microsoft Corporation. All Rights Reserved. --// Information Contained Herein is Proprietary and Confidential. - // - //----------------------------------------------------------------------------------- - --- -2.25.1 -