Skip to content

Commit

Permalink
[release/5.0] Update ServiceModel version on compat pack (#45905)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
github-actions[bot] and safern committed Dec 11, 2020
1 parent 2a51bcb commit 4a61651
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
1 change: 1 addition & 0 deletions src/libraries/libraries-packages.proj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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" />
Expand Down

0 comments on commit 4a61651

Please sign in to comment.