Index: Core/Common/test/Core.Common.TestUtil/Core.Common.TestUtil.csproj
===================================================================
diff -u -r02c669e0011d6260e38da25d47e3f38503d1f613 -r51b41412cb828395418b531d172df7355adade92
--- Core/Common/test/Core.Common.TestUtil/Core.Common.TestUtil.csproj	(.../Core.Common.TestUtil.csproj)	(revision 02c669e0011d6260e38da25d47e3f38503d1f613)
+++ Core/Common/test/Core.Common.TestUtil/Core.Common.TestUtil.csproj	(.../Core.Common.TestUtil.csproj)	(revision 51b41412cb828395418b531d172df7355adade92)
@@ -57,5 +57,8 @@
     <PackageReference Include="NUnit">
       <Version>3.8.1</Version>
     </PackageReference>
+    <PackageReference Include="System.Resources.Extensions">
+      <Version>10.0.5</Version>
+    </PackageReference>
   </ItemGroup>
 </Project>
\ No newline at end of file
Index: Core/Components/test/Core.Components.BruTile.TestUtil/Core.Components.BruTile.TestUtil.csproj
===================================================================
diff -u -r02c669e0011d6260e38da25d47e3f38503d1f613 -r51b41412cb828395418b531d172df7355adade92
--- Core/Components/test/Core.Components.BruTile.TestUtil/Core.Components.BruTile.TestUtil.csproj	(.../Core.Components.BruTile.TestUtil.csproj)	(revision 02c669e0011d6260e38da25d47e3f38503d1f613)
+++ Core/Components/test/Core.Components.BruTile.TestUtil/Core.Components.BruTile.TestUtil.csproj	(.../Core.Components.BruTile.TestUtil.csproj)	(revision 51b41412cb828395418b531d172df7355adade92)
@@ -35,5 +35,8 @@
     <PackageReference Include="BruTile">
       <Version>3.1.3</Version>
     </PackageReference>
+    <PackageReference Include="System.Resources.Extensions">
+      <Version>10.0.5</Version>
+    </PackageReference>
   </ItemGroup>
 </Project>
\ No newline at end of file
Index: build/Base.targets
===================================================================
diff -u -r02c669e0011d6260e38da25d47e3f38503d1f613 -r51b41412cb828395418b531d172df7355adade92
--- build/Base.targets	(.../Base.targets)	(revision 02c669e0011d6260e38da25d47e3f38503d1f613)
+++ build/Base.targets	(.../Base.targets)	(revision 51b41412cb828395418b531d172df7355adade92)
@@ -43,72 +43,8 @@
     <PackageReference Include="MSBuildConfigurationDefaults" Version="1.0.1" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Bcl.HashCode">
-      <Version>6.0.0</Version>
-      <GeneratePathProperty>true</GeneratePathProperty>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="System.Buffers">
-      <Version>4.6.1</Version>
-      <GeneratePathProperty>true</GeneratePathProperty>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="System.Collections.Immutable">
-      <Version>10.0.5</Version>
-      <GeneratePathProperty>true</GeneratePathProperty>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="System.Formats.Nrbf">
-      <Version>10.0.5</Version>
-      <GeneratePathProperty>true</GeneratePathProperty>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="System.Memory">
-      <Version>4.6.3</Version>
-      <GeneratePathProperty>true</GeneratePathProperty>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="System.Numerics.Vectors">
-      <Version>4.6.1</Version>
-      <GeneratePathProperty>true</GeneratePathProperty>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="System.Reflection.Metadata">
-      <Version>10.0.5</Version>
-      <GeneratePathProperty>true</GeneratePathProperty>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="System.Resources.Extensions">
-      <Version>10.0.5</Version>
-      <GeneratePathProperty>true</GeneratePathProperty>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe">
-      <Version>6.1.2</Version>
-      <GeneratePathProperty>true</GeneratePathProperty>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="System.ValueTuple">
-      <Version>4.6.1</Version>
-      <GeneratePathProperty>true</GeneratePathProperty>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
     <Compile Include="$(SolutionDir)build\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
   </ItemGroup>
