Skip to content

Commit b5b6eae

Browse files
crummelcrummel
authored
Merge pull request #2064 from omajid/delegate-publish-to-runtime
[release/5.0] Stop hardcoding RIDs in local tasks
2 parents ccff33e + b21a589 commit b5b6eae

9 files changed

+139
-191
lines changed

‎patches/aspnetcore/0019-Publish-compressed-files-to-a-provided-location.patch

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
From 2196196a6308eb52af91b1213dbfbdb8917e587f Mon Sep 17 00:00:00 2001
2+
From: Omair Majid <omajid@redhat.com>
3+
Date: Tue, 23 Feb 2021 09:42:29 -0500
4+
Subject: [PATCH] Publish compressed files to a provided location
5+
6+
This allows source-build to consume these files directly.
7+
---
8+
.../src/Microsoft.AspNetCore.App.Runtime.csproj | 15 +++++++++++++++
9+
1 file changed, 15 insertions(+)
10+
11+
diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
12+
index cfbe759aff..285acbd07a 100644
13+
--- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
14+
+++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
15+
@@ -183,6 +183,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
16+
_CreateInternalSharedFxArchive;
17+
_CreateRedistSharedFxArchive;
18+
_InstallFrameworkIntoLocalDotNet;
19+
+ _PublishCompressedFilesForSourceBuild;
20+
</CoreBuildDependsOn>
21+
<CrossGenDependsOn>
22+
ResolveReferences;
23+
@@ -560,4 +561,18 @@ This package is an internal implementation of the .NET Core SDK and is not meant
24+
</ItemGroup>
25+
</Target>
26+
27+
+ <!-- Used by source-build to get a copy of the right runtime -->
28+
+ <Target Name="_PublishCompressedFilesForSourceBuild"
29+
+ Condition="'$(PublishCompressedFilesPathPrefix)' != ''">
30+
+
31+
+ <MakeDir Directories="$(PublishCompressedFilesPathPrefix)$(MicrosoftNETCoreAppRuntimeVersion)" />
32+
+
33+
+ <Copy SourceFiles="$(InternalArchiveOutputPath)"
34+
+ DestinationFolder="$(PublishCompressedFilesPathPrefix)$(MicrosoftNETCoreAppRuntimeVersion)" />
35+
+
36+
+ <Copy SourceFiles="$(BaseRuntimeVersionFileOutputPath)"
37+
+ DestinationFolder="$(PublishCompressedFilesPathPrefix)$(MicrosoftNETCoreAppRuntimeVersion)" />
38+
+
39+
+ </Target>
40+
+
41+
</Project>
42+
--
43+
2.29.2
44+

‎patches/runtime/0035-Publish-compressed-files-to-a-provided-location.patch

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
From 824e7a89533f6e35099762a7f543d76fae693484 Mon Sep 17 00:00:00 2001
2+
From: Omair Majid <omajid@redhat.com>
3+
Date: Tue, 23 Feb 2021 09:45:39 -0500
4+
Subject: [PATCH] Publish compressed files to a provided location
5+
6+
Used by source-build
7+
---
8+
src/installer/pkg/packaging/installers.proj | 22 +++++++++++++++++++++
9+
1 file changed, 22 insertions(+)
10+
11+
diff --git a/src/installer/pkg/packaging/installers.proj b/src/installer/pkg/packaging/installers.proj
12+
index dbae53d0852..5293f91e0b9 100644
13+
--- a/src/installer/pkg/packaging/installers.proj
14+
+++ b/src/installer/pkg/packaging/installers.proj
15+
@@ -12,6 +12,7 @@
16+
GetInstallerLocations;
17+
GenerateVersionBadge;
18+
GenerateCompressedFiles;
19+
+ PublishCompressedFilesForSourceBuild;
20+
GenerateInstallers;
21+
GenerateProjectInstallers;
22+
</PackageTargets>
23+
@@ -259,6 +260,27 @@
24+
<Error Condition="!Exists('$(AssetOutputPath)$(SharedFrameworkSymbolsCompressedFile)')" Message="Unable to create $(AssetOutputPath)$(SharedFrameworkSymbolsCompressedFile)" />
25+
</Target>
26+
27+
+ <!-- Used by source-build -->
28+
+ <Target Name="PublishCompressedFilesForSourceBuild"
29+
+ Condition="'$(PublishCompressedFilesPathPrefix)' != ''">
30+
+
31+
+ <MakeDir Directories="$(PublishCompressedFilesPathPrefix)$(ProductVersion)" />
32+
+
33+
+ <Copy SourceFiles="$(AssetOutputPath)$(CombinedCompressedFile)"
34+
+ DestinationFolder="$(PublishCompressedFilesPathPrefix)$(ProductVersion)" />
35+
+
36+
+ <Copy SourceFiles="$(AssetOutputPath)$(HostFxrCompressedFile)"
37+
+ DestinationFolder="$(PublishCompressedFilesPathPrefix)$(ProductVersion)" />
38+
+
39+
+ <Copy SourceFiles="$(AssetOutputPath)$(SharedFrameworkCompressedFile)"
40+
+ DestinationFolder="$(PublishCompressedFilesPathPrefix)$(ProductVersion)" />
41+
+
42+
+ <Copy SourceFiles="$(AssetOutputPath)$(SharedFrameworkSymbolsCompressedFile)"
43+
+ DestinationFolder="$(PublishCompressedFilesPathPrefix)$(ProductVersion)" />
44+
+
45+
+ </Target>
46+
+
47+
+
48+
<Import Project="osx\package.targets" />
49+
<Import Project="deb\package.targets" />
50+
<Import Project="rpm\package.targets" />
51+
--
52+
2.29.2
53+

