From 9745bf76d758d1dfcfb9117d46c6321afe08eceb Mon Sep 17 00:00:00 2001
From: Arlo Godfrey <arlo.godfrey@outlook.com>
Date: Wed, 31 May 2023 18:07:45 -0500
Subject: [PATCH 1/3] Made System.Collections.Immutable a non-transient
 dependency

---
 MultiTarget/PackageReferences/Netstandard.props | 2 +-
 MultiTarget/PackageReferences/Uwp.props         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MultiTarget/PackageReferences/Netstandard.props b/MultiTarget/PackageReferences/Netstandard.props
index b00467ee..d834424e 100644
--- a/MultiTarget/PackageReferences/Netstandard.props
+++ b/MultiTarget/PackageReferences/Netstandard.props
@@ -1,5 +1,5 @@
 <Project>
   <ItemGroup>
-    <PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
+    <PackageReference Include="System.Collections.Immutable" Version="5.0.0" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/MultiTarget/PackageReferences/Uwp.props b/MultiTarget/PackageReferences/Uwp.props
index ee7ca310..bc558e58 100644
--- a/MultiTarget/PackageReferences/Uwp.props
+++ b/MultiTarget/PackageReferences/Uwp.props
@@ -1,6 +1,6 @@
 <Project>
   <ItemGroup>
     <PackageReference Include="Microsoft.UI.Xaml" Version="2.7.0" />
-    <PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
+    <PackageReference Include="System.Collections.Immutable" Version="5.0.0" PrivateAssets="All" />
   </ItemGroup>
 </Project>

From 90aba63a3b3f289826a551df423a05206b4a1ce8 Mon Sep 17 00:00:00 2001
From: Arlo Godfrey <arlo.godfrey@outlook.com>
Date: Wed, 31 May 2023 19:25:28 -0500
Subject: [PATCH 2/3] Removed all unused dependencies on
 System.Collections.Immutable

---
 .../ToolkitSampleMetadataTests.cs                            | 1 +
 .../ToolkitSampleMetadataGenerator.Documentation.cs          | 1 +
 .../UIThreadTestMethodTests.cs                               | 1 +
 GlobalUsings.cs                                              | 1 -
 MultiTarget/Library.props                                    | 1 -
 MultiTarget/PackageReferences/Netstandard.props              | 5 -----
 MultiTarget/PackageReferences/Uwp.props                      | 1 -
 ToolkitComponent.SampleProject.props                         | 5 +++--
 8 files changed, 6 insertions(+), 10 deletions(-)
 delete mode 100644 MultiTarget/PackageReferences/Netstandard.props

diff --git a/CommunityToolkit.Tooling.SampleGen.Tests/ToolkitSampleMetadataTests.cs b/CommunityToolkit.Tooling.SampleGen.Tests/ToolkitSampleMetadataTests.cs
index ca4b3b1e..c051c86b 100644
--- a/CommunityToolkit.Tooling.SampleGen.Tests/ToolkitSampleMetadataTests.cs
+++ b/CommunityToolkit.Tooling.SampleGen.Tests/ToolkitSampleMetadataTests.cs
@@ -8,6 +8,7 @@
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Collections.Immutable;
 using System.ComponentModel.DataAnnotations;
 
 namespace CommunityToolkit.Tooling.SampleGen.Tests;
diff --git a/CommunityToolkit.Tooling.SampleGen/ToolkitSampleMetadataGenerator.Documentation.cs b/CommunityToolkit.Tooling.SampleGen/ToolkitSampleMetadataGenerator.Documentation.cs
index 6e720eec..64457389 100644
--- a/CommunityToolkit.Tooling.SampleGen/ToolkitSampleMetadataGenerator.Documentation.cs
+++ b/CommunityToolkit.Tooling.SampleGen/ToolkitSampleMetadataGenerator.Documentation.cs
@@ -7,6 +7,7 @@
 using CommunityToolkit.Tooling.SampleGen.Metadata;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Text;
+using System.Collections.Immutable;
 
 namespace CommunityToolkit.Tooling.SampleGen;
 
diff --git a/CommunityToolkit.Tooling.TestGen.Tests/UIThreadTestMethodTests.cs b/CommunityToolkit.Tooling.TestGen.Tests/UIThreadTestMethodTests.cs
index fa11373d..fa484c1f 100644
--- a/CommunityToolkit.Tooling.TestGen.Tests/UIThreadTestMethodTests.cs
+++ b/CommunityToolkit.Tooling.TestGen.Tests/UIThreadTestMethodTests.cs
@@ -7,6 +7,7 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Collections.Immutable;
 
 namespace CommunityToolkit.Tooling.TestGen.Tests;
 
