Merge remote-tracking branch 'origin/main' into dev/rolf/docs-items-a…

…nd-properties
dotnet · Dec 9, 2024 · b66bd48 · b66bd48
2 parents 0a7793d + a8e360d
commit b66bd48
Show file tree

Hide file tree

Showing 104 changed files with 571 additions and 2,337 deletions.
diff --git a/DOWNLOADS.md b/DOWNLOADS.md
@@ -1,3 +1,10 @@
+> [!NOTE]
+> This page lists Xamarin.iOS and Xamarin.Mac downloads, which are both discontinued.
+> 
+> If you're looking for how to install a specific version of the iOS, tvOS, Mac Catalyst or macOS workloads (for .NET),
+> please [file an issue](https://github.com/xamarin/xamarin-macios/issues/new/choose) explaining what you need
+> (they're shipped as .NET workloads, and not installable from packages).
+
 # Xamarin.iOS
 
 | Date | Version | Package | Release Notes |

diff --git a/dotnet/Makefile b/dotnet/Makefile
@@ -58,7 +58,7 @@ $(foreach platform,$(DOTNET_WINDOWS_PLATFORMS),$(eval $(call DefineWindowsTarget
 ifdef INCLUDE_HOTRESTART
 
 iOS_WINDOWS_NUGET_TARGETS += \
-	$(DOTNET_DESTDIR)/$(IOS_NUGET_WINDOWS_SDK_NAME)/tools/msbuild/iOS/Xamarin.PreBuilt.iOS.app.zip \
+	$(DOTNET_DESTDIR)/$(IOS_NUGET_WINDOWS_SDK_NAME)/tools/msbuild/Xamarin.PreBuilt.iOS.app.zip \
 
 endif
 
@@ -511,7 +511,7 @@ clean-local::
 	$(Q) $(DOTNET) restore package/workaround-for-maccore-issue-2427/restore.csproj /bl:package/workaround-for-maccore-issue-2427/restore.binlog $(MSBUILD_VERBOSITY)
 	$(Q) touch $@
 
-$(DOTNET_DESTDIR)/$(IOS_NUGET_WINDOWS_SDK_NAME)/tools/msbuild/iOS/Xamarin.PreBuilt.iOS.app.zip: .stamp-install-workloads
+$(DOTNET_DESTDIR)/$(IOS_NUGET_WINDOWS_SDK_NAME)/tools/msbuild/Xamarin.PreBuilt.iOS.app.zip: .stamp-install-workloads
 	$(Q) $(MAKE) -C $(TOP)/msbuild/Xamarin.HotRestart.PreBuilt all
 	$(Q) touch $@
 

diff --git a/dotnet/Microsoft.iOS.Sdk/targets/Microsoft.iOS.Sdk.props b/dotnet/Microsoft.iOS.Sdk/targets/Microsoft.iOS.Sdk.props
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <_PlatformName>iOS</_PlatformName>
     <!-- Used by Microsoft.iOS.Windows.Sdk -->
-    <CoreiOSSdkDirectory>$(MSBuildThisFileDirectory)..\tools\msbuild\iOS\</CoreiOSSdkDirectory>
+    <CoreiOSSdkDirectory>$(MSBuildThisFileDirectory)..\tools\msbuild\</CoreiOSSdkDirectory>
   </PropertyGroup>
 
   <Import Project="Xamarin.Shared.Sdk.props" Condition="'$(_IsWorkloadEol)' != 'true'" />

diff --git a/dotnet/Microsoft.iOS.Windows.Sdk/targets/Microsoft.iOS.Windows.Sdk.props b/dotnet/Microsoft.iOS.Windows.Sdk/targets/Microsoft.iOS.Windows.Sdk.props
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\iOS\Xamarin.iOS.Common.Before.props" />
-  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\iOS\Xamarin.iOS.Common.Before.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\Xamarin.iOS.Common.Before.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\Xamarin.iOS.Common.Before.targets" />
 
   <PropertyGroup>
     <_DotNetRootRemoteDirectory Condition="$(_DotNetRootRemoteDirectory) == ''">/usr/local/share/dotnet/</_DotNetRootRemoteDirectory>

diff --git a/dotnet/Microsoft.iOS.Windows.Sdk/targets/Microsoft.iOS.Windows.Sdk.targets b/dotnet/Microsoft.iOS.Windows.Sdk/targets/Microsoft.iOS.Windows.Sdk.targets
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\iOS\Xamarin.iOS.Common.After.props" />
-  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\iOS\Xamarin.iOS.Common.After.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\Xamarin.iOS.Common.After.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\Xamarin.iOS.Common.After.targets" />
 
   <!-- Note: The following pack files are not yet imported in .NET 6:
 
-  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\iOS\Xamarin.iOS.ObjCBinding.Common.After.props" />
-  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\iOS\Xamarin.iOS.ObjCBinding.Common.After.targets" />
-  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\iOS\Xamarin.iOS.ObjCBinding.Common.Before.targets" />
-  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\iOS\Xamarin.iOS.ObjCBinding.CSharp.After.props" />
-  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\iOS\Xamarin.iOS.ObjCBinding.CSharp.After.targets" />
-  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\iOS\Xamarin.iOS.WatchApp.Common.After.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\Xamarin.iOS.ObjCBinding.Common.After.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\Xamarin.iOS.ObjCBinding.Common.After.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\Xamarin.iOS.ObjCBinding.Common.Before.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\Xamarin.iOS.ObjCBinding.CSharp.After.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\Xamarin.iOS.ObjCBinding.CSharp.After.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)..\tools\msbuild\Xamarin.iOS.WatchApp.Common.After.targets" />
 
   -->
 

diff --git a/dotnet/Workloads/SignList.xml b/dotnet/Workloads/SignList.xml
@@ -3,17 +3,17 @@
   <ItemGroup>
     <Skip Include="System.Reflection.MetadataLoadContext.dll" />
     <!-- Microsoft.iOS.Windows.Sdk content -->
-    <Skip Include="tools\msbuild\iOS\Microsoft.Win32.Registry.dll" />
-    <Skip Include="tools\msbuild\iOS\System.Buffers.dll" />
-    <Skip Include="tools\msbuild\iOS\System.Formats.Asn1.dll" />
-    <Skip Include="tools\msbuild\iOS\System.Memory.dll" />
-    <Skip Include="tools\msbuild\iOS\System.Numerics.Vectors.dll" />
-    <Skip Include="tools\msbuild\iOS\System.Runtime.CompilerServices.Unsafe.dll" />
-    <Skip Include="tools\msbuild\iOS\System.Security.AccessControl.dll" />
-    <Skip Include="tools\msbuild\iOS\System.Security.Cryptography.Pkcs.dll" />
-    <Skip Include="tools\msbuild\iOS\System.Security.Cryptography.ProtectedData.dll" />
-    <Skip Include="tools\msbuild\iOS\System.Security.Principal.Windows.dll" />
-    <Skip Include="tools\msbuild\iOS\ws2_32.dll" />
+    <Skip Include="tools\msbuild\Microsoft.Win32.Registry.dll" />
+    <Skip Include="tools\msbuild\System.Buffers.dll" />
+    <Skip Include="tools\msbuild\System.Formats.Asn1.dll" />
+    <Skip Include="tools\msbuild\System.Memory.dll" />
+    <Skip Include="tools\msbuild\System.Numerics.Vectors.dll" />
+    <Skip Include="tools\msbuild\System.Runtime.CompilerServices.Unsafe.dll" />
+    <Skip Include="tools\msbuild\System.Security.AccessControl.dll" />
+    <Skip Include="tools\msbuild\System.Security.Cryptography.Pkcs.dll" />
+    <Skip Include="tools\msbuild\System.Security.Cryptography.ProtectedData.dll" />
+    <Skip Include="tools\msbuild\System.Security.Principal.Windows.dll" />
+    <Skip Include="tools\msbuild\ws2_32.dll" />
     <!-- Broker.zip -->
     <Skip Include="Broker\Newtonsoft.Json.dll" />
     <Skip Include="Broker\System.Net.Mqtt.dll" />

diff --git a/dotnet/targets/Xamarin.Shared.Sdk.props b/dotnet/targets/Xamarin.Shared.Sdk.props
@@ -29,8 +29,7 @@
 		<_XamarinRelativeSdkRootDirectory Condition="'$(_XamarinRelativeSdkRootDirectory)' == ''">$(XamarinRelativeSdkRootDirectory)</_XamarinRelativeSdkRootDirectory>
 		<!-- This is the location of the Microsoft.<platform>.Sdk NuGet on macOS, this value will be overriden from Windows  -->
 		<_XamarinSdkRootDirectoryOnMac>$(_XamarinSdkRootDirectory)</_XamarinSdkRootDirectoryOnMac>
-		<_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>
+		<_XamarinTaskAssembly>$(_XamarinSdkRootDirectory)\tools\msbuild\Xamarin.MacDev.Tasks.dll</_XamarinTaskAssembly>
 
 		<!--
 			PublishAot should only take effect when doing 'dotnet publish', not when doing 'dotnet build'. We distinguish these cases using the '_IsPublishing' property,

diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets
@@ -2458,7 +2458,7 @@ global using nfloat = global::System.Runtime.InteropServices.NFloat%3B
 		<_ProjectLanguage Condition="'$(_ProjectLanguage)' == 'F#' ">FSharp</_ProjectLanguage>
 		<_ProjectLanguage Condition="'$(_ProjectLanguage)' == 'VB' ">VisualBasic</_ProjectLanguage>
 
-		<_TargetsDirectory>$(_XamarinSdkRootDirectory)\tools\msbuild\$(_PlatformName)\</_TargetsDirectory>
+		<_TargetsDirectory>$(_XamarinSdkRootDirectory)\tools\msbuild\</_TargetsDirectory>
 	</PropertyGroup>
 
 	<Import Project="$(_TargetsDirectory)Xamarin.iOS.$(_ProjectLanguage).targets"                  Condition="'$(_ProjectType)' == 'iOSExecutableProject' Or '$(_ProjectType)' == 'iOSClassLibrary' " />

diff --git a/msbuild/ILMerge.targets b/msbuild/ILMerge.targets
@@ -27,11 +27,10 @@
     <ItemGroup Condition="$(TargetFramework.StartsWith ('netstandard'))">
       <!-- I don't like to have a hard-coded list of assemblies to merge, but I couldn't find a way to calculate it -->
       <MergedAssemblies Include="@(ReferenceDependencyPaths)" Condition="'%(FileName)' == 'AssemblyStripper'" />
-      <MergedAssemblies Include="@(ReferenceDependencyPaths)" Condition="'%(FileName)' == 'MonoTargetsTasks'" />
-      <MergedAssemblies Include="@(ReferencePath)" Condition="'%(FileName)' == 'Xamarin.MacDev.Tasks'" />
+      <MergedAssemblies Include="@(ReferencePath)" Condition="'%(FileName)' == 'MonoTargetsTasks'" />
       <MergedAssemblies Include="@(ReferencePath)" Condition="'%(FileName)' == 'Xamarin.MacDev'" />
       <MergedAssemblies Include="@(ReferencePath)" Condition="'%(FileName)' == 'DotNetZip'" />
-      <MergedAssemblies Include="@(ReferenceDependencyPaths)" Condition="'%(FileName)' == 'ILLink.Tasks'" />
+      <MergedAssemblies Include="@(ReferencePath)" Condition="'%(FileName)' == 'ILLink.Tasks'" />
       <MergedAssemblies Include="@(ReferencePath)" Condition="'%(FileName)' == 'ILStrip'" />
       <MergedAssemblies Include="@(ReferencePath)" Condition="'%(FileName)' == 'Newtonsoft.Json'" />
       <MergedAssemblies Include="@(ReferencePath)" Condition="'%(FileName)' == 'Renci.SshNet'" />