From e1cd6bd717b586e652c174f49b4fed061274a574 Mon Sep 17 00:00:00 2001
From: Aleksey Kliger <alklig@microsoft.com>
Date: Thu, 8 Sep 2022 17:04:51 -0400
Subject: [PATCH 1/9] checkpoint

---
 eng/emsdk.proj                                |  9 ++++++++
 ...T.Runtime.Emscripten.Threading.Sdk.pkgproj | 21 +++++++++++++++++++
 ...NET.Runtime.Emscripten.Threading.Sdk.props | 10 +++++++++
 eng/sdk_files/Emscripten.Threading.Sdk.props  | 13 ++++++++++++
 .../Emscripten.Threading.Sdk.targets          |  8 +++++++
 5 files changed, 61 insertions(+)
 create mode 100644 eng/nuget/Microsoft.NET.Runtime.Emscripten.Threading.Sdk/Microsoft.NET.Runtime.Emscripten.Threading.Sdk.pkgproj
 create mode 100644 eng/nuget/Microsoft.NET.Runtime.Emscripten.Threading.Sdk/Microsoft.NET.Runtime.Emscripten.Threading.Sdk.props
 create mode 100644 eng/sdk_files/Emscripten.Threading.Sdk.props
 create mode 100644 eng/sdk_files/Emscripten.Threading.Sdk.targets

diff --git a/eng/emsdk.proj b/eng/emsdk.proj
index 36795ee078..36b0d6ec76 100644
--- a/eng/emsdk.proj
+++ b/eng/emsdk.proj
@@ -124,6 +124,14 @@
     <Delete Files="$(ArtifactsObjDir)upstream\emscripten\third_party\*.*" />
     <!--<Delete Files="$(ArtifactsObjDir)upstream\bin\wasm-ld.exe" />--> <!-- TODO: this is used by emcc but could be a symlink to ld.exe -->
 
+    <ItemGroup>
+      <!-- these libs are needed for the threaded runtime. Move them out of the way -->
+      <ThreadingCacheFiles Include="$(ArtifactsObjDir)upstream\emscripten\cache\sysroot\lib\wasm32-emscripten\lib*-mt.a" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(ThreadingCacheFiles)"
+	  DestinationFiles="$(ArtifactsObjDir)\.threading\upstream\emscripten\cache\sysroot\lib\wasm32-emscripten\%(RecursiveDir)%(Filename)%(Extension)" />
+	
     <ItemGroup>
       <!-- delete these libs from the cache to reduce windows nuget size context: https://github.com/dotnet/emsdk/pull/34#issuecomment-872691739 -->
       <DeleteCacheFiles Include="$(ArtifactsObjDir)upstream\emscripten\cache\sysroot\lib\wasm32-emscripten\libasan_js.a" />
@@ -165,6 +173,7 @@
     <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Runtime.Emscripten.Node\Microsoft.NET.Runtime.Emscripten.Node.pkgproj" Targets="Build" />
     <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Runtime.Emscripten.Python\Microsoft.NET.Runtime.Emscripten.Python.pkgproj" Targets="Build" Condition="'$(UsesPythonFromEmsdk)' == 'true'" />
     <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Runtime.Emscripten.Sdk\Microsoft.NET.Runtime.Emscripten.Sdk.pkgproj" Targets="Build" />
+    <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Runtime.Emscripten.Threading.Sdk\Microsoft.NET.Runtime.Emscripten.Threading.Sdk.pkgproj" Targets="Build" />
     <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Workload.Emscripten.net6.Manifest\Microsoft.NET.Workload.Emscripten.net6.Manifest.pkgproj" Targets="Build" Condition="'$(AssetManifestOS)' == '' or '$(AssetManifestOS)' == 'win'" />
     <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Workload.Emscripten.net7.Manifest\Microsoft.NET.Workload.Emscripten.net7.Manifest.pkgproj" Targets="Build" Condition="'$(AssetManifestOS)' == '' or '$(AssetManifestOS)' == 'win'" />
     <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Runtime.Emscripten.Sdk.Internal\Microsoft.NET.Runtime.Emscripten.Sdk.Internal.pkgproj" Targets="Build" Condition="'$(OS)' == 'Windows_NT'" />
diff --git a/eng/nuget/Microsoft.NET.Runtime.Emscripten.Threading.Sdk/Microsoft.NET.Runtime.Emscripten.Threading.Sdk.pkgproj b/eng/nuget/Microsoft.NET.Runtime.Emscripten.Threading.Sdk/Microsoft.NET.Runtime.Emscripten.Threading.Sdk.pkgproj
new file mode 100644
index 0000000000..fe5dc25cb4
--- /dev/null
+++ b/eng/nuget/Microsoft.NET.Runtime.Emscripten.Threading.Sdk/Microsoft.NET.Runtime.Emscripten.Threading.Sdk.pkgproj
@@ -0,0 +1,21 @@
+<Project>
+  <Import Project="$(RepoRoot)\Directory.Build.props" />
+  <Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\build\Microsoft.DotNet.Build.Tasks.Packaging.props" />
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Microsoft.NET.Runtime.Emscripten.Common.props))" />
+  <Import Project="Microsoft.NET.Runtime.Emscripten.Threading.Sdk.props" />
+
+  <Target Name="_PrepareForPack" BeforeTargets="GetPackageFiles" DependsOnTargets="GenerateUnixPermissionsFile" Returns="@(PackageFile)">
+    <!-- Override the id to include the Emscripten version -->
+    <PropertyGroup>
+      <Id>Microsoft.NET.Runtime.Emscripten.$(EmscriptenVersion).Threading.Sdk.$(PackageRID)</Id>
+    </PropertyGroup>
+  </Target>
+
+  <PropertyGroup>
+    <PackageDescription>Contains Emscripten SDK multithreading binaries for $(PackageRID).</PackageDescription>
+    <Description>Contains Emscripten SDK multithreading binaries for $(PackageRID).</Description>
+  </PropertyGroup>
+
+  <Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\build\Microsoft.DotNet.Build.Tasks.Packaging.targets" />
+  <Import Project="..\Directory.Build.targets" />
+</Project>
diff --git a/eng/nuget/Microsoft.NET.Runtime.Emscripten.Threading.Sdk/Microsoft.NET.Runtime.Emscripten.Threading.Sdk.props b/eng/nuget/Microsoft.NET.Runtime.Emscripten.Threading.Sdk/Microsoft.NET.Runtime.Emscripten.Threading.Sdk.props
new file mode 100644
index 0000000000..06f6e3f1bb
--- /dev/null
+++ b/eng/nuget/Microsoft.NET.Runtime.Emscripten.Threading.Sdk/Microsoft.NET.Runtime.Emscripten.Threading.Sdk.props
@@ -0,0 +1,10 @@
+<Project>
+  <PropertyGroup>
+    <ArtifactsDirToPackage>$(ArtifactsObjDir).threading\</ArtifactsDirToPackage>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <File Include="$(ArtifactsDirToPackage)**" TargetPath="tools\%(RecursiveDir)" SkipPackageFileCheck="true" />
+    <File Include="$(RepoRoot)eng\sdk_files\Emscripten.Threading.Sdk.props" TargetPath="Sdk\Sdk.props" SkipPackageFileCheck="true" />
+  </ItemGroup>
+</Project>
diff --git a/eng/sdk_files/Emscripten.Threading.Sdk.props b/eng/sdk_files/Emscripten.Threading.Sdk.props
new file mode 100644
index 0000000000..7dc840e817
--- /dev/null
+++ b/eng/sdk_files/Emscripten.Threading.Sdk.props
@@ -0,0 +1,13 @@
+<Project>
+  <PropertyGroup>
+    <EmscriptenThreadingSdkToolsPath>$(MSBuildThisFileDirectory)..\tools\</EmscriptenThreadingSdkToolsPath>
+    <EmscriptenThreadingUpstreamEmscriptenPath>$(EmscriptenSdkToolsPath)emscripten\</EmscriptenThreadingUpstreamEmscriptenPath>
+
+    <EmscriptenThreadingSdkCacheDir>$(EmscriptenThreadingUpstreamEmscriptenPath)cache\sysroot\lib\wasm32-emscripten
+  </PropertyGroup>
+
+  <ItemGroup>
+    <EmscriptenPrependPATH Include="$(EmscriptenUpstreamBinPath)" />
+    <EmscriptenPrependPATH Include="$(EmscriptenUpstreamEmscriptenPath)" />
+  </ItemGroup>
+</Project>
diff --git a/eng/sdk_files/Emscripten.Threading.Sdk.targets b/eng/sdk_files/Emscripten.Threading.Sdk.targets
new file mode 100644
index 0000000000..4e41edbd57
--- /dev/null
+++ b/eng/sdk_files/Emscripten.Threading.Sdk.targets
@@ -0,0 +1,8 @@
+<Project>
+  <Target Name="_EmscriptenThreadingPrependLinkFlags" BeforeTargets="_WasmWriteRspFilesForLinking" >
+    <ItemGroup>
+      <!-- FIXME: normalize to platform path separator - don't use \ on unix -->
+      <_EmccLDFlags Include="-L$(EmscriptenThreadingSdkCacheDir)" />
+    </ItemGroup>
+  </Target>
+</Project>

