-
Notifications
You must be signed in to change notification settings - Fork 4.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Split the Runtime Shared Framework project and combine legs in the of…
…ficial build (#111136)
- Loading branch information
1 parent
bc2ac2f
commit e68313e
Showing
27 changed files
with
441 additions
and
441 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
84 changes: 84 additions & 0 deletions
84
src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.CoreCLR.sfxproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| <Project TreatAsLocalProperty="RuntimeFlavor;BuildNativeAOTRuntimePack"> | ||
| <PropertyGroup> | ||
| <RuntimeFlavor>CoreCLR</RuntimeFlavor> | ||
| <BuildNativeAOTRuntimePack>false</BuildNativeAOTRuntimePack> | ||
| <OutDirName>coreclr-pack</OutDirName> | ||
| </PropertyGroup> | ||
| <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" /> | ||
| <Import Project="Sdk.props" Sdk="Microsoft.DotNet.SharedFramework.Sdk" /> | ||
|
|
||
| <PropertyGroup> | ||
| <PlatformPackageType>RuntimePack</PlatformPackageType> | ||
| <InstallerName Condition="'$(TargetOS)' != 'osx'">dotnet-runtime</InstallerName> | ||
| <InstallerName Condition="'$(TargetOS)' == 'osx'">dotnet-runtime-internal</InstallerName> | ||
| <IsPackable Condition="'$(BuildOnlyPgoInstrumentedAssets)' != ''">false</IsPackable> | ||
| <VSInsertionShortComponentName>NetCore.SharedFramework</VSInsertionShortComponentName> | ||
| <UseTemplatedPlatformManifest>true</UseTemplatedPlatformManifest> | ||
| <UseRidGraph>true</UseRidGraph> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <LinuxPackageDependency Include="dotnet-hostfxr-$(MajorVersion).$(MinorVersion);dotnet-runtime-deps-$(MajorVersion).$(MinorVersion)" Version="$(InstallerPackageVersion)" /> | ||
| </ItemGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <PublishReadyToRun>true</PublishReadyToRun> | ||
| <!-- Disable crossgen on NetBSD, illumos, Solaris and Haiku for now. This can be revisited when we have full support. --> | ||
| <PublishReadyToRun Condition="'$(TargetOS)' == 'netbsd' or '$(TargetOS)' == 'illumos' or '$(TargetOS)' == 'solaris' or '$(TargetOS)' == 'haiku'">false</PublishReadyToRun> | ||
| <!-- Disable crossgen on FreeBSD when cross building from Linux. --> | ||
| <PublishReadyToRun Condition="'$(TargetOS)'=='freebsd' and '$(CrossBuild)'=='true'">false</PublishReadyToRun> | ||
| <UsesMuxerHostModel Condition="'$(TargetsMobile)' != 'true'">true</UsesMuxerHostModel> | ||
| <IncludeDiaSymReaderNative Condition="'$(TargetOS)' == 'windows'">true</IncludeDiaSymReaderNative> | ||
| <UseLocalCrossgen2Pack>$(PublishReadyToRun)</UseLocalCrossgen2Pack> | ||
| </PropertyGroup> | ||
|
|
||
| <Import Project="Microsoft.NETCore.App.Runtime.props" /> | ||
|
|
||
| <PropertyGroup> | ||
| <PublishReadyToRunComposite Condition="$(ForcePublishReadyToRunComposite) == 'true'">true</PublishReadyToRunComposite> | ||
| </PropertyGroup> | ||
|
|
||
|
|
||
| <Target Name="ResolveReadyToRunCompilers" DependsOnTargets="ResolveRuntimeFilesFromLocalBuild"> | ||
| <PropertyGroup> | ||
| <Crossgen2Path>$([MSBuild]::NormalizePath('$(Crossgen2InBuildDir)', 'crossgen2$(ExeSuffix)'))</Crossgen2Path> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Crossgen2Tool Include="$(Crossgen2Path)" | ||
| TargetArch="$(TargetArchitecture)" | ||
| TargetOS="$(TargetOS)" | ||
| PerfmapFormatVersion="$(PublishReadyToRunPerfmapFormatVersion)"/> | ||
| </ItemGroup> | ||
| </Target> | ||
|
|
||
| <!-- | ||
| Put the mibc file into tools and not into PgoData. Add it after GetFilesToPackage to ensure it isn't automatically classified. | ||
| Putting it in tools will also hide it from being part of the RuntimeList.xml. | ||
| --> | ||
| <Target Name="AddMibcFilesToPackage" | ||
| AfterTargets="GetFilesToPackage"> | ||
| <ItemGroup> | ||
| <FilesToPackageMibcData Include="$(CoreCLRArtifactsPath)StandardOptimizationData.mibc" | ||
| Condition="Exists('$(CoreCLRArtifactsPath)StandardOptimizationData.mibc')"> | ||
| <TargetPath>tools</TargetPath> | ||
| </FilesToPackageMibcData> | ||
| <FilesToPackage Include="@(FilesToPackageMibcData)"/> | ||
| </ItemGroup> | ||
| </Target> | ||
|
|
||
|
|
||
| <Target Name="AddCoreCLRRuntimeFiles" AfterTargets="AddRuntimeFilesToPackage"> | ||
| <ItemGroup> | ||
| <CoreCLRCrossTargetFiles PackOnly="true" /> | ||
| <CoreCLRCrossTargetFiles Condition="$([System.String]::new('%(FileName)').StartsWith('mscordaccore')) and '$(TargetsWindows)' == 'true'"> | ||
| <TargetPath>tools/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)</TargetPath> | ||
| </CoreCLRCrossTargetFiles> | ||
| <CoreCLRCrossTargetFiles Condition="'%(FileName)%(Extension)' == 'mscordbi.dll' and '$(TargetsWindows)' == 'true'"> | ||
| <TargetPath>tools/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)</TargetPath> | ||
| </CoreCLRCrossTargetFiles> | ||
|
|
||
| <ReferenceCopyLocalPaths Include="@(CoreCLRCrossTargetFiles)" /> | ||
| </ItemGroup> | ||
| </Target> | ||
| </Project> |
73 changes: 73 additions & 0 deletions
73
src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.Mono.sfxproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| <Project TreatAsLocalProperty="RuntimeFlavor;BuildNativeAOTRuntimePack"> | ||
| <PropertyGroup> | ||
| <RuntimeFlavor>Mono</RuntimeFlavor> | ||
| <BuildNativeAOTRuntimePack>false</BuildNativeAOTRuntimePack> | ||
| <OutDirName>mono-pack</OutDirName> | ||
| </PropertyGroup> | ||
|
|
||
| <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" /> | ||
| <Import Project="Sdk.props" Sdk="Microsoft.DotNet.SharedFramework.Sdk" /> | ||
|
|
||
| <PropertyGroup> | ||
| <PlatformPackageType>RuntimePack</PlatformPackageType> | ||
| <UseTemplatedPlatformManifest>true</UseTemplatedPlatformManifest> | ||
| <UseRidGraph>true</UseRidGraph> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <SkipInstallerBuild>true</SkipInstallerBuild> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <PublishReadyToRun>false</PublishReadyToRun> | ||
| <UsesMuxerHostModel Condition="'$(TargetsMobile)' != 'true'">true</UsesMuxerHostModel> | ||
| <IncludeDiaSymReaderNative Condition="'$(TargetOS)' == 'windows'">true</IncludeDiaSymReaderNative> | ||
| <IncludeStaticLibrariesInPack Condition="'$(TargetsMobile)' == 'true'">true</IncludeStaticLibrariesInPack> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(RuntimeFlavor)' != '$(PrimaryRuntimeFlavor)' or '$(TargetsMobile)' == 'true'"> | ||
| <RuntimeSpecificFrameworkSuffix>Mono</RuntimeSpecificFrameworkSuffix> | ||
| <IsShipping Condition="'$(TargetsMobile)' != 'true'">false</IsShipping> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(MonoEnableLLVM)' == 'true' and '$(TargetsMobile)' != 'true'"> | ||
| <RuntimeSpecificFrameworkSuffix>Mono.LLVM</RuntimeSpecificFrameworkSuffix> | ||
| <IsShipping>false</IsShipping> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(MonoAOTEnableLLVM)' == 'true' and '$(TargetsMobile)' != 'true'"> | ||
| <RuntimeSpecificFrameworkSuffix>Mono.LLVM.AOT</RuntimeSpecificFrameworkSuffix> | ||
| <IsShipping>false</IsShipping> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(WasmEnableThreads)' == 'true'"> | ||
| <RuntimeSpecificFrameworkSuffix>Mono.multithread</RuntimeSpecificFrameworkSuffix> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(RuntimeSpecificFrameworkSuffix)' != ''"> | ||
| <OverridePackageId>$(SharedFrameworkName).Runtime.$(RuntimeSpecificFrameworkSuffix).$(RuntimeIdentifier)</OverridePackageId> | ||
| </PropertyGroup> | ||
|
|
||
| <Import Project="Microsoft.NETCore.App.Runtime.props" /> | ||
|
|
||
| <Target Name="AddMonoRuntimeFiles" AfterTargets="AddRuntimeFilesToPackage"> | ||
| <ItemGroup> | ||
| <MonoRuntimeFiles Include="@(MonoFrameworkReleaseFiles)" | ||
| ExcludeFromDataFiles="true"> | ||
| <TargetPath>runtimes/$(RuntimeIdentifier)/native/Mono.release.framework/%(RecursiveDir)</TargetPath> | ||
| </MonoRuntimeFiles> | ||
|
|
||
| <MonoRuntimeFiles Include="@(MonoFrameworkDebugFiles)" | ||
| ExcludeFromDataFiles="true"> | ||
| <TargetPath>runtimes/$(RuntimeIdentifier)/native/Mono.debug.framework/%(RecursiveDir)</TargetPath> | ||
| </MonoRuntimeFiles> | ||
|
|
||
| <MonoRuntimeFiles Include="@(MonoIncludeFiles)" | ||
| ExcludeFromDataFiles="true"> | ||
| <TargetPath>runtimes/$(RuntimeIdentifier)/native/include/%(RecursiveDir)</TargetPath> | ||
| </MonoRuntimeFiles> | ||
|
|
||
| <MonoRuntimeFiles Include="@(MonoBuildFiles)" | ||
| ExcludeFromDataFiles="true"> | ||
| <TargetPath>runtimes/$(RuntimeIdentifier)/build/%(RecursiveDir)</TargetPath> | ||
| </MonoRuntimeFiles> | ||
| <ReferenceCopyLocalPaths Include="@(MonoRuntimeFiles)" /> | ||
| </ItemGroup> | ||
| </Target> | ||
| </Project> |
36 changes: 36 additions & 0 deletions
36
src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.NativeAOT.sfxproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| <Project TreatAsLocalProperty="RuntimeFlavor;BuildNativeAOTRuntimePack"> | ||
| <PropertyGroup> | ||
| <RuntimeFlavor>CoreCLR</RuntimeFlavor> | ||
| <BuildNativeAOTRuntimePack>true</BuildNativeAOTRuntimePack> | ||
| <OutDirName>naot-pack</OutDirName> | ||
| </PropertyGroup> | ||
|
|
||
| <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" /> | ||
| <Import Project="Sdk.props" Sdk="Microsoft.DotNet.SharedFramework.Sdk" /> | ||
|
|
||
| <PropertyGroup> | ||
| <PlatformPackageType>RuntimePack</PlatformPackageType> | ||
| <UseTemplatedPlatformManifest>true</UseTemplatedPlatformManifest> | ||
| <UseRidGraph>true</UseRidGraph> | ||
| <SkipInstallerBuild>true</SkipInstallerBuild> | ||
| <PublishReadyToRun>false</PublishReadyToRun> | ||
| <OverridePackageId>$(SharedFrameworkName).Runtime.NativeAOT.$(RuntimeIdentifier)</OverridePackageId> | ||
| <IncludeStaticLibrariesInPack>true</IncludeStaticLibrariesInPack> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <IgnoredDuplicateType Include="Internal.Runtime.CompilerHelpers.LibraryInitializer" /> | ||
| </ItemGroup> | ||
|
|
||
| <Import Project="Microsoft.NETCore.App.Runtime.props" /> | ||
|
|
||
| <Target Name="IncludeSymbolFilesInNativeAOTPackage" | ||
| AfterTargets="GetFilesToPackage"> | ||
| <ItemGroup> | ||
| <!-- ILC needs the symbols next to the binaries --> | ||
| <FilesToPackage Update="@(FilesToPackage->WithMetadataValue('IsSymbolFile', 'true'))"> | ||
| <IncludeAlways>true</IncludeAlways> | ||
| </FilesToPackage> | ||
| </ItemGroup> | ||
| </Target> | ||
| </Project> |
Oops, something went wrong.