Skip to content

Commit

Permalink
Update CoreClr, CoreFx, CoreSetup, ProjectNTfs, ProjectNTfsTestILC to…
Browse files Browse the repository at this point in the history
… preview1-26114-03, preview1-26115-01, preview1-26114-03, beta-26115-00, beta-26115-00, respectively (dotnet/corefx#26330)

Commit migrated from dotnet/corefx@5a3bba7
  • Loading branch information
dotnet-maestro-bot authored and jkotas committed Jan 15, 2018
1 parent d30b836 commit 79980ba
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 19 deletions.
30 changes: 15 additions & 15 deletions src/libraries/dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
These ref versions are pulled from https://github.com/dotnet/versions.
-->
<PropertyGroup>
<CoreFxCurrentRef>7e3736ed778f2aa043f90492499d004cf0cb9963</CoreFxCurrentRef>
<CoreClrCurrentRef>7e3736ed778f2aa043f90492499d004cf0cb9963</CoreClrCurrentRef>
<CoreSetupCurrentRef>7e3736ed778f2aa043f90492499d004cf0cb9963</CoreSetupCurrentRef>
<CoreFxCurrentRef>c14c5e6411ded29ba1892676f9a38e734b41a1bb</CoreFxCurrentRef>
<CoreClrCurrentRef>c14c5e6411ded29ba1892676f9a38e734b41a1bb</CoreClrCurrentRef>
<CoreSetupCurrentRef>c14c5e6411ded29ba1892676f9a38e734b41a1bb</CoreSetupCurrentRef>
<ExternalCurrentRef>96dc7805f5df4a70a55783964ce69dcd91bfca80</ExternalCurrentRef>
<ProjectNTfsCurrentRef>3c000dbfc7dfe9b5b5277675b7678c9b88331a96</ProjectNTfsCurrentRef>
<ProjectNTfsTestILCCurrentRef>3c000dbfc7dfe9b5b5277675b7678c9b88331a96</ProjectNTfsTestILCCurrentRef>
<ProjectNTfsCurrentRef>c14c5e6411ded29ba1892676f9a38e734b41a1bb</ProjectNTfsCurrentRef>
<ProjectNTfsTestILCCurrentRef>c14c5e6411ded29ba1892676f9a38e734b41a1bb</ProjectNTfsTestILCCurrentRef>
<SniCurrentRef>8bd1ec5fac9f0eec34ff6b34b1d878b4359e02dd</SniCurrentRef>
<StandardCurrentRef>6298244e25cf84d91e3cda9627315f2425274624</StandardCurrentRef>
<BuildToolsCurrentRef>40dda40e015b97aae61742a2fd36de801137e906</BuildToolsCurrentRef>
Expand All @@ -31,16 +31,16 @@

<!-- Tests/infrastructure dependency versions. -->
<PropertyGroup>
<CoreFxExpectedPrerelease>preview1-26113-03</CoreFxExpectedPrerelease>
<MicrosoftNETCorePlatformsPackageVersion>2.1.0-preview1-26113-03</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>2.1.0-preview1-26113-02</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<ProjectNTfsExpectedPrerelease>beta-26112-00</ProjectNTfsExpectedPrerelease>
<ProjectNTfsTestILCExpectedPrerelease>beta-26112-00</ProjectNTfsTestILCExpectedPrerelease>
<ProjectNTfsTestILCPackageVersion>1.0.0-beta-26112-00</ProjectNTfsTestILCPackageVersion>
<MicrosoftNETCoreDotNetHostPackageVersion>2.1.0-preview1-26112-04</MicrosoftNETCoreDotNetHostPackageVersion>
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0-preview1-26112-04</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
<MicrosoftNETCoreAppPackageVersion>2.1.0-preview1-26112-04</MicrosoftNETCoreAppPackageVersion>
<MicrosoftDotNetPlatformAbstractionsPackageVersion>2.1.0-preview1-26112-04</MicrosoftDotNetPlatformAbstractionsPackageVersion>
<CoreFxExpectedPrerelease>preview1-26115-01</CoreFxExpectedPrerelease>
<MicrosoftNETCorePlatformsPackageVersion>2.1.0-preview1-26115-01</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>2.1.0-preview1-26114-03</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<ProjectNTfsExpectedPrerelease>beta-26115-00</ProjectNTfsExpectedPrerelease>
<ProjectNTfsTestILCExpectedPrerelease>beta-26115-00</ProjectNTfsTestILCExpectedPrerelease>
<ProjectNTfsTestILCPackageVersion>1.0.0-beta-26115-00</ProjectNTfsTestILCPackageVersion>
<MicrosoftNETCoreDotNetHostPackageVersion>2.1.0-preview1-26114-03</MicrosoftNETCoreDotNetHostPackageVersion>
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0-preview1-26114-03</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
<MicrosoftNETCoreAppPackageVersion>2.1.0-preview1-26114-03</MicrosoftNETCoreAppPackageVersion>
<MicrosoftDotNetPlatformAbstractionsPackageVersion>2.1.0-preview1-26114-03</MicrosoftDotNetPlatformAbstractionsPackageVersion>

<!-- CoreFX-built SNI identity package -->
<RuntimeNativeSystemDataSqlClientSniPackageVersion>4.4.0</RuntimeNativeSystemDataSqlClientSniPackageVersion>
Expand Down
6 changes: 3 additions & 3 deletions src/libraries/external/test-runtime/optional.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"net45": {
"dependencies": {
"Microsoft.DotNet.IBCMerge": "4.6.0-alpha-00001",
"TestILC.amd64ret": "1.0.0-beta-26112-00",
"TestILC.armret": "1.0.0-beta-26112-00",
"TestILC.x86ret": "1.0.0-beta-26112-00"
"TestILC.amd64ret": "1.0.0-beta-26115-00",
"TestILC.armret": "1.0.0-beta-26115-00",
"TestILC.x86ret": "1.0.0-beta-26115-00"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion tools-local/ILAsmVersion.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.0-preview1-26113-02
2.1.0-preview1-26114-03

0 comments on commit 79980ba

Please sign in to comment.