From ade7bab2b4e15b8fdd97183c6e0b175e408e7351 Mon Sep 17 00:00:00 2001
From: Aleksey Kliger <alklig@microsoft.com>
Date: Fri, 9 Sep 2022 09:31:07 -0400
Subject: [PATCH 2/9] checkpoint

---
 eng/emsdk.proj                                              | 2 +-
 .../Microsoft.NET.Runtime.Emscripten.Threading.Sdk.props    | 1 +
 eng/sdk_files/Emscripten.Threading.Sdk.targets              | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/eng/emsdk.proj b/eng/emsdk.proj
index 36b0d6ec76..cde5cd1e21 100644
--- a/eng/emsdk.proj
+++ b/eng/emsdk.proj
@@ -130,7 +130,7 @@
     </ItemGroup>
 
     <Copy SourceFiles="@(ThreadingCacheFiles)"
-	  DestinationFiles="$(ArtifactsObjDir)\.threading\upstream\emscripten\cache\sysroot\lib\wasm32-emscripten\%(RecursiveDir)%(Filename)%(Extension)" />
+	  DestinationFiles="$(ArtifactsObjDir)\.threading\emscripten\cache\sysroot\lib\wasm32-emscripten\%(RecursiveDir)%(Filename)%(Extension)" />
 	
     <ItemGroup>
       <!-- delete these libs from the cache to reduce windows nuget size context: https://github.com/dotnet/emsdk/pull/34#issuecomment-872691739 -->
diff --git a/eng/nuget/Microsoft.NET.Runtime.Emscripten.Threading.Sdk/Microsoft.NET.Runtime.Emscripten.Threading.Sdk.props b/eng/nuget/Microsoft.NET.Runtime.Emscripten.Threading.Sdk/Microsoft.NET.Runtime.Emscripten.Threading.Sdk.props
index 06f6e3f1bb..44114c3065 100644
--- a/eng/nuget/Microsoft.NET.Runtime.Emscripten.Threading.Sdk/Microsoft.NET.Runtime.Emscripten.Threading.Sdk.props
+++ b/eng/nuget/Microsoft.NET.Runtime.Emscripten.Threading.Sdk/Microsoft.NET.Runtime.Emscripten.Threading.Sdk.props
@@ -6,5 +6,6 @@
   <ItemGroup>
     <File Include="$(ArtifactsDirToPackage)**" TargetPath="tools\%(RecursiveDir)" SkipPackageFileCheck="true" />
     <File Include="$(RepoRoot)eng\sdk_files\Emscripten.Threading.Sdk.props" TargetPath="Sdk\Sdk.props" SkipPackageFileCheck="true" />
+    <File Include="$(RepoRoot)eng\sdk_files\Emscripten.Threading.Sdk.targets" TargetPath="Sdk\Sdk.targets" SkipPackageFileCheck="true" />
   </ItemGroup>
 </Project>
diff --git a/eng/sdk_files/Emscripten.Threading.Sdk.targets b/eng/sdk_files/Emscripten.Threading.Sdk.targets
index 4e41edbd57..80f57ecb43 100644
--- a/eng/sdk_files/Emscripten.Threading.Sdk.targets
+++ b/eng/sdk_files/Emscripten.Threading.Sdk.targets
@@ -1,8 +1,8 @@
 <Project>
-  <Target Name="_EmscriptenThreadingPrependLinkFlags" BeforeTargets="_WasmWriteRspFilesForLinking" >
+  <Target Name="_EmscriptenThreadingPrependLinkFlags" BeforeTargets="_WasmWriteRspFilesForLinking" Condition="'$(WasmEnableThreads)' == 'true'">
     <ItemGroup>
-      <!-- FIXME: normalize to platform path separator - don't use \ on unix -->
-      <_EmccLDFlags Include="-L$(EmscriptenThreadingSdkCacheDir)" />
+      <!-- FIXME: quotes in case the path has spaces? -->
+      <_EmccLDFlags Include="-L$([MSBuild]::NormalizeDirectory($(EmscriptenThreadingSdkCacheDir)))" />
     </ItemGroup>
   </Target>
 </Project>

From 920c711ca770bbb65ca764ba72d4011816e7e549 Mon Sep 17 00:00:00 2001
From: Aleksey Kliger <alklig@microsoft.com>
Date: Fri, 9 Sep 2022 09:38:52 -0400
Subject: [PATCH 3/9] remove unwanted copypasta

---
 eng/sdk_files/Emscripten.Threading.Sdk.props | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/eng/sdk_files/Emscripten.Threading.Sdk.props b/eng/sdk_files/Emscripten.Threading.Sdk.props
index 7dc840e817..7d0517f772 100644
--- a/eng/sdk_files/Emscripten.Threading.Sdk.props
+++ b/eng/sdk_files/Emscripten.Threading.Sdk.props
@@ -6,8 +6,4 @@
     <EmscriptenThreadingSdkCacheDir>$(EmscriptenThreadingUpstreamEmscriptenPath)cache\sysroot\lib\wasm32-emscripten
   </PropertyGroup>
 
-  <ItemGroup>
-    <EmscriptenPrependPATH Include="$(EmscriptenUpstreamBinPath)" />
-    <EmscriptenPrependPATH Include="$(EmscriptenUpstreamEmscriptenPath)" />
-  </ItemGroup>
 </Project>

