From cec51a8ee33e2cbe10be61afe7b7fbef1dab9b7a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 8 Aug 2022 12:49:32 +0000 Subject: [PATCH 01/27] Update dependencies from https://github.com/dotnet/installer build 20220807.1 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-rc.1.22405.9 -> To Version 7.0.100-rc.1.22407.1 --- 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 ae2aeff9b4ff..9071a00c45ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - 785bddf6a55f6e826f92a46e0464c01ff41481c1 + 8f639696e6d57fb09e03e89c6397d913de1231ed https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index 94476b57e12d..1e96d4896d11 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 7.0.100-rc.1.22405.9 + 7.0.100-rc.1.22407.1 7.0.100-1.22377.1 6.0.0-beta.21212.6 6.0.0-rc.2.21468.3 From 801194f1499209d76137e9f4456454fe40cd10a3 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Mon, 8 Aug 2022 12:50:24 +0000 Subject: [PATCH 02/27] Re-generate global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index ed0b6425ccb9..827d99b10663 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-rc.1.22405.9" + "version": "7.0.100-rc.1.22407.1" } } From 8ddd0027b319484b8fae8bc515db3cee854faa6f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Aug 2022 13:21:58 +0000 Subject: [PATCH 03/27] Update dependencies from https://github.com/dotnet/installer build 20220808.5 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-rc.1.22405.9 -> To Version 7.0.100-rc.1.22408.5 --- 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 9071a00c45ad..1afbe5c62e8a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - 8f639696e6d57fb09e03e89c6397d913de1231ed + 54f388406f003a518021e73a2f3183109fb75f13 https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index 1e96d4896d11..e64d7a484328 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 7.0.100-rc.1.22407.1 + 7.0.100-rc.1.22408.5 7.0.100-1.22377.1 6.0.0-beta.21212.6 6.0.0-rc.2.21468.3 From 9be4d21551a172cb17b7e053186ed548389fe10c Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Tue, 9 Aug 2022 13:22:50 +0000 Subject: [PATCH 04/27] Re-generate global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 827d99b10663..1ff2a3573f0b 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-rc.1.22407.1" + "version": "7.0.100-rc.1.22408.5" } } From 6a29fabaa9a37922e8b1e3f6cbf7ec0c3cfc6476 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Aug 2022 12:56:47 +0000 Subject: [PATCH 05/27] Update dependencies from https://github.com/dotnet/installer build 20220809.23 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-rc.1.22405.9 -> To Version 7.0.100-rc.1.22409.23 --- 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 1afbe5c62e8a..241bcfcc4fc8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - 54f388406f003a518021e73a2f3183109fb75f13 + 716bd17882e62abb008911461ea4ff5a75c26788 https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index e64d7a484328..4c8e7040a5ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 7.0.100-rc.1.22408.5 + 7.0.100-rc.1.22409.23 7.0.100-1.22377.1 6.0.0-beta.21212.6 6.0.0-rc.2.21468.3 From e5b73919df5c62096df818162ff6a305a5201978 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 10 Aug 2022 12:57:47 +0000 Subject: [PATCH 06/27] Re-generate global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 1ff2a3573f0b..a8aaa2a14e00 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-rc.1.22408.5" + "version": "7.0.100-rc.1.22409.23" } } From 764d0524a3ddc2a10cab085b8134be8d3ce096bc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 11 Aug 2022 13:13:17 +0000 Subject: [PATCH 07/27] Update dependencies from https://github.com/dotnet/installer build 20220810.15 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-rc.1.22405.9 -> To Version 7.0.100-rc.1.22410.15 --- 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 241bcfcc4fc8..9831c37de98c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - 716bd17882e62abb008911461ea4ff5a75c26788 + b47c93b9f85ed49918308df74abc6e388dd8166a https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index 4c8e7040a5ff..d4b63c96024f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 7.0.100-rc.1.22409.23 + 7.0.100-rc.1.22410.15 7.0.100-1.22377.1 6.0.0-beta.21212.6 6.0.0-rc.2.21468.3 From e5d6c9c34d569e9b84b9c174f93f9032d1654fe7 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 11 Aug 2022 13:14:12 +0000 Subject: [PATCH 08/27] Re-generate global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index a8aaa2a14e00..f5374515bfa1 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-rc.1.22409.23" + "version": "7.0.100-rc.1.22410.15" } } From f07190df5f2b07646020cc631408a8b9a5723eca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Aug 2022 13:20:55 +0000 Subject: [PATCH 09/27] Update dependencies from https://github.com/dotnet/installer build 20220812.1 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-rc.1.22405.9 -> To Version 7.0.100-rc.1.22412.1 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref From Version 7.0.100-1.22377.1 -> To Version 7.0.100-1.22411.2 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9831c37de98c..9d8526543aaa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/installer - b47c93b9f85ed49918308df74abc6e388dd8166a + 904aad05ed06249e590ed22c75ed0cfbd6064916 - + https://github.com/dotnet/linker - f09bacf09ef10b61cf9f19825f8782171a816dab + 81ffbb5af38a45ff60648999df8f35a79061ae43 - + https://github.com/dotnet/runtime - 26a71c61fbda229f151afb14e274604b4926df5c + 7be37908e5a1cbb83b1062768c1649827eeaceaa - + https://github.com/dotnet/aspnetcore - 80ea57377a90fa2750f46662be3642b59ad0feed + 7194f1cbf02c0f5bf3b4bb20d19d8cc6922b7391 diff --git a/eng/Versions.props b/eng/Versions.props index d4b63c96024f..377e593e7ed3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,11 @@ - 7.0.100-rc.1.22410.15 - 7.0.100-1.22377.1 + 7.0.100-rc.1.22412.1 + 7.0.100-1.22411.2 6.0.0-beta.21212.6 6.0.0-rc.2.21468.3 - 7.0.0-rc.1.22403.8 + 7.0.0-rc.1.22410.9 7.0.100-alpha.1.21601.1 From 4bbc52b266bc4903eb5c95311aff7e344da0df54 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 12 Aug 2022 13:21:48 +0000 Subject: [PATCH 10/27] Re-generate global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index f5374515bfa1..8852e24f6627 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-rc.1.22410.15" + "version": "7.0.100-rc.1.22412.1" } } From ad44963d360750dfe95442f57936576152b0a1f0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 13 Aug 2022 12:58:49 +0000 Subject: [PATCH 11/27] Update dependencies from https://github.com/dotnet/installer build 20220813.1 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-rc.1.22405.9 -> To Version 7.0.100-rc.1.22413.1 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref From Version 7.0.100-1.22377.1 -> To Version 7.0.100-1.22412.1 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d8526543aaa..103253ee7a8e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/installer - 904aad05ed06249e590ed22c75ed0cfbd6064916 + fd587269d0a1fa669d547f3a2e74f5d9353b6dcf - + https://github.com/dotnet/linker - 81ffbb5af38a45ff60648999df8f35a79061ae43 + 95ea1842abc8634d1e98d995577c4202ad3fc5c5 - + https://github.com/dotnet/runtime - 7be37908e5a1cbb83b1062768c1649827eeaceaa + f52d8c59bb49360eb2cbeeb863c5856ebd62adda - + https://github.com/dotnet/aspnetcore - 7194f1cbf02c0f5bf3b4bb20d19d8cc6922b7391 + 7cb457bdaac8de9214391a9b9b273821d01c2300 diff --git a/eng/Versions.props b/eng/Versions.props index 377e593e7ed3..34be5f684958 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,11 @@ - 7.0.100-rc.1.22412.1 - 7.0.100-1.22411.2 + 7.0.100-rc.1.22413.1 + 7.0.100-1.22412.1 6.0.0-beta.21212.6 6.0.0-rc.2.21468.3 - 7.0.0-rc.1.22410.9 + 7.0.0-rc.1.22411.12 7.0.100-alpha.1.21601.1 From f7b083ee9808cba2dc949bf4e383467c5519e346 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Sat, 13 Aug 2022 12:59:33 +0000 Subject: [PATCH 12/27] Re-generate global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 8852e24f6627..42c7d886f43a 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-rc.1.22412.1" + "version": "7.0.100-rc.1.22413.1" } } From 415a2d269ef09d365205a9abf1c56180a29f78c8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 15 Aug 2022 13:04:41 +0000 Subject: [PATCH 13/27] Update dependencies from https://github.com/dotnet/installer build 20220814.7 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-rc.1.22405.9 -> To Version 7.0.100-rc.1.22414.7 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref From Version 7.0.100-1.22377.1 -> To Version 7.0.100-1.22412.1 (parent: Microsoft.Dotnet.Sdk.Internal --- 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 103253ee7a8e..8718f08ea37a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - fd587269d0a1fa669d547f3a2e74f5d9353b6dcf + 1dc3340838d6a59dd1c83e7064358e3a42fb150c https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index 34be5f684958..d5ece236580c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 7.0.100-rc.1.22413.1 + 7.0.100-rc.1.22414.7 7.0.100-1.22412.1 6.0.0-beta.21212.6 6.0.0-rc.2.21468.3 From 5dba5c1f40a7c68cfce60dd83d3c8ea8c9c54246 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Mon, 15 Aug 2022 13:05:27 +0000 Subject: [PATCH 14/27] Re-generate global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 42c7d886f43a..c6e8fafcb084 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-rc.1.22413.1" + "version": "7.0.100-rc.1.22414.7" } } From c47f5d3758560b87fc02c6df34217bc87af10544 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 Aug 2022 12:59:25 +0000 Subject: [PATCH 15/27] Update dependencies from https://github.com/dotnet/installer build 20220816.2 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-rc.1.22405.9 -> To Version 7.0.100-rc.1.22416.2 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref From Version 7.0.100-1.22377.1 -> To Version 7.0.100-1.22415.1 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8718f08ea37a..8c2ecde2da97 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/installer - 1dc3340838d6a59dd1c83e7064358e3a42fb150c + 62d6076288023c4bf511bb232873eba1c314ade1 - + https://github.com/dotnet/linker - 95ea1842abc8634d1e98d995577c4202ad3fc5c5 + 33c3b2c60d0a2006162a6326db853fe5415439bd https://github.com/dotnet/runtime f52d8c59bb49360eb2cbeeb863c5856ebd62adda - + https://github.com/dotnet/aspnetcore - 7cb457bdaac8de9214391a9b9b273821d01c2300 + 0438e7ec04808230c67b00caa3d584bd2b991f57 diff --git a/eng/Versions.props b/eng/Versions.props index d5ece236580c..45f1d0ba45c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,8 +1,8 @@ - 7.0.100-rc.1.22414.7 - 7.0.100-1.22412.1 + 7.0.100-rc.1.22416.2 + 7.0.100-1.22415.1 6.0.0-beta.21212.6 6.0.0-rc.2.21468.3 7.0.0-rc.1.22411.12 From b351372c7f0cd8ec354e0152b136ee0341a374ec Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Tue, 16 Aug 2022 13:00:24 +0000 Subject: [PATCH 16/27] Re-generate global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index c6e8fafcb084..96141fcc6648 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-rc.1.22414.7" + "version": "7.0.100-rc.1.22416.2" } } From dccf5bc262f6a9f1fed7335d6f295e70135e68d0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Aug 2022 13:15:32 +0000 Subject: [PATCH 17/27] Update dependencies from https://github.com/dotnet/installer build 20220817.1 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-rc.1.22405.9 -> To Version 7.0.100-rc.2.22417.1 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.AspNetCore.App.Ref From Version 7.0.100-1.22377.1 -> To Version 7.0.100-1.22415.4 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c2ecde2da97..627189441d52 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,12 +1,12 @@ - + https://github.com/dotnet/installer - 62d6076288023c4bf511bb232873eba1c314ade1 + f3da421a6e81382d6d2b25b236697f33e210092c - + https://github.com/dotnet/linker - 33c3b2c60d0a2006162a6326db853fe5415439bd + 6252a2194dd32911db2c0669fc818555687d5570 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 45f1d0ba45c2..6265526830e3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,8 +1,8 @@ - 7.0.100-rc.1.22416.2 - 7.0.100-1.22415.1 + 7.0.100-rc.2.22417.1 + 7.0.100-1.22415.4 6.0.0-beta.21212.6 6.0.0-rc.2.21468.3 7.0.0-rc.1.22411.12 From 3bfbdd1b04de2389d65e422b220389ac971c532a Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 17 Aug 2022 13:16:18 +0000 Subject: [PATCH 18/27] Re-generate global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 96141fcc6648..025227828f21 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100-rc.1.22416.2" + "version": "7.0.100-rc.2.22417.1" } } From 4bd22e3144aa17f9c8596f64cdf6659a754164d2 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Wed, 17 Aug 2022 16:39:31 +0200 Subject: [PATCH 19/27] [dotnet] Include the 'marshal-ilgen' component. Fixes #15668. Fixes https://github.com/xamarin/xamarin-macios/issues/15668. --- dotnet/targets/Xamarin.Shared.Sdk.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets index a0df14724028..d8285f9418f2 100644 --- a/dotnet/targets/Xamarin.Shared.Sdk.targets +++ b/dotnet/targets/Xamarin.Shared.Sdk.targets @@ -395,6 +395,7 @@ <_MonoComponent Include="hot_reload" Condition="'$(MtouchInterpreter)' == 'true'" /> <_MonoComponent Include="debugger" Condition="'$(_BundlerDebug)' == 'true'" /> <_MonoComponent Include="diagnostics_tracing" Condition="'$(_BundlerDebug)' == 'true'" /> + <_MonoComponent Include="marshal-ilgen" /> From 4fa5a49921c03f2b67d5579fa0fb38f48e674108 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Wed, 17 Aug 2022 18:22:29 +0200 Subject: [PATCH 20/27] [dotnet] Enable serialization discovery in the linker. Fixes #15676. Fixes https://github.com/xamarin/xamarin-macios/issues/15676. --- dotnet/targets/Xamarin.Shared.Sdk.targets | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets index d8285f9418f2..0cdede9c518b 100644 --- a/dotnet/targets/Xamarin.Shared.Sdk.targets +++ b/dotnet/targets/Xamarin.Shared.Sdk.targets @@ -555,6 +555,9 @@ <_ExtraTrimmerArgs Condition="('$(_PlatformName)' == 'iOS' Or '$(_PlatformName)' == 'tvOS') And '$(_SdkIsSimulator)' == 'true'">$(_ExtraTrimmerArgs) --feature ObjCRuntime.Runtime.Arch.IsSimulator true <_ExtraTrimmerArgs Condition="('$(_PlatformName)' == 'iOS' Or '$(_PlatformName)' == 'tvOS') And '$(_SdkIsSimulator)' != 'true'">$(_ExtraTrimmerArgs) --feature ObjCRuntime.Runtime.Arch.IsSimulator false + + <_ExtraTrimmerArgs>$(_ExtraTrimmerArgs) --enable-serialization-discovery + false From 8f9e149d42cdcaeee354198d6d4379799b05d28b Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Thu, 18 Aug 2022 13:01:00 +0200 Subject: [PATCH 21/27] [tests] Make the dont link tests actually not link for macOS. --- tests/linker/ios/dont link/dotnet/shared.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/linker/ios/dont link/dotnet/shared.csproj b/tests/linker/ios/dont link/dotnet/shared.csproj index 610303c294ea..3273f4efc285 100644 --- a/tests/linker/ios/dont link/dotnet/shared.csproj +++ b/tests/linker/ios/dont link/dotnet/shared.csproj @@ -6,6 +6,7 @@ dontlink dont link None + $(MtouchLink) $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\..\..\..')) $(RootTestsDirectory)\linker\ios\dont link From 639ac43e4e2b4f6f6e1853460ec60b72b40a5e48 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Thu, 18 Aug 2022 13:01:17 +0200 Subject: [PATCH 22/27] [tests] The 'trimmode copy' test needs an adjustment after recent linker changes. --- tests/linker/ios/trimmode copy/dotnet/shared.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/linker/ios/trimmode copy/dotnet/shared.csproj b/tests/linker/ios/trimmode copy/dotnet/shared.csproj index fd5ec5a5d81a..df28e608d26e 100644 --- a/tests/linker/ios/trimmode copy/dotnet/shared.csproj +++ b/tests/linker/ios/trimmode copy/dotnet/shared.csproj @@ -7,6 +7,7 @@ trimmode copy TrimMode Copy copy + <_TrimmerDefaultAction>copy $([System.IO.Path]::GetFullPath('$(MSBuildProjectDirectory)\..\..\..\..\..')) $(RootTestsDirectory)\linker\ios\dont link From c108dddc41ed11713a9e5d8d201a4573888a7d49 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Thu, 18 Aug 2022 13:34:35 +0200 Subject: [PATCH 23/27] [dotnet] Don't set a default 'TrimMode' value. We already compute a TrimMode value depending on other properties (MtouchLink/LinkMode - or a default value if those aren't set), and the logic to compute the default value is not executed if we set a TrimMode default (because TrimMode overrides any MtouchLink/LinkMode values). --- dotnet/targets/Xamarin.Shared.Sdk.props | 2 -- 1 file changed, 2 deletions(-) diff --git a/dotnet/targets/Xamarin.Shared.Sdk.props b/dotnet/targets/Xamarin.Shared.Sdk.props index 05635ec5d87d..d710f6276662 100644 --- a/dotnet/targets/Xamarin.Shared.Sdk.props +++ b/dotnet/targets/Xamarin.Shared.Sdk.props @@ -18,8 +18,6 @@ <_XamarinTaskAssembly Condition="'$(_PlatformName)' != 'macOS'">$(_XamarinSdkRootDirectory)\tools\msbuild\iOS\Xamarin.iOS.Tasks.dll <_XamarinTaskAssembly Condition="'$(_PlatformName)' == 'macOS'">$(_XamarinSdkRootDirectory)\tools\msbuild\macOS\Xamarin.Mac.Tasks.dll true - - partial $(AfterMicrosoftNETSdkTargets);$(MSBuildThisFileDirectory)Microsoft.$(_PlatformName).Sdk.targets From 0add8a116befb5635633f7797b991e579ac4424b Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Thu, 18 Aug 2022 13:36:48 +0200 Subject: [PATCH 24/27] [tests] Workaround a bug in 'dotnet build'. Workaround a bug in 'dotnet build' where escaping semicolons interferes with our ability to pass RuntimeIdentifiers to the build on the command line. --- tests/common/DotNet.cs | 26 +++++++++++++++++++++++++- tests/common/shared-dotnet.csproj | 2 ++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/tests/common/DotNet.cs b/tests/common/DotNet.cs index fea7dffa7515..119aafe82552 100644 --- a/tests/common/DotNet.cs +++ b/tests/common/DotNet.cs @@ -120,6 +120,7 @@ public static ExecutionResult Execute (string verb, string project, Dictionary generatedProps = null; foreach (var prop in properties) { if (prop.Value.IndexOfAny (new char [] { ';' }) >= 0) { // https://github.com/dotnet/msbuild/issues/471 @@ -128,11 +129,34 @@ public static ExecutionResult Execute (string verb, string project, Dictionary (); + generatedProps.Add (prop.Key, prop.Value); } else { args.Add ($"/p:{prop.Key}={prop.Value}"); } } + if (generatedProps is not null) { + var sb = new StringBuilder (); + sb.AppendLine (""); + sb.AppendLine (""); + sb.AppendLine ("\t"); + foreach (var prop in generatedProps) { + sb.AppendLine ($"\t\t<{prop.Key}>{prop.Value}"); + } + sb.AppendLine ("\t"); + sb.AppendLine (""); + + var generatedProjectFile = Path.Combine (Cache.CreateTemporaryDirectory (), "GeneratedProjectFile.props"); + File.WriteAllText (generatedProjectFile, sb.ToString ()); + args.Add ($"/p:GeneratedProjectFile={generatedProjectFile}"); + } } if (!string.IsNullOrEmpty (target)) args.Add ("/t:" + target); diff --git a/tests/common/shared-dotnet.csproj b/tests/common/shared-dotnet.csproj index 3634816ebc43..c1a0405e622d 100644 --- a/tests/common/shared-dotnet.csproj +++ b/tests/common/shared-dotnet.csproj @@ -64,4 +64,6 @@ + + From 1f8917f6636d1c75f5e1ff7180349eaa801d89f9 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Thu, 18 Aug 2022 13:37:31 +0200 Subject: [PATCH 25/27] [dotnet] Update expected bundle contents according to updated runtime. --- tests/dotnet/UnitTests/BundleStructureTest.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/dotnet/UnitTests/BundleStructureTest.cs b/tests/dotnet/UnitTests/BundleStructureTest.cs index 8b6c24b5f8ce..9f0b5bfb1575 100644 --- a/tests/dotnet/UnitTests/BundleStructureTest.cs +++ b/tests/dotnet/UnitTests/BundleStructureTest.cs @@ -46,6 +46,7 @@ void CheckAppBundleContents (ApplePlatform platform, string appPath, string[] ru var fn = Path.GetFileName (v!); switch (fn) { + case "libclrgc.dylib": case "libclrjit.dylib": case "libcoreclr.dylib": case "libdbgshim.dylib": @@ -57,6 +58,7 @@ void CheckAppBundleContents (ApplePlatform platform, string appPath, string[] ru case "libmono-component-debugger.dylib": case "libmono-component-diagnostics_tracing.dylib": case "libmono-component-hot_reload.dylib": + case "libmono-component-marshal-ilgen.dylib": case "libmonosgen-2.0.dylib": return platform != ApplePlatform.MacOSX; case "libSystem.Native.dylib": From de7e738c111ff21fe05bf0a58e7667473b3d3b11 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Thu, 18 Aug 2022 13:37:43 +0200 Subject: [PATCH 26/27] [tests] Update expected error message texts. --- tests/dotnet/UnitTests/ProjectTest.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/dotnet/UnitTests/ProjectTest.cs b/tests/dotnet/UnitTests/ProjectTest.cs index 9f43a3d9a767..063a9ef52478 100644 --- a/tests/dotnet/UnitTests/ProjectTest.cs +++ b/tests/dotnet/UnitTests/ProjectTest.cs @@ -487,10 +487,10 @@ public void InvalidRuntimeIdentifier (ApplePlatform platform, string runtimeIden } [Test] - [TestCase (ApplePlatform.iOS, "win10-x86", null)] - [TestCase (ApplePlatform.TVOS, "win10-x64", null)] + [TestCase (ApplePlatform.iOS, "win10-x86", "Error getting pack version: Pack 'Microsoft.NETCore.App.Runtime.Mono.win-x86' was not present in workload manifests.")] + [TestCase (ApplePlatform.TVOS, "win10-x64", "Error getting pack version: Pack 'Microsoft.NETCore.App.Runtime.Mono.win-x64' was not present in workload manifests.")] [TestCase (ApplePlatform.MacOSX, "win10-arm", null)] - [TestCase (ApplePlatform.MacCatalyst, "win10-arm64", "Unable to find package Microsoft.NETCore.App.Runtime.Mono.win-arm64. No packages exist with this id in source[(]s[)]:.*")] + [TestCase (ApplePlatform.MacCatalyst, "win10-arm64", "Error getting pack version: Pack 'Microsoft.NETCore.App.Runtime.Mono.win-arm64' was not present in workload manifests.")] public void InvalidRuntimeIdentifier_Restore (ApplePlatform platform, string runtimeIdentifier, string? failureMessagePattern) { var project = "MySimpleApp"; From e2a34fbf6aed26ba21adfc40eb98c46dd9d84109 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Fri, 19 Aug 2022 12:53:02 +0200 Subject: [PATCH 27/27] Bump to RC 2. --- Make.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Make.config b/Make.config index 8c14902955b7..e1f24569c81a 100644 --- a/Make.config +++ b/Make.config @@ -133,7 +133,7 @@ endif ## change *first*, otherwise we'll produce builds with the same version from ## two different branches (which is very, very bad). ## -NUGET_HARDCODED_PRERELEASE_IDENTIFIER=rc.1 +NUGET_HARDCODED_PRERELEASE_IDENTIFIER=rc.2 NUGET_HARDCODED_PRERELEASE_BRANCH=net7.0 # compute the alphanumeric version of branch names