-  <Target Name="BasePostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="xcopy /d/s/y &quot;$(PkgMicrosoft_Bcl_HashCode)\lib\net462\*&quot; &quot;$(OutDir)Application\Built-in\Managed\Third-party\Microsoft.Bcl.HashCode-6.0.0\*&quot;" />
-    <Exec Command="xcopy /d/s/y &quot;$(PkgSystem_Buffers)\lib\net462\*&quot; &quot;$(OutDir)Application\Built-in\Managed\Third-party\System.Buffers-4.6.1\*&quot;" />
-    <Exec Command="xcopy /d/s/y &quot;$(PkgSystem_Collections_Immutable)\lib\net462\*&quot; &quot;$(OutDir)Application\Built-in\Managed\Third-party\System.Collections.Immutable-10.0.5\*&quot;" />
-    <Exec Command="xcopy /d/s/y &quot;$(PkgSystem_Formats_Nrbf)\lib\net462\*&quot; &quot;$(OutDir)Application\Built-in\Managed\Third-party\System.Formats.Nrbf-10.0.5\*&quot;" />
-    <Exec Command="xcopy /d/s/y &quot;$(PkgSystem_Memory)\lib\net462\*&quot; &quot;$(OutDir)Application\Built-in\Managed\Third-party\System.Memory-4.6.3\*&quot;" />
-    <Exec Command="xcopy /d/s/y &quot;$(PkgSystem_Numerics_Vectors)\lib\net462\*&quot; &quot;$(OutDir)Application\Built-in\Managed\Third-party\System.Numerics.Vectors-4.6.1\*&quot;" />
-    <Exec Command="xcopy /d/s/y &quot;$(PkgSystem_Reflection_Metadata)\lib\net462\*&quot; &quot;$(OutDir)Application\Built-in\Managed\Third-party\System.Reflection.Metadata-10.0.5\*&quot;" />
-    <Exec Command="xcopy /d/s/y &quot;$(PkgSystem_Resources_Extensions)\lib\net462\*&quot; &quot;$(OutDir)Application\Built-in\Managed\Third-party\System.Resources.Extensions-10.0.5\*&quot;" />
-    <Exec Command="xcopy /d/s/y &quot;$(PkgSystem_Runtime_CompilerServices_Unsafe)\lib\net462\*&quot; &quot;$(OutDir)Application\Built-in\Managed\Third-party\System.Runtime.CompilerServices.Unsafe-6.1.2\*&quot;" />
-    <Exec Command="xcopy /d/s/y &quot;$(PkgSystem_ValueTuple)\lib\net462\*&quot; &quot;$(OutDir)Application\Built-in\Managed\Third-party\System.ValueTuple-4.6.1\*&quot;" />
-  </Target>
 </Project>
\ No newline at end of file
Index: build/Source.targets
===================================================================
diff -u -r74a6d622c8644188a39e3cb1e688e80cc6540f1b -r51b41412cb828395418b531d172df7355adade92
--- build/Source.targets	(.../Source.targets)	(revision 74a6d622c8644188a39e3cb1e688e80cc6540f1b)
+++ build/Source.targets	(.../Source.targets)	(revision 51b41412cb828395418b531d172df7355adade92)
@@ -6,6 +6,70 @@
     <CleanSQLiteInteropFiles>false</CleanSQLiteInteropFiles>
     <CollectSQLiteInteropFiles>false</CollectSQLiteInteropFiles>
   </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Bcl.HashCode">