From a720e10df5b92020e3b8f3c7b955a70aba598e64 Mon Sep 17 00:00:00 2001
From: Aleksey Kliger <aleksey@lambdageek.org>
Date: Fri, 9 Sep 2022 12:30:06 -0400
Subject: [PATCH 4/9] make a Cache Sdk instead of a Threading Sdk

- Split up the Emscripten SDK by moving the system libraries cache into
a separate nupkg.

- make a new Emscripten Cache SDK that includes just the cache
directory

- the Cache SDK overrides the WasmCachePath (if it's not set by the
user) to point into the Cache SDK

- we leave the mt multithreaded libraries in the cache.  (But we
remove the ww WebWorker (non-pthread) Emscripten API libraries)
---
 eng/emsdk.proj                                | 59 ++++++++++---------
 ....NET.Runtime.Emscripten.Cache.Sdk.pkgproj} |  8 +--
 ...oft.NET.Runtime.Emscripten.Cache.Sdk.props | 11 ++++
 ...NET.Runtime.Emscripten.Threading.Sdk.props | 11 ----
 eng/sdk_files/Emscripten.Cache.Sdk.props      |  7 +++
 eng/sdk_files/Emscripten.Cache.Sdk.targets    |  7 +++
 eng/sdk_files/Emscripten.Threading.Sdk.props  |  9 ---
 .../Emscripten.Threading.Sdk.targets          |  8 ---
 8 files changed, 59 insertions(+), 61 deletions(-)
 rename eng/nuget/{Microsoft.NET.Runtime.Emscripten.Threading.Sdk/Microsoft.NET.Runtime.Emscripten.Threading.Sdk.pkgproj => Microsoft.NET..Emscripten.Cache.Sdk/Microsoft.NET.Runtime.Emscripten.Cache.Sdk.pkgproj} (74%)
 create mode 100644 eng/nuget/Microsoft.NET..Emscripten.Cache.Sdk/Microsoft.NET.Runtime.Emscripten.Cache.Sdk.props
 delete mode 100644 eng/nuget/Microsoft.NET.Runtime.Emscripten.Threading.Sdk/Microsoft.NET.Runtime.Emscripten.Threading.Sdk.props
 create mode 100644 eng/sdk_files/Emscripten.Cache.Sdk.props
 create mode 100644 eng/sdk_files/Emscripten.Cache.Sdk.targets
 delete mode 100644 eng/sdk_files/Emscripten.Threading.Sdk.props
 delete mode 100644 eng/sdk_files/Emscripten.Threading.Sdk.targets

diff --git a/eng/emsdk.proj b/eng/emsdk.proj
index cde5cd1e21..0a3af76d96 100644
--- a/eng/emsdk.proj
+++ b/eng/emsdk.proj
@@ -124,37 +124,38 @@
     <Delete Files="$(ArtifactsObjDir)upstream\emscripten\third_party\*.*" />
     <!--<Delete Files="$(ArtifactsObjDir)upstream\bin\wasm-ld.exe" />--> <!-- TODO: this is used by emcc but could be a symlink to ld.exe -->
 
-    <ItemGroup>
-      <!-- these libs are needed for the threaded runtime. Move them out of the way -->
-      <ThreadingCacheFiles Include="$(ArtifactsObjDir)upstream\emscripten\cache\sysroot\lib\wasm32-emscripten\lib*-mt.a" />
-    </ItemGroup>
+    <PropertyGroup>
+      <CacheSdkFilesDir>$(ArtifactObjDir)\.cache-sdk\</CacheSdkFilesDir>
+    </PropertyGroup>
+
+    <!-- move the emscripten cache to a separate directory -->
+    <Move SourceFiles="$(ArtifactObjDir)upstream\emscripten\cache\**\*"
+	  DestinationFiles="$(CacheSdkFilesDir)emscripten\cache\%(RecursiveDir)%(Filename)%(Extension)" />
 
-    <Copy SourceFiles="@(ThreadingCacheFiles)"
-	  DestinationFiles="$(ArtifactsObjDir)\.threading\emscripten\cache\sysroot\lib\wasm32-emscripten\%(RecursiveDir)%(Filename)%(Extension)" />
-	
     <ItemGroup>
       <!-- delete these libs from the cache to reduce windows nuget size context: https://github.com/dotnet/emsdk/pull/34#issuecomment-872691739 -->
