Merge pull request #34480 from mmitche/mount-st-helens-p3

[release/5.0-preview3] Fixup more package dependencies for Microsoft.Windows.Compatibility
dotnet · Apr 3, 2020 · 54ee8af · 54ee8af
2 parents 2b487f3 + 8d6d2c6
commit 54ee8af
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
@@ -378,7 +378,7 @@ jobs:
     buildConfig: Release
     runtimeFlavor: mono
     platforms:
-    - iOS_arm
+    # - iOS_arm # https://github.com/dotnet/runtime/issues/34465
     - iOS_arm64
     - iOS_x64
     jobParameters:
@@ -390,7 +390,7 @@ jobs:
     buildConfig: Debug
     runtimeFlavor: mono
     platforms:
-    - iOS_arm
+    # - iOS_arm # https://github.com/dotnet/runtime/issues/34465
     - iOS_arm64
     - iOS_x64
     jobParameters:

diff --git a/src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj b/src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj
@@ -32,9 +32,6 @@
     <PrereleaseLibraryPackage Include="System.IO.Packaging" />
     <PrereleaseLibraryPackage Include="System.IO.Ports" />
     <PrereleaseLibraryPackage Include="System.Management" />
-    <PrereleaseLibraryPackage Include="System.Reflection.Emit" />
-    <PrereleaseLibraryPackage Include="System.Reflection.Emit.ILGeneration" />
-    <PrereleaseLibraryPackage Include="System.Reflection.Emit.Lightweight" />
     <PrereleaseLibraryPackage Include="System.Runtime.Caching" />
     <PrereleaseLibraryPackage Include="System.Security.AccessControl" />
     <PrereleaseLibraryPackage Include="System.Security.Cryptography.Cng" />
@@ -61,6 +58,15 @@
     <LibraryPackage Include="System.Data.SqlClient">
       <Version>4.8.1</Version>
     </LibraryPackage>
+    <LibraryPackage Include="System.Reflection.Emit">
+      <Version>4.7.0</Version>
+    </LibraryPackage>
+    <LibraryPackage Include="System.Reflection.Emit.ILGeneration">
+      <Version>4.7.0</Version>
+    </LibraryPackage>
+    <LibraryPackage Include="System.Reflection.Emit.Lightweight">
+      <Version>4.7.0</Version>
+    </LibraryPackage>
 
     <!-- Service model packages -->
     <ExternalLibraryPackage Include="System.ServiceModel.Primitives">

diff --git a/src/libraries/pkg/baseline/packageIndex.json b/src/libraries/pkg/baseline/packageIndex.json
@@ -4467,7 +4467,8 @@
         "4.0.0",
         "4.0.1",
         "4.3.0",
-        "4.6.0"
+        "4.6.0",
+        "4.7.0"
       ],
       "BaselineVersion": "4.6.0",
       "InboxOn": {
@@ -4495,7 +4496,8 @@
         "4.0.0",
         "4.0.1",
         "4.3.0",
-        "4.6.0"
+        "4.6.0",
+        "4.7.0"
       ],
       "BaselineVersion": "4.6.0",
       "InboxOn": {
@@ -4524,7 +4526,8 @@
         "4.0.0",
         "4.0.1",
         "4.3.0",
-        "4.6.0"
+        "4.6.0",
+        "4.7.0"
       ],
       "BaselineVersion": "4.6.0",
       "InboxOn": {