Skip to content

Commit 42912c3

Browse files
author
John Luo
committed
Do not build redist tarball in source build
1 parent 7d6d90d commit 42912c3

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

eng/Build.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@
121121
Use caution to avoid deep recursion. If the globbing pattern picks up something which exceeds MAX_PATH,
122122
the entire pattern will silently fail to evaluate correctly.
123123
-->
124-
125124
<DotNetProjects Include="
126125
$(RepoRoot)src\Framework\ref\Microsoft.AspNetCore.App.Ref.csproj;
127126
$(RepoRoot)src\Framework\src\Microsoft.AspNetCore.App.Runtime.csproj;

src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -363,18 +363,12 @@ This package is an internal implementation of the .NET Core SDK and is not meant
363363
Targets related to creating .zip/.tar.gz
364364
#########################################
365365
-->
366-
<Target Name="_DownloadAndExtractDotNetRuntime">
367-
<!-- Download dotnet runtime from web when not building from source -->
368-
<DownloadFile Condition=" ! Exists('$(DotNetRuntimeArchive)') and '$(DotNetRuntimeArchiveSource)' == ''"
366+
<Target Name="_DownloadAndExtractDotNetRuntime" Condition="'$(DotNetBuildFromSource)' != 'true'">
367+
<DownloadFile Condition=" ! Exists('$(DotNetRuntimeArchive)')"
369368
SourceUrl="$(DotNetRuntimeDownloadUrl)$(DotNetAssetRootAccessTokenSuffix)"
370369
DestinationFolder="$(BaseIntermediateOutputPath)"
371370
DestinationFileName="$(DotNetRuntimeArchiveFileName)" />
372371

373-
<!-- Copy from corefx build output when building from source -->
374-
<Copy Condition="! Exists('$(DotNetRuntimeArchive)') and '$(DotNetRuntimeArchiveSource)' != ''"
375-
SourceFiles="$(DotNetRuntimeArchiveSource)"
376-
DestinationFiles="$(BaseIntermediateOutputPath)$(DotNetRuntimeArchiveFileName)" />
377-
378372
<!-- Extract the dotnet-runtime archive -->
379373
<Exec Condition="'$(ArchiveExtension)' == '.tar.gz'"
380374
Command="tar -xzf $(DotNetRuntimeArchive) -C $(RedistSharedFrameworkLayoutRoot)" />
@@ -447,7 +441,8 @@ This package is an internal implementation of the .NET Core SDK and is not meant
447441
Condition="'$(ArchiveExtension)' == '.tar.gz'" />
448442
</Target>
449443

450-
<Target Name="_CreateRedistSharedFxArchive"
444+
<Target Condition="'$(DotNetBuildFromSource)' != 'true'"
445+
Name="_CreateRedistSharedFxArchive"
451446
Inputs="@(SharedFxContent)"
452447
Outputs="$(RedistArchiveOutputPath)">
453448
<Message Importance="High" Text="$(MSbuildProjectFile) -> $(RedistArchiveOutputPath)" />

0 commit comments

Comments
 (0)