-      <DeleteCacheFiles Include="$(ArtifactsObjDir)upstream\emscripten\cache\sysroot\lib\wasm32-emscripten\libasan_js.a" />
-      <DeleteCacheFiles Include="$(ArtifactsObjDir)upstream\emscripten\cache\sysroot\lib\wasm32-emscripten\libasan_rt-mt.a" />
-      <DeleteCacheFiles Include="$(ArtifactsObjDir)upstream\emscripten\cache\sysroot\lib\wasm32-emscripten\libasan_rt.a" />
-      <DeleteCacheFiles Include="$(ArtifactsObjDir)upstream\emscripten\cache\sysroot\lib\wasm32-emscripten\libc_rt_wasm-asan-optz.a" />
-      <DeleteCacheFiles Include="$(ArtifactsObjDir)upstream\emscripten\cache\sysroot\lib\wasm32-emscripten\libc_rt_wasm-asan.a" />
-      <DeleteCacheFiles Include="$(ArtifactsObjDir)upstream\emscripten\cache\sysroot\lib\wasm32-emscripten\libc-asan.a" />
-      <DeleteCacheFiles Include="$(ArtifactsObjDir)upstream\emscripten\cache\sysroot\lib\wasm32-emscripten\libc-mt-asan.a" />
-      <DeleteCacheFiles Include="$(ArtifactsObjDir)upstream\emscripten\cache\sysroot\lib\wasm32-emscripten\liblsan_common_rt-mt.a" />
-      <DeleteCacheFiles Include="$(ArtifactsObjDir)upstream\emscripten\cache\sysroot\lib\wasm32-emscripten\liblsan_common_rt.a" />
-      <DeleteCacheFiles Include="$(ArtifactsObjDir)upstream\emscripten\cache\sysroot\lib\wasm32-emscripten\liblsan_rt-mt.a" />
-      <DeleteCacheFiles Include="$(ArtifactsObjDir)upstream\emscripten\cache\sysroot\lib\wasm32-emscripten\liblsan_rt.a" />
-      <DeleteCacheFiles Include="$(ArtifactsObjDir)upstream\emscripten\cache\sysroot\lib\wasm32-emscripten\libprintf_long_double-asan.a" />
-      <DeleteCacheFiles Include="$(ArtifactsObjDir)upstream\emscripten\cache\sysroot\lib\wasm32-emscripten\libprintf_long_double-mt-asan.a" />
-      <DeleteCacheFiles Include="$(ArtifactsObjDir)upstream\emscripten\cache\sysroot\lib\wasm32-emscripten\libsanitizer_common_rt-mt.a" />
-      <DeleteCacheFiles Include="$(ArtifactsObjDir)upstream\emscripten\cache\sysroot\lib\wasm32-emscripten\libsanitizer_common_rt.a" />
-      <DeleteCacheFiles Include="$(ArtifactsObjDir)upstream\emscripten\cache\sysroot\lib\wasm32-emscripten\libubsan_minimal_rt_wasm-mt.a" />
-      <DeleteCacheFiles Include="$(ArtifactsObjDir)upstream\emscripten\cache\sysroot\lib\wasm32-emscripten\libubsan_minimal_rt_wasm.a" />
-      <DeleteCacheFiles Include="$(ArtifactsObjDir)upstream\emscripten\cache\sysroot\lib\wasm32-emscripten\libubsan_rt-mt.a" />
-      <DeleteCacheFiles Include="$(ArtifactsObjDir)upstream\emscripten\cache\sysroot\lib\wasm32-emscripten\libubsan_rt.a" />
-      <DeleteCacheFiles Include="$(ArtifactsObjDir)upstream\emscripten\cache\sysroot\lib\wasm32-emscripten\lib*-mt.a" />
-      <DeleteCacheFiles Include="$(ArtifactsObjDir)upstream\emscripten\cache\sysroot\lib\wasm32-emscripten\lib*-mt-*.a" />
+      <DeleteCacheFiles Include="$(CacheSdkFilesDir)emscripten\cache\sysroot\lib\wasm32-emscripten\libasan_js.a" />
+      <DeleteCacheFiles Include="$(CacheSdkFilesDir)emscripten\cache\sysroot\lib\wasm32-emscripten\libasan_rt-mt.a" />
+      <DeleteCacheFiles Include="$(CacheSdkFilesDir)emscripten\cache\sysroot\lib\wasm32-emscripten\libasan_rt.a" />
+      <DeleteCacheFiles Include="$(CacheSdkFilesDir)emscripten\cache\sysroot\lib\wasm32-emscripten\libc_rt_wasm-asan-optz.a" />
+      <DeleteCacheFiles Include="$(CacheSdkFilesDir)emscripten\cache\sysroot\lib\wasm32-emscripten\libc_rt_wasm-asan.a" />
+      <DeleteCacheFiles Include="$(CacheSdkFilesDir)emscripten\cache\sysroot\lib\wasm32-emscripten\libc-asan.a" />
+      <DeleteCacheFiles Include="$(CacheSdkFilesDir)emscripten\cache\sysroot\lib\wasm32-emscripten\libc-mt-asan.a" />
+      <DeleteCacheFiles Include="$(CacheSdkFilesDir)emscripten\cache\sysroot\lib\wasm32-emscripten\liblsan_common_rt-mt.a" />
+      <DeleteCacheFiles Include="$(CacheSdkFilesDir)emscripten\cache\sysroot\lib\wasm32-emscripten\liblsan_common_rt.a" />
+      <DeleteCacheFiles Include="$(CacheSdkFilesDir)emscripten\cache\sysroot\lib\wasm32-emscripten\liblsan_rt-mt.a" />
+      <DeleteCacheFiles Include="$(CacheSdkFilesDir)emscripten\cache\sysroot\lib\wasm32-emscripten\liblsan_rt.a" />
+      <DeleteCacheFiles Include="$(CacheSdkFilesDir)emscripten\cache\sysroot\lib\wasm32-emscripten\libprintf_long_double-asan.a" />
+      <DeleteCacheFiles Include="$(CacheSdkFilesDir)emscripten\cache\sysroot\lib\wasm32-emscripten\libprintf_long_double-mt-asan.a" />
+      <DeleteCacheFiles Include="$(CacheSdkFilesDir)emscripten\cache\sysroot\lib\wasm32-emscripten\libsanitizer_common_rt-mt.a" />
+      <DeleteCacheFiles Include="$(CacheSdkFilesDir)emscripten\cache\sysroot\lib\wasm32-emscripten\libsanitizer_common_rt.a" />
+      <DeleteCacheFiles Include="$(CacheSdkFilesDir)emscripten\cache\sysroot\lib\wasm32-emscripten\libubsan_minimal_rt_wasm-mt.a" />
+      <DeleteCacheFiles Include="$(CacheSdkFilesDir)emscripten\cache\sysroot\lib\wasm32-emscripten\libubsan_minimal_rt_wasm.a" />
+      <DeleteCacheFiles Include="$(CacheSdkFilesDir)emscripten\cache\sysroot\lib\wasm32-emscripten\libubsan_rt-mt.a" />
+      <DeleteCacheFiles Include="$(CacheSdkFilesDir)emscripten\cache\sysroot\lib\wasm32-emscripten\libubsan_rt.a" />
+      <!-- delete the non-pthreads Emscripten WebWorker API libs -->
+      <DeleteCacheFiles Include="$(CacheSdkFilesDir)emscripten\cache\sysroot\lib\wasm32-emscripten\lib*-ww.a" />
+      <DeleteCacheFiles Include="$(CacheSdkFilesDir)emscripten\cache\sysroot\lib\wasm32-emscripten\lib*-ww-*.a" />
     </ItemGroup>
     <Delete Files="@(DeleteCacheFiles)" />
 
@@ -173,7 +174,7 @@
     <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Runtime.Emscripten.Node\Microsoft.NET.Runtime.Emscripten.Node.pkgproj" Targets="Build" />
     <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Runtime.Emscripten.Python\Microsoft.NET.Runtime.Emscripten.Python.pkgproj" Targets="Build" Condition="'$(UsesPythonFromEmsdk)' == 'true'" />
     <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Runtime.Emscripten.Sdk\Microsoft.NET.Runtime.Emscripten.Sdk.pkgproj" Targets="Build" />
-    <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Runtime.Emscripten.Threading.Sdk\Microsoft.NET.Runtime.Emscripten.Threading.Sdk.pkgproj" Targets="Build" />
+    <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Runtime.Emscripten.Cache.Sdk\Microsoft.NET.Runtime.Emscripten.Cache.Sdk.pkgproj" Targets="Build" />
     <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Workload.Emscripten.net6.Manifest\Microsoft.NET.Workload.Emscripten.net6.Manifest.pkgproj" Targets="Build" Condition="'$(AssetManifestOS)' == '' or '$(AssetManifestOS)' == 'win'" />
     <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Workload.Emscripten.net7.Manifest\Microsoft.NET.Workload.Emscripten.net7.Manifest.pkgproj" Targets="Build" Condition="'$(AssetManifestOS)' == '' or '$(AssetManifestOS)' == 'win'" />
     <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Runtime.Emscripten.Sdk.Internal\Microsoft.NET.Runtime.Emscripten.Sdk.Internal.pkgproj" Targets="Build" Condition="'$(OS)' == 'Windows_NT'" />
diff --git a/eng/nuget/Microsoft.NET.Runtime.Emscripten.Threading.Sdk/Microsoft.NET.Runtime.Emscripten.Threading.Sdk.pkgproj b/eng/nuget/Microsoft.NET..Emscripten.Cache.Sdk/Microsoft.NET.Runtime.Emscripten.Cache.Sdk.pkgproj
similarity index 74%
rename from eng/nuget/Microsoft.NET.Runtime.Emscripten.Threading.Sdk/Microsoft.NET.Runtime.Emscripten.Threading.Sdk.pkgproj
rename to eng/nuget/Microsoft.NET..Emscripten.Cache.Sdk/Microsoft.NET.Runtime.Emscripten.Cache.Sdk.pkgproj
index fe5dc25cb4..d6d6c08478 100644
--- a/eng/nuget/Microsoft.NET.Runtime.Emscripten.Threading.Sdk/Microsoft.NET.Runtime.Emscripten.Threading.Sdk.pkgproj
+++ b/eng/nuget/Microsoft.NET..Emscripten.Cache.Sdk/Microsoft.NET.Runtime.Emscripten.Cache.Sdk.pkgproj
@@ -2,18 +2,18 @@
   <Import Project="$(RepoRoot)\Directory.Build.props" />
   <Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\build\Microsoft.DotNet.Build.Tasks.Packaging.props" />
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Microsoft.NET.Runtime.Emscripten.Common.props))" />
-  <Import Project="Microsoft.NET.Runtime.Emscripten.Threading.Sdk.props" />
+  <Import Project="Microsoft.NET.Runtime.Emscripten.Cache.Sdk.props" />
 
   <Target Name="_PrepareForPack" BeforeTargets="GetPackageFiles" DependsOnTargets="GenerateUnixPermissionsFile" Returns="@(PackageFile)">
     <!-- Override the id to include the Emscripten version -->
     <PropertyGroup>
