Merge in 'release/2.2' changes

dotnet · Apr 17, 2019 · 9b5053f · 9b5053f
2 parents 4233b72 + e2f63cd
commit 9b5053f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj b/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj
@@ -4,8 +4,8 @@
 
   <PropertyGroup>
     <HarvestStablePackage>false</HarvestStablePackage>
-    <PackageVersion>2.1.0</PackageVersion>
-    <ServiceModelVersion>4.4.1</ServiceModelVersion>
+    <PackageVersion>2.1.1</PackageVersion>
+    <ServiceModelVersion>4.5.3</ServiceModelVersion>
   </PropertyGroup>
 
   <ItemDefinitionGroup>

diff --git a/pkg/Microsoft.Windows.Compatibility/externalIndex.json b/pkg/Microsoft.Windows.Compatibility/externalIndex.json
@@ -4,36 +4,41 @@
       "StableVersions": [
         "4.4.0",
         "4.3.0",
-        "4.4.1"
+        "4.4.1",
+        "4.5.3"
       ]
     },
     "System.ServiceModel.Duplex": {
       "StableVersions": [
         "4.4.0",
         "4.3.0",
-        "4.4.1"
+        "4.4.1",
+        "4.5.3"
       ]
     },
     "System.ServiceModel.Http": {
       "StableVersions": [
         "4.4.0",
         "4.3.0",
-        "4.4.1"
+        "4.4.1",
+        "4.5.3"
       ]
     },
     "System.ServiceModel.NetTcp": {
       "StableVersions": [
         "4.4.0",
         "4.3.0",
-        "4.4.1"
+        "4.4.1",
+        "4.5.3"
       ]
     },
     "System.ServiceModel.Security": {
       "StableVersions": [
         "4.4.0",
         "4.3.0",
-        "4.4.1"
+        "4.4.1",
+        "4.5.3"
       ]
     }
   }
-}
+}
diff --git a/src/packages.builds b/src/packages.builds
@@ -35,6 +35,9 @@
     <Project Include="$(MSBuildThisFileDirectory)System.Data.SqlClient\pkg\System.Data.SqlClient.pkgproj">
       <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
     </Project>
+    <Project Include="$(MSBuildThisFileDirectory)..\pkg\Microsoft.Windows.Compatibility\Microsoft.Windows.Compatibility.builds">
+      <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
+    </Project>
   </ItemGroup>
 
   <!-- Need the PackageIndexFile file property from baseline.props -->