Skip to content

Commit 8a939b9

Browse files
committed
Reorder App.Runtime build slightly
- move `_InstallFrameworkIntoLocalDotNet` earlier because other builds depend on this part - this target sometimes executes after dependent projects continue - add `DependsOnTargets` attributes to further constrain ordering nit: `IncludeFrameworkListFile` should run before `_ResolveSharedFrameworkContent`
1 parent 26f93f0 commit 8a939b9

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

Diff for: src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj

+10-7
Original file line numberDiff line numberDiff line change
@@ -176,14 +176,14 @@ This package is an internal implementation of the .NET Core SDK and is not meant
176176
GenerateSharedFxDepsFile;
177177
GenerateSharedFxVersionsFiles;
178178
Crossgen;
179-
_ResolveSharedFrameworkContent;
180179
IncludeFrameworkListFile;
180+
_ResolveSharedFrameworkContent;
181+
_InstallFrameworkIntoLocalDotNet;
181182
_DownloadAndExtractDotNetRuntime;
182183
_BatchCopyToSharedFrameworkLayout;
183184
_BatchCopyToRedistLayout;
184185
_CreateInternalSharedFxArchive;
185186
_CreateRedistSharedFxArchive;
186-
_InstallFrameworkIntoLocalDotNet;
187187
</CoreBuildDependsOn>
188188
<CrossGenDependsOn>
189189
ResolveReferences;
@@ -485,8 +485,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant
485485

486486
<!-- Required to workaround https://github.com/dotnet/core-setup/issues/4809. This copies the shared framework into the $reporoot/.dotnet folder so tests can run against the shared framework. -->
487487
<!-- This workaround is not needed in source build -->
488-
<Target Condition="'$(DotNetBuildFromSource)' != 'true'"
489-
Name="_InstallFrameworkIntoLocalDotNet"
488+
<Target Name="_InstallFrameworkIntoLocalDotNet"
489+
DependsOnTargets="_ResolveSharedFrameworkContent"
490+
Condition="'$(DotNetBuildFromSource)' != 'true'"
490491
Inputs="@(SharedFxContent)"
491492
Outputs="@(SharedFxContent->'$(LocalInstallationOutputPath)%(FileName)%(Extension)')">
492493

@@ -497,9 +498,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant
497498
</Target>
498499

499500
<Target Name="_CreateInternalSharedFxArchive"
501+
DependsOnTargets="_BatchCopyToSharedFrameworkLayout"
500502
Inputs="@(SharedFxContent)"
501503
Outputs="$(InternalArchiveOutputPath)">
502-
<Message Importance="High" Text="$(MSbuildProjectFile) -> $(InternalArchiveOutputPath)" />
503504
<ZipDirectory
504505
SourceDirectory="$(SharedFrameworkLayoutRoot)"
505506
DestinationFile="$(InternalArchiveOutputPath)"
@@ -509,11 +510,13 @@ This package is an internal implementation of the .NET Core SDK and is not meant
509510
Command="tar -czf $(InternalArchiveOutputPath) ."
510511
WorkingDirectory="$(SharedFrameworkLayoutRoot)"
511512
Condition="'$(ArchiveExtension)' == '.tar.gz'" />
513+
<Message Importance="High" Text="$(MSbuildProjectFile) -> $(InternalArchiveOutputPath)" />
512514
</Target>
513515

514516
<!-- Redist tarball including the dotnet-runtime is not needed in source build -->
515-
<Target Condition="'$(DotNetBuildFromSource)' != 'true'"
516-
Name="_CreateRedistSharedFxArchive"
517+
<Target Name="_CreateRedistSharedFxArchive"
518+
DependsOnTargets="_DownloadAndExtractDotNetRuntime;_BatchCopyToRedistLayout"
519+
Condition="'$(DotNetBuildFromSource)' != 'true'"
517520
Inputs="@(SharedFxContent)"
518521
Outputs="$(RedistArchiveOutputPath)">
519522
<Message Importance="High" Text="$(MSbuildProjectFile) -> $(RedistArchiveOutputPath)" />

0 commit comments

Comments
 (0)