-      <Id>Microsoft.NET.Runtime.Emscripten.$(EmscriptenVersion).Threading.Sdk.$(PackageRID)</Id>
+      <Id>Microsoft.NET.Runtime.Emscripten.$(EmscriptenVersion).Cache.Sdk.$(PackageRID)</Id>
     </PropertyGroup>
   </Target>
 
   <PropertyGroup>
-    <PackageDescription>Contains Emscripten SDK multithreading binaries for $(PackageRID).</PackageDescription>
-    <Description>Contains Emscripten SDK multithreading binaries for $(PackageRID).</Description>
+    <PackageDescription>Contains Emscripten SDK system libraries cache for $(PackageRID).</PackageDescription>
+    <Description>Contains Emscripten SDK system libraries cache for $(PackageRID).</Description>
   </PropertyGroup>
 
   <Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\build\Microsoft.DotNet.Build.Tasks.Packaging.targets" />
diff --git a/eng/nuget/Microsoft.NET..Emscripten.Cache.Sdk/Microsoft.NET.Runtime.Emscripten.Cache.Sdk.props b/eng/nuget/Microsoft.NET..Emscripten.Cache.Sdk/Microsoft.NET.Runtime.Emscripten.Cache.Sdk.props
new file mode 100644
index 0000000000..1ff085c8dc
--- /dev/null
+++ b/eng/nuget/Microsoft.NET..Emscripten.Cache.Sdk/Microsoft.NET.Runtime.Emscripten.Cache.Sdk.props
@@ -0,0 +1,11 @@
+<Project>
+  <PropertyGroup>
+    <ArtifactsDirToPackage>$(ArtifactsObjDir).cache-sdk\</ArtifactsDirToPackage>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <File Include="$(ArtifactsDirToPackage)**" TargetPath="tools\%(RecursiveDir)" SkipPackageFileCheck="true" />
+    <File Include="$(RepoRoot)eng\sdk_files\Emscripten.Cache.Sdk.props" TargetPath="Sdk\Sdk.props" SkipPackageFileCheck="true" />
+    <File Include="$(RepoRoot)eng\sdk_files\Emscripten.Cache.Sdk.targets" TargetPath="Sdk\Sdk.targets" SkipPackageFileCheck="true" />
+  </ItemGroup>
+</Project>
diff --git a/eng/nuget/Microsoft.NET.Runtime.Emscripten.Threading.Sdk/Microsoft.NET.Runtime.Emscripten.Threading.Sdk.props b/eng/nuget/Microsoft.NET.Runtime.Emscripten.Threading.Sdk/Microsoft.NET.Runtime.Emscripten.Threading.Sdk.props
deleted file mode 100644
index 44114c3065..0000000000
--- a/eng/nuget/Microsoft.NET.Runtime.Emscripten.Threading.Sdk/Microsoft.NET.Runtime.Emscripten.Threading.Sdk.props
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <ArtifactsDirToPackage>$(ArtifactsObjDir).threading\</ArtifactsDirToPackage>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <File Include="$(ArtifactsDirToPackage)**" TargetPath="tools\%(RecursiveDir)" SkipPackageFileCheck="true" />
-    <File Include="$(RepoRoot)eng\sdk_files\Emscripten.Threading.Sdk.props" TargetPath="Sdk\Sdk.props" SkipPackageFileCheck="true" />
-    <File Include="$(RepoRoot)eng\sdk_files\Emscripten.Threading.Sdk.targets" TargetPath="Sdk\Sdk.targets" SkipPackageFileCheck="true" />
-  </ItemGroup>
-</Project>
diff --git a/eng/sdk_files/Emscripten.Cache.Sdk.props b/eng/sdk_files/Emscripten.Cache.Sdk.props
new file mode 100644
index 0000000000..40d3c528a2
--- /dev/null
+++ b/eng/sdk_files/Emscripten.Cache.Sdk.props
@@ -0,0 +1,7 @@
+<Project>
+  <PropertyGroup>
+    <EmscriptenCacheSdkToolsPath>$(MSBuildThisFileDirectory)..\tools\</EmscriptenCacheSdkToolsPath>
+    <EmscriptenCacheSdkCacheDir>$(EmscriptenCacheSdkToolsPath)emscripten\cache\</EmscriptenCacheSdkCacheDir>
+  </PropertyGroup>
+
+</Project>
diff --git a/eng/sdk_files/Emscripten.Cache.Sdk.targets b/eng/sdk_files/Emscripten.Cache.Sdk.targets
new file mode 100644
index 0000000000..abc03367cb
--- /dev/null
+++ b/eng/sdk_files/Emscripten.Cache.Sdk.targets
@@ -0,0 +1,7 @@
+<Project>
+  <Target Name="_EmscriptenCacheSdkOverrideWasmCachePath" BeforeTargets="_PrepareForWasmBuildNative" Condition="'$(WasmBuildNative)' == 'true'">
+    <PropertyGroup>
+      <WasmCachePath Condition="'$(WasmCachePath)' == ''">$([MSBuild]::NormalizeDirectory($(EmscriptenCacheSdkCacheDir)))</WasmCachePath>
+    </PropertyGroup>
+  </Target>
+</Project>
diff --git a/eng/sdk_files/Emscripten.Threading.Sdk.props b/eng/sdk_files/Emscripten.Threading.Sdk.props
deleted file mode 100644
index 7d0517f772..0000000000
--- a/eng/sdk_files/Emscripten.Threading.Sdk.props
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <EmscriptenThreadingSdkToolsPath>$(MSBuildThisFileDirectory)..\tools\</EmscriptenThreadingSdkToolsPath>
-    <EmscriptenThreadingUpstreamEmscriptenPath>$(EmscriptenSdkToolsPath)emscripten\</EmscriptenThreadingUpstreamEmscriptenPath>
-
-    <EmscriptenThreadingSdkCacheDir>$(EmscriptenThreadingUpstreamEmscriptenPath)cache\sysroot\lib\wasm32-emscripten
-  </PropertyGroup>
-
-</Project>
diff --git a/eng/sdk_files/Emscripten.Threading.Sdk.targets b/eng/sdk_files/Emscripten.Threading.Sdk.targets
deleted file mode 100644
index 80f57ecb43..0000000000
--- a/eng/sdk_files/Emscripten.Threading.Sdk.targets
+++ /dev/null
@@ -1,8 +0,0 @@
-<Project>
-  <Target Name="_EmscriptenThreadingPrependLinkFlags" BeforeTargets="_WasmWriteRspFilesForLinking" Condition="'$(WasmEnableThreads)' == 'true'">
-    <ItemGroup>
-      <!-- FIXME: quotes in case the path has spaces? -->
-      <_EmccLDFlags Include="-L$([MSBuild]::NormalizeDirectory($(EmscriptenThreadingSdkCacheDir)))" />
-    </ItemGroup>
-  </Target>
-</Project>

