hoist CoreCLRRid definition to Prepare.targets
This commit is contained in:
parent
d25f2a11d6
commit
090c8e2e09
3 changed files with 7 additions and 8 deletions
|
@ -43,6 +43,10 @@
|
|||
<IntermediateDirectory>$(BaseOutputDirectory)/intermediate</IntermediateDirectory>
|
||||
<PackagesDirectory>$(BaseOutputDirectory)/packages</PackagesDirectory>
|
||||
<SharedFrameworkPublishDirectory>$(IntermediateDirectory)/sharedFrameworkPublish</SharedFrameworkPublishDirectory>
|
||||
<CoreCLRRid>$(Rid)</CoreCLRRid>
|
||||
<CoreCLRRid Condition=" '$(OSName)' == 'win' ">win7-$(Architecture)</CoreCLRRid>
|
||||
<CoreCLRRid Condition=" '$(OSName)' == 'osx' ">osx.10.10-x64</CoreCLRRid>
|
||||
<CoreCLRRid Condition=" '$(OSName)' == 'centos' OR '$(OSName)' == 'rhel' ">rhel.7-x64</CoreCLRRid>
|
||||
</PropertyGroup>
|
||||
|
||||
<GetCommitHash RepoRoot="$(RepoRoot)">
|
||||
|
|
|
@ -3,11 +3,6 @@
|
|||
<Target Name="InitCrossgenProps"
|
||||
DependsOnTargets="Init">
|
||||
<PropertyGroup>
|
||||
<CoreCLRRid>$(Rid)</CoreCLRRid>
|
||||
<CoreCLRRid Condition=" '$(OSName)' == 'win' ">win7-$(Architecture)</CoreCLRRid>
|
||||
<CoreCLRRid Condition=" '$(OSName)' == 'osx' ">osx.10.10-x64</CoreCLRRid>
|
||||
<CoreCLRRid Condition=" '$(OSName)' == 'centos' OR '$(OSName)' == 'rhel' ">rhel.7-x64</CoreCLRRid>
|
||||
|
||||
<CoreCLRPackageName>runtime.$(CoreCLRRid).microsoft.netcore.runtime.coreclr</CoreCLRPackageName>
|
||||
<CrossGenPackageName>runtime.$(CoreCLRRid).microsoft.netcore.runtime.coreclr</CrossGenPackageName>
|
||||
<LibCLRJitPackageName>runtime.$(CoreCLRRid).microsoft.netcore.jit</LibCLRJitPackageName>
|
||||
|
|
|
@ -55,7 +55,7 @@
|
|||
<VersionPrefix>1.0.0</VersionPrefix>
|
||||
<VersionSuffix></VersionSuffix>
|
||||
<Clean>True</Clean>
|
||||
<PackRuntime>$(CoreCLRRid)</PackRuntime>
|
||||
<MsbuildArgs>/p:RuntimeIdentifier=$(CoreCLRRid)</MsbuildArgs>
|
||||
</BaseTestPackageProject>
|
||||
<BaseTestPackageProject Include="TestAssets/TestPackages/dotnet-dependency-context-test">
|
||||
<Name>dotnet-dependency-context-test</Name>
|
||||
|
@ -84,7 +84,7 @@
|
|||
<VersionPrefix>1.0.0-rc-</VersionPrefix>
|
||||
<VersionSuffix>rc-$(TestPackageBuildVersionSuffix)</VersionSuffix>
|
||||
<Clean>True</Clean>
|
||||
<PackRuntime>$(CoreCLRRid)</PackRuntime>
|
||||
<MsbuildArgs>/p:RuntimeIdentifier=$(CoreCLRRid)</MsbuildArgs>
|
||||
</BaseTestPackageProject>
|
||||
<BaseTestPackageProject Include="TestAssets/TestPackages/dotnet-desktop-binding-redirects"
|
||||
Condition=" '$(IsDesktopAvailable)' == 'True' ">
|
||||
|
@ -96,7 +96,7 @@
|
|||
<VersionPrefix>1.0.0-rc-</VersionPrefix>
|
||||
<VersionSuffix>rc-$(TestPackageBuildVersionSuffix)</VersionSuffix>
|
||||
<Clean>True</Clean>
|
||||
<PackRuntime>$(CoreCLRRid)</PackRuntime>
|
||||
<MsbuildArgs>/p:RuntimeIdentifier=$(CoreCLRRid)</MsbuildArgs>
|
||||
</BaseTestPackageProject>
|
||||
<BaseTestPackageProject Include="TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello">
|
||||
<Name>dotnet-hello</Name>
|
||||
|
|
Loading…
Reference in a new issue