From e3b477d668e487fa210390afae3920df14ca589e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 20 Oct 2023 22:17:37 +0000 Subject: [PATCH 01/10] Update dependencies from https://github.com/dotnet/emsdk build 20231020.2 Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-rtm.23511.3 -> To Version 8.0.0-rtm.23520.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e9087374ba0cf..cc11f9dab040e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,9 +90,9 @@ 45dd3a73dd5b64b010c4251303b3664bb30df029 - + https://github.com/dotnet/emsdk - 1b7f3a6560f6fb5f32b2758603c0376037f555ea + f7ae2160cecd2209121757647d28e64ab8525202 diff --git a/eng/Versions.props b/eng/Versions.props index 189fb6671d44b..38b84018292d0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -240,7 +240,7 @@ Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-8_0_100_Transport --> - 8.0.0-rtm.23511.3 + 8.0.0-rtm.23520.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion) 1.1.87-gba258badda From 58dc6328f18a554053246e1c72d8e2cb360692a2 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Fri, 20 Oct 2023 19:42:14 -0500 Subject: [PATCH 02/10] switch to the stable version now --- eng/Version.Details.xml | 2 +- eng/Versions.props | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cc11f9dab040e..ed86804979c4e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,7 +90,7 @@ 45dd3a73dd5b64b010c4251303b3664bb30df029 - + https://github.com/dotnet/emsdk f7ae2160cecd2209121757647d28e64ab8525202 diff --git a/eng/Versions.props b/eng/Versions.props index 38b84018292d0..5a7716b36b8ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -240,8 +240,8 @@ Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-8_0_100_Transport --> - 8.0.0-rtm.23520.2 - $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion) + 8.0.0 + $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version) 1.1.87-gba258badda 1.0.0-v3.14.0.5722 From 18671cfd2ab713c814821e04b9dfbebfafca3e05 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Fri, 20 Oct 2023 21:29:50 -0500 Subject: [PATCH 03/10] Update dependencies --- NuGet.config | 5 ++++ eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- 2 files changed, 35 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 80dd215a4bf01..423372ca9017d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,11 @@ + + + + + - 8.0.100-rtm.23478.7 - + 8.0.100-rtm.23506.1 + $(MicrosoftDotnetSdkInternalVersion) From 768b65bab585f303bca6e0e9a36cf06d59e90387 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Sun, 22 Oct 2023 16:19:25 -0500 Subject: [PATCH 06/10] Use source generation for the serializer --- eng/Versions.props | 2 +- src/mono/wasm/testassets/WasmBasicTestApp/LazyLoadingTest.cs | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index e99a081fbd6ed..7bca669addc84 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -259,6 +259,6 @@ 1.0.406601 8.0.100-rtm.23506.1 - $(MicrosoftDotnetSdkInternalVersion) + diff --git a/src/mono/wasm/testassets/WasmBasicTestApp/LazyLoadingTest.cs b/src/mono/wasm/testassets/WasmBasicTestApp/LazyLoadingTest.cs index 0d68b1216816c..5df4dd2486d57 100644 --- a/src/mono/wasm/testassets/WasmBasicTestApp/LazyLoadingTest.cs +++ b/src/mono/wasm/testassets/WasmBasicTestApp/LazyLoadingTest.cs @@ -12,9 +12,12 @@ public static void Run() { // System.Text.Json is marked as lazy loaded in the csproj ("BlazorWebAssemblyLazyLoad"), this method can be called only after the assembly is lazy loaded // In the test case it is done in the JS before call to this method - var text = JsonSerializer.Serialize(new Person("John", "Doe")); + var text = JsonSerializer.Serialize(new Person("John", "Doe"), SourceGenerationContext.Default.Person); TestOutput.WriteLine(text); } + internal partial class SourceGenerationContext : JsonSerializerContext + { + } public record Person(string FirstName, string LastName); } From be0554c70b9444795ac78c5f617bcddce0b922e6 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Sun, 22 Oct 2023 16:26:22 -0500 Subject: [PATCH 07/10] Try to make sourcebuild happy --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3d6bd228710c7..1524758dcb68b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,7 +93,7 @@ https://github.com/dotnet/emsdk f7ae2160cecd2209121757647d28e64ab8525202 - + https://github.com/dotnet/source-build-reference-packages From 8c1faf561b8a305661cda047cf0298250a0c919a Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Sun, 22 Oct 2023 16:55:35 -0500 Subject: [PATCH 08/10] Try again to make sourcebuild happy --- eng/Version.Details.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1524758dcb68b..207328488f054 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,7 +93,11 @@ https://github.com/dotnet/emsdk f7ae2160cecd2209121757647d28e64ab8525202 - + + + https://github.com/dotnet/emsdk + f7ae2160cecd2209121757647d28e64ab8525202 + https://github.com/dotnet/source-build-reference-packages From 36c97de43646dc80c0cd534bee3adbc73986553c Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Sun, 22 Oct 2023 18:44:13 -0500 Subject: [PATCH 09/10] Use reflection and suppress trim analysis instead This reverts commit 768b65bab585f303bca6e0e9a36cf06d59e90387. --- eng/Versions.props | 2 +- src/mono/wasm/testassets/WasmBasicTestApp/LazyLoadingTest.cs | 5 +---- .../wasm/testassets/WasmBasicTestApp/WasmBasicTestApp.csproj | 1 + 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7bca669addc84..e99a081fbd6ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -259,6 +259,6 @@ 1.0.406601 8.0.100-rtm.23506.1 - + $(MicrosoftDotnetSdkInternalVersion) diff --git a/src/mono/wasm/testassets/WasmBasicTestApp/LazyLoadingTest.cs b/src/mono/wasm/testassets/WasmBasicTestApp/LazyLoadingTest.cs index 5df4dd2486d57..0d68b1216816c 100644 --- a/src/mono/wasm/testassets/WasmBasicTestApp/LazyLoadingTest.cs +++ b/src/mono/wasm/testassets/WasmBasicTestApp/LazyLoadingTest.cs @@ -12,12 +12,9 @@ public static void Run() { // System.Text.Json is marked as lazy loaded in the csproj ("BlazorWebAssemblyLazyLoad"), this method can be called only after the assembly is lazy loaded // In the test case it is done in the JS before call to this method - var text = JsonSerializer.Serialize(new Person("John", "Doe"), SourceGenerationContext.Default.Person); + var text = JsonSerializer.Serialize(new Person("John", "Doe")); TestOutput.WriteLine(text); } - internal partial class SourceGenerationContext : JsonSerializerContext - { - } public record Person(string FirstName, string LastName); } diff --git a/src/mono/wasm/testassets/WasmBasicTestApp/WasmBasicTestApp.csproj b/src/mono/wasm/testassets/WasmBasicTestApp/WasmBasicTestApp.csproj index 33858b9a6a755..761ac6354ce86 100644 --- a/src/mono/wasm/testassets/WasmBasicTestApp/WasmBasicTestApp.csproj +++ b/src/mono/wasm/testassets/WasmBasicTestApp/WasmBasicTestApp.csproj @@ -4,6 +4,7 @@ browser-wasm Exe true + true From 1ae22d581f5221ee31b2c7261a0e85c6ea753de5 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Sun, 22 Oct 2023 22:09:01 -0500 Subject: [PATCH 10/10] Fix reverting too much --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e99a081fbd6ed..7bca669addc84 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -259,6 +259,6 @@ 1.0.406601 8.0.100-rtm.23506.1 - $(MicrosoftDotnetSdkInternalVersion) +