From 979ac9f453988f1113d02f3fec5969e2de37f91e Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Fri, 26 Jan 2024 08:46:03 +0100 Subject: [PATCH 1/3] [wasm][mt] Fix few libraries projects --- .../System.Linq.Parallel/src/System.Linq.Parallel.csproj | 4 ++-- .../ref/System.Threading.Thread.csproj | 2 -- src/libraries/System.Threading/ref/System.Threading.csproj | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/libraries/System.Linq.Parallel/src/System.Linq.Parallel.csproj b/src/libraries/System.Linq.Parallel/src/System.Linq.Parallel.csproj index 1c349dd76cadb9..8b492f952038f8 100644 --- a/src/libraries/System.Linq.Parallel/src/System.Linq.Parallel.csproj +++ b/src/libraries/System.Linq.Parallel/src/System.Linq.Parallel.csproj @@ -1,13 +1,13 @@ - $(NetCoreAppCurrent) + $(NetCoreAppCurrent);$(NetCoreAppCurrent)-browser true false $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) - true + true $(DefineConstants);FEATURE_WASM_THREADS diff --git a/src/libraries/System.Threading.Thread/ref/System.Threading.Thread.csproj b/src/libraries/System.Threading.Thread/ref/System.Threading.Thread.csproj index d5723a09d9b9f1..af99f9b0724306 100644 --- a/src/libraries/System.Threading.Thread/ref/System.Threading.Thread.csproj +++ b/src/libraries/System.Threading.Thread/ref/System.Threading.Thread.csproj @@ -1,8 +1,6 @@ $(NetCoreAppCurrent) - true - $(DefineConstants);FEATURE_WASM_THREADS diff --git a/src/libraries/System.Threading/ref/System.Threading.csproj b/src/libraries/System.Threading/ref/System.Threading.csproj index 7a2cbac20a48ef..48a7ddb57ebe5a 100644 --- a/src/libraries/System.Threading/ref/System.Threading.csproj +++ b/src/libraries/System.Threading/ref/System.Threading.csproj @@ -1,8 +1,6 @@ $(NetCoreAppCurrent) - true - $(DefineConstants);FEATURE_WASM_THREADS From be492ea206f97840e2c2ab53f10843accf793407 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Fri, 26 Jan 2024 10:17:27 +0100 Subject: [PATCH 2/3] Conditional TFMs in src/System.Linq.Parallel.csproj Co-authored-by: Viktor Hofer --- .../System.Linq.Parallel/src/System.Linq.Parallel.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libraries/System.Linq.Parallel/src/System.Linq.Parallel.csproj b/src/libraries/System.Linq.Parallel/src/System.Linq.Parallel.csproj index 8b492f952038f8..abe40ca2e317e8 100644 --- a/src/libraries/System.Linq.Parallel/src/System.Linq.Parallel.csproj +++ b/src/libraries/System.Linq.Parallel/src/System.Linq.Parallel.csproj @@ -1,7 +1,8 @@ - $(NetCoreAppCurrent);$(NetCoreAppCurrent)-browser + $(NetCoreAppCurrent) + $(NetCoreAppCurrent);$(NetCoreAppCurrent)-browser true false From 25a16b035bd9a425c4c30ce0cc1e86c40db73946 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Fri, 26 Jan 2024 10:20:09 +0100 Subject: [PATCH 3/3] Feedback --- .../src/System.Threading.Tasks.Parallel.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libraries/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj b/src/libraries/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj index ed9222b0224fb1..6332041eb43ffd 100644 --- a/src/libraries/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj +++ b/src/libraries/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj @@ -1,7 +1,8 @@ - $(NetCoreAppCurrent);$(NetCoreAppCurrent)-browser + $(NetCoreAppCurrent) + $(NetCoreAppCurrent);$(NetCoreAppCurrent)-browser true false