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

Update CoreClr, CoreFx, CoreSetup, ProjectNTfs, ProjectNTfsTestILC, Standard to preview1-26613-04, preview1-26613-07, preview1-26613-01, beta-26613-00, beta-26613-00, servicing-26419-02, respectively (master) #30338

Closed
dotnet-maestro-bot wants to merge 3 commits into from
Closed

Update CoreClr, CoreFx, CoreSetup, ProjectNTfs, ProjectNTfsTestILC, Standard to preview1-26613-04, preview1-26613-07, preview1-26613-01, beta-26613-00, beta-26613-00, servicing-26419-02, respectively (master) #30338

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
decfa53
Update CoreClr, CoreFx, CoreSetup, ProjectNTfs, ProjectNTfsTestILC, S…
dotnet-maestro-bot Jun 13, 2018
9dafe7f
Remove Opcodes due to Opcodes moved to S.P.Corelib
Jun 13, 2018
29156be
Trivial Update WindowsRuntimeResourceManager
Jun 11, 2018
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
32 changes: 16 additions & 16 deletions dependencies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@
These ref versions are pulled from https://github.com/dotnet/versions.
-->
<PropertyGroup>
<CoreFxCurrentRef>892881e9575271257eb3f4c0106532dd3b9a41c3</CoreFxCurrentRef>
<CoreClrCurrentRef>892881e9575271257eb3f4c0106532dd3b9a41c3</CoreClrCurrentRef>
<CoreSetupCurrentRef>892881e9575271257eb3f4c0106532dd3b9a41c3</CoreSetupCurrentRef>
<CoreFxCurrentRef>9beae4222a58a355e2107e99bdbcb8902c232c18</CoreFxCurrentRef>
<CoreClrCurrentRef>9beae4222a58a355e2107e99bdbcb8902c232c18</CoreClrCurrentRef>
<CoreSetupCurrentRef>9beae4222a58a355e2107e99bdbcb8902c232c18</CoreSetupCurrentRef>
<ExternalCurrentRef>96dc7805f5df4a70a55783964ce69dcd91bfca80</ExternalCurrentRef>
<ProjectNTfsCurrentRef>892881e9575271257eb3f4c0106532dd3b9a41c3</ProjectNTfsCurrentRef>
<ProjectNTfsTestILCCurrentRef>892881e9575271257eb3f4c0106532dd3b9a41c3</ProjectNTfsTestILCCurrentRef>
<ProjectNTfsCurrentRef>9beae4222a58a355e2107e99bdbcb8902c232c18</ProjectNTfsCurrentRef>
<ProjectNTfsTestILCCurrentRef>9beae4222a58a355e2107e99bdbcb8902c232c18</ProjectNTfsTestILCCurrentRef>
<SniCurrentRef>8bd1ec5fac9f0eec34ff6b34b1d878b4359e02dd</SniCurrentRef>
<StandardCurrentRef>270a80f37f01e09111b7b12858f1d0424bf9983b</StandardCurrentRef>
<StandardCurrentRef>9beae4222a58a355e2107e99bdbcb8902c232c18</StandardCurrentRef>
<BuildToolsCurrentRef>892881e9575271257eb3f4c0106532dd3b9a41c3</BuildToolsCurrentRef>
</PropertyGroup>

<!-- Product dependency versions. -->
<PropertyGroup>
<NETStandardLibraryPackageVersion>2.0.4-servicing-26522-02</NETStandardLibraryPackageVersion>
<NETStandardLibraryPackageVersion>2.0.3</NETStandardLibraryPackageVersion>
<NETStandardLibraryPackageId>NETStandard.Library</NETStandardLibraryPackageId>

<!-- SNI runtime package -->
Expand All @@ -31,15 +31,15 @@

<!-- Tests/infrastructure dependency versions. -->
<PropertyGroup>
<CoreFxExpectedPrerelease>preview1-26612-04</CoreFxExpectedPrerelease>
<MicrosoftNETCorePlatformsPackageVersion>2.2.0-preview1-26612-04</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>2.2.0-preview1-26612-04</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<ProjectNTfsExpectedPrerelease>beta-26612-00</ProjectNTfsExpectedPrerelease>
<ProjectNTfsTestILCExpectedPrerelease>beta-26612-00</ProjectNTfsTestILCExpectedPrerelease>
<ProjectNTfsTestILCPackageVersion>1.0.0-beta-26612-00</ProjectNTfsTestILCPackageVersion>
<MicrosoftNETCoreDotNetHostPackageVersion>2.2.0-preview1-26612-01</MicrosoftNETCoreDotNetHostPackageVersion>
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.2.0-preview1-26612-01</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
<MicrosoftNETCoreAppPackageVersion>2.2.0-preview1-26612-01</MicrosoftNETCoreAppPackageVersion>
<CoreFxExpectedPrerelease>preview1-26613-07</CoreFxExpectedPrerelease>
<MicrosoftNETCorePlatformsPackageVersion>2.2.0-preview1-26613-07</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>2.2.0-preview1-26613-04</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<ProjectNTfsExpectedPrerelease>beta-26613-00</ProjectNTfsExpectedPrerelease>
<ProjectNTfsTestILCExpectedPrerelease>beta-26613-00</ProjectNTfsTestILCExpectedPrerelease>
<ProjectNTfsTestILCPackageVersion>1.0.0-beta-26613-00</ProjectNTfsTestILCPackageVersion>
<MicrosoftNETCoreDotNetHostPackageVersion>2.2.0-preview1-26613-01</MicrosoftNETCoreDotNetHostPackageVersion>
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.2.0-preview1-26613-01</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
<MicrosoftNETCoreAppPackageVersion>2.2.0-preview1-26613-01</MicrosoftNETCoreAppPackageVersion>

<!-- CoreFX-built SNI identity package -->
<RuntimeNativeSystemDataSqlClientSniPackageVersion>4.4.0</RuntimeNativeSystemDataSqlClientSniPackageVersion>
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 @@ -3,9 +3,9 @@
"net45": {
"dependencies": {
"Microsoft.DotNet.IBCMerge": "4.6.0-alpha-00001",
"TestILC.amd64ret": "1.0.0-beta-26612-00",
"TestILC.armret": "1.0.0-beta-26612-00",
"TestILC.x86ret": "1.0.0-beta-26612-00"
"TestILC.amd64ret": "1.0.0-beta-26613-00",
"TestILC.armret": "1.0.0-beta-26613-00",
"TestILC.x86ret": "1.0.0-beta-26613-00"
}
}
}
Expand Down
9 changes: 0 additions & 9 deletions src/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,6 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uapaot-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uapaot-Windows_NT-Release|AnyCPU'" />
<ItemGroup Condition="'$(TargetGroup)'=='uapaot'">
<Compile Include="System\Reflection\Emit\FlowControl.cs" />
<Compile Include="System\Reflection\Emit\Opcode.cs" />
<Compile Include="System\Reflection\Emit\OpCodes.cs" />
<Compile Include="System\Reflection\Emit\OpcodeType.cs" />
<Compile Include="System\Reflection\Emit\OperandType.cs" />
<Compile Include="System\Reflection\Emit\PackingSize.cs" />
<Compile Include="System\Reflection\Emit\StackBehaviour.cs" />
</ItemGroup>
<ItemGroup>
<ReferenceFromRuntime Include="System.Private.CoreLib" />
</ItemGroup>
Expand Down
20 changes: 0 additions & 20 deletions src/System.Reflection.Primitives/src/System/Reflection/Emit/FlowControl.cs
View file
Open in desktop

This file was deleted.

Loading