Consume coreclr dependencies (dotnet/corefx#34169)

* 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 https://github.com/dotnet/corefx/commit/23a05d37db809e2fb76db60abb80e6f8ed5168a6

diff --git a/eng/dependencies.props b/eng/dependencies.props
index accbcb8e5f4e218cdcdf06aeb41b50bf78c1bcac..302ffebe4d7deddb717b4c7f32d7184802640a38 100644 (file)
--- a/eng/dependencies.props
+++ b/eng/dependencies.props
@@ -10,7 +10,6 @@
   -->
   <PropertyGroup>
     <CoreFxCurrentRef>528234f0de15b714b0f439f77285196e6d932cf7</CoreFxCurrentRef>
-    <CoreClrCurrentRef>528234f0de15b714b0f439f77285196e6d932cf7</CoreClrCurrentRef>
     <ProjectNTfsCurrentRef>528234f0de15b714b0f439f77285196e6d932cf7</ProjectNTfsCurrentRef>
     <ProjectNTfsTestILCCurrentRef>528234f0de15b714b0f439f77285196e6d932cf7</ProjectNTfsTestILCCurrentRef>
     <SniCurrentRef>8bd1ec5fac9f0eec34ff6b34b1d878b4359e02dd</SniCurrentRef>
@@ -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>
@@ -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>
@@ -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>

diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj
index 5ee3f4716957092cd9ac011254932cba29d7c362..b54fabba458f401a09086428d3e877b48aaed099 100644 (file)
--- a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj
+++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj
@@ -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" 
@@ -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>

diff --git a/src/libraries/external/runtime/runtime.depproj b/src/libraries/external/runtime/runtime.depproj
index ba88403e1fd348b15c5f284d4d58e33d9f0d2250..2705e786e7cd3b5b68d722f4c0d184b7ff8f7555 100644 (file)
--- a/src/libraries/external/runtime/runtime.depproj
+++ b/src/libraries/external/runtime/runtime.depproj
@@ -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"

diff --git a/src/libraries/external/tools/tools.depproj b/src/libraries/external/tools/tools.depproj
index ae06b3672cb98faf85822af6303d6a616c69d65d..015a10adc37853298e522a720086376e1fa4e9cb 100644 (file)
--- a/src/libraries/external/tools/tools.depproj
+++ b/src/libraries/external/tools/tools.depproj
@@ -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>