Skip to content

Commit fd04c9c

Browse files
ayakaelayakael
committed
Eliminate runtime portable build (backport dotnet#14549)
1 parent ffe70b9 commit fd04c9c

11 files changed

+92
-151
lines changed

‎src/SourceBuild/tarball/content/Directory.Build.props

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,6 @@
2222
<Platform Condition="'$(Platform)' == ''">x64</Platform>
2323

2424
<UseStableVersions Condition="'$(UseStableVersions)' == ''">false</UseStableVersions>
25-
26-
<!-- new supported portable/nonportable options. These control whether to build portable runtime
27-
or portable SDK. The PortableBuild flag is only set in runtime-portable.proj and should
28-
no longer be passed in. -->
29-
<BuildPortableRuntime Condition="'$(BuildPortableRuntime)' == ''">false</BuildPortableRuntime>
30-
<BuildPortableSdk Condition="'$(BuildPortableSdk)' == ''">false</BuildPortableSdk>
31-
<UseSystemLibraries Condition="'$(UseSystemLibraries)' == '' AND '$(PortableRuntime)' != 'true'">true</UseSystemLibraries>
32-
<UseSystemLibraries Condition="'$(UseSystemLibraries)' == ''">false</UseSystemLibraries>
3325
</PropertyGroup>
3426

3527
<!-- This repo's projects are entirely infrastructure and do not ship. -->

‎src/SourceBuild/tarball/content/repos/aspnetcore.proj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<BuildCommandArgs>$(BuildCommandArgs) --no-build-repo-tasks</BuildCommandArgs>
1010
<BuildCommandArgs>$(BuildCommandArgs) /p:BuildNodeJs=false</BuildCommandArgs>
1111
<BuildCommandArgs>$(BuildCommandArgs) /p:PublishCompressedFilesPathPrefix=$(SourceBuiltAspNetCoreRuntime)</BuildCommandArgs>
12+
<BuildCommandArgs>$(BuildCommandArgs) /p:PortableBuild=false /p:TargetRuntimeIdentifier=$(TargetRid)</BuildCommandArgs>
1213
<!-- Update to 1.0.0 version of reference assemblies which are built in SBRP instead of the preview.2 version
1314
included by Arcade -->
1415
<BuildCommandArgs>$(BuildCommandArgs) /p:MicrosoftNetFrameworkReferenceAssembliesVersion=1.0.0</BuildCommandArgs>

‎src/SourceBuild/tarball/content/repos/installer.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:Rid=$(TargetRid)</BuildCommandArgs>
2626
<BuildCommandArgs>$(BuildCommandArgs) /p:DOTNET_INSTALL_DIR=$(DotNetCliToolDir)</BuildCommandArgs>
2727

28-
<BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:AspNetCoreInstallerRid=linux-$(Platform)</BuildCommandArgs>
28+
<BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:AspNetCoreInstallerRid=$(TargetRid)</BuildCommandArgs>
2929
<!-- core-sdk always wants to build portable on OSX and FreeBSD -->
3030
<BuildCommandArgs Condition="'$(TargetOS)' == 'FreeBSD'">$(BuildCommandArgs) /p:CoreSetupRid=freebsd-x64 /p:PortableBuild=true</BuildCommandArgs>
3131
<BuildCommandArgs Condition="'$(TargetOS)' == 'OSX'">$(BuildCommandArgs) /p:CoreSetupRid=osx-x64</BuildCommandArgs>

‎src/SourceBuild/tarball/content/repos/known-good.proj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
<!-- Tier 2 -->
4545
<RepositoryReference Include="linker" />
4646
<RepositoryReference Include="msbuild" />
47-
<RepositoryReference Include="runtime-portable" />
4847
<RepositoryReference Include="runtime" />
4948
<RepositoryReference Include="templating" />
5049

‎src/SourceBuild/tarball/content/repos/runtime-portable.proj

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

‎src/SourceBuild/tarball/content/repos/runtime.common.props

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

‎src/SourceBuild/tarball/content/repos/runtime.common.targets

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

‎src/SourceBuild/tarball/content/repos/runtime.proj

Lines changed: 83 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,107 @@
11
<Project>
2-
<Import Project="runtime.common.props"/>
2+
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
33

4+
<!-- Build arguments -->
45
<PropertyGroup>
6+
<LogVerbosityOptOut>true</LogVerbosityOptOut>
7+
8+
<CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
9+
510
<OverrideTargetRid>$(TargetRid)</OverrideTargetRid>
611
<OverrideTargetRid Condition="'$(TargetOS)' == 'OSX'">osx-x64</OverrideTargetRid>
712
<OverrideTargetRid Condition="'$(TargetOS)' == 'FreeBSD'">freebsd-x64</OverrideTargetRid>
813
<OverrideTargetRid Condition="'$(TargetOS)' == 'Windows_NT'">win-x64</OverrideTargetRid>
914

15+
<_platformIndex>$(NETCoreSdkRuntimeIdentifier.LastIndexOf('-'))</_platformIndex>
16+
<RuntimeOS>$(NETCoreSdkRuntimeIdentifier.Substring(0, $(_platformIndex)))</RuntimeOS>
17+
18+
<_platformIndex>$(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-'))</_platformIndex>
19+
<BaseOS>$(NETCoreSdkPortableRuntimeIdentifier.Substring(0, $(_platformIndex)))</BaseOS>
20+
1021
<BuildCommandArgs>$(StandardSourceBuildArgs)</BuildCommandArgs>
1122
<BuildCommandArgs>$(BuildCommandArgs) /p:TargetRid=$(OverrideTargetRid)</BuildCommandArgs>
23+
<BuildCommandArgs>$(BuildCommandArgs) /p:RuntimeOS=$(RuntimeOS)</BuildCommandArgs>
24+
<BuildCommandArgs>$(BuildCommandArgs) /p:BaseOS=$(BaseOS)</BuildCommandArgs>
1225
<BuildCommandArgs>$(BuildCommandArgs) /p:SourceBuildNonPortable=true</BuildCommandArgs>
1326
<BuildCommand>$(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand>
1427
</PropertyGroup>
1528

29+
<!-- Output / source-build flags -->
30+
<PropertyGroup>
31+
<GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
32+
<NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>
33+
<OutputPlacementRepoApiImplemented>false</OutputPlacementRepoApiImplemented>
34+
<DependencyVersionInputRepoApiImplemented>true</DependencyVersionInputRepoApiImplemented>
35+
</PropertyGroup>
36+
37+
<!-- SDK Overrides -->
38+
<ItemGroup>
39+
<UseSourceBuiltSdkOverride Include="@(ArcadeSdkOverride)" />
40+
<UseSourceBuiltSdkOverride Include="@(ArcadeCoreFxTestingOverride)" />
41+
<UseSourceBuiltSdkOverride Include="@(ArcadePackagingOverride)" />
42+
<UseSourceBuiltSdkOverride Include="@(ArcadeTargetFrameworkOverride)" />
43+
<UseSourceBuiltSdkOverride Include="@(ArcadeSharedFrameworkSdkOverride)" />
44+
</ItemGroup>
45+
46+
<!-- Environment Variables -->
47+
<ItemGroup>
48+
<EnvironmentVariables Include="BuildInParallel=false" />
49+
</ItemGroup>
50+
51+
<ItemGroup>
52+
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftCodeAnalysisVersion_4_X" Version="%24(MicrosoftCodeAnalysisVersion)" />
53+
</ItemGroup>
54+
1655
<!-- Repository References -->
1756
<ItemGroup>
1857
<RepositoryReference Include="arcade" />
1958
<RepositoryReference Include="symreader" />
2059
<RepositoryReference Include="linker" />
2160
<RepositoryReference Include="source-build" />
2261
<RepositoryReference Include="roslyn" />
23-
<RepositoryReference Include="runtime-portable" />
2462
</ItemGroup>
2563

26-
<Import Project="runtime.common.targets" />
64+
<UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="AddRidToRuntimeJson" />
65+
<UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="PublishCoreSetupBinaries" />
66+
67+
<Target Name="SetOutputList" AfterTargets="Package" BeforeTargets="GatherBuiltPackages">
68+
<ItemGroup>
69+
<PackagesOutputList Include="$(ShippingPackagesOutput)" />
70+
<PackagesOutputList Include="$(NonShippingPackagesOutput)" />
71+
</ItemGroup>
72+
</Target>
73+
74+
<Target Name="UpdateRuntimeGraph"
75+
BeforeTargets="Build"
76+
Condition="'$(_IsBootstrapping)' == 'true'">
77+
<PropertyGroup>
78+
<RuntimeJsonFile>$(ProjectDirectory)pkg/Microsoft.NETCore.Platforms/runtime.json</RuntimeJsonFile>
79+
</PropertyGroup>
80+
81+
<Message Importance="High" Text="Adding rid, $(TargetRid), to $(RuntimeJsonFile)" />
82+
<AddRidToRuntimeJson RuntimeJson="$(RuntimeJsonFile)"
83+
Rid="$(TargetRid)-$(Platform)" />
84+
</Target>
85+
86+
<Target Name="CopyBinariesToBinFolder"
87+
AfterTargets="ExtractIntermediatePackages"
88+
Inputs="$(MSBuildProjectFullPath)"
89+
Outputs="$(RepoCompletedSemaphorePath)CopyBinariesToBinFolder.complete">
90+
<ItemGroup>
91+
<_builtRuntimePackages Include="$(SourceBuiltAssetsDir)*.symbols.nupkg" />
92+
<_builtRuntimePackages>
93+
<TransformedFileName>$([System.String]::Copy('%(FileName)').Replace('symbols', 'nupkg'))</TransformedFileName>
94+
</_builtRuntimePackages>
95+
<BinariesToCopy Include="$(SourceBuiltAssetsDir)*.*" Exclude="$(SourceBuiltAssetsDir)*.nupkg;$(SourceBuiltAssetsDir)*.requires_nupkg_signing" />
96+
<BinariesToCopy Include="@(_builtRuntimePackages->'$(SourceBuiltPackagesPath)%(TransformedFileName)')" />
97+
</ItemGroup>
98+
99+
<Copy SourceFiles="@(BinariesToCopy)"
100+
DestinationFolder="$(OutputPath)runtime"
101+
Condition="'@(BinariesToCopy)'!=''" />
102+
103+
<WriteLinesToFile File="$(RepoCompletedSemaphorePath)CopyBinariesToBinFolder.complete" Overwrite="true" />
104+
</Target>
105+
106+
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
27107
</Project>

‎src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
33

44
<PropertyGroup>
5-
<BuildCommand>$(StandardSourceBuildCommand) $(StandardSourceBuildArgs)</BuildCommand>
5+
<BuildCommandArgs>$(StandardSourceBuildArgs)</BuildCommandArgs>
6+
<BuildCommandArgs>$(BuildCommandArgs) /p:MicrosoftNetCoreIlasmPackageRuntimeId=$(NETCoreSdkRuntimeIdentifier)</BuildCommandArgs>
7+
<BuildCommand>$(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand>
68

79
<NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>
810
<GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>

‎src/redist/targets/Crossgen.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<PropertyGroup>
88
<RuntimeNETCoreAppPackageName>microsoft.netcore.app.runtime.$(SharedFrameworkRid)</RuntimeNETCoreAppPackageName>
9-
<RuntimeNETCrossgenPackageName>microsoft.netcore.app.crossgen2.$(HostOSName)-$(BuildArchitecture)</RuntimeNETCrossgenPackageName>
9+
<RuntimeNETCrossgenPackageName>microsoft.netcore.app.crossgen2.$(Crossgen2Rid)</RuntimeNETCrossgenPackageName>
1010
<CrossgenPath>$(NuGetPackageRoot)/$(RuntimeNETCrossgenPackageName)/$(MicrosoftNETCoreAppRuntimePackageVersion)/tools/crossgen2$(ExeExtension)</CrossgenPath>
1111
<!-- When ingesting stable pgo instrumented binaries, the shared framework will be a non-stable version,
1212
as will the archive file names themselves. -->

0 commit comments

Comments
 (0)