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

Update CoreClr, CoreFx, CoreSetup, External, ProjectNTfs, ProjectNTfsTestILC, Standard to preview1-25321-03, preview1-25322-02, preview1-25321-02, beta-25322-00, beta-25322-00, beta-25322-00, preview1-25322-01, respectively (master) #20025

Merged
weshaggard merged 3 commits into from
May 24, 2017
Merged

Update CoreClr, CoreFx, CoreSetup, External, ProjectNTfs, ProjectNTfsTestILC, Standard to preview1-25321-03, preview1-25322-02, preview1-25321-02, beta-25322-00, beta-25322-00, beta-25322-00, preview1-25322-01, respectively (master) #20025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
544b07a
Update CoreClr, CoreFx, CoreSetup, External, ProjectNTfs, ProjectNTfs…
dotnet-bot May 22, 2017
444ea73
Update properties used for auto-package update
weshaggard May 22, 2017
93016f1
Undo the update to CoreCLR version for now to unblock other updates
weshaggard May 24, 2017
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
1 change: 0 additions & 1 deletion Packaging.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

<!-- We're currently not building a "live" baseline, instead we're using .NETCore 1.0 RTM stable versions as the baseline -->
<SkipBaseLineCheck>true</SkipBaseLineCheck>
<PlatformPackageVersion Condition="'$(PlatformPackageVersion)' == ''">2.1.0</PlatformPackageVersion>

<!-- by default all packages will use the same version which revs with respect to product version -->
<PackageVersion Condition="'$(PackageVersion)' == ''">4.5.0</PackageVersion>
Expand Down
38 changes: 22 additions & 16 deletions dependencies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,28 @@
These ref versions are pulled from https://github.com/dotnet/versions.
-->
<PropertyGroup>
<CoreFxCurrentRef>3974bbe4abba2327b3b4f063331bc1b760870211</CoreFxCurrentRef>
<CoreFxCurrentRef>5a0606fccb09fce4b47545ae9896139acca547f5</CoreFxCurrentRef>
<CoreClrCurrentRef>fcd99ed86a703a16698fcd0027707739c8ef3501</CoreClrCurrentRef>
<CoreSetupCurrentRef>88ad93f43fcab8e6fcf4ef5713b515ff634c1a5c</CoreSetupCurrentRef>
<ExternalCurrentRef>9be29f5804c4798d8b51bd3fed99ea076041aeb2</ExternalCurrentRef>
<ProjectNTfsCurrentRef>3974bbe4abba2327b3b4f063331bc1b760870211</ProjectNTfsCurrentRef>
<ProjectNTfsTestILCCurrentRef>3974bbe4abba2327b3b4f063331bc1b760870211</ProjectNTfsTestILCCurrentRef>
<CoreSetupCurrentRef>5a0606fccb09fce4b47545ae9896139acca547f5</CoreSetupCurrentRef>
<ExternalCurrentRef>5a0606fccb09fce4b47545ae9896139acca547f5</ExternalCurrentRef>
<ProjectNTfsCurrentRef>5a0606fccb09fce4b47545ae9896139acca547f5</ProjectNTfsCurrentRef>
<ProjectNTfsTestILCCurrentRef>5a0606fccb09fce4b47545ae9896139acca547f5</ProjectNTfsTestILCCurrentRef>
<SniCurrentRef>97059fa979a3c8fb8b9fba127c526f15e48c9dde</SniCurrentRef>
<StandardCurrentRef>a10b32352e820a22d976e9df11b0e737443045e2</StandardCurrentRef>
<StandardCurrentRef>5a0606fccb09fce4b47545ae9896139acca547f5</StandardCurrentRef>
</PropertyGroup>