From bb88c3518d83142dc5c1051dc41066fba475976b Mon Sep 17 00:00:00 2001
From: Aleksey Kliger <aleksey@lambdageek.org>
Date: Fri, 9 Sep 2022 12:41:32 -0400
Subject: [PATCH 5/9] fix msbuild error

---
 eng/emsdk.proj | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/eng/emsdk.proj b/eng/emsdk.proj
index 0a3af76d96..896bdae8c8 100644
--- a/eng/emsdk.proj
+++ b/eng/emsdk.proj
@@ -125,11 +125,15 @@
     <!--<Delete Files="$(ArtifactsObjDir)upstream\bin\wasm-ld.exe" />--> <!-- TODO: this is used by emcc but could be a symlink to ld.exe -->
 
     <PropertyGroup>
-      <CacheSdkFilesDir>$(ArtifactObjDir)\.cache-sdk\</CacheSdkFilesDir>
+      <CacheSdkFilesDir>$(ArtifactsObjDir)\.cache-sdk\</CacheSdkFilesDir>
     </PropertyGroup>
 
+    <ItemGroup>
+      <CacheSdkFilesToMove Include="$(ArtifactsObjDir)upstream\emscripten\cache\**\*" />
+    </ItemGroup>
+
     <!-- move the emscripten cache to a separate directory -->
-    <Move SourceFiles="$(ArtifactObjDir)upstream\emscripten\cache\**\*"
+    <Move SourceFiles="@(CacheSdkFilesToMove)"
 	  DestinationFiles="$(CacheSdkFilesDir)emscripten\cache\%(RecursiveDir)%(Filename)%(Extension)" />
 
     <ItemGroup>

From cbfbc9ea3ff64b156b7ab9bc8da511a0d5af35ef Mon Sep 17 00:00:00 2001
From: Aleksey Kliger <aleksey@lambdageek.org>
Date: Fri, 9 Sep 2022 12:59:24 -0400
Subject: [PATCH 6/9] directory name typo

---
 .../Microsoft.NET.Runtime.Emscripten.Cache.Sdk.pkgproj            | 0
 .../Microsoft.NET.Runtime.Emscripten.Cache.Sdk.props              | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename eng/nuget/{Microsoft.NET..Emscripten.Cache.Sdk => Microsoft.NET.Runtime.Emscripten.Cache.Sdk}/Microsoft.NET.Runtime.Emscripten.Cache.Sdk.pkgproj (100%)
 rename eng/nuget/{Microsoft.NET..Emscripten.Cache.Sdk => Microsoft.NET.Runtime.Emscripten.Cache.Sdk}/Microsoft.NET.Runtime.Emscripten.Cache.Sdk.props (100%)

diff --git a/eng/nuget/Microsoft.NET..Emscripten.Cache.Sdk/Microsoft.NET.Runtime.Emscripten.Cache.Sdk.pkgproj b/eng/nuget/Microsoft.NET.Runtime.Emscripten.Cache.Sdk/Microsoft.NET.Runtime.Emscripten.Cache.Sdk.pkgproj
similarity index 100%
rename from eng/nuget/Microsoft.NET..Emscripten.Cache.Sdk/Microsoft.NET.Runtime.Emscripten.Cache.Sdk.pkgproj
rename to eng/nuget/Microsoft.NET.Runtime.Emscripten.Cache.Sdk/Microsoft.NET.Runtime.Emscripten.Cache.Sdk.pkgproj
diff --git a/eng/nuget/Microsoft.NET..Emscripten.Cache.Sdk/Microsoft.NET.Runtime.Emscripten.Cache.Sdk.props b/eng/nuget/Microsoft.NET.Runtime.Emscripten.Cache.Sdk/Microsoft.NET.Runtime.Emscripten.Cache.Sdk.props
similarity index 100%
rename from eng/nuget/Microsoft.NET..Emscripten.Cache.Sdk/Microsoft.NET.Runtime.Emscripten.Cache.Sdk.props
rename to eng/nuget/Microsoft.NET.Runtime.Emscripten.Cache.Sdk/Microsoft.NET.Runtime.Emscripten.Cache.Sdk.props

From dd7cde7a827024c613f7981865bdc6fb94971d72 Mon Sep 17 00:00:00 2001
From: Aleksey Kliger <aleksey@lambdageek.org>
Date: Fri, 9 Sep 2022 13:15:12 -0400
Subject: [PATCH 7/9] Update workload

---
 .../WorkloadManifest.json.in                          | 11 +++++++++++
 .../WorkloadManifest.targets                          |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/eng/nuget/Microsoft.NET.Workload.Emscripten.net7.Manifest/WorkloadManifest.json.in b/eng/nuget/Microsoft.NET.Workload.Emscripten.net7.Manifest/WorkloadManifest.json.in
index a3ba7c4d2c..2511f0babc 100644
--- a/eng/nuget/Microsoft.NET.Workload.Emscripten.net7.Manifest/WorkloadManifest.json.in
+++ b/eng/nuget/Microsoft.NET.Workload.Emscripten.net7.Manifest/WorkloadManifest.json.in
@@ -7,6 +7,7 @@
       "packs": [
         "Microsoft.NET.Runtime.Emscripten.Node.net7",
         "Microsoft.NET.Runtime.Emscripten.Python.net7",
+        "Microsoft.NET.Runtime.Emscripten.Cache.Sdk.net7",
         "Microsoft.NET.Runtime.Emscripten.Sdk.net7"
       ],
       "platforms": [ "win-x64", "linux-x64", "osx-x64", "osx-arm64" ]
@@ -32,6 +33,16 @@
         "osx-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Python.osx-x64"
       }
     },