diff --git a/GlobalUsings.cs b/GlobalUsings.cs
index 9afc2ea5..d2f1b686 100644
--- a/GlobalUsings.cs
+++ b/GlobalUsings.cs
@@ -7,7 +7,6 @@
 
 global using System;
 global using System.Collections.Generic;
-global using System.Collections.Immutable;
 global using System.Collections.ObjectModel;
 global using System.ComponentModel;
 global using System.Diagnostics;
diff --git a/MultiTarget/Library.props b/MultiTarget/Library.props
index f7632349..d67a6451 100644
--- a/MultiTarget/Library.props
+++ b/MultiTarget/Library.props
@@ -18,7 +18,6 @@
   <Import Project="$(ToolingDirectory)\MultiTarget\DefinedConstants.props" />
 
   <!-- Add platform package dependencies -->
-  <Import Project="$(ToolingDirectory)\MultiTarget\PackageReferences\Netstandard.props" Condition="$(IsNetstandard) == 'true'" />
   <Import Project="$(ToolingDirectory)\MultiTarget\PackageReferences\Uno.props" Condition="$(IsUno) == 'true'" />
   <Import Project="$(ToolingDirectory)\MultiTarget\PackageReferences\Uwp.props" Condition="$(IsUwp) == 'true'"/>
   <Import Project="$(ToolingDirectory)\MultiTarget\PackageReferences\WinAppSdk.props" Condition="$(IsWinAppSdk) == 'true'"/>
diff --git a/MultiTarget/PackageReferences/Netstandard.props b/MultiTarget/PackageReferences/Netstandard.props
deleted file mode 100644
index d834424e..00000000
--- a/MultiTarget/PackageReferences/Netstandard.props
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project>
-  <ItemGroup>
-    <PackageReference Include="System.Collections.Immutable" Version="5.0.0" PrivateAssets="All" />
-  </ItemGroup>
-</Project>
diff --git a/MultiTarget/PackageReferences/Uwp.props b/MultiTarget/PackageReferences/Uwp.props
index bc558e58..1a6a408f 100644
--- a/MultiTarget/PackageReferences/Uwp.props
+++ b/MultiTarget/PackageReferences/Uwp.props
@@ -1,6 +1,5 @@
 <Project>
   <ItemGroup>
     <PackageReference Include="Microsoft.UI.Xaml" Version="2.7.0" />
-    <PackageReference Include="System.Collections.Immutable" Version="5.0.0" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/ToolkitComponent.SampleProject.props b/ToolkitComponent.SampleProject.props
index 6e2d0961..b28a4de8 100644
--- a/ToolkitComponent.SampleProject.props
+++ b/ToolkitComponent.SampleProject.props
@@ -2,13 +2,14 @@
   <Target Name="CheckComponentName">
     <Error Condition="$(ToolkitComponentName) == ''" Message="ToolkitComponentName is not defined. Please check your csproj." />
   </Target>
-  
+
   <!-- Set up the MultiTarget system -->
   <Import Project="$(ToolingDirectory)\MultiTarget\Library.props" />
 
   <!-- Import this component's source project -->
   <ItemGroup>
     <ProjectReference Include="$(MSBuildProjectDirectory)\..\src\*.csproj" />
+    <PackageReference Include="System.Collections.Immutable" Version="5.0.0" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>
@@ -25,7 +26,7 @@
     <!-- Manually include XAML files, except under UWP in Release mode. The files already exist in the final app package (with some modifications) -->
     <Content Condition="!('$(IsUwp)' == 'true' AND '$(Configuration)' == 'Release')" Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
 
-    <!-- Manually include .cs and .md files -->    
+    <!-- Manually include .cs and .md files -->
     <Content Include="**\*.cs" Exclude="bin\**\*.cs;obj\**\*.cs" />
     <Content Include="**\*.md" Exclude="bin\**\*.md;obj\**\*.md" />
   </ItemGroup>

From 37cd223489d19f627223d5728b5f78dbf012ba62 Mon Sep 17 00:00:00 2001
From: Arlo Godfrey <arlo.godfrey@outlook.com>
Date: Wed, 31 May 2023 19:47:04 -0500
Subject: [PATCH 3/3] Remove PrivateAssets

---
 ToolkitComponent.SampleProject.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ToolkitComponent.SampleProject.props b/ToolkitComponent.SampleProject.props
index b28a4de8..c40dad37 100644
--- a/ToolkitComponent.SampleProject.props
+++ b/ToolkitComponent.SampleProject.props
@@ -9,7 +9,7 @@
   <!-- Import this component's source project -->
   <ItemGroup>
     <ProjectReference Include="$(MSBuildProjectDirectory)\..\src\*.csproj" />
-    <PackageReference Include="System.Collections.Immutable" Version="5.0.0" PrivateAssets="All" />
+    <PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>