<!-- Auto-upgraded properties for each build info dependency. -->
<PropertyGroup>
<CoreFxExpectedPrerelease>preview2-25319-04</CoreFxExpectedPrerelease>
<CoreClrExpectedPrerelease>preview2-25316-03</CoreClrExpectedPrerelease>
<ExternalExpectedPrerelease>beta-25307-00</ExternalExpectedPrerelease>
<ProjectNTfsExpectedPrerelease>beta-25319-01</ProjectNTfsExpectedPrerelease>
<ProjectNTfsTestILCExpectedPrerelease>beta-25319-01</ProjectNTfsTestILCExpectedPrerelease>
<ProjectNTfsTestILCPackageVersion>1.0.0-beta-25319-01</ProjectNTfsTestILCPackageVersion>
<NETStandardPackageVersion>2.1.0-preview1-25319-01</NETStandardPackageVersion>
<PlatformPackageVersion>2.1.0-preview1-25322-02</PlatformPackageVersion>
<CoreFxExpectedPrerelease>preview1-25322-02</CoreFxExpectedPrerelease>
<CoreClrPackageVersion>2.0.0-preview2-25316-03</CoreClrPackageVersion>
<ExternalExpectedPrerelease>beta-25322-00</ExternalExpectedPrerelease>
<ProjectNTfsExpectedPrerelease>beta-25322-00</ProjectNTfsExpectedPrerelease>
<ProjectNTfsTestILCExpectedPrerelease>beta-25322-00</ProjectNTfsTestILCExpectedPrerelease>
<ProjectNTfsTestILCPackageVersion>1.0.0-beta-25322-00</ProjectNTfsTestILCPackageVersion>
<NETStandardPackageVersion>2.1.0-preview1-25322-01</NETStandardPackageVersion>
<NETStandardPackageId>NETStandard.Library</NETStandardPackageId>
<MicrosoftNETCoreAppPackageVersion>2.0.0-preview2-25319-02</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreAppPackageVersion>2.1.0-preview1-25321-02</MicrosoftNETCoreAppPackageVersion>
<!-- Use the SNI runtime package -->
<SniPackageVersion>4.4.0-preview2-25312-01</SniPackageVersion>
</PropertyGroup>
Expand Down Expand Up @@ -92,10 +93,15 @@
<ElementName>CoreFxExpectedPrerelease</ElementName>
<BuildInfoName>CoreFx</BuildInfoName>
</XmlUpdateStep>
<XmlUpdateStep Include="CoreFx">
<Path>$(MSBuildThisFileFullPath)</Path>
<ElementName>PlatformPackageVersion</ElementName>
<PackageId>Microsoft.NETCore.Platforms</PackageId>
</XmlUpdateStep>
<XmlUpdateStep Include="CoreClr">
<Path>$(MSBuildThisFileFullPath)</Path>
<ElementName>CoreClrExpectedPrerelease</ElementName>
<BuildInfoName>CoreClr</BuildInfoName>
<ElementName>CoreClrPackageVersion</ElementName>
<PackageId>Microsoft.NETCore.Runtime.CoreCLR</PackageId>
</XmlUpdateStep>
<XmlUpdateStep Include="External">
<Path>$(MSBuildThisFileFullPath)</Path>
Expand Down
6 changes: 3 additions & 3 deletions external/ilasm/ilasm.depproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.Platforms">
<Version>2.0.0-$(CoreFxExpectedPrerelease)</Version>
<Version>$(PlatformPackageVersion)</Version>
</PackageReference>
<PackageReference Include="Microsoft.NETCore.Runtime.CoreCLR">
<Version>2.0.0-$(CoreClrExpectedPrerelease)</Version>
<Version>$(CoreClrPackageVersion)</Version>
</PackageReference>
<PackageReference Include="Microsoft.NETCore.ILAsm">
<Version>2.0.0-$(CoreClrExpectedPrerelease)</Version>
<Version>$(CoreClrPackageVersion)</Version>
</PackageReference>
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
Expand Down
8 changes: 4 additions & 4 deletions external/runtime/runtime.depproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@

<ItemGroup Condition="'$(TargetGroup)'!='uapaot'">
<PackageReference Include="Microsoft.NETCore.Platforms">
<Version>2.0.0-$(CoreFxExpectedPrerelease)</Version>
<Version>$(PlatformPackageVersion)</Version>
</PackageReference>
<PackageReference Include="Microsoft.NETCore.Runtime.CoreCLR">
<Version>2.0.0-$(CoreClrExpectedPrerelease)</Version>
<Version>$(CoreClrPackageVersion)</Version>
</PackageReference>
<PackageReference Include="Microsoft.NETCore.TestHost">
<Version>2.0.0-$(CoreClrExpectedPrerelease)</Version>
<Version>$(CoreClrPackageVersion)</Version>
</PackageReference>
<PackageReference Include="runtime.native.System.Data.SqlClient.sni">
<Version>4.4.0-$(CoreFxExpectedPrerelease)</Version>
<Version>$(PackageVersion)-$(CoreFxExpectedPrerelease)</Version>
Copy link
Copy Markdown
Member

@dagood dagood May 22, 2017

Choose a reason for hiding this comment

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

You should be able to get this full version from the CoreFX build-info rather than assembling it here.

Copy link
Copy Markdown
Member

@weshaggard weshaggard May 22, 2017

Choose a reason for hiding this comment

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

Yes I started to do that but then I noticed we have multiple sni versions we care about one is this one and one is the RID specific packages so instead of adding yet another SNIVersion into dependencies.props I went this route. However I don't really care for this approach much either so we should consider changing that later. For now this part of the PR is unblocked, just need to figure out the test failures now.

Copy link
Copy Markdown
Member

@dagood dagood May 23, 2017

Choose a reason for hiding this comment

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

Agreed, unblocked. There's also an active question of whether this identity package should be created during the SNI build instead (https://github.com/dotnet/corefx/issues/16918), so wiring up another property for this might not be worthwhile.

</PackageReference>
<PackageReference Include="Microsoft.NETCore.DotNetHost">
<Version>1.2.0-beta-001259-00</Version>
Expand Down
6 changes: 3 additions & 3 deletions external/test-runtime/optional.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"dependencies": {
"Microsoft.DotNet.IBCMerge": "4.6.0-alpha-00001",
"Microsoft.DotNet.UAP.TestTools": "1.0.2",
"TestILC.amd64ret": "1.0.0-beta-25319-01",
"TestILC.armret": "1.0.0-beta-25319-01",
"TestILC.x86ret": "1.0.0-beta-25319-01"
"TestILC.amd64ret": "1.0.0-beta-25322-00",
"TestILC.armret": "1.0.0-beta-25322-00",
"TestILC.x86ret": "1.0.0-beta-25322-00"
}
}
}
Expand Down