From 4a616514ae67761a87943d16250d7d189d2509b0 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 11 Dec 2020 15:47:03 -0800
Subject: [PATCH] [release/5.0] Update ServiceModel version on compat pack
 (#45905)

* Update ServiceModel version on compat pack

* Bump package version

* Include compat pack in building list and make sure the dependency versions are correct

Co-authored-by: Santiago Fernandez Madero <safern@microsoft.com>
---
 src/libraries/libraries-packages.proj                |  1 +
 .../Microsoft.Windows.Compatibility.pkgproj          | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/libraries/libraries-packages.proj b/src/libraries/libraries-packages.proj
index 340827d00b2b1..3a910172e8e96 100644
--- a/src/libraries/libraries-packages.proj
+++ b/src/libraries/libraries-packages.proj
@@ -18,6 +18,7 @@
     <ProjectReference Include="$(PkgDir)*\*.proj" Exclude="$(PkgDir)test\*" Condition="'$(BuildAllOOBPackages)' == 'true'" />
     <ProjectReference Include="$(MSBuildThisFileDirectory)*\pkg\**\*.pkgproj" Condition="('$(BuildAllConfigurations)' == 'true' or '$(DotNetBuildFromSource)' == 'true') And '$(BuildAllOOBPackages)' == 'true'" />
     <!-- If setting BuildAllOOBPackages to false, add bellow the individual OOB packages you want to continue to build -->
+    <ProjectReference Include="$(LibrariesProjectRoot)\pkg\Microsoft.Windows.Compatibility\Microsoft.Windows.Compatibility.pkgproj" Condition="'$(BuildAllConfigurations)' == 'true'" />
     <ProjectReference Include="$(LibrariesProjectRoot)\System.Text.Json\pkg\System.Text.Json.pkgproj" Condition="'$(BuildAllConfigurations)' == 'true'" />
     <ProjectReference Include="$(LibrariesProjectRoot)\System.Composition*\pkg\System.Composition*.pkgproj" Condition="'$(BuildAllConfigurations)' == 'true'" />
   </ItemGroup>
diff --git a/src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj b/src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj
index 9e0156017f95e..9000728f0a77a 100644
--- a/src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj
+++ b/src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj
@@ -1,16 +1,18 @@
 <Project DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
   <PropertyGroup>
-    <ServiceModelVersion>4.7.0</ServiceModelVersion>
+    <_PreReleasePackageVersion>5.0.0</_PreReleasePackageVersion>
+    <PackageVersion>5.0.1</PackageVersion>
+    <ServiceModelVersion>4.8.0</ServiceModelVersion>
     <!-- We don't need to harvest the stable packages to build this -->
     <HarvestStablePackage>false</HarvestStablePackage>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <PrereleaseLibraryPackage>
-      <Version>$(PackageVersion)</Version>
+      <Version>$(_PreReleasePackageVersion)</Version>
     </PrereleaseLibraryPackage>
     <NS21PrereleaseLibraryPackage>
-      <Version>$(PackageVersion)</Version>
+      <Version>$(_PreReleasePackageVersion)</Version>
     </NS21PrereleaseLibraryPackage>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -36,7 +38,9 @@
     <PrereleaseLibraryPackage Include="System.Runtime.Caching" />
     <PrereleaseLibraryPackage Include="System.Security.AccessControl" />
     <PrereleaseLibraryPackage Include="System.Security.Cryptography.Cng" />
-    <PrereleaseLibraryPackage Include="System.Security.Cryptography.Pkcs" />
+    <PrereleaseLibraryPackage Include="System.Security.Cryptography.Pkcs">
+      <Version>5.0.1</Version>
+    </PrereleaseLibraryPackage>
     <PrereleaseLibraryPackage Include="System.Security.Cryptography.ProtectedData" />
     <PrereleaseLibraryPackage Include="System.Security.Cryptography.Xml" />
     <PrereleaseLibraryPackage Include="System.Security.Permissions" />