Merge pull request #36550 from ahsonkhan/S.Memory.Packaging

[release/2.1] Add SuppressMetaPackage to break circular dependency during System.Memory package restore
dotnet · Apr 12, 2019 · 723b1ba · 723b1ba
2 parents 876e51e + 70a151f
commit 723b1ba
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 3 deletions.
diff --git a/external/harvestPackages/harvestPackages.props b/external/harvestPackages/harvestPackages.props
@@ -73,6 +73,9 @@
 <PackageReference Include="System.Json">
   <Version>4.5.0</Version>
 </PackageReference>
+<PackageReference Include="System.Memory">
+  <Version>4.5.2</Version>
+</PackageReference>
 <PackageReference Include="System.Net.Http.WinHttpHandler">
   <Version>4.5.3</Version>
 </PackageReference>

diff --git a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
@@ -2499,7 +2499,8 @@
       },
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.4.0",
-        "4.0.1.0": "4.5.1"
+        "4.0.1.0": "4.5.1",
+        "4.0.1.1": "4.5.3"
       }
     },
     "System.Messaging": {

diff --git a/pkg/test/packageSettings/System.Memory/netcoreapp1.0/workaroundDowngrade.targets b/pkg/test/packageSettings/System.Memory/netcoreapp1.0/workaroundDowngrade.targets
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <!-- issue https://github.com/dotnet/corefx/issues/28551 -->
+    <PackageReference Include="NETStandard.Library" Version="1.6.1" />
+  </ItemGroup>
+</Project>
diff --git a/src/System.Memory/dir.props b/src/System.Memory/dir.props
@@ -2,7 +2,7 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\dir.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.1.0</AssemblyVersion>
+    <AssemblyVersion>4.0.1.1</AssemblyVersion>
     <PackageVersion>4.5.1</PackageVersion>
     <!-- System.Memory has forwarded types into the runtime on netcoreapp/uap
          It must win over assemblies versioned at 4.0.* -->

diff --git a/src/System.Memory/pkg/System.Memory.pkgproj b/src/System.Memory/pkg/System.Memory.pkgproj
@@ -2,14 +2,18 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
-    <PackageVersion>4.5.2</PackageVersion>
+    <PackageVersion>4.5.3</PackageVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageIndex Include="$(ProjectDir)\pkg\baseline\packageBaseline.1.1.json" />
     <ProjectReference Include="..\ref\System.Memory.csproj">
       <SupportedFramework>net45;netcore45;wpa81;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Memory.csproj" />
+
+    <!-- this package is part of the implementation closure of NETStandard.Library
+      therefore it cannot reference NETStandard.Library -->
+    <SuppressMetaPackage Include="NETStandard.Library" />
     <InboxOnTargetFramework  Include="netcoreapp2.1" />
   </ItemGroup>
   <PropertyGroup>

diff --git a/src/packages.builds b/src/packages.builds
@@ -24,6 +24,9 @@
       <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
     </Project>
     <!-- add specific builds / pkgproj's here to include in servicing builds -->
+    <Project Include="$(MSBuildThisFileDirectory)System.Memory\pkg\System.Memory.pkgproj">
+      <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
+    </Project>
   </ItemGroup>
 
   <!-- Need the PackageIndexFile file property from baseline.props -->