Update CoreClr, CoreFx to preview1-25323-01, preview1-25323-02, respectively (master...

* Update CoreClr, CoreFx to preview1-25323-01, preview1-25323-02, respectively

* Update corefx package versions in projects

Commit migrated from https://github.com/dotnet/coreclr/commit/715845bfa33576badfd1a62177ea85581a5f105e

diff --git a/src/coreclr/dependencies.props b/src/coreclr/dependencies.props
index 1da0a32..a43e571 100644 (file)
--- a/src/coreclr/dependencies.props
+++ b/src/coreclr/dependencies.props
@@ -1,18 +1,19 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. -->
   <PropertyGroup>
-    <CoreFxCurrentRef>61076147ca863b39fc5d32253f31d889ccfd1d12</CoreFxCurrentRef>
-    <CoreClrCurrentRef>fcd99ed86a703a16698fcd0027707739c8ef3501</CoreClrCurrentRef>
+    <CoreFxCurrentRef>5dfd662db1b2793a26441fe3c0a8ee5136004aed</CoreFxCurrentRef>
+    <CoreClrCurrentRef>5dfd662db1b2793a26441fe3c0a8ee5136004aed</CoreClrCurrentRef>
   </PropertyGroup>
 
   <!-- Auto-upgraded properties for each build info dependency. -->
   <PropertyGroup>
-    <CoreFxExpectedPrerelease>preview2-25319-01</CoreFxExpectedPrerelease>
+    <CoreFxPackageVersion>4.5.0-preview1-25323-02</CoreFxPackageVersion>
+    <PlatformPackageVersion>2.1.0-preview1-25323-02</PlatformPackageVersion>
   </PropertyGroup>
 
   <!-- Full package version strings that are used in other parts of the build. -->
   <PropertyGroup>
-    <CoreClrPackageVersion>2.0.0-preview2-25316-03</CoreClrPackageVersion>
+    <CoreClrPackageVersion>2.1.0-preview1-25323-01</CoreClrPackageVersion>
     <XunitPackageVersion>2.2.0-beta2-build3300</XunitPackageVersion>
   </PropertyGroup>
 
@@ -32,15 +33,20 @@
       <BuildInfoPath>$(BaseDotNetBuildInfo)coreclr/$(DependencyBranch)</BuildInfoPath>
       <CurrentRef>$(CoreClrCurrentRef)</CurrentRef>
     </RemoteDependencyBuildInfo>
-    
+
     <DependencyBuildInfo Include="@(RemoteDependencyBuildInfo)">
       <RawVersionsBaseUrl>https://raw.githubusercontent.com/dotnet/versions</RawVersionsBaseUrl>
     </DependencyBuildInfo>
 
     <XmlUpdateStep Include="CoreFx">
       <Path>$(MSBuildThisFileFullPath)</Path>
-      <ElementName>CoreFxExpectedPrerelease</ElementName>
-      <BuildInfoName>CoreFx</BuildInfoName>
+      <ElementName>CoreFxPackageVersion</ElementName>
+      <PackageId>Microsoft.Private.CoreFx.NETCoreApp</PackageId>
+    </XmlUpdateStep>
+    <XmlUpdateStep Include="CoreFx">
+      <Path>$(MSBuildThisFileFullPath)</Path>
+      <ElementName>PlatformPackageVersion</ElementName>
+      <PackageId>Microsoft.NETCore.Platforms</PackageId>
     </XmlUpdateStep>
     <XmlUpdateStep Include="CoreClr">
       <Path>$(MSBuildThisFileFullPath)</Path>

diff --git a/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj b/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj
index f5b1b31..53b51f7 100644 (file)
--- a/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj
+++ b/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj
@@ -14,16 +14,16 @@
       <Version>1.0.1-prerelease-*</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Private.CoreFx.NETCoreApp">
-      <Version>4.4.0-$(CoreFxExpectedPrerelease)</Version>
+      <Version>$(CoreFxPackageVersion)</Version>
     </PackageReference>
     <PackageReference Include="System.Memory">
-      <Version>4.4.0-$(CoreFxExpectedPrerelease)</Version>
+      <Version>$(CoreFxPackageVersion)</Version>
     </PackageReference>
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe">
-      <Version>4.4.0-$(CoreFxExpectedPrerelease)</Version>
+      <Version>$(CoreFxPackageVersion)</Version>
     </PackageReference>
     <PackageReference Include="System.Security.Permissions">
-      <Version>4.4.0-$(CoreFxExpectedPrerelease)</Version>
+      <Version>$(CoreFxPackageVersion)</Version>
     </PackageReference>
   </ItemGroup>
   <PropertyGroup>

diff --git a/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj b/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj
index 0212b05..aad0055 100644 (file)
--- a/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj
+++ b/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.Platforms">
-      <Version>2.0.0-$(CoreFxExpectedPrerelease)</Version>
+      <Version>$(PlatformPackageVersion)</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.DotNet.CoreCLR.TestDependencies">
       <Version>1.0.0-prerelease</Version>
@@ -36,5 +36,5 @@
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <Target Name="Build"
-     DependsOnTargets="ResolveReferences" /> 
+     DependsOnTargets="ResolveReferences" />
 </Project>

diff --git a/src/coreclr/tests/src/TestWrappersConfig/TestWrappersConfig.csproj b/src/coreclr/tests/src/TestWrappersConfig/TestWrappersConfig.csproj
index b108d48..cab63a4 100644 (file)
--- a/src/coreclr/tests/src/TestWrappersConfig/TestWrappersConfig.csproj
+++ b/src/coreclr/tests/src/TestWrappersConfig/TestWrappersConfig.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.Platforms">
-      <Version>2.0.0-$(CoreFxExpectedPrerelease)</Version>
+      <Version>$(PlatformPackageVersion)</Version>
     </PackageReference>
     <PackageReference Include="xunit">
       <Version>$(XunitPackageVersion)</Version>