Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove usages of private CoreCLR and CoreFX packages from SharedFramework SDK. #4708

Merged
merged 4 commits into from
Jan 30, 2020
Merged

Remove usages of private CoreCLR and CoreFX packages from SharedFramework SDK. #4708

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d8d97f5
Remove usages of private CoreCLR and CoreFX packages from SharedFrame…
jkoritzinsky Jan 29, 2020
3f5921c
Use Microsoft.NETCore.App.Internal instead of the runtime pack.
jkoritzinsky Jan 29, 2020
c779058
Use the runtime pack instead of Microsoft.NETCore.App.Internal.
jkoritzinsky Jan 30, 2020
c532093
Merge branch 'master' of https://github.com/dotnet/arcade into no-pri…
jkoritzinsky Jan 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions src/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk/targets/framework.dependency.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,7 @@
<Target Name="AddCrossgenToolPackageReferences"
BeforeTargets="CollectPackageReferences">
<ItemGroup>
<CrossgenToolPackageReference Include="Microsoft.Private.CoreFx.NETCoreApp" Version="$(MicrosoftPrivateCoreFxNETCoreAppVersion)" />
<CrossgenToolPackageReference Include="transport.Microsoft.NETCore.Runtime.CoreCLR" Version="$(MicrosoftNETCoreRuntimeCoreCLRVersion)" />
<CrossgenToolPackageReference Include="$(MicrosoftNETCoreAppRuntimePackage)" Version="$(MicrosoftNETCoreAppRuntimeVersion)" />
<CrossgenToolPackageReference Include="$(MicrosoftTargetingPackPrivateWinRTPackage)" Version="$(MicrosoftTargetingPackPrivateWinRTVersion)" />

<!-- This tool is a prebuilt not buildable from source. -->
Expand All @@ -241,12 +240,10 @@
<Target Name="GetCorePackagePaths"
DependsOnTargets="ResolveReferences">
<PropertyGroup>
<_runtimePackageId>transport.runtime.$(PackageRID).$(MicrosoftNETCoreRuntimeCoreCLRPackage.ToLowerInvariant())</_runtimePackageId>
<_runtimePackageVersion>$(MicrosoftNETCoreRuntimeCoreCLRVersion)</_runtimePackageVersion>
<_runtimePackageId>$(MicrosoftNETCoreAppRuntimePackage.ToLowerInvariant()).$(PackageRID)</_runtimePackageId>
<_runtimePackageVersion>$(MicrosoftNETCoreAppRuntimeVersion)</_runtimePackageVersion>

<_runtimePackageDir>$(NuGetPackageRoot)$(_runtimePackageId)/$(_runtimePackageVersion)/</_runtimePackageDir>
<_jitPackageDir>$(NuGetPackageRoot)transport.runtime.$(PackageRID).microsoft.netcore.jit/$(MicrosoftNETCoreRuntimeCoreCLRVersion)/</_jitPackageDir>
<_corefxPackageDir>$(NuGetPackageRoot)runtime.$(PackageRID).$(MicrosoftPrivateCoreFxNETCoreAppPackage.ToLowerInvariant())/$(MicrosoftPrivateCoreFxNETCoreAppVersion)/</_corefxPackageDir>
<_winmdPackageDir>$(NuGetPackageRoot)$(MicrosoftTargetingPackPrivateWinRTPackage.ToLowerInvariant())/$(MicrosoftTargetingPackPrivateWinRTVersion)/</_winmdPackageDir>
<_diaSymReaderPackageDir>$(NuGetPackageRoot)microsoft.diasymreader.native/$(MicrosoftDiaSymReaderNativeVersion)/</_diaSymReaderPackageDir>
</PropertyGroup>
Expand All @@ -265,7 +262,7 @@
</PropertyGroup>

<ItemGroup>
<_requiredProperty Include="_runtimePackageDir;_jitPackageDir;_corefxPackageDir;_winmdPackageDir" />
<_requiredProperty Include="_runtimePackageDir;_winmdPackageDir" />
</ItemGroup>

<Message Text="%(_requiredProperty.Identity): $(%(_requiredProperty.Identity))" />
Expand All @@ -279,7 +276,7 @@
<!-- Find crossgen tool assets in package cache to allow ExcludeAssets=All. -->
<_runtimeCLR Include="$(_runtimePackageDir)**/$(LibraryFilePrefix)coreclr$(LibraryFileExtension)" />
<_runtimeCoreLib Include="$(_runtimePackageDir)**/native/System.Private.CoreLib.dll" />
<_fxSystemRuntime Include="$(_corefxPackageDir)**/System.Runtime.dll" />
<_fxSystemRuntime Include="$(_runtimePackageDir)**/System.Runtime.dll" />
<_windowsWinMD Include="$(_winmdPackageDir)**/Windows.winmd" />
<_diaSymReaderAssembly Include="$(_diaSymReaderPackageDir)**\Microsoft.DiaSymReader.Native.*.dll" />
</ItemGroup>
Expand All @@ -294,8 +291,8 @@
</PropertyGroup>

<PropertyGroup>
<_jitPath Condition="'$(_crossDir)' == ''">$(_jitPackageDir)runtimes/$(PackageRID)/native/$(LibraryFilePrefix)clrjit$(LibraryFileExtension)</_jitPath>
<_jitPath Condition="'$(_crossDir)' != ''">$(_jitPackageDir)runtimes$(_crossDir)/native/$(LibraryFilePrefix)clrjit$(LibraryFileExtension)</_jitPath>
<_jitPath Condition="'$(_crossDir)' == ''">$(_runtimePackageDir)runtimes/$(PackageRID)/native/$(LibraryFilePrefix)clrjit$(LibraryFileExtension)</_jitPath>
<_jitPath Condition="'$(_crossDir)' != ''">$(_runtimePackageDir)runtimes$(_crossDir)/native/$(LibraryFilePrefix)clrjit$(LibraryFileExtension)</_jitPath>
</PropertyGroup>

<PropertyGroup Condition="'@(_fxSystemRuntime)' != ''">
Expand Down