+      <Version>6.0.0</Version>
+      <GeneratePathProperty>true</GeneratePathProperty>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="System.Buffers">
+      <Version>4.6.1</Version>
+      <GeneratePathProperty>true</GeneratePathProperty>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="System.Collections.Immutable">
+      <Version>10.0.5</Version>
+      <GeneratePathProperty>true</GeneratePathProperty>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="System.Formats.Nrbf">
+      <Version>10.0.5</Version>
+      <GeneratePathProperty>true</GeneratePathProperty>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="System.Memory">
+      <Version>4.6.3</Version>
+      <GeneratePathProperty>true</GeneratePathProperty>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="System.Numerics.Vectors">
+      <Version>4.6.1</Version>
+      <GeneratePathProperty>true</GeneratePathProperty>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="System.Reflection.Metadata">
+      <Version>10.0.5</Version>
+      <GeneratePathProperty>true</GeneratePathProperty>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="System.Resources.Extensions">
+      <Version>10.0.5</Version>
+      <GeneratePathProperty>true</GeneratePathProperty>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe">
+      <Version>6.1.2</Version>
+      <GeneratePathProperty>true</GeneratePathProperty>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="System.ValueTuple">
+      <Version>4.6.1</Version>
+      <GeneratePathProperty>true</GeneratePathProperty>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+  <Target Name="BasePostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="xcopy /d/s/y &quot;$(PkgMicrosoft_Bcl_HashCode)\lib\net462\*&quot; &quot;$(OutDir)Application\Built-in\Managed\Third-party\Microsoft.Bcl.HashCode-6.0.0\*&quot;" />
+    <Exec Command="xcopy /d/s/y &quot;$(PkgSystem_Buffers)\lib\net462\*&quot; &quot;$(OutDir)Application\Built-in\Managed\Third-party\System.Buffers-4.6.1\*&quot;" />
+    <Exec Command="xcopy /d/s/y &quot;$(PkgSystem_Collections_Immutable)\lib\net462\*&quot; &quot;$(OutDir)Application\Built-in\Managed\Third-party\System.Collections.Immutable-10.0.5\*&quot;" />
+    <Exec Command="xcopy /d/s/y &quot;$(PkgSystem_Formats_Nrbf)\lib\net462\*&quot; &quot;$(OutDir)Application\Built-in\Managed\Third-party\System.Formats.Nrbf-10.0.5\*&quot;" />
+    <Exec Command="xcopy /d/s/y &quot;$(PkgSystem_Memory)\lib\net462\*&quot; &quot;$(OutDir)Application\Built-in\Managed\Third-party\System.Memory-4.6.3\*&quot;" />
+    <Exec Command="xcopy /d/s/y &quot;$(PkgSystem_Numerics_Vectors)\lib\net462\*&quot; &quot;$(OutDir)Application\Built-in\Managed\Third-party\System.Numerics.Vectors-4.6.1\*&quot;" />
+    <Exec Command="xcopy /d/s/y &quot;$(PkgSystem_Reflection_Metadata)\lib\net462\*&quot; &quot;$(OutDir)Application\Built-in\Managed\Third-party\System.Reflection.Metadata-10.0.5\*&quot;" />
+    <Exec Command="xcopy /d/s/y &quot;$(PkgSystem_Resources_Extensions)\lib\net462\*&quot; &quot;$(OutDir)Application\Built-in\Managed\Third-party\System.Resources.Extensions-10.0.5\*&quot;" />
+    <Exec Command="xcopy /d/s/y &quot;$(PkgSystem_Runtime_CompilerServices_Unsafe)\lib\net462\*&quot; &quot;$(OutDir)Application\Built-in\Managed\Third-party\System.Runtime.CompilerServices.Unsafe-6.1.2\*&quot;" />
+    <Exec Command="xcopy /d/s/y &quot;$(PkgSystem_ValueTuple)\lib\net462\*&quot; &quot;$(OutDir)Application\Built-in\Managed\Third-party\System.ValueTuple-4.6.1\*&quot;" />
+  </Target>
   <Target Name="PostBuildCopyAssembly" AfterTargets="PostBuildEvent">
     <Exec Command=":loop
       xcopy /d/s/y &quot;$(OutDir)$(AssemblyName).dll&quot; &quot;$(SolutionDir)bin\$(Configuration)\Application\Built-in\Managed\Core\*&quot;