+    "Microsoft.NET.Runtime.Emscripten.Cache.Sdk.net7" : {
+      "kind": "Sdk",
+      "version": "${PackageVersion}",
+      "alias-to": {
+        "win-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Cache.Sdk.win-x64",
+        "linux-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Cache.Sdk.linux-x64",
+        "osx-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Cache.Sdk.osx-x64",
+        "osx-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Cache.Sdk.osx-x64"
+      }
+    },
     "Microsoft.NET.Runtime.Emscripten.Sdk.net7" : {
       "kind": "Sdk",
       "version": "${PackageVersion}",
diff --git a/eng/nuget/Microsoft.NET.Workload.Emscripten.net7.Manifest/WorkloadManifest.targets b/eng/nuget/Microsoft.NET.Workload.Emscripten.net7.Manifest/WorkloadManifest.targets
index 8d5acd6b8b..0127c22381 100644
--- a/eng/nuget/Microsoft.NET.Workload.Emscripten.net7.Manifest/WorkloadManifest.targets
+++ b/eng/nuget/Microsoft.NET.Workload.Emscripten.net7.Manifest/WorkloadManifest.targets
@@ -22,5 +22,7 @@
     <Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Python.net7" Condition="!$([MSBuild]::IsOsPlatform('Linux'))" />
     <Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Node.net7" />
     <Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Sdk.net7" />
+    <Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Cache.Sdk.net7" />
+    <Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.Emscripten.Cache.Sdk.net7" />
   </ImportGroup>
 </Project>

From d0f3cabd6b4fb7637e7252df81f605b8343c19ef Mon Sep 17 00:00:00 2001
From: Aleksey Kliger <aleksey@lambdageek.org>
Date: Fri, 9 Sep 2022 13:31:40 -0400
Subject: [PATCH 8/9] Better name Microsoft.NET.Runtime.Emscripten.Cache

---
 eng/emsdk.proj                                       |  2 +-
 .../Microsoft.NET.Runtime.Emscripten.Cache.pkgproj}  |  4 ++--
 .../Microsoft.NET.Runtime.Emscripten.Cache.props}    |  4 ++--
 .../WorkloadManifest.json.in                         | 12 ++++++------
 .../WorkloadManifest.targets                         |  4 ++--
 ...ripten.Cache.Sdk.props => Emscripten.Cache.props} |  0
 ...en.Cache.Sdk.targets => Emscripten.Cache.targets} |  0
 7 files changed, 13 insertions(+), 13 deletions(-)
 rename eng/nuget/{Microsoft.NET.Runtime.Emscripten.Cache.Sdk/Microsoft.NET.Runtime.Emscripten.Cache.Sdk.pkgproj => Microsoft.NET.Runtime.Emscripten.Cache/Microsoft.NET.Runtime.Emscripten.Cache.pkgproj} (91%)
 rename eng/nuget/{Microsoft.NET.Runtime.Emscripten.Cache.Sdk/Microsoft.NET.Runtime.Emscripten.Cache.Sdk.props => Microsoft.NET.Runtime.Emscripten.Cache/Microsoft.NET.Runtime.Emscripten.Cache.props} (52%)
 rename eng/sdk_files/{Emscripten.Cache.Sdk.props => Emscripten.Cache.props} (100%)
 rename eng/sdk_files/{Emscripten.Cache.Sdk.targets => Emscripten.Cache.targets} (100%)

diff --git a/eng/emsdk.proj b/eng/emsdk.proj
index 896bdae8c8..bf3fd732ab 100644
--- a/eng/emsdk.proj
+++ b/eng/emsdk.proj
@@ -178,7 +178,7 @@
     <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Runtime.Emscripten.Node\Microsoft.NET.Runtime.Emscripten.Node.pkgproj" Targets="Build" />
     <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Runtime.Emscripten.Python\Microsoft.NET.Runtime.Emscripten.Python.pkgproj" Targets="Build" Condition="'$(UsesPythonFromEmsdk)' == 'true'" />
     <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Runtime.Emscripten.Sdk\Microsoft.NET.Runtime.Emscripten.Sdk.pkgproj" Targets="Build" />
-    <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Runtime.Emscripten.Cache.Sdk\Microsoft.NET.Runtime.Emscripten.Cache.Sdk.pkgproj" Targets="Build" />
+    <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Runtime.Emscripten.Cache\Microsoft.NET.Runtime.Emscripten.Cache.pkgproj" Targets="Build" />
     <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Workload.Emscripten.net6.Manifest\Microsoft.NET.Workload.Emscripten.net6.Manifest.pkgproj" Targets="Build" Condition="'$(AssetManifestOS)' == '' or '$(AssetManifestOS)' == 'win'" />
     <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Workload.Emscripten.net7.Manifest\Microsoft.NET.Workload.Emscripten.net7.Manifest.pkgproj" Targets="Build" Condition="'$(AssetManifestOS)' == '' or '$(AssetManifestOS)' == 'win'" />
     <MSBuild Projects="$(MSBuildThisFileDirectory)nuget\Microsoft.NET.Runtime.Emscripten.Sdk.Internal\Microsoft.NET.Runtime.Emscripten.Sdk.Internal.pkgproj" Targets="Build" Condition="'$(OS)' == 'Windows_NT'" />
diff --git a/eng/nuget/Microsoft.NET.Runtime.Emscripten.Cache.Sdk/Microsoft.NET.Runtime.Emscripten.Cache.Sdk.pkgproj b/eng/nuget/Microsoft.NET.Runtime.Emscripten.Cache/Microsoft.NET.Runtime.Emscripten.Cache.pkgproj
similarity index 91%
rename from eng/nuget/Microsoft.NET.Runtime.Emscripten.Cache.Sdk/Microsoft.NET.Runtime.Emscripten.Cache.Sdk.pkgproj
rename to eng/nuget/Microsoft.NET.Runtime.Emscripten.Cache/Microsoft.NET.Runtime.Emscripten.Cache.pkgproj
index d6d6c08478..fd3f9d3953 100644
--- a/eng/nuget/Microsoft.NET.Runtime.Emscripten.Cache.Sdk/Microsoft.NET.Runtime.Emscripten.Cache.Sdk.pkgproj
+++ b/eng/nuget/Microsoft.NET.Runtime.Emscripten.Cache/Microsoft.NET.Runtime.Emscripten.Cache.pkgproj
@@ -2,12 +2,12 @@
   <Import Project="$(RepoRoot)\Directory.Build.props" />
   <Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\build\Microsoft.DotNet.Build.Tasks.Packaging.props" />
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Microsoft.NET.Runtime.Emscripten.Common.props))" />
-  <Import Project="Microsoft.NET.Runtime.Emscripten.Cache.Sdk.props" />
+  <Import Project="Microsoft.NET.Runtime.Emscripten.Cache.props" />
 
   <Target Name="_PrepareForPack" BeforeTargets="GetPackageFiles" DependsOnTargets="GenerateUnixPermissionsFile" Returns="@(PackageFile)">
     <!-- Override the id to include the Emscripten version -->
     <PropertyGroup>
-      <Id>Microsoft.NET.Runtime.Emscripten.$(EmscriptenVersion).Cache.Sdk.$(PackageRID)</Id>
+      <Id>Microsoft.NET.Runtime.Emscripten.$(EmscriptenVersion).Cache.$(PackageRID)</Id>
     </PropertyGroup>
   </Target>
 
diff --git a/eng/nuget/Microsoft.NET.Runtime.Emscripten.Cache.Sdk/Microsoft.NET.Runtime.Emscripten.Cache.Sdk.props b/eng/nuget/Microsoft.NET.Runtime.Emscripten.Cache/Microsoft.NET.Runtime.Emscripten.Cache.props
similarity index 52%
rename from eng/nuget/Microsoft.NET.Runtime.Emscripten.Cache.Sdk/Microsoft.NET.Runtime.Emscripten.Cache.Sdk.props
rename to eng/nuget/Microsoft.NET.Runtime.Emscripten.Cache/Microsoft.NET.Runtime.Emscripten.Cache.props
index 1ff085c8dc..eee485708d 100644
--- a/eng/nuget/Microsoft.NET.Runtime.Emscripten.Cache.Sdk/Microsoft.NET.Runtime.Emscripten.Cache.Sdk.props
+++ b/eng/nuget/Microsoft.NET.Runtime.Emscripten.Cache/Microsoft.NET.Runtime.Emscripten.Cache.props
@@ -5,7 +5,7 @@
 
   <ItemGroup>
     <File Include="$(ArtifactsDirToPackage)**" TargetPath="tools\%(RecursiveDir)" SkipPackageFileCheck="true" />
