Merge branch 'main' into darc-main-35b1ce53-93f3-4548-9141-a67575ca61c3

This commit is contained in:
Michael Simons 2023-06-15 07:50:18 -05:00 committed by GitHub
commit 7076268dee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 39 deletions

View file

@ -1,24 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Tue, 11 Apr 2023 17:03:48 +0000
Subject: [PATCH] Exclude dotnet-sourcelink from source build
This addresses prebuilts.
Backport: https://github.com/dotnet/sourcelink/pull/933
---
src/dotnet-sourcelink/dotnet-sourcelink.csproj | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/dotnet-sourcelink/dotnet-sourcelink.csproj b/src/dotnet-sourcelink/dotnet-sourcelink.csproj
index f2a6e7a..5c675ef 100644
--- a/src/dotnet-sourcelink/dotnet-sourcelink.csproj
+++ b/src/dotnet-sourcelink/dotnet-sourcelink.csproj
@@ -2,6 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>$(NetCurrent)</TargetFrameworks>
+ <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
<!-- NuGet -->
<IsPackable>true</IsPackable>