Skip to content

Commit

Permalink
Consume coreclr dependencies (dotnet/corefx#34169)
Browse files Browse the repository at this point in the history 
* Consume coreclr dependencies using new dependency flow
* Use consistent casing for new package versions
* Use dotnet-coreclr source in Directory.Build.props, NuGet.config, and symbol asset urls

Directory.Build.props is used for packagereferences, NuGet.config is used for assets in global.json, and constructed urls are used to download symbols.


Commit migrated from dotnet/corefx@23a05d3
  • Loading branch information
@sbomer
sbomer authored Jan 16, 2019
1 parent 4a359db commit 59d871f
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 30 deletions.
23 changes: 0 additions & 23 deletions eng/dependencies.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
-->
<PropertyGroup>
<CoreFxCurrentRef>528234f0de15b714b0f439f77285196e6d932cf7</CoreFxCurrentRef>
<CoreClrCurrentRef>528234f0de15b714b0f439f77285196e6d932cf7</CoreClrCurrentRef>
<ProjectNTfsCurrentRef>528234f0de15b714b0f439f77285196e6d932cf7</ProjectNTfsCurrentRef>
<ProjectNTfsTestILCCurrentRef>528234f0de15b714b0f439f77285196e6d932cf7</ProjectNTfsTestILCCurrentRef>
<SniCurrentRef>8bd1ec5fac9f0eec34ff6b34b1d878b4359e02dd</SniCurrentRef>
Expand All @@ -32,8 +31,6 @@
<PropertyGroup>
<CoreFxExpectedPrerelease>preview.19064.4</CoreFxExpectedPrerelease>
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview.19064.4</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview-27315-01</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<MicrosoftNetCoreIlasmPackageVersion>3.0.0-preview-27315-01</MicrosoftNetCoreIlasmPackageVersion>
<ProjectNTfsExpectedPrerelease>beta-27315-00</ProjectNTfsExpectedPrerelease>
<ProjectNTfsTestILCExpectedPrerelease>beta-27315-00</ProjectNTfsTestILCExpectedPrerelease>
<ProjectNTfsTestILCPackageVersion>1.0.0-beta-27315-00</ProjectNTfsTestILCPackageVersion>
Expand Down Expand Up @@ -85,10 +82,6 @@
<BuildInfoPath>$(BaseDotNetBuildInfo)corefx/$(DependencyBranch)</BuildInfoPath>
<CurrentRef>$(CoreFxCurrentRef)</CurrentRef>
</RemoteDependencyBuildInfo>
<RemoteDependencyBuildInfo Include="CoreClr">
<BuildInfoPath>$(BaseDotNetBuildInfo)coreclr/$(DependencyBranch)</BuildInfoPath>
<CurrentRef>$(CoreClrCurrentRef)</CurrentRef>
</RemoteDependencyBuildInfo>
<RemoteDependencyBuildInfo Include="Sni">
<BuildInfoPath>$(BaseDotNetBuildInfo)sni/$(DependencyBranch)</BuildInfoPath>
<CurrentRef>$(SniCurrentRef)</CurrentRef>
Expand Down Expand Up @@ -128,22 +121,6 @@
<ElementName>MicrosoftNETCorePlatformsPackageVersion</ElementName>
<PackageId>Microsoft.NETCore.Platforms</PackageId>
</XmlUpdateStep>
<XmlUpdateStep Include="CoreClr">
<Path>$(MSBuildThisFileFullPath)</Path>
<ElementName>MicrosoftNETCoreRuntimeCoreCLRPackageVersion</ElementName>
<PackageId>Microsoft.NETCore.Runtime.CoreCLR</PackageId>
</XmlUpdateStep>
<XmlUpdateStep Include="CoreClr">
<Path>$(MSBuildThisFileFullPath)</Path>
<ElementName>MicrosoftNetCoreIlasmPackageVersion</ElementName>
<PackageId>Microsoft.NETCore.ILAsm</PackageId>
</XmlUpdateStep>
<UpdateStep Include="CoreCLR">
<UpdaterType>MSBuildSdk</UpdaterType>
<Path>$(MSBuildThisFileDirectory)../global.json</Path>
<PackageId>Microsoft.NET.Sdk.IL</PackageId>
<MSBuildSdkName>Microsoft.NET.Sdk.IL</MSBuildSdkName>
</UpdateStep>
<XmlUpdateStep Include="Standard">
<Path>$(MSBuildThisFileFullPath)</Path>
<ElementName>NETStandardLibraryPackageVersion</ElementName>
Expand Down
8 changes: 4 additions & 4 deletions .../System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<ItemGroup>
<Compile Include="System.Runtime.CompilerServices.Unsafe.il" />
<Reference Include="System.Runtime" />
<PackageReference Include="$(MicrosoftNetCoreIldasmPackageName)" Version="$(MicrosoftNetCoreIlasmPackageVersion)" PrivateAssets="all" />
<PackageReference Include="$(MicrosoftNetCoreIldasmPackageName)" Version="$(MicrosoftNETCoreILAsmPackageVersion)" PrivateAssets="all" />
</ItemGroup>

<Target Name="AddResourcesFileToIlasm"
Expand All @@ -23,9 +23,9 @@
Inputs="$(ContractOutputPath)/$(MSBuildProjectName).dll"
Outputs="$(IntermediateOutputPath)$(MSBuildProjectName).ref.res.obj">
<ItemGroup>
<_IlasmSourceFiles Include="$(NuGetPackageRoot)\$(MicrosoftNetCoreIldasmPackageName)\$(MicrosoftNetCoreIlasmPackageVersion)\runtimes\$(MicrosoftNetCoreIlasmPackageRuntimeId)\native\**\*" />
<_IlasmSourceFiles Include="$(NuGetPackageRoot)\$(MicrosoftNetCoreRuntimeCoreClrPackageName)\$(MicrosoftNetCoreIlasmPackageVersion)\runtimes\$(MicrosoftNetCoreIlasmPackageRuntimeId)\native\**\*" />
<_IlasmSourceFiles Include="$(NuGetPackageRoot)\$(MicrosoftNetCoreJitPackageName)\$(MicrosoftNetCoreIlasmPackageVersion)\runtimes\$(MicrosoftNetCoreIlasmPackageRuntimeId)\native\**\*" />
<_IlasmSourceFiles Include="$(NuGetPackageRoot)\$(MicrosoftNetCoreIldasmPackageName)\$(MicrosoftNETCoreILAsmPackageVersion)\runtimes\$(MicrosoftNetCoreIlasmPackageRuntimeId)\native\**\*" />
<_IlasmSourceFiles Include="$(NuGetPackageRoot)\$(MicrosoftNetCoreRuntimeCoreClrPackageName)\$(MicrosoftNETCoreILAsmPackageVersion)\runtimes\$(MicrosoftNetCoreIlasmPackageRuntimeId)\native\**\*" />
<_IlasmSourceFiles Include="$(NuGetPackageRoot)\$(MicrosoftNetCoreJitPackageName)\$(MicrosoftNETCoreILAsmPackageVersion)\runtimes\$(MicrosoftNetCoreIlasmPackageRuntimeId)\native\**\*" />
</ItemGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/external/runtime/runtime.depproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@

<PropertyGroup>
<SymbolPackagesDir>$(PackagesDir)symbolpackages/</SymbolPackagesDir>
<DotNetAssetRootUrl Condition="'$(DotNetAssetRootUrl)' == ''">https://dotnetfeed.blob.core.windows.net/dotnet-core/assets/</DotNetAssetRootUrl>
<DotNetAssetRootUrl Condition="'$(DotNetAssetRootUrl)' == ''">https://dotnetfeed.blob.core.windows.net/dotnet-coreclr/assets/</DotNetAssetRootUrl>
</PropertyGroup>

<Target Name="CalculateCoreCLRSymbolPackageProperties"
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/external/tools/tools.depproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

<ItemGroup>
<PackageReference Include="Microsoft.NETCore.ILAsm">
<Version>$(MicrosoftNetCoreIlasmPackageVersion)</Version>
<Version>$(MicrosoftNETCoreILAsmPackageVersion)</Version>
</PackageReference>
<PackageReference Include="Microsoft.NETCore.ILDAsm">
<Version>$(MicrosoftNetCoreIlasmPackageVersion)</Version>
<Version>$(MicrosoftNETCoreILAsmPackageVersion)</Version>
</PackageReference>
</ItemGroup>
</Project>

0 comments on commit 59d871f

Please sign in to comment.