mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

[main] Update dependencies from dotnet/source-build-externals (#17027)

Browse source 
[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
This commit is contained in:
dotnet-maestro[bot] 2023-07-24 18:52:28 +00:00 committed by GitHub
parent f8bab721ae
commit 5203a93f73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
eng/Version.Details.xml
View file

@ -181,9 +181,9 @@
<Sha>9e870996b8bf0b91a791edd1039bfd23bdd01af8</Sha>
<SourceBuild RepoName="deployment-tools" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23362.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23374.2">
<Uri>https://github.com/dotnet/source-build-externals</Uri>
<Sha>76026f9224bd83ede7b2f494912694a30169c233</Sha>
<Sha>b9eb9bc83da8a0dc5b62e67d576867f7f11e7c0c</Sha>
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.symreader" Version="2.1.0-beta.23253.1">

33
src/SourceBuild/patches/source-build-externals/0001-remove-comment-2671.patch
View file

@ -1,33 +0,0 @@
From 7ce38a6434c502213e2652dc15afa5cf392a60f3 Mon Sep 17 00:00:00 2001
From: Timothy Mothra <tilee@microsoft.com>
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 file='CustomTelemetryChannel.cs' company='Microsoft Corporation'>
// Copyright (c) Microsoft Corporation. All Rights Reserved.
-// Information Contained Herein is Proprietary and Confidential.
// </copyright>
//-----------------------------------------------------------------------------------
--
2.25.1