diff options
| author | Juan Hoyos <juan.hoyos@microsoft.com> | 2019-02-13 18:14:35 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-13 18:14:35 -0800 |
| commit | ebaa5ddf432ed4dd120007e0bdc13717943147f3 (patch) | |
| tree | bb07d3332b5019f9aa141eb0f0fd58ff34e08afa /dependencies.props | |
| parent | a32190d14c3f1f44f397cd1f9b20157ce6dd6067 (diff) | |
| download | coreclr-ebaa5ddf432ed4dd120007e0bdc13717943147f3.tar.gz coreclr-ebaa5ddf432ed4dd120007e0bdc13717943147f3.tar.bz2 coreclr-ebaa5ddf432ed4dd120007e0bdc13717943147f3.zip | |
Use dependency flow for core-setup and corefx dependencies (#22544)
* Remove old use of signing package used to work around SPC signing now that arcade has bubbled up the version.
* Move dependency update for CoreFX and Core-setup dependencies to BAR/Darc/Maestro++ flow
* Update property references in tests.
* Version bump for CoreFX and Core-Setup dependencies.
* Update test Github_20958 to use revised System.Range constructor as surface area changed with #22331.
Diffstat (limited to 'dependencies.props')
| -rw-r--r-- | dependencies.props | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/dependencies.props b/dependencies.props index 2d4da66a06..5b6694703e 100644 --- a/dependencies.props +++ b/dependencies.props @@ -10,6 +10,8 @@ </RestoreSources> </PropertyGroup> + <Import Project="eng/Versions.props" /> + <PropertyGroup> <!-- Central place to set the versions of all nuget packages produced in the repo --> <PackageVersion Condition="'$(PackageVersion)' == ''">3.0.0</PackageVersion> @@ -23,21 +25,16 @@ <!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. --> <PropertyGroup> - <CoreFxCurrentRef>855b22a229d8730564b19474f9966779b1c4f12b</CoreFxCurrentRef> <CoreClrCurrentRef>f31086500dc58cefe7b1275300f6fc07b38c1bcc</CoreClrCurrentRef> <BuildToolsCurrentRef>f31086500dc58cefe7b1275300f6fc07b38c1bcc</BuildToolsCurrentRef> <PgoDataCurrentRef>7fb04b947ac4fde6e33a57474c5c4a07ef90a185</PgoDataCurrentRef> - <CoreSetupCurrentRef>855b22a229d8730564b19474f9966779b1c4f12b</CoreSetupCurrentRef> <IbcDataCurrentRef>7fb04b947ac4fde6e33a57474c5c4a07ef90a185</IbcDataCurrentRef> </PropertyGroup> <!-- Tests/infrastructure dependency versions. --> <PropertyGroup> - <MicrosoftPrivateCoreFxNETCoreAppPackageVersion>4.6.0-preview.19106.8</MicrosoftPrivateCoreFxNETCoreAppPackageVersion> - <MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview.19106.8</MicrosoftNETCorePlatformsPackageVersion> <PgoDataPackageVersion>99.99.99-master-20190130.3</PgoDataPackageVersion> <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview-27316-02</MicrosoftNETCoreRuntimeCoreCLRPackageVersion> - <MicrosoftNETCoreAppPackageVersion>3.0.0-preview-27406-8</MicrosoftNETCoreAppPackageVersion> <XunitPackageVersion>2.4.1</XunitPackageVersion> <IbcDataPackageVersion>99.99.99-master-20190130.3</IbcDataPackageVersion> <IbcMergePackageVersion>4.6.0-alpha-00001</IbcMergePackageVersion> @@ -77,10 +74,6 @@ </PropertyGroup> <ItemGroup> - <RemoteDependencyBuildInfo Include="CoreFx"> - <BuildInfoPath>$(BaseDotNetBuildInfo)corefx/$(DependencyBranch)</BuildInfoPath> - <CurrentRef>$(CoreFxCurrentRef)</CurrentRef> - </RemoteDependencyBuildInfo> <RemoteDependencyBuildInfo Include="CoreClr"> <BuildInfoPath>$(BaseDotNetBuildInfo)coreclr/$(DependencyBranch)</BuildInfoPath> <CurrentRef>$(CoreClrCurrentRef)</CurrentRef> @@ -97,35 +90,16 @@ <BuildInfoPath>$(BaseDotNetBuildInfo)optimization/$(DependencyBranch)/IBC</BuildInfoPath> <CurrentRef>$(IbcDataCurrentRef)</CurrentRef> </RemoteDependencyBuildInfo> - <RemoteDependencyBuildInfo Include="CoreSetup"> - <BuildInfoPath>$(BaseDotNetBuildInfo)core-setup/$(DependencyBranch)</BuildInfoPath> - <CurrentRef>$(CoreSetupCurrentRef)</CurrentRef> - </RemoteDependencyBuildInfo> - + <DependencyBuildInfo Include="@(RemoteDependencyBuildInfo)"> <RawVersionsBaseUrl>https://raw.githubusercontent.com/dotnet/versions</RawVersionsBaseUrl> </DependencyBuildInfo> - <XmlUpdateStep Include="CoreFx"> - <Path>$(MSBuildThisFileFullPath)</Path> - <ElementName>MicrosoftPrivateCoreFxNETCoreAppPackageVersion</ElementName> - <PackageId>Microsoft.Private.CoreFx.NETCoreApp</PackageId> - </XmlUpdateStep> - <XmlUpdateStep Include="CoreFx"> - <Path>$(MSBuildThisFileFullPath)</Path> - <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="CoreSetup"> - <Path>$(MSBuildThisFileFullPath)</Path> - <ElementName>MicrosoftNETCoreAppPackageVersion</ElementName> - <PackageId>Microsoft.NETCore.App</PackageId> - </XmlUpdateStep> <UpdateStep Include="BuildTools"> <UpdaterType>File</UpdaterType> <Path>$(MSBuildThisFileDirectory)BuildToolsVersion.txt</Path> |