35 lines
1.5 KiB
Diff
35 lines
1.5 KiB
Diff
From 5f34f12928157f5ed1c351dc217bf4bf5b62befe Mon Sep 17 00:00:00 2001
|
|
From: Chris Rummel <crummel@microsoft.com>
|
|
Date: Mon, 14 Sep 2020 09:47:04 -0500
|
|
Subject: [PATCH 5/5] Don't do this in source-build -
|
|
aspnetcore-targeting-pack.tar.gz not available.
|
|
|
|
---
|
|
src/redist/targets/GeneratePKG.targets | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/redist/targets/GeneratePKG.targets b/src/redist/targets/GeneratePKG.targets
|
|
index 82e55b18c..c78dc7b55 100644
|
|
--- a/src/redist/targets/GeneratePKG.targets
|
|
+++ b/src/redist/targets/GeneratePKG.targets
|
|
@@ -128,7 +128,7 @@
|
|
Inputs="@(GenerateSdkPkgInputs)"
|
|
Outputs="$(SdkPKGInstallerFile)"
|
|
DependsOnTargets="GenerateLayout;SetupPkgInputsOutputs"
|
|
- Condition=" '$(OSName)' == 'osx' ">
|
|
+ Condition=" '$(OSName)' == 'osx' and '$(DotNetBuildFromSource)' != 'true' ">
|
|
|
|
<ItemGroup>
|
|
<TemplateFiles Include="$(RedistLayoutPath)templates/**/*" />
|
|
@@ -172,7 +172,7 @@
|
|
Inputs="@(GenerateSdkProductArchiveInputs)"
|
|
Outputs="$(CombinedFrameworkSdkHostPKGInstallerFile)"
|
|
DependsOnTargets="GenerateSdkPkg"
|
|
- Condition=" '$(OSName)' == 'osx' ">
|
|
+ Condition=" '$(OSName)' == 'osx' and '$(DotNetBuildFromSource)' != 'true' ">
|
|
<ItemGroup>
|
|
<PkgComponentsSourceFiles Include="$(SdkPKGInstallerFile);
|
|
$(DownloadsFolder)$(DownloadedSharedFrameworkInstallerFileName);
|
|
--
|
|
2.18.0
|
|
|