Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Update CoreClr, CoreFx, ProjectNTfs, ProjectNTfsTestILC, Standard to preview2-25227-01, preview2-25227-01, beta-25227-00, beta-25227-00, preview2-25227-01, respectively (release/2.0.0) #19024

Merged
merged 1 commit into from
Apr 27, 2017
Merged

Update CoreClr, CoreFx, ProjectNTfs, ProjectNTfsTestILC, Standard to preview2-25227-01, preview2-25227-01, beta-25227-00, beta-25227-00, preview2-25227-01, respectively (release/2.0.0) #19024

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 21 additions & 18 deletions dependencies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,24 @@
These ref versions are pulled from https://github.com/dotnet/versions.
-->
<PropertyGroup>
<CoreFxCurrentRef>ff616742d18be3af7e9da9327d51502b79de859d</CoreFxCurrentRef>
<CoreClrCurrentRef>6de42fd82cb7b8db12fe9339e4304f77343edc83</CoreClrCurrentRef>
<CoreFxCurrentRef>a84d35ed9b6b6da8749cf90a2c107f4adfc73a2b</CoreFxCurrentRef>
<CoreClrCurrentRef>a84d35ed9b6b6da8749cf90a2c107f4adfc73a2b</CoreClrCurrentRef>
<ExternalCurrentRef>3b8a99621d89ad9877f053ba8af25e0f25dcd9d8</ExternalCurrentRef>
<ProjectNTfsCurrentRef>ff616742d18be3af7e9da9327d51502b79de859d</ProjectNTfsCurrentRef>
<ProjectNTfsTestILCCurrentRef>ff616742d18be3af7e9da9327d51502b79de859d</ProjectNTfsTestILCCurrentRef>
<SniCurrentRef>05650e53f2aa4497f74cd6e9b053d3f69f64b0bd</SniCurrentRef>
<StandardCurrentRef>6de42fd82cb7b8db12fe9339e4304f77343edc83</StandardCurrentRef>
<StandardCurrentRef>a84d35ed9b6b6da8749cf90a2c107f4adfc73a2b</StandardCurrentRef>
</PropertyGroup>

<!-- Auto-upgraded properties for each build info dependency. -->
<PropertyGroup>
<CoreFxExpectedPrerelease>preview2-25226-01</CoreFxExpectedPrerelease>
<CoreClrExpectedPrerelease>preview2-25226-02</CoreClrExpectedPrerelease>
<CoreFxExpectedPrerelease>preview1-25227-04</CoreFxExpectedPrerelease>
<CoreClrExpectedPrerelease>preview1-25227-01</CoreClrExpectedPrerelease>
<ExternalExpectedPrerelease>beta-25016-01</ExternalExpectedPrerelease>
<ProjectNTfsExpectedPrerelease>beta-25226-00</ProjectNTfsExpectedPrerelease>
<ProjectNTfsTestILCExpectedPrerelease>beta-25226-00</ProjectNTfsTestILCExpectedPrerelease>
<ProjectNTfsTestILCPackageVersion>1.0.0-beta-25226-00</ProjectNTfsTestILCPackageVersion>
<NETStandardPackageVersion>2.0.0-preview2-25226-01</NETStandardPackageVersion>
<NETStandardPackageVersion>2.0.0-preview1-25227-01</NETStandardPackageVersion>
<NETStandardPackageId>NETStandard.Library</NETStandardPackageId>
<!-- Use the SNI runtime package -->
<SniPackageVersion>4.4.0-beta-25007-02</SniPackageVersion>
Expand All @@ -43,7 +43,7 @@
<!-- Package dependency verification/auto-upgrade configuration. -->
<PropertyGroup>
<BaseDotNetBuildInfo>build-info/dotnet/</BaseDotNetBuildInfo>
<DependencyBranch>master</DependencyBranch>
<DependencyBranch>release/2.0.0</DependencyBranch>
<CurrentRefXmlPath>$(MSBuildThisFileFullPath)</CurrentRefXmlPath>
</PropertyGroup>

