mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Remove CoreCLRRid property

Browse source 
This property was only legitimately by the project which wants to
restore `crossgen`. Since that now comes from
Microsoft.NETCore.App (i.e. the shared framework) use
SharedFrameworkRid instead.

I also ensured that we passed UsePortableLinuxSharedFramework to
dotnet restore when restoring the tool projects, so we can use the
platform specific RID when non portable build.
This commit is contained in:
Matt Ellis 2017-05-12 14:04:45 -07:00
parent 7f50f322d5
commit 3aa59d98bd
7 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
TestAssets/TestPackages/PackageWithFakeNativeDep/PackageWithFakeNativeDep.csproj
View file

@ -2,7 +2,6 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net45</TargetFramework> <TargetFramework>net45</TargetFramework>
<AssemblyName>PackageWithFakeNativeDep</AssemblyName> <AssemblyName>PackageWithFakeNativeDep</AssemblyName>
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;osx.10.10-x64;rhel.7-x64</RuntimeIdentifiers>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

4
build/CrossGen.props
View file

@ -1,8 +1,8 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<RuntimeNETCoreAppPackageName>runtime.$(CoreCLRRid).microsoft.netcore.app</RuntimeNETCoreAppPackageName> <RuntimeNETCoreAppPackageName>runtime.$(SharedFrameworkRid).microsoft.netcore.app</RuntimeNETCoreAppPackageName>
<CrossgenPath>$(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(CLI_SharedFrameworkVersion)/tools/crossgen$(ExeExtension)</CrossgenPath> <CrossgenPath>$(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(CLI_SharedFrameworkVersion)/tools/crossgen$(ExeExtension)</CrossgenPath>
<LibCLRJitPath>$(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(CLI_SharedFrameworkVersion)/runtimes/$(CoreCLRRid)/native/$(DynamicLibPrefix)clrjit$(DynamicLibExtension)</LibCLRJitPath> <LibCLRJitPath>$(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(CLI_SharedFrameworkVersion)/runtimes/$(SharedFrameworkRid)/native/$(DynamicLibPrefix)clrjit$(DynamicLibExtension)</LibCLRJitPath>
<SharedFrameworkNameVersionPath>$(OutputDirectory)/shared/$(SharedFrameworkName)/$(SharedFrameworkVersion)</SharedFrameworkNameVersionPath> <SharedFrameworkNameVersionPath>$(OutputDirectory)/shared/$(SharedFrameworkName)/$(SharedFrameworkVersion)</SharedFrameworkNameVersionPath>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

3
build/Prepare.targets
View file

@ -80,7 +80,8 @@
<CallTarget Targets="CleanToolsLockFiles" /> <CallTarget Targets="CleanToolsLockFiles" />
<DotNetRestore ToolPath="$(Stage0Directory)" <DotNetRestore ToolPath="$(Stage0Directory)"
ProjectPath="&quot;%(RestoreToolsPackagesInput.FullPath)&quot;" /> ProjectPath="&quot;%(RestoreToolsPackagesInput.FullPath)&quot;"
AdditionalParameters="/p:UsePortableLinuxSharedFramework=$(UsePortableLinuxSharedFramework)" />
</Target> </Target>

3
build/Stage0.props
View file

@ -5,8 +5,5 @@
<DotnetStage0>$(Stage0Directory)/dotnet$(ExeExtension)</DotnetStage0> <DotnetStage0>$(Stage0Directory)/dotnet$(ExeExtension)</DotnetStage0>
<IsDesktopAvailable>False</IsDesktopAvailable> <IsDesktopAvailable>False</IsDesktopAvailable>
<IsDesktopAvailable Condition=" '$(OSName)' == 'win' ">True</IsDesktopAvailable> <IsDesktopAvailable Condition=" '$(OSName)' == 'win' ">True</IsDesktopAvailable>
<CoreCLRRid Condition=" '$(OSName)' == 'win' ">win-$(Architecture)</CoreCLRRid>
<CoreCLRRid Condition=" '$(OSName)' == 'osx' ">osx-x64</CoreCLRRid>
<CoreCLRRid Condition=" '$(CoreCLRRid)' == '' ">linux-x64</CoreCLRRid>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

1
build/test/TestPackageProjects.targets
View file

@ -59,7 +59,6 @@
<VersionPrefix>1.0.0</VersionPrefix> <VersionPrefix>1.0.0</VersionPrefix>
<VersionSuffix></VersionSuffix> <VersionSuffix></VersionSuffix>
<Clean>True</Clean> <Clean>True</Clean>
<MsbuildArgs>/p:RuntimeIdentifier=$(CoreCLRRid)</MsbuildArgs>
</BaseTestPackageProject> </BaseTestPackageProject>
<BaseTestPackageProject Include="TestAssets/TestPackages/dotnet-dependency-context-test"> <BaseTestPackageProject Include="TestAssets/TestPackages/dotnet-dependency-context-test">
<Name>dotnet-dependency-context-test</Name> <Name>dotnet-dependency-context-test</Name>

2
dir.props
View file

@ -34,9 +34,9 @@
<Import Project="build/OutputDirectories.props" /> <Import Project="build/OutputDirectories.props" />
<Import Project="build/BuildDefaults.props" /> <Import Project="build/BuildDefaults.props" />
<Import Project="build/Stage0.props" /> <Import Project="build/Stage0.props" />
<Import Project="build/CrossGen.props" />
<Import Project="build/VersionBadge.props" /> <Import Project="build/VersionBadge.props" />
<Import Project="build/BundledRuntimes.props" /> <Import Project="build/BundledRuntimes.props" />
<Import Project="build/CrossGen.props" />
<Import Project="build/BackwardsCompatibilityRuntimes.props" /> <Import Project="build/BackwardsCompatibilityRuntimes.props" />
<Import Project="build/AzureInfo.props" /> <Import Project="build/AzureInfo.props" />

2
tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj
View file

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework> <TargetFramework>netcoreapp2.0</TargetFramework>
<RuntimeIdentifier>$(CoreCLRRid)</RuntimeIdentifier> <RuntimeIdentifier>$(SharedFrameworkRid)</RuntimeIdentifier>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>