‎patches/sdk/0019-Publish-archives-to-a-provided-location.patch

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
From 59705e091ae3feccb8d50f67f0ffc58f16981efb Mon Sep 17 00:00:00 2001
2+
From: Omair Majid <omajid@redhat.com>
3+
Date: Tue, 23 Feb 2021 09:48:12 -0500
4+
Subject: [PATCH] Publish archives to a provided location
5+
6+
Used by source-build to consume the archives.
7+
---
8+
.../redist/targets/GenerateArchive.targets | 16 ++++++++++++++++
9+
1 file changed, 16 insertions(+)
10+
11+
diff --git a/src/Layout/redist/targets/GenerateArchive.targets b/src/Layout/redist/targets/GenerateArchive.targets
12+
index a67bd7a4b..d9f1318f7 100644
13+
--- a/src/Layout/redist/targets/GenerateArchive.targets
14+
+++ b/src/Layout/redist/targets/GenerateArchive.targets
15+
@@ -33,4 +33,20 @@
16+
Lines="$(Version)"
17+
Overwrite="true" />
18+
</Target>
19+
+
20+
+ <!-- Used by source-build -->
21+
+ <Target Name="GenerateSourceBuildArchives"
22+
+ AfterTargets="GenerateArchives"
23+
+ Condition="'$(PublishCompressedFilesPathPrefix)' != ''">
24+
+
25+
+ <MakeDir Directories="$(PublishCompressedFilesPathPrefix)$(Version)" />
26+
+
27+
+ <ItemGroup>
28+
+ <ToolsetZips Include="$(ArtifactsNonShippingPackagesDir)dotnet-*.zip" />
29+
+ </ItemGroup>
30+
+
31+
+ <Copy SourceFiles="@(ToolsetZips)"
32+
+ DestinationFolder="$(PublishCompressedFilesPathPrefix)$(Version)" />
33+
+ </Target>
34+
+
35+
</Project>
36+
--
37+
2.29.2
38+

‎repos/aspnetcore.proj

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<BuildCommandArgs>$(BuildCommandArgs) /p:BuildNodeJs=false</BuildCommandArgs>
1818
<BuildCommandArgs>$(BuildCommandArgs) /p:SourceBuildRuntimeIdentifier=$(OverrideTargetRid)</BuildCommandArgs>
1919
<BuildCommandArgs>$(BuildCommandArgs) /p:UseAppHost=false</BuildCommandArgs>
20+
<BuildCommandArgs>$(BuildCommandArgs) /p:PublishCompressedFilesPathPrefix=$(SourceBuiltAspNetCoreRuntime)</BuildCommandArgs>
2021

2122
<!-- Update to 1.0.0 version of reference assemblies which are built in SBRP instead of the preview.2 version
2223
included by Arcade -->
@@ -26,7 +27,6 @@
2627

