Skip to content

Commit 54ee8af

Browse files
authored
Merge pull request #34480 from mmitche/mount-st-helens-p3
[release/5.0-preview3] Fixup more package dependencies for Microsoft.Windows.Compatibility
2 parents 2b487f3 + 8d6d2c6 commit 54ee8af

File tree

3 files changed

+17
-8
lines changed

3 files changed

+17
-8
lines changed

eng/pipelines/runtime.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ jobs:
378378
buildConfig: Release
379379
runtimeFlavor: mono
380380
platforms:
381-
- iOS_arm
381+
# - iOS_arm # https://github.com/dotnet/runtime/issues/34465
382382
- iOS_arm64
383383
- iOS_x64
384384
jobParameters:
@@ -390,7 +390,7 @@ jobs:
390390
buildConfig: Debug
391391
runtimeFlavor: mono
392392
platforms:
393-
- iOS_arm
393+
# - iOS_arm # https://github.com/dotnet/runtime/issues/34465
394394
- iOS_arm64
395395
- iOS_x64
396396
jobParameters:

src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232
<PrereleaseLibraryPackage Include="System.IO.Packaging" />
3333
<PrereleaseLibraryPackage Include="System.IO.Ports" />
3434
<PrereleaseLibraryPackage Include="System.Management" />
35-
<PrereleaseLibraryPackage Include="System.Reflection.Emit" />
36-
<PrereleaseLibraryPackage Include="System.Reflection.Emit.ILGeneration" />
37-
<PrereleaseLibraryPackage Include="System.Reflection.Emit.Lightweight" />
3835
<PrereleaseLibraryPackage Include="System.Runtime.Caching" />
3936
<PrereleaseLibraryPackage Include="System.Security.AccessControl" />
4037
<PrereleaseLibraryPackage Include="System.Security.Cryptography.Cng" />
@@ -61,6 +58,15 @@
6158
<LibraryPackage Include="System.Data.SqlClient">
6259
<Version>4.8.1</Version>
6360
</LibraryPackage>
61+
<LibraryPackage Include="System.Reflection.Emit">
62+
<Version>4.7.0</Version>
63+
</LibraryPackage>
64+
<LibraryPackage Include="System.Reflection.Emit.ILGeneration">
65+
<Version>4.7.0</Version>
66+
</LibraryPackage>
67+
<LibraryPackage Include="System.Reflection.Emit.Lightweight">
68+
<Version>4.7.0</Version>
69+
</LibraryPackage>
6470

6571
<!-- Service model packages -->
6672
<ExternalLibraryPackage Include="System.ServiceModel.Primitives">

src/libraries/pkg/baseline/packageIndex.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4467,7 +4467,8 @@
44674467
"4.0.0",
44684468
"4.0.1",
44694469
"4.3.0",
4470-
"4.6.0"
4470+
"4.6.0",
4471+
"4.7.0"
44714472
],
44724473
"BaselineVersion": "4.6.0",
44734474
"InboxOn": {
@@ -4495,7 +4496,8 @@
44954496
"4.0.0",
44964497
"4.0.1",
44974498
"4.3.0",
4498-
"4.6.0"
4499+
"4.6.0",
4500+
"4.7.0"
44994501
],
45004502
"BaselineVersion": "4.6.0",
45014503
"InboxOn": {
@@ -4524,7 +4526,8 @@
45244526
"4.0.0",
45254527
"4.0.1",
45264528
"4.3.0",
4527-
"4.6.0"
4529+
"4.6.0",
4530+
"4.7.0"
45284531
],
45294532
"BaselineVersion": "4.6.0",
45304533
"InboxOn": {

0 commit comments

Comments
 (0)