From 7fb53d63a829f6c874068e3da2afddf03c299c62 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Tue, 8 Dec 2020 13:47:48 +0100
Subject: [PATCH 1/3] Add Microsoft StrongNameKey back to System.Composition*

---
 src/libraries/System.Composition/Directory.Build.props | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/libraries/System.Composition/Directory.Build.props b/src/libraries/System.Composition/Directory.Build.props
index ad247e4c80f99a..321f1f0b26e38d 100644
--- a/src/libraries/System.Composition/Directory.Build.props
+++ b/src/libraries/System.Composition/Directory.Build.props
@@ -1,3 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
-</Project>
\ No newline at end of file
+   <PropertyGroup>	
+    <StrongNameKeyId>Microsoft</StrongNameKeyId>	
+  </PropertyGroup>
+</Project>

From 4f0e4c9ce921dea6aa36a096a6ad1bd8a6cbb3b7 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Fri, 11 Dec 2020 18:39:03 +0100
Subject: [PATCH 2/3] Increment package version for System.Composition*

---
 src/libraries/System.Composition/Directory.Build.props | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/libraries/System.Composition/Directory.Build.props b/src/libraries/System.Composition/Directory.Build.props
index 321f1f0b26e38d..d3fd2e762c544a 100644
--- a/src/libraries/System.Composition/Directory.Build.props
+++ b/src/libraries/System.Composition/Directory.Build.props
@@ -1,6 +1,7 @@
-<Project>
+<Project>
   <Import Project="..\Directory.Build.props" />
-   <PropertyGroup>	
-    <StrongNameKeyId>Microsoft</StrongNameKeyId>	
+  <PropertyGroup>	
+    <StrongNameKeyId>Microsoft</StrongNameKeyId>
+    <PackageVersion>5.0.1</PackageVersion>
   </PropertyGroup>
 </Project>

From 711d57fe80ab1aabcd578c5ad79fcdc7be277e7e Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Fri, 11 Dec 2020 18:44:23 +0100
Subject: [PATCH 3/3] Add System.Composition to list for packages to build

---
 src/libraries/libraries-packages.proj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libraries/libraries-packages.proj b/src/libraries/libraries-packages.proj
index c285c07bbbbfad..340827d00b2b1a 100644
--- a/src/libraries/libraries-packages.proj
+++ b/src/libraries/libraries-packages.proj
@@ -19,6 +19,7 @@
     <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)\System.Text.Json\pkg\System.Text.Json.pkgproj" Condition="'$(BuildAllConfigurations)' == 'true'" />
+    <ProjectReference Include="$(LibrariesProjectRoot)\System.Composition*\pkg\System.Composition*.pkgproj" Condition="'$(BuildAllConfigurations)' == 'true'" />
   </ItemGroup>
 
   <!-- Need the PackageIndexFile file property from baseline.props -->