[net7.0] Update dependencies from dotnet/installer

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

dotnet/targets/Xamarin.Shared.Sdk.props

@@ -18,8 +18,6 @@
 		<_XamarinTaskAssembly Condition="'$(_PlatformName)' != 'macOS'">$(_XamarinSdkRootDirectory)\tools\msbuild\iOS\Xamarin.iOS.Tasks.dll</_XamarinTaskAssembly>
 		<_XamarinTaskAssembly Condition="'$(_PlatformName)' == 'macOS'">$(_XamarinSdkRootDirectory)\tools\msbuild\macOS\Xamarin.Mac.Tasks.dll</_XamarinTaskAssembly>
 		<SuppressTrimAnalysisWarnings Condition=" '$(SuppressTrimAnalysisWarnings)' == '' ">true</SuppressTrimAnalysisWarnings>
-		<!-- For compat with user code not marked trimmable, only trim opt-in by default. -->
-		<TrimMode Condition="'$(TrimMode)' == ''">partial</TrimMode>
 		<AfterMicrosoftNETSdkTargets>$(AfterMicrosoftNETSdkTargets);$(MSBuildThisFileDirectory)Microsoft.$(_PlatformName).Sdk.targets</AfterMicrosoftNETSdkTargets>
 
 		<!-- _XamarinSdkRoot is used by the existing MSBuild targets files -->

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" />
 		</ItemGroup>
 	</Target>
 
@@ -554,6 +555,9 @@
 			<_ExtraTrimmerArgs Condition="('$(_PlatformName)' == 'iOS' Or '$(_PlatformName)' == 'tvOS') And '$(_SdkIsSimulator)' == 'true'">$(_ExtraTrimmerArgs) --feature ObjCRuntime.Runtime.Arch.IsSimulator true</_ExtraTrimmerArgs>
 			<_ExtraTrimmerArgs Condition="('$(_PlatformName)' == 'iOS' Or '$(_PlatformName)' == 'tvOS') And '$(_SdkIsSimulator)' != 'true'">$(_ExtraTrimmerArgs) --feature ObjCRuntime.Runtime.Arch.IsSimulator false</_ExtraTrimmerArgs>
 
+			<!-- Enable serialization discovery. Ref: https://github.com/xamarin/xamarin-macios/issues/15676 -->
+			<_ExtraTrimmerArgs>$(_ExtraTrimmerArgs) --enable-serialization-discovery</_ExtraTrimmerArgs>
+
 			<!-- We always want the linker to process debug symbols, even when building in Release mode, because the AOT compiler uses the managed debug symbols to output DWARF debugging symbols -->
 			<TrimmerRemoveSymbols Condition="'$(TrimmerRemoveSymbols)' == ''">false</TrimmerRemoveSymbols>
 

eng/Version.Details.xml

@@ -1,21 +1,21 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rc.1.22405.9">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rc.2.22417.1">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>785bddf6a55f6e826f92a46e0464c01ff41481c1</Sha>
+      <Sha>f3da421a6e81382d6d2b25b236697f33e210092c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22377.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22415.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/linker</Uri>
-      <Sha>f09bacf09ef10b61cf9f19825f8782171a816dab</Sha>
+      <Sha>6252a2194dd32911db2c0669fc818555687d5570</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rc.1.22403.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rc.1.22411.12" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>26a71c61fbda229f151afb14e274604b4926df5c</Sha>
+      <Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
     </Dependency>
     <!-- This is required for our test apps to build; in some cases Microsoft.AspNetCore.App is pulled in, and when building test apps the build needs to be able to resolve that -->
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0-rc.1.22404.6" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0-rc.1.22415.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>80ea57377a90fa2750f46662be3642b59ad0feed</Sha>
+      <Sha>0438e7ec04808230c67b00caa3d584bd2b991f57</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>

eng/Versions.props

@@ -1,11 +1,11 @@
 <Project>
   <!--Package versions-->
   <PropertyGroup>
