23 lines
1 KiB
Diff
23 lines
1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Nikola Milosavljevic <nikolam@microsoft.com>
|
|
Date: Tue, 23 May 2023 21:15:50 +0000
|
|
Subject: [PATCH] Do not restore ILMerge in source-build
|
|
|
|
Backport: https://github.com/NuGet/NuGet.Client/pull/5178
|
|
---
|
|
.../NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj
|
|
index 7940ac1d1..ff3627e00 100644
|
|
--- a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj
|
|
+++ b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj
|
|
@@ -37,7 +37,7 @@
|
|
</ItemGroup>
|
|
|
|
<ItemGroup>
|
|
- <PackageReference Include="ILMerge" PrivateAssets="All" />
|
|
+ <PackageReference Include="ILMerge" PrivateAssets="All" Condition="'$(DotNetBuildFromSource)' != 'true'" />
|
|
</ItemGroup>
|
|
|
|
<ItemGroup Condition=" '$(IsCore)' == 'true' ">
|