-    <File Include="$(RepoRoot)eng\sdk_files\Emscripten.Cache.Sdk.props" TargetPath="Sdk\Sdk.props" SkipPackageFileCheck="true" />
-    <File Include="$(RepoRoot)eng\sdk_files\Emscripten.Cache.Sdk.targets" TargetPath="Sdk\Sdk.targets" SkipPackageFileCheck="true" />
+    <File Include="$(RepoRoot)eng\sdk_files\Emscripten.Cache.props" TargetPath="Sdk\Sdk.props" SkipPackageFileCheck="true" />
+    <File Include="$(RepoRoot)eng\sdk_files\Emscripten.Cache.targets" TargetPath="Sdk\Sdk.targets" SkipPackageFileCheck="true" />
   </ItemGroup>
 </Project>
diff --git a/eng/nuget/Microsoft.NET.Workload.Emscripten.net7.Manifest/WorkloadManifest.json.in b/eng/nuget/Microsoft.NET.Workload.Emscripten.net7.Manifest/WorkloadManifest.json.in
index 2511f0babc..d19720689d 100644
--- a/eng/nuget/Microsoft.NET.Workload.Emscripten.net7.Manifest/WorkloadManifest.json.in
+++ b/eng/nuget/Microsoft.NET.Workload.Emscripten.net7.Manifest/WorkloadManifest.json.in
@@ -7,7 +7,7 @@
       "packs": [
         "Microsoft.NET.Runtime.Emscripten.Node.net7",
         "Microsoft.NET.Runtime.Emscripten.Python.net7",
-        "Microsoft.NET.Runtime.Emscripten.Cache.Sdk.net7",
+        "Microsoft.NET.Runtime.Emscripten.Cache.net7",
         "Microsoft.NET.Runtime.Emscripten.Sdk.net7"
       ],
       "platforms": [ "win-x64", "linux-x64", "osx-x64", "osx-arm64" ]
@@ -33,14 +33,14 @@
         "osx-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Python.osx-x64"
       }
     },
-    "Microsoft.NET.Runtime.Emscripten.Cache.Sdk.net7" : {
+    "Microsoft.NET.Runtime.Emscripten.Cache.net7" : {
       "kind": "Sdk",
       "version": "${PackageVersion}",
       "alias-to": {
-        "win-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Cache.Sdk.win-x64",
-        "linux-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Cache.Sdk.linux-x64",
-        "osx-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Cache.Sdk.osx-x64",
-        "osx-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Cache.Sdk.osx-x64"
+        "win-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Cache.win-x64",
+        "linux-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Cache.linux-x64",
+        "osx-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Cache.osx-x64",
+        "osx-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Cache.osx-x64"
       }
     },
     "Microsoft.NET.Runtime.Emscripten.Sdk.net7" : {
diff --git a/eng/nuget/Microsoft.NET.Workload.Emscripten.net7.Manifest/WorkloadManifest.targets b/eng/nuget/Microsoft.NET.Workload.Emscripten.net7.Manifest/WorkloadManifest.targets
index 0127c22381..3a2dbbd523 100644
--- a/eng/nuget/Microsoft.NET.Workload.Emscripten.net7.Manifest/WorkloadManifest.targets
+++ b/eng/nuget/Microsoft.NET.Workload.Emscripten.net7.Manifest/WorkloadManifest.targets
@@ -22,7 +22,7 @@
     <Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Python.net7" Condition="!$([MSBuild]::IsOsPlatform('Linux'))" />
     <Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Node.net7" />
     <Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Sdk.net7" />
-    <Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Cache.Sdk.net7" />
-    <Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.Emscripten.Cache.Sdk.net7" />
+    <Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Cache.net7" />
+    <Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.Emscripten.Cache.net7" />
   </ImportGroup>
 </Project>
diff --git a/eng/sdk_files/Emscripten.Cache.Sdk.props b/eng/sdk_files/Emscripten.Cache.props
similarity index 100%
rename from eng/sdk_files/Emscripten.Cache.Sdk.props
rename to eng/sdk_files/Emscripten.Cache.props
diff --git a/eng/sdk_files/Emscripten.Cache.Sdk.targets b/eng/sdk_files/Emscripten.Cache.targets
similarity index 100%
rename from eng/sdk_files/Emscripten.Cache.Sdk.targets
rename to eng/sdk_files/Emscripten.Cache.targets

From 386f160792ad349ff8c6668309c87ff732ca2a23 Mon Sep 17 00:00:00 2001
From: Aleksey Kliger <aleksey@lambdageek.org>
Date: Fri, 9 Sep 2022 14:25:21 -0400
Subject: [PATCH 9/9] Apply review feedback

---
 eng/emsdk.proj                         | 2 +-
 eng/sdk_files/Emscripten.Cache.props   | 2 +-
 eng/sdk_files/Emscripten.Cache.targets | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/emsdk.proj b/eng/emsdk.proj
index bf3fd732ab..e2490b7fcb 100644
--- a/eng/emsdk.proj
+++ b/eng/emsdk.proj
@@ -134,7 +134,7 @@
 
     <!-- move the emscripten cache to a separate directory -->
     <Move SourceFiles="@(CacheSdkFilesToMove)"
-	  DestinationFiles="$(CacheSdkFilesDir)emscripten\cache\%(RecursiveDir)%(Filename)%(Extension)" />
+          DestinationFiles="$(CacheSdkFilesDir)emscripten\cache\%(RecursiveDir)%(Filename)%(Extension)" />
 
     <ItemGroup>
       <!-- delete these libs from the cache to reduce windows nuget size context: https://github.com/dotnet/emsdk/pull/34#issuecomment-872691739 -->
diff --git a/eng/sdk_files/Emscripten.Cache.props b/eng/sdk_files/Emscripten.Cache.props
index 40d3c528a2..f993940ac6 100644
--- a/eng/sdk_files/Emscripten.Cache.props
+++ b/eng/sdk_files/Emscripten.Cache.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <EmscriptenCacheSdkToolsPath>$(MSBuildThisFileDirectory)..\tools\</EmscriptenCacheSdkToolsPath>
-    <EmscriptenCacheSdkCacheDir>$(EmscriptenCacheSdkToolsPath)emscripten\cache\</EmscriptenCacheSdkCacheDir>
+    <EmscriptenCacheSdkCacheDir>$([MSBuild]::NormalizeDirectory('$(EmscriptenCacheSdkToolsPath)', 'emscripten', 'cache'))</EmscriptenCacheSdkCacheDir>
   </PropertyGroup>
 
 </Project>
diff --git a/eng/sdk_files/Emscripten.Cache.targets b/eng/sdk_files/Emscripten.Cache.targets
index abc03367cb..071a641e66 100644
--- a/eng/sdk_files/Emscripten.Cache.targets
+++ b/eng/sdk_files/Emscripten.Cache.targets
@@ -1,7 +1,7 @@
 <Project>
   <Target Name="_EmscriptenCacheSdkOverrideWasmCachePath" BeforeTargets="_PrepareForWasmBuildNative" Condition="'$(WasmBuildNative)' == 'true'">
     <PropertyGroup>
-      <WasmCachePath Condition="'$(WasmCachePath)' == ''">$([MSBuild]::NormalizeDirectory($(EmscriptenCacheSdkCacheDir)))</WasmCachePath>
+      <WasmCachePath Condition="'$(WasmCachePath)' == ''">$(EmscriptenCacheSdkCacheDir)</WasmCachePath>
     </PropertyGroup>
   </Target>
 </Project>