-    <MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rc.1.22405.9</MicrosoftDotnetSdkInternalPackageVersion>
-    <MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22377.1</MicrosoftNETILLinkTasksPackageVersion>
+    <MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rc.2.22417.1</MicrosoftDotnetSdkInternalPackageVersion>
+    <MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22415.4</MicrosoftNETILLinkTasksPackageVersion>
     <MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
     <MicrosoftNETILStripTasksPackageVersion>6.0.0-rc.2.21468.3</MicrosoftNETILStripTasksPackageVersion>
-    <MicrosoftNETCoreAppRefPackageVersion>7.0.0-rc.1.22403.8</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>7.0.0-rc.1.22411.12</MicrosoftNETCoreAppRefPackageVersion>
     <MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
   </PropertyGroup>
 </Project>

global.json

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "7.0.100-rc.1.22405.9"
+    "version": "7.0.100-rc.2.22417.1"
   }
 }

tests/common/DotNet.cs

@@ -120,6 +120,7 @@ public static ExecutionResult Execute (string verb, string project, Dictionary<s
 				args.Add (verb);
 				args.Add (project);
 				if (properties != null) {
+					Dictionary<string, string> 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<s
 							// This means that a task that takes a "string[] RuntimeIdentifiers" will get an array with
 							// a single element, where that single element is the whole RuntimeIdentifiers string.
 							// Example task: https://github.com/dotnet/sdk/blob/ffca47e9a36652da2e7041360f2201a2ba197194/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs#L45
-							args.Add ($"/p:{prop.Key}=\"{prop.Value}\"");
+							// args.Add ($"/p:{prop.Key}=\"{prop.Value}\"");
+
+							// Setting a property with a semicolon from the command line doesn't work anymore.
+							// Ref: https://github.com/dotnet/sdk/issues/27059#issuecomment-1219319513
+							// So write these properties in a file instead. This is a behavioural difference, because
+							// they'll be project-specific instead of global, but I don't see a better workaround.
+							if (generatedProps is null)
+								generatedProps = new Dictionary<string, string> ();
+							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 ("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
+						sb.AppendLine ("<Project>");
+						sb.AppendLine ("\t<PropertyGroup>");
+						foreach (var prop in generatedProps) {
+							sb.AppendLine ($"\t\t<{prop.Key}>{prop.Value}</{prop.Key}>");
+						}
+						sb.AppendLine ("\t</PropertyGroup>");
+						sb.AppendLine ("</Project>");
+
+						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);

tests/common/shared-dotnet.csproj

@@ -64,4 +64,6 @@
 	</ItemGroup>
 
 	<Import Project="$(MSBuildThisFileDirectory)/../nunit.framework.targets" />
+
+	<Import Project="$(GeneratedProjectFile)" Condition="'$(GeneratedProjectFile)' != ''" />
 </Project>

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":

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";

tests/linker/ios/dont link/dotnet/shared.csproj

@@ -6,6 +6,7 @@
     <RootNamespace>dontlink</RootNamespace>
     <AssemblyName>dont link</AssemblyName>
     <MtouchLink>None</MtouchLink>
+    <LinkMode>$(MtouchLink)</LinkMode>
     <RootTestsDirectory>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\..\..\..'))</RootTestsDirectory>
     <ThisTestDirectory>$(RootTestsDirectory)\linker\ios\dont link</ThisTestDirectory>
   </PropertyGroup>

tests/linker/ios/trimmode copy/dotnet/shared.csproj

@@ -7,6 +7,7 @@
     <AssemblyName>trimmode copy</AssemblyName>
     <ApplicationTitle>TrimMode Copy</ApplicationTitle>
     <TrimMode>copy</TrimMode>
+    <_TrimmerDefaultAction>copy</_TrimmerDefaultAction> <!-- https://github.com/dotnet/linker/issues/2981 -->
     <RootTestsDirectory>$([System.IO.Path]::GetFullPath('$(MSBuildProjectDirectory)\..\..\..\..\..'))</RootTestsDirectory>
     <ThisTestDirectory>$(RootTestsDirectory)\linker\ios\dont link</ThisTestDirectory>
   </PropertyGroup>