2728
<BuildCommand>$(ProjectDirectory)build$(ShellExtension) $(BuildCommandArgs)</BuildCommand>
2829

29-
<TarballOutputDir>$(ProjectDirectory)artifacts/installers/$(Configuration)/</TarballOutputDir>
3030
<ShippingPackagesOutput>$(ProjectDirectory)artifacts/packages/$(Configuration)/Shipping/</ShippingPackagesOutput>
3131
<NonShippingPackagesOutput>$(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/</NonShippingPackagesOutput>
3232
<RepoApiImplemented>false</RepoApiImplemented>
@@ -86,27 +86,5 @@
8686
</ItemGroup>
8787
</Target>
8888

89-
<UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="PublishToolsetBinaries" />
90-
91-
<Target Name="PublishBinaries"
92-
AfterTargets="Build"
93-
Inputs="$(MSBuildProjectFullPath)"
94-
Outputs="$(RepoCompletedSemaphorePath)PublishBinaries.complete">
95-
<ItemGroup>
96-
<AspNetTarballs Include="$(TarballOutputDir)aspnetcore-*.tar.gz" />
97-
<ExtraAspNetFiles Include="$(TarballOutputDir)*.version" />
98-
</ItemGroup>
99-
<Message Importance="High" Text="Publishing @(AspNetTarballs) from $(TarballOutputDir) to $(SourceBuiltAspNetCoreRuntime){version}/" />
100-
<PublishToolsetBinaries Binaries="@(AspNetTarballs)"
101-
DestinationFolderTemplate="$(SourceBuiltAspNetCoreRuntime){version}/">
102-
<Output TaskParameter="PublishedVersion" PropertyName="PublishedVersion" />
103-
</PublishToolsetBinaries>
104-
<Message Text="Published ASP.NET runtime version $(PublishedVersion)" Importance="High" />
105-
<Copy SourceFiles="@(ExtraAspNetFiles)" DestinationFolder="$(SourceBuiltAspNetCoreRuntime)$(PublishedVersion)" Condition="'@(ExtraAspNetFiles)' != ''" />
106-
<Message Text="Published extra ASP.NET files @(ExtraAspNetFiles) to $(SourceBuiltAspNetCoreRuntime)$(PublishedVersion)" Importance="High" />
107-
108-
<WriteLinesToFile File="$(RepoCompletedSemaphorePath)PublishBinaries.complete" Overwrite="true" />
109-
</Target>
110-
11189
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
11290
</Project>

‎repos/runtime.common.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
<InstallerBuildArguments>$(InstallerBuildArguments) /p:RestoreAllBuildRids=false</InstallerBuildArguments>
8080
<InstallerBuildArguments>$(InstallerBuildArguments) /p:OutputRid=$(OverrideTargetRid)</InstallerBuildArguments>
8181
<InstallerBuildArguments>$(InstallerBuildArguments) /p:DotNetOutputBlobFeedDir=$(SourceBuiltBlobFeedDir)</InstallerBuildArguments>
82+
<InstallerBuildArguments>$(InstallerBuildArguments) /p:PublishCompressedFilesPathPrefix=$(SourceBuiltRuntimeDir)</InstallerBuildArguments>
8283
<InstallerBuildArguments>$(InstallerBuildArguments) /p:BuiltSdkPackageOverride=""</InstallerBuildArguments> <!-- Clear PackageOverride for Installer - it only applies to coreclr -->
8384
<InstallerBuildArguments>$(InstallerBuildArguments) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg)</InstallerBuildArguments>
8485

‎repos/runtime.common.targets

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -48,26 +48,8 @@
4848
<WriteLinesToFile File="$(RepoCompletedSemaphorePath)CopyTools.complete" Overwrite="true" />
4949
</Target>
5050

51-
<!-- Need to "publish" the tarballs for cli, until cli respects the assets blob -->
52-
<Target Name="PublishBinaries"
53-
AfterTargets="Build"
54-
Inputs="$(MSBuildProjectFullPath)"
55-
Outputs="$(RepoCompletedSemaphorePath)PublishBinaries.complete">
56-
<ItemGroup>
57-
<CoreSetupTarballs Include="$(SourceBuiltAssetsDir)dotnet-runtime-*$(TarBallExtension)" />
58-
<CoreSetupTarballs Include="$(SourceBuiltAssetsDir)dotnet-hostfxr-*$(TarBallExtension)" />
59-
</ItemGroup>
60-
<PublishCoreSetupBinaries Binaries="@(CoreSetupTarballs)"
61-
DestinationFolderTemplate="$(SourceBuiltRuntimeDir){version}/" >
62-
<Output TaskParameter="PublishedVersion" PropertyName="PublishedVersion" />
63-
</PublishCoreSetupBinaries>
64-
<Message Text="Published core-setup binaries version $(PublishedVersion)" Importance="High" />
65-
66-
<WriteLinesToFile File="$(RepoCompletedSemaphorePath)PublishBinaries.complete" Overwrite="true" />
67-
</Target>
68-
6951
<Target Name="CopyBinariesToBinFolder"
70-
AfterTargets="PublishBinaries"
52+
AfterTargets="Build"
7153
Inputs="$(MSBuildProjectFullPath)"
7254
Outputs="$(RepoCompletedSemaphorePath)CopyBinariesToBinFolder.complete">
7355
<ItemGroup>

‎repos/sdk.proj

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<PropertyGroup>
66
<BuildCommandArgs>--pack --configuration $(Configuration)</BuildCommandArgs>
77
<BuildCommandArgs>$(BuildCommandArgs) /p:PackageProjectUrl=https://github.com/dotnet/sdk</BuildCommandArgs>
8+
<BuildCommandArgs>$(BuildCommandArgs) /p:PublishCompressedFilesPathPrefix=$(SourceBuiltToolsetDir)</BuildCommandArgs>
89

910
<LogVerbosityOptOut>true</LogVerbosityOptOut>
1011
<BuildCommandArgs>$(BuildCommandArgs) -v $(LogVerbosity)</BuildCommandArgs>
@@ -30,7 +31,6 @@
3031
<DependencyVersionInputRepoApiImplemented>true</DependencyVersionInputRepoApiImplemented>
3132
<OutputPlacementRepoApiImplemented>false</OutputPlacementRepoApiImplemented>
3233
<PackagesOutput>$(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/</PackagesOutput>
33-
<ToolsetZipOutputDir>$(ProjectDirectory)artifacts/packages/Release/NonShipping/</ToolsetZipOutputDir>
3434

3535
<EnvironmentRestoreSources>$(SourceBuiltPackagesPath)</EnvironmentRestoreSources>
3636
<EnvironmentRestoreSources Condition="'$(OfflineBuild)' == 'true'">$(EnvironmentRestoreSources)%3B$(ReferencePackagesDir)%3B$(PrebuiltPackagesPath)</EnvironmentRestoreSources>
@@ -58,25 +58,5 @@
5858
<RepositoryReference Include="fsharp" />
5959
</ItemGroup>
6060

61-
<UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="PublishToolsetBinaries" />
62-
63-
<!-- Need to "publish" the tarballs for cli, until cli respects the assets blob -->
64-
<Target Name="PublishBinaries"
65-
AfterTargets="Build"
66-
Inputs="$(MSBuildProjectFullPath)"
67-
Outputs="$(RepoCompletedSemaphorePath)PublishBinaries.complete">
68-
<ItemGroup>
69-
<ToolsetZips Include="$(ToolsetZipOutputDir)dotnet-*.zip" />
70-
</ItemGroup>
71-
<Message Importance="High" Text="Publishing @(ToolsetZips) from $(ToolsetZipOutputDir) to $(LocalBlobStorageRoot)Sdk/{version}/" />
72-
<PublishToolsetBinaries Binaries="@(ToolsetZips)"
73-
DestinationFolderTemplate="$(SourceBuiltToolsetDir){version}/">
74-
<Output TaskParameter="PublishedVersion" PropertyName="PublishedVersion" />
75-
</PublishToolsetBinaries>
76-
<Message Text="Published toolset binaries version $(PublishedVersion)" Importance="High" />
77-
78-
<WriteLinesToFile File="$(RepoCompletedSemaphorePath)PublishBinaries.complete" Overwrite="true" />
79-
</Target>
80-
8161
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
8262
</Project>

‎tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/PublishCoreSetupBinaries.cs

Lines changed: 0 additions & 98 deletions
This file was deleted.

‎tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/PublishToolsetBinaries.cs

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)