Expand All @@ -56,6 +56,11 @@
<BuildInfoPath>$(BaseDotNetBuildInfo)coreclr/$(DependencyBranch)</BuildInfoPath>
<CurrentRef>$(CoreClrCurrentRef)</CurrentRef>
</RemoteDependencyBuildInfo>
<RemoteDependencyBuildInfo Include="Standard">
<BuildInfoPath>$(BaseDotNetBuildInfo)standard/$(DependencyBranch)</BuildInfoPath>
<CurrentRef>$(StandardCurrentRef)</CurrentRef>
</RemoteDependencyBuildInfo>
<!--
<RemoteDependencyBuildInfo Include="External">
<BuildInfoPath>$(BaseDotNetBuildInfo)projectk-tfs/$(DependencyBranch)</BuildInfoPath>
<CurrentRef>$(ExternalCurrentRef)</CurrentRef>
Expand All @@ -64,10 +69,6 @@
<BuildInfoPath>$(BaseDotNetBuildInfo)sni/$(DependencyBranch)</BuildInfoPath>
<CurrentRef>$(SniCurrentRef)</CurrentRef>
</RemoteDependencyBuildInfo>
<RemoteDependencyBuildInfo Include="Standard">
<BuildInfoPath>$(BaseDotNetBuildInfo)standard/$(DependencyBranch)</BuildInfoPath>
<CurrentRef>$(StandardCurrentRef)</CurrentRef>
</RemoteDependencyBuildInfo>
<RemoteDependencyBuildInfo Include="ProjectNTfs">
<BuildInfoPath>$(BaseDotNetBuildInfo)projectn-tfs/$(DependencyBranch)</BuildInfoPath>
<CurrentRef>$(ProjectNTfsCurrentRef)</CurrentRef>
Expand All @@ -76,7 +77,7 @@
<BuildInfoPath>$(BaseDotNetBuildInfo)projectn-tfs-testilc/$(DependencyBranch)</BuildInfoPath>
<CurrentRef>$(ProjectNTfsTestILCCurrentRef)</CurrentRef>
</RemoteDependencyBuildInfo>

-->
<DependencyBuildInfo Include="@(RemoteDependencyBuildInfo)">
<RawVersionsBaseUrl>https://raw.githubusercontent.com/dotnet/versions</RawVersionsBaseUrl>
</DependencyBuildInfo>
Expand All @@ -91,16 +92,17 @@
<ElementName>CoreClrExpectedPrerelease</ElementName>
<BuildInfoName>CoreClr</BuildInfoName>
</XmlUpdateStep>
<XmlUpdateStep Include="External">
<Path>$(MSBuildThisFileFullPath)</Path>
<ElementName>ExternalExpectedPrerelease</ElementName>
<BuildInfoName>External</BuildInfoName>
</XmlUpdateStep>
<XmlUpdateStep Include="Standard">
<Path>$(MSBuildThisFileFullPath)</Path>
<ElementName>NETStandardPackageVersion</ElementName>
<PackageId>$(NETStandardPackageId)</PackageId>
</XmlUpdateStep>
<!--
<XmlUpdateStep Include="External">
<Path>$(MSBuildThisFileFullPath)</Path>
<ElementName>ExternalExpectedPrerelease</ElementName>
Copy link
Member

@dagood dagood Apr 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch that these need to be commented out. I think they could be conditioned on whether the RemoteDependencyBuildInfo exists, but that seems more complicated than it's worth.

<BuildInfoName>External</BuildInfoName>
</XmlUpdateStep>
<XmlUpdateStep Include="ProjectNTfs">
<Path>$(MSBuildThisFileFullPath)</Path>
<ElementName>ProjectNTfsExpectedPrerelease</ElementName>
Expand All @@ -119,9 +121,10 @@
<XmlUpdateStep Include="Sni">
<Path>$(MSBuildThisFileFullPath)</Path>
<ElementName>SniPackageVersion</ElementName>
<!-- Pick any of the SNI runtime packages. All the runtime packages of sni will have the same version -->
- Pick any of the SNI runtime packages. All the runtime packages of sni will have the same version -
<PackageId>runtime.win7-x64.runtime.native.System.Data.SqlClient.sni</PackageId>
</XmlUpdateStep>
-->
</ItemGroup>

<PropertyGroup>
Expand Down