diff --git a/Make.config b/Make.config
index 2edae0c8d818..ea29b452ef91 100644
--- a/Make.config
+++ b/Make.config
@@ -574,10 +574,10 @@ DOTNET_CSC_PATH_STABLE=$(DOTNET6_DIR)/sdk/$(DOTNET6_VERSION_BAND)/Roslyn/bincore
 DOTNET6_CSC=$(DOTNET6) exec $(DOTNET_CSC_PATH_STABLE)
 
 # How are our assemblies named?
-DOTNET_IOS_ASSEMBLY_NAME=Xamarin.iOS
-DOTNET_TVOS_ASSEMBLY_NAME=Xamarin.TVOS
-DOTNET_MACCATALYST_ASSEMBLY_NAME=Xamarin.MacCatalyst
-DOTNET_MACOS_ASSEMBLY_NAME=Xamarin.Mac
+DOTNET_IOS_ASSEMBLY_NAME=Microsoft.iOS
+DOTNET_TVOS_ASSEMBLY_NAME=Microsoft.tvOS
+DOTNET_MACCATALYST_ASSEMBLY_NAME=Microsoft.MacCatalyst
+DOTNET_MACOS_ASSEMBLY_NAME=Microsoft.macOS
 
 DOTNET_PLATFORMS=
 ifdef INCLUDE_IOS
diff --git a/NuGet.config b/NuGet.config
index 5bddfe28dab7..4c6aaac70e1c 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -9,6 +9,7 @@
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-pub-dotnet-runtime-4fde4c1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-4fde4c18/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" protocolVersion="3" />
diff --git a/dotnet/BreakingChanges.md b/dotnet/BreakingChanges.md
index c5e51eb2c325..a1ff9ceb0761 100644
--- a/dotnet/BreakingChanges.md
+++ b/dotnet/BreakingChanges.md
@@ -2,6 +2,20 @@
 
 Reference: https://github.com/xamarin/xamarin-macios/issues/13087
 
+## The SDK assemblies have been renamed.
+
+We've renamed the SDK assemblies like this:
+
+* `Xamarin.iOS.dll` -> `Microsoft.iOS.dll`
+* `Xamarin.TVOS.dll` -> `Microsoft.tvOS.dll`
+* `Xamarin.MacCatalyst.dll` -> `Microsoft.MacCatalyst.dll`
+* `Xamarin.Mac.dll` -> `Microsoft.macOS.dll`
+
+This will affect:
+
+* Code using reflection with hardcoded assembly name.
+* [Custom linker configuration files](https://docs.microsoft.com/en-us/xamarin/cross-platform/deploy-test/linker), since they contain the assembly name.
+
 ## Removed `System.nint` and `System.nuint`
 
 The two types `System.nint` and `System.nuint` (which despite their `System`
diff --git a/dotnet/package/common.csproj b/dotnet/package/common.csproj
index 2a073cdaf83b..8e0860dac264 100644
--- a/dotnet/package/common.csproj
+++ b/dotnet/package/common.csproj
@@ -31,9 +31,9 @@
     <NupkgPath Condition=" '$(NupkgPath)' == '' ">$([MSBuild]::NormalizeDirectory ('$(_buildPath)\nupkgs\'))</NupkgPath>
     <BarManifestOutputPath Condition=" '$(BarManifestOutputPath)' == '' ">$(NupkgPath)\bar-manifests</BarManifestOutputPath>
     <_AssemblyInfix Condition="'$(_PlatformName)' == 'iOS'">iOS</_AssemblyInfix>
-    <_AssemblyInfix Condition="'$(_PlatformName)' == 'tvOS'">TVOS</_AssemblyInfix>
-    <_AssemblyInfix Condition="'$(_PlatformName)' == 'watchOS'">WatchOS</_AssemblyInfix>
-    <_AssemblyInfix Condition="'$(_PlatformName)' == 'macOS'">Mac</_AssemblyInfix>
+    <_AssemblyInfix Condition="'$(_PlatformName)' == 'tvOS'">tvOS</_AssemblyInfix>
+    <_AssemblyInfix Condition="'$(_PlatformName)' == 'watchOS'">watchOS</_AssemblyInfix>
+    <_AssemblyInfix Condition="'$(_PlatformName)' == 'macOS'">macOS</_AssemblyInfix>
     <_AssemblyInfix Condition="'$(_PlatformName)' == 'MacCatalyst'">MacCatalyst</_AssemblyInfix>
   </PropertyGroup>
 
diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets
index 760f0677c7e2..5ac883680d6b 100644
--- a/dotnet/targets/Xamarin.Shared.Sdk.targets
+++ b/dotnet/targets/Xamarin.Shared.Sdk.targets
@@ -99,11 +99,7 @@
 	
 	<PropertyGroup>
 		<!-- Add a property that specifies the name of the platform assembly for each platform -->
-		<_PlatformAssemblyName Condition=" '$(_PlatformName)' == 'iOS' ">Xamarin.iOS</_PlatformAssemblyName>
-		<_PlatformAssemblyName Condition=" '$(_PlatformName)' == 'tvOS' ">Xamarin.TVOS</_PlatformAssemblyName>
-		<_PlatformAssemblyName Condition=" '$(_PlatformName)' == 'watchOS' ">Xamarin.WatchOS</_PlatformAssemblyName>
-		<_PlatformAssemblyName Condition=" '$(_PlatformName)' == 'macOS' ">Xamarin.Mac</_PlatformAssemblyName>
-		<_PlatformAssemblyName Condition=" '$(_PlatformName)' == 'MacCatalyst' ">Xamarin.MacCatalyst</_PlatformAssemblyName>
+		<_PlatformAssemblyName>Microsoft.$(_PlatformName)</_PlatformAssemblyName>
 
 		<!-- We have to set DebuggerSupport before importing Microsoft.NET.Sdk -->
 		<!-- That means we have to set _BundlerDebug before that, because DebuggerSupport depends on it -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index c0ba8fa5af94..03f3b2234092 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -8,9 +8,9 @@
       <Uri>https://github.com/dotnet/linker</Uri>
       <Sha>70dc7f6daaf50e8eb67afb91876b8efc8330103f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.2-mauipre.1.22102.15">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3da69c23c1f8f502ec2eb1d44ff2fe7522210282</Sha>
+      <Sha>4fde4c1824e644b051162b53c4fb4497a6563a13</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="6.0.0" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
diff --git a/eng/Versions.props b/eng/Versions.props
index de32ccd3829b..78acaa879492 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,6 +5,6 @@
     <MicrosoftNETILLinkTasksPackageVersion>6.0.200-1.22069.1</MicrosoftNETILLinkTasksPackageVersion>
     <MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
     <MicrosoftNETILStripTasksPackageVersion>6.0.0-rc.2.21468.3</MicrosoftNETILStripTasksPackageVersion>
-    <MicrosoftNETCoreAppRefPackageVersion>6.0.2-mauipre.1.22102.15</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>6.0.3</MicrosoftNETCoreAppRefPackageVersion>
   </PropertyGroup>
 </Project>
diff --git a/msbuild/Xamarin.Shared/Xamarin.Shared.props b/msbuild/Xamarin.Shared/Xamarin.Shared.props
index 0b2b9333f190..946c64b446cf 100644
--- a/msbuild/Xamarin.Shared/Xamarin.Shared.props
+++ b/msbuild/Xamarin.Shared/Xamarin.Shared.props
@@ -92,7 +92,7 @@ Copyright (C) 2020 Microsoft. All rights reserved.
 		<_XamarinBclPath Condition="'$(_PlatformName)' == 'tvOS'">$(_XamarinSdkRoot)/lib/mono/Xamarin.TVOS/</_XamarinBclPath>
 		<_XamarinBclPath Condition="'$(_PlatformName)' == 'watchOS'">$(_XamarinSdkRoot)/lib/mono/Xamarin.WatchOS/</_XamarinBclPath>
 	</PropertyGroup>
-	<PropertyGroup>
+	<PropertyGroup Condition="'$(UsingAppleNETSdk)' != 'true'">
 		<_XamarinPlatformAssemblyName Condition="'$(_PlatformName)' == 'MacCatalyst'">Xamarin.MacCatalyst.dll</_XamarinPlatformAssemblyName>
 		<_XamarinPlatformAssemblyName Condition="'$(_PlatformName)' == 'iOS'">Xamarin.iOS.dll</_XamarinPlatformAssemblyName>
 		<_XamarinPlatformAssemblyName Condition="'$(_PlatformName)' == 'tvOS'">Xamarin.TVOS.dll</_XamarinPlatformAssemblyName>
@@ -100,6 +100,9 @@ Copyright (C) 2020 Microsoft. All rights reserved.
 		<_XamarinPlatformAssemblyName Condition="'$(_PlatformName)' == 'macOS'">Xamarin.Mac.dll</_XamarinPlatformAssemblyName>
 		<_XamarinPlatformAssemblyPath>$(_XamarinBclPath)$(_XamarinPlatformAssemblyName)</_XamarinPlatformAssemblyPath>
 	</PropertyGroup>
+	<PropertyGroup Condition="'$(UsingAppleNETSdk)' == 'true'">
+		<_XamarinPlatformAssemblyPath>$(_XamarinBclPath)$(_PlatformAssemblyName).dll</_XamarinPlatformAssemblyPath>
+	</PropertyGroup>
 
 	<!-- Sometimes we've used different variable names for the same thing for Xamarin.iOS and Xamarin.Mac projects. Here we try to unify those variables -->
 	<PropertyGroup>
diff --git a/runtime/product.h b/runtime/product.h
index 1e8b6d3ef0a6..39554a8a3e8b 100644
--- a/runtime/product.h
+++ b/runtime/product.h
@@ -10,47 +10,72 @@
 
 #ifdef MONOTOUCH
   #if TARGET_OS_WATCH
-	#define PRODUCT                  "Xamarin.WatchOS"
+    #if DOTNET
+      #define PRODUCT    "Microsoft.watchOS"
+    #else
+      #define PRODUCT    "Xamarin.WatchOS"
+    #endif
   #elif TARGET_OS_MACCATALYST
-  #define PRODUCT                  "Xamarin.MacCatalyst"
+    #if DOTNET
+      #define PRODUCT    "Microsoft.MacCatalyst"
+    #else
+      #define PRODUCT    "Xamarin.MacCatalyst"
+    #endif
   #elif TARGET_OS_IOS
-	#define PRODUCT                  "Xamarin.iOS"
+    #if DOTNET
+      #define PRODUCT                  "Microsoft.iOS"
+    #else
+      #define PRODUCT                  "Xamarin.iOS"
+    #endif
   #elif TARGET_OS_TV
-    #define PRODUCT                  "Xamarin.TVOS"
+    #if DOTNET
+      #define PRODUCT                  "Microsoft.tvOS"
+    #else
+      #define PRODUCT                  "Xamarin.TVOS"
+    #endif
   #else
     #error Unknown MONOTOUCH product
   #endif
-  #if TARGET_OS_WATCH
-	#define PRODUCT_DUAL_ASSEMBLY    "Xamarin.WatchOS.dll"
-  #elif TARGET_OS_MACCATALYST
-  #define PRODUCT_DUAL_ASSEMBLY    "Xamarin.MacCatalyst.dll"
-  #elif TARGET_OS_IOS
-	#define PRODUCT_DUAL_ASSEMBLY    "Xamarin.iOS.dll"
-  #elif TARGET_OS_TV
-    #define PRODUCT_DUAL_ASSEMBLY    "Xamarin.TVOS.dll"
-  #else
-    #error Unknown MONOTOUCH product for dual assembly
+  #if !DOTNET
+    #if TARGET_OS_WATCH
+      #define PRODUCT_DUAL_ASSEMBLY    "Xamarin.WatchOS.dll"
+    #elif TARGET_OS_MACCATALYST
+      #define PRODUCT_DUAL_ASSEMBLY    "Xamarin.MacCatalyst.dll"
+    #elif TARGET_OS_IOS
+      #define PRODUCT_DUAL_ASSEMBLY    "Xamarin.iOS.dll"
+    #elif TARGET_OS_TV
+      #define PRODUCT_DUAL_ASSEMBLY    "Xamarin.TVOS.dll"
+    #else
+      #error Unknown MONOTOUCH product for dual assembly
+    #endif
   #endif
   #if DOTNET
     #define PRODUCT_EXCEPTION_TYPE   "ObjCException"
   #else
     #define PRODUCT_EXCEPTION_TYPE   "MonoTouchException"
   #endif
-	#ifdef __LP64__
-		#define ARCH_SUBDIR ".monotouch-64"
-	#else
-		#define ARCH_SUBDIR ".monotouch-32"
-	#endif
-
+  #ifdef __LP64__
+    #define ARCH_SUBDIR ".monotouch-64"
+  #else
+    #define ARCH_SUBDIR ".monotouch-32"
+  #endif
 #elif MONOMAC
-	#define PRODUCT                  "Xamarin.Mac"
-	#define PRODUCT_DUAL_ASSEMBLY    "Xamarin.Mac.dll"
-	#define PRODUCT_EXCEPTION_TYPE   "ObjCException"
-	#define ARCH_SUBDIR				
+  #if DOTNET
+    #define PRODUCT                  "Microsoft.macOS"
+  #else
+    #define PRODUCT                  "Xamarin.Mac"
+    #define PRODUCT_DUAL_ASSEMBLY    "Xamarin.Mac.dll"
+  #endif
+  #define PRODUCT_EXCEPTION_TYPE   "ObjCException"
+  #define ARCH_SUBDIR        
 #else
     #error Either MONOTOUCH or MONOMAC must be defined.
 #endif
 
+#if DOTNET
+  #define PRODUCT_DUAL_ASSEMBLY PRODUCT ".dll"
+#endif
+
 // Set RuntimeIdentifier defines
 #if TARGET_OS_MACCATALYST
   #define RUNTIMEIDENTIFIER_PLATFORM    "maccatalyst"
diff --git a/src/ILLink.LinkAttributes.tvos.xml b/src/ILLink.LinkAttributes.tvos.xml
index 11d5ee9cdeaa..e8575696b259 100644
--- a/src/ILLink.LinkAttributes.tvos.xml
+++ b/src/ILLink.LinkAttributes.tvos.xml
@@ -1,5 +1,5 @@
 <linker>
-  <assembly fullname="Xamarin.TVOS">
+  <assembly fullname="Microsoft.tvOS">
     <!-- Foundation -->
     <type fullname="Foundation.AdviceAttribute">
       <attribute internal="RemoveAttributeInstances" />
diff --git a/src/ILLink.Substitutions.MacCatalyst.xml b/src/ILLink.Substitutions.MacCatalyst.xml
index fb0e007c00d5..0b9d639ef39e 100644
--- a/src/ILLink.Substitutions.MacCatalyst.xml
+++ b/src/ILLink.Substitutions.MacCatalyst.xml
@@ -1,5 +1,5 @@
 <linker>
-  <assembly fullname="Xamarin.MacCatalyst">
+  <assembly fullname="Microsoft.MacCatalyst">
     <type fullname="ObjCRuntime.Dlfcn">
       <method signature="System.Void WarnOnce()" body="stub" feature="System.Diagnostics.Debugger.IsSupported" featurevalue="false" />
     </type>
diff --git a/src/ILLink.Substitutions.ios.xml b/src/ILLink.Substitutions.ios.xml
index de6e315bd503..af423bf9d212 100644
--- a/src/ILLink.Substitutions.ios.xml
+++ b/src/ILLink.Substitutions.ios.xml
@@ -1,5 +1,5 @@
 <linker>
-  <assembly fullname="Xamarin.iOS">
+  <assembly fullname="Microsoft.iOS">
     <type fullname="ObjCRuntime.Dlfcn">
       <method signature="System.Void WarnOnce()" body="stub" feature="System.Diagnostics.Debugger.IsSupported" featurevalue="false" />
     </type>
diff --git a/src/ILLink.Substitutions.macOS.xml b/src/ILLink.Substitutions.macOS.xml
index 91a71cc698bd..3ab27d24199e 100644
--- a/src/ILLink.Substitutions.macOS.xml
+++ b/src/ILLink.Substitutions.macOS.xml
@@ -1,5 +1,5 @@
 <linker>
-  <assembly fullname="Xamarin.Mac">
+  <assembly fullname="Microsoft.macOS">
     <type fullname="ObjCRuntime.Dlfcn">
       <method signature="System.Void WarnOnce()" body="stub" feature="System.Diagnostics.Debugger.IsSupported" featurevalue="false" />
     </type>
diff --git a/src/ILLink.Substitutions.tvos.xml b/src/ILLink.Substitutions.tvos.xml
index 1718ec386b6a..50fcf04fedfc 100644
--- a/src/ILLink.Substitutions.tvos.xml
+++ b/src/ILLink.Substitutions.tvos.xml
@@ -1,5 +1,5 @@
 <linker>
-  <assembly fullname="Xamarin.TVOS">
+  <assembly fullname="Microsoft.tvOS">
     <type fullname="ObjCRuntime.Dlfcn">
       <method signature="System.Void WarnOnce()" body="stub" feature="System.Diagnostics.Debugger.IsSupported" featurevalue="false" />
     </type>
diff --git a/src/Makefile b/src/Makefile
index 1d567f56da1d..479839244f69 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -184,7 +184,7 @@ $(IOS_BUILD_DIR)/AssemblyInfo.cs: $(TOP)/src/AssemblyInfo.cs.in | $(IOS_BUILD_DI
 	$(Q) touch $@
 
 $(IOS_DOTNET_BUILD_DIR)/ILLink.LinkAttributes.xml: $(TOP)/src/ILLink.LinkAttributes.xml.in | $(IOS_DOTNET_BUILD_DIR)
-	$(call Q_PROF_GEN,ios) sed < $< > $@ 's|@PRODUCT_NAME@|$(IOS_PRODUCT)|g;'
+	$(call Q_PROF_GEN,ios) sed < $< > $@ 's|@PRODUCT_NAME@|Microsoft.iOS|g;'
 
 $(IOS_DOTNET_BUILD_DIR)/ILLink.Substitutions.xml: $(TOP)/src/ILLink.Substitutions.ios.xml | $(IOS_DOTNET_BUILD_DIR)
 	$(Q) $(CP) $< $@
@@ -261,8 +261,8 @@ $(IOS_BUILD_DIR)/native-$(1)%Xamarin.iOS.dll $(IOS_BUILD_DIR)/native-$(1)%Xamari
 		@$(BUILD_DIR)/ios-defines.rsp \
 		$$(IOS_SOURCES) @$(IOS_BUILD_DIR)/native/generated_sources
 
-$(IOS_DOTNET_BUILD_DIR)/$(1)/Xamarin.iOS%dll $(IOS_DOTNET_BUILD_DIR)/$(1)/Xamarin.iOS%pdb $(2): $$(IOS_DOTNET_SOURCES) $$(IOS_DOTNET_BUILD_DIR)/ios-generated-sources $$(IOS_DOTNET_BUILD_DIR)/ILLink.LinkAttributes.xml $$(IOS_DOTNET_BUILD_DIR)/ILLink.Substitutions.xml $(PRODUCT_KEY_PATH) | $(IOS_DOTNET_BUILD_DIR)/$(1) $(IOS_DOTNET_BUILD_DIR)/ref
-	$$(call Q_PROF_CSC,dotnet/$(1)-bit) $(DOTNET6_CSC) $(DOTNET_FLAGS) -out:$(IOS_DOTNET_BUILD_DIR)/$(1)/Xamarin.iOS.dll -unsafe -optimize \
+$(IOS_DOTNET_BUILD_DIR)/$(1)/Microsoft.iOS%dll $(IOS_DOTNET_BUILD_DIR)/$(1)/Microsoft.iOS%pdb $(2): $$(IOS_DOTNET_SOURCES) $$(IOS_DOTNET_BUILD_DIR)/ios-generated-sources $$(IOS_DOTNET_BUILD_DIR)/ILLink.LinkAttributes.xml $$(IOS_DOTNET_BUILD_DIR)/ILLink.Substitutions.xml $(PRODUCT_KEY_PATH) | $(IOS_DOTNET_BUILD_DIR)/$(1) $(IOS_DOTNET_BUILD_DIR)/ref
+	$$(call Q_PROF_CSC,dotnet/$(1)-bit) $(DOTNET6_CSC) $(DOTNET_FLAGS) -out:$(IOS_DOTNET_BUILD_DIR)/$(1)/Microsoft.iOS.dll -unsafe -optimize \
 		$$(ARGS_$(1)) \
 		-publicsign -keyfile:$(PRODUCT_KEY_PATH) \
 		$(3) \
@@ -283,7 +283,7 @@ $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1/%: $(IOS_BUILD_DIR)/compat/%
 	$(Q) $(CP) $< $@
 
 $(eval $(call IOS_TARGETS_template,32))
-$(eval $(call IOS_TARGETS_template,64,$(IOS_DOTNET_BUILD_DIR)/ref/Xamarin.iOS%dll,-refout:$(IOS_DOTNET_BUILD_DIR)/ref/Xamarin.iOS.dll,$(IOS_BUILD_DIR)/reference%Xamarin.iOS.dll,-refout:$(IOS_BUILD_DIR)/reference/Xamarin.iOS.dll))
+$(eval $(call IOS_TARGETS_template,64,$(IOS_DOTNET_BUILD_DIR)/ref/Microsoft.iOS%dll,-refout:$(IOS_DOTNET_BUILD_DIR)/ref/Microsoft.iOS.dll,$(IOS_BUILD_DIR)/reference%Xamarin.iOS.dll,-refout:$(IOS_BUILD_DIR)/reference/Xamarin.iOS.dll))
 
 # MonoTouch.Dialog-1
 $(IOS_BUILD_DIR)/reference/MonoTouch.Dialog-1.dll: $(MACIOS_BINARIES_PATH)/MonoTouch.Dialog-Unified/ios/MonoTouch.Dialog-1.dll | $(IOS_BUILD_DIR)/reference
@@ -360,12 +360,12 @@ IOS_TARGETS += \
 	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits/iOS/Xamarin.iOS.pdb               \
 
 DOTNET_TARGETS += \
-	$(IOS_DOTNET_BUILD_DIR)/32/Xamarin.iOS.dll \
-	$(IOS_DOTNET_BUILD_DIR)/64/Xamarin.iOS.dll \
-	$(IOS_DOTNET_BUILD_DIR)/ref/Xamarin.iOS.dll \
-	$(DOTNET_DESTDIR)/$(IOS_NUGET).Ref/ref/net6.0/Xamarin.iOS.dll \
-	$(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.iOS.dll) \
-	$(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.iOS.pdb) \
+	$(IOS_DOTNET_BUILD_DIR)/32/Microsoft.iOS.dll \
+	$(IOS_DOTNET_BUILD_DIR)/64/Microsoft.iOS.dll \
+	$(IOS_DOTNET_BUILD_DIR)/ref/Microsoft.iOS.dll \
+	$(DOTNET_DESTDIR)/$(IOS_NUGET).Ref/ref/net6.0/Microsoft.iOS.dll \
+	$(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Microsoft.iOS.dll) \
+	$(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Microsoft.iOS.pdb) \
 
 DOTNET_TARGETS_DIRS += \
 	$(IOS_DOTNET_BUILD_DIR) \
@@ -401,7 +401,7 @@ $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/%.pdb: $(IOS_BUILD_DIR)/r
 $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/%.config: $(IOS_BUILD_DIR)/reference/%.config | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS
 	$(Q) install -m 0644 $< $@
 
-$(DOTNET_DESTDIR)/$(IOS_NUGET).Ref/ref/net6.0/Xamarin.iOS.dll: $(IOS_DOTNET_BUILD_DIR)/ref/Xamarin.iOS.dll | $(DOTNET_DESTDIR)/$(IOS_NUGET).Ref/ref/net6.0
+$(DOTNET_DESTDIR)/$(IOS_NUGET).Ref/ref/net6.0/Microsoft.iOS.dll: $(IOS_DOTNET_BUILD_DIR)/ref/Microsoft.iOS.dll | $(DOTNET_DESTDIR)/$(IOS_NUGET).Ref/ref/net6.0
 	$(Q) $(CP) $< $@
 
 # the actual architecture-specific versions
@@ -417,16 +417,16 @@ $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits/iOS/Xamarin.iOS.dll: $(IOS_BUILD_DI
 $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits/iOS/Xamarin.iOS.pdb: $(IOS_BUILD_DIR)/native-64/Xamarin.iOS.pdb | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits/iOS
 	$(Q) install -m 0644 $< $@
 
-$(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS_32),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.iOS.dll): $(IOS_DOTNET_BUILD_DIR)/32/Xamarin.iOS.dll | $(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS_32),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0)
+$(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS_32),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Microsoft.iOS.dll): $(IOS_DOTNET_BUILD_DIR)/32/Microsoft.iOS.dll | $(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS_32),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0)
 	$(Q) $(CP) $< $@
 
-$(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS_32),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.iOS.pdb): $(IOS_DOTNET_BUILD_DIR)/32/Xamarin.iOS.pdb | $(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS_32),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0)
+$(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS_32),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Microsoft.iOS.pdb): $(IOS_DOTNET_BUILD_DIR)/32/Microsoft.iOS.pdb | $(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS_32),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0)
 	$(Q) $(CP) $< $@
 
-$(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS_64),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.iOS.dll): $(IOS_DOTNET_BUILD_DIR)/64/Xamarin.iOS.dll | $(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS_64),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0)
+$(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS_64),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Microsoft.iOS.dll): $(IOS_DOTNET_BUILD_DIR)/64/Microsoft.iOS.dll | $(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS_64),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0)
 	$(Q) $(CP) $< $@
 
-$(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS_64),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.iOS.pdb): $(IOS_DOTNET_BUILD_DIR)/64/Xamarin.iOS.pdb | $(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS_64),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0)
+$(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS_64),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Microsoft.iOS.pdb): $(IOS_DOTNET_BUILD_DIR)/64/Microsoft.iOS.pdb | $(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS_64),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0)
 	$(Q) $(CP) $< $@
 
 $(IOS_TARGETS_DIRS):
@@ -556,7 +556,7 @@ $(MAC_BUILD_DIR)/AssemblyInfo.cs: $(TOP)/src/AssemblyInfo.cs.in | $(MAC_BUILD_DI
 	$(Q) touch $@
 
 $(MACOS_DOTNET_BUILD_DIR)/ILLink.LinkAttributes.xml: $(TOP)/src/ILLink.LinkAttributes.xml.in | $(MACOS_DOTNET_BUILD_DIR)
-	$(call Q_PROF_GEN,mac) sed < $< > $@ 's|@PRODUCT_NAME@|$(MAC_PRODUCT)|g;'
+	$(call Q_PROF_GEN,mac) sed < $< > $@ 's|@PRODUCT_NAME@|Microsoft.macOS|g;'
 
 $(MACOS_DOTNET_BUILD_DIR)/ILLink.Substitutions.xml: $(TOP)/src/ILLink.Substitutions.macOS.xml | $(MACOS_DOTNET_BUILD_DIR)
 	$(Q) $(CP) $< $@
@@ -638,7 +638,7 @@ $(MAC_BUILD_DIR)/%-reference/Xamarin.Mac.pdb: $(MAC_BUILD_DIR)/%-64/Xamarin.Mac.
 	@mkdir -p $(@D)
 	$(Q) $(CP) $^ $@
 
-$(DOTNET_DESTDIR)/$(MACOS_NUGET).Ref/ref/net6.0/Xamarin.Mac.dll: $(MACOS_DOTNET_BUILD_DIR)/ref/Xamarin.Mac.dll | $(DOTNET_DESTDIR)/$(MACOS_NUGET).Ref/ref/net6.0
+$(DOTNET_DESTDIR)/$(MACOS_NUGET).Ref/ref/net6.0/Microsoft.macOS.dll: $(MACOS_DOTNET_BUILD_DIR)/ref/Microsoft.macOS.dll | $(DOTNET_DESTDIR)/$(MACOS_NUGET).Ref/ref/net6.0
 	$(Q) $(CP) $< $@
 
 ### .NET ###
@@ -668,11 +668,11 @@ $(MACOS_DOTNET_BUILD_DIR)/macos.rsp: Makefile Makefile.generator frameworks.sour
 		@$(DOTNET_BUILD_DIR)/macos-defines-dotnet.rsp \
 		> $@
 
-$(MACOS_DOTNET_BUILD_DIR)/64/Xamarin.Mac%dll $(MACOS_DOTNET_BUILD_DIR)/64/Xamarin.Mac%pdb $(MACOS_DOTNET_BUILD_DIR)/ref/Xamarin.Mac%dll: $(MACOS_DOTNET_BUILD_DIR)/macos-generated-sources $(MACOS_DOTNET_SOURCES) $(SN_KEY) $(MACOS_DOTNET_BUILD_DIR)/ILLink.LinkAttributes.xml $(MACOS_DOTNET_BUILD_DIR)/ILLink.Substitutions.xml | $(MACOS_DOTNET_BUILD_DIR)/64 $(MACOS_DOTNET_BUILD_DIR)/ref
+$(MACOS_DOTNET_BUILD_DIR)/64/Microsoft.macOS%dll $(MACOS_DOTNET_BUILD_DIR)/64/Microsoft.macOS%pdb $(MACOS_DOTNET_BUILD_DIR)/ref/Microsoft.macOS%dll: $(MACOS_DOTNET_BUILD_DIR)/macos-generated-sources $(MACOS_DOTNET_SOURCES) $(SN_KEY) $(MACOS_DOTNET_BUILD_DIR)/ILLink.LinkAttributes.xml $(MACOS_DOTNET_BUILD_DIR)/ILLink.Substitutions.xml | $(MACOS_DOTNET_BUILD_DIR)/64 $(MACOS_DOTNET_BUILD_DIR)/ref
 	$(Q_DOTNET_BUILD) \
-		$(DOTNET6_CSC) $(DOTNET_FLAGS) -out:$(MACOS_DOTNET_BUILD_DIR)/64/Xamarin.Mac.dll -optimize \
+		$(DOTNET6_CSC) $(DOTNET_FLAGS) -out:$(MACOS_DOTNET_BUILD_DIR)/64/Microsoft.macOS.dll -optimize \
 		-publicsign -keyfile:$(SN_KEY) \
-		-refout:$(MACOS_DOTNET_BUILD_DIR)/ref/Xamarin.Mac.dll \
+		-refout:$(MACOS_DOTNET_BUILD_DIR)/ref/Microsoft.macOS.dll \
 		$(MAC_COMMON_DEFINES) \
 		$(ARGS_64) \
 		-nowarn:3021,1635,612,618,0219,0414,$(MAC_WARNINGS_TO_FIX),$(WARNINGS_TO_IGNORE) \
@@ -686,11 +686,11 @@ $(MACOS_DOTNET_BUILD_DIR)/64/Xamarin.Mac%dll $(MACOS_DOTNET_BUILD_DIR)/64/Xamari
 
 ifdef INCLUDE_MAC
 DOTNET_TARGETS += \
-	$(MACOS_DOTNET_BUILD_DIR)/64/Xamarin.Mac.dll \
-	$(MACOS_DOTNET_BUILD_DIR)/ref/Xamarin.Mac.dll \
-	$(DOTNET_DESTDIR)/$(MACOS_NUGET).Ref/ref/net6.0/Xamarin.Mac.dll \
-	$(foreach rid,$(DOTNET_MACOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.Mac.dll) \
-	$(foreach rid,$(DOTNET_MACOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.Mac.pdb) \
+	$(MACOS_DOTNET_BUILD_DIR)/64/Microsoft.macOS.dll \
+	$(MACOS_DOTNET_BUILD_DIR)/ref/Microsoft.macOS.dll \
+	$(DOTNET_DESTDIR)/$(MACOS_NUGET).Ref/ref/net6.0/Microsoft.macOS.dll \
+	$(foreach rid,$(DOTNET_MACOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Microsoft.macOS.dll) \
+	$(foreach rid,$(DOTNET_MACOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Microsoft.macOS.pdb) \
 
 DOTNET_TARGETS_DIRS += \
 	$(MACOS_DOTNET_BUILD_DIR) \
@@ -784,10 +784,10 @@ $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/Xamarin.Mac/Xamarin.Mac.dll
 $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/Xamarin.Mac.dll $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/Xamarin.Mac.pdb: | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5
 	$(Q) ln -sF ../../reference/full/$(@F) $@
 
-$(foreach rid,$(DOTNET_MACOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.Mac.dll): $(MACOS_DOTNET_BUILD_DIR)/64/Xamarin.Mac.dll | $(foreach rid,$(DOTNET_MACOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0)
+$(foreach rid,$(DOTNET_MACOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Microsoft.macOS.dll): $(MACOS_DOTNET_BUILD_DIR)/64/Microsoft.macOS.dll | $(foreach rid,$(DOTNET_MACOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0)
 	$(Q) $(CP) $< $@
 
-$(foreach rid,$(DOTNET_MACOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.Mac.pdb): $(MACOS_DOTNET_BUILD_DIR)/64/Xamarin.Mac.pdb | $(foreach rid,$(DOTNET_MACOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0)
+$(foreach rid,$(DOTNET_MACOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Microsoft.macOS.pdb): $(MACOS_DOTNET_BUILD_DIR)/64/Microsoft.macOS.pdb | $(foreach rid,$(DOTNET_MACOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0)
 	$(Q) $(CP) $< $@
 
 $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/pkgconfig/xammac.pc: $(TOP)/Make.config | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/pkgconfig
@@ -861,7 +861,7 @@ $(WATCH_BUILD_DIR)/AssemblyInfo.cs: $(TOP)/src/AssemblyInfo.cs.in $(TOP)/Make.co
 
 $(WATCH_DOTNET_BUILD_DIR)/ILLink.LinkAttributes.xml: $(TOP)/src/ILLink.LinkAttributes.xml.in
 	$(Q) mkdir -p $(WATCH_DOTNET_BUILD_DIR)
-	$(call Q_PROF_GEN,watch) sed < $< > $@ 's|@PRODUCT_NAME@|Xamarin.WatchOS|g;'
+	$(call Q_PROF_GEN,watch) sed < $< > $@ 's|@PRODUCT_NAME@|Microsoft.watchOS|g;'
 
 $(WATCH_BUILD_DIR)/watch/core.dll: $(WATCHOS_CORE_SOURCES) frameworks.sources $(BUILD_DIR)/watchos-defines.rsp | $(WATCH_BUILD_DIR)/watch
 	@mkdir -p $(WATCH_BUILD_DIR)/watch
@@ -1231,11 +1231,11 @@ $(TVOS_DOTNET_BUILD_DIR)/tvos.rsp: Makefile Makefile.generator frameworks.source
 		@$(DOTNET_BUILD_DIR)/tvos-defines-dotnet.rsp \
 		> $@
 
-$(TVOS_DOTNET_BUILD_DIR)/64/Xamarin.TVOS%dll $(TVOS_DOTNET_BUILD_DIR)/64/Xamarin.TVOS%pdb $(TVOS_DOTNET_BUILD_DIR)/ref/Xamarin.TVOS%dll: $(TVOS_DOTNET_BUILD_DIR)/tvos-generated-sources $(TVOS_DOTNET_SOURCES) $(PRODUCT_KEY_PATH) $(TVOS_DOTNET_BUILD_DIR)/ILLink.LinkAttributes.xml $(TVOS_DOTNET_BUILD_DIR)/ILLink.Substitutions.xml | $(TVOS_DOTNET_BUILD_DIR)/64 $(TVOS_DOTNET_BUILD_DIR)/ref
+$(TVOS_DOTNET_BUILD_DIR)/64/Microsoft.tvOS%dll $(TVOS_DOTNET_BUILD_DIR)/64/Microsoft.tvOS%pdb $(TVOS_DOTNET_BUILD_DIR)/ref/Microsoft.tvOS%dll: $(TVOS_DOTNET_BUILD_DIR)/tvos-generated-sources $(TVOS_DOTNET_SOURCES) $(PRODUCT_KEY_PATH) $(TVOS_DOTNET_BUILD_DIR)/ILLink.LinkAttributes.xml $(TVOS_DOTNET_BUILD_DIR)/ILLink.Substitutions.xml | $(TVOS_DOTNET_BUILD_DIR)/64 $(TVOS_DOTNET_BUILD_DIR)/ref
 	$(Q_DOTNET_GEN) \
-		$(DOTNET6_CSC) $(DOTNET_FLAGS) -out:$(TVOS_DOTNET_BUILD_DIR)/64/Xamarin.TVOS.dll -optimize \
+		$(DOTNET6_CSC) $(DOTNET_FLAGS) -out:$(TVOS_DOTNET_BUILD_DIR)/64/Microsoft.tvOS.dll -optimize \
 		-publicsign -keyfile:$(PRODUCT_KEY_PATH) \
-		-refout:$(TVOS_DOTNET_BUILD_DIR)/ref/Xamarin.TVOS.dll \
+		-refout:$(TVOS_DOTNET_BUILD_DIR)/ref/Microsoft.tvOS.dll \
 		$(TVOS_DEFINES) \
 		$(ARGS_64) \
 		$(TVOS_WARNINGS_TO_FIX) \
@@ -1384,7 +1384,7 @@ $(MACCATALYST_BUILD_DIR)/AssemblyInfo.cs: $(TOP)/src/AssemblyInfo.cs.in $(TOP)/M
 	$(Q) touch $@
 
 $(MACCATALYST_DOTNET_BUILD_DIR)/ILLink.LinkAttributes.xml: $(TOP)/src/ILLink.LinkAttributes.xml.in | $(MACCATALYST_DOTNET_BUILD_DIR)
-	$(call Q_PROF_GEN,maccatalyst) sed < $< > $@ 's|@PRODUCT_NAME@|Xamarin.MacCatalyst|g;'
+	$(call Q_PROF_GEN,maccatalyst) sed < $< > $@ 's|@PRODUCT_NAME@|Microsoft.MacCatalyst|g;'
 
 $(MACCATALYST_DOTNET_BUILD_DIR)/ILLink.Substitutions.xml: $(TOP)/src/ILLink.Substitutions.MacCatalyst.xml | $(MACCATALYST_DOTNET_BUILD_DIR)
 	$(Q) $(CP) $< $@
@@ -1416,11 +1416,11 @@ $(MACCATALYST_DOTNET_BUILD_DIR)/maccatalyst.rsp: Makefile Makefile.generator fra
 		@$(DOTNET_BUILD_DIR)/maccatalyst-defines-dotnet.rsp \
 		> $@
 
-$(MACCATALYST_DOTNET_BUILD_DIR)/64/Xamarin.MacCatalyst%dll $(MACCATALYST_DOTNET_BUILD_DIR)/64/Xamarin.MacCatalyst%pdb $(MACCATALYST_DOTNET_BUILD_DIR)/ref/Xamarin.MacCatalyst%dll: $(MACCATALYST_DOTNET_BUILD_DIR)/maccatalyst-generated-sources $(MACCATALYST_DOTNET_SOURCES) $(PRODUCT_KEY_PATH) $(MACCATALYST_DOTNET_BUILD_DIR)/ILLink.LinkAttributes.xml $(MACCATALYST_DOTNET_BUILD_DIR)/ILLink.Substitutions.xml | $(MACCATALYST_DOTNET_BUILD_DIR)/64 $(MACCATALYST_DOTNET_BUILD_DIR)/ref
+$(MACCATALYST_DOTNET_BUILD_DIR)/64/Microsoft.MacCatalyst%dll $(MACCATALYST_DOTNET_BUILD_DIR)/64/Microsoft.MacCatalyst%pdb $(MACCATALYST_DOTNET_BUILD_DIR)/ref/Microsoft.MacCatalyst%dll: $(MACCATALYST_DOTNET_BUILD_DIR)/maccatalyst-generated-sources $(MACCATALYST_DOTNET_SOURCES) $(PRODUCT_KEY_PATH) $(MACCATALYST_DOTNET_BUILD_DIR)/ILLink.LinkAttributes.xml $(MACCATALYST_DOTNET_BUILD_DIR)/ILLink.Substitutions.xml | $(MACCATALYST_DOTNET_BUILD_DIR)/64 $(MACCATALYST_DOTNET_BUILD_DIR)/ref
 	$(Q_DOTNET_GEN) \
-		$(DOTNET6_CSC) $(DOTNET_FLAGS) -out:$(MACCATALYST_DOTNET_BUILD_DIR)/64/Xamarin.MacCatalyst.dll -optimize \
+		$(DOTNET6_CSC) $(DOTNET_FLAGS) -out:$(MACCATALYST_DOTNET_BUILD_DIR)/64/Microsoft.MacCatalyst.dll -optimize \
 		-publicsign -keyfile:$(PRODUCT_KEY_PATH) \
-		-refout:$(MACCATALYST_DOTNET_BUILD_DIR)/ref/Xamarin.MacCatalyst.dll \
+		-refout:$(MACCATALYST_DOTNET_BUILD_DIR)/ref/Microsoft.MacCatalyst.dll \
 		$(MACCATALYST_DEFINES) \
 		$(ARGS_64) \
 		$(MACCATALYST_WARNINGS_TO_FIX) \
@@ -1443,11 +1443,11 @@ MACCATALYST_TARGETS_DIRS +=                                                 \
 
 ifdef INCLUDE_MACCATALYST
 DOTNET_TARGETS += \
-	$(MACCATALYST_DOTNET_BUILD_DIR)/64/Xamarin.MacCatalyst.dll \
-	$(MACCATALYST_DOTNET_BUILD_DIR)/ref/Xamarin.MacCatalyst.dll \
-	$(DOTNET_DESTDIR)/$(MACCATALYST_NUGET).Ref/ref/net6.0/Xamarin.MacCatalyst.dll \
-	$(foreach rid,$(DOTNET_MACCATALYST_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACCATALYST_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.MacCatalyst.dll) \
-	$(foreach rid,$(DOTNET_MACCATALYST_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACCATALYST_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.MacCatalyst.pdb) \
+	$(MACCATALYST_DOTNET_BUILD_DIR)/64/Microsoft.MacCatalyst.dll \
+	$(MACCATALYST_DOTNET_BUILD_DIR)/ref/Microsoft.MacCatalyst.dll \
+	$(DOTNET_DESTDIR)/$(MACCATALYST_NUGET).Ref/ref/net6.0/Microsoft.MacCatalyst.dll \
+	$(foreach rid,$(DOTNET_MACCATALYST_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACCATALYST_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Microsoft.MacCatalyst.dll) \
+	$(foreach rid,$(DOTNET_MACCATALYST_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACCATALYST_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Microsoft.MacCatalyst.pdb) \
 
 DOTNET_TARGETS_DIRS += \
 	$(MACCATALYST_DOTNET_BUILD_DIR) \
@@ -1463,10 +1463,10 @@ endif
 $(DOTNET_DESTDIR)/$(MACCATALYST_NUGET).Ref/ref/net6.0/%.dll: $(MACCATALYST_DOTNET_BUILD_DIR)/ref/%.dll | $(DOTNET_DESTDIR)/$(MACCATALYST_NUGET).Ref/ref/net6.0
 	$(Q) $(CP) $< $@
 
-$(foreach rid,$(DOTNET_MACCATALYST_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACCATALYST_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.MacCatalyst.dll): $(MACCATALYST_DOTNET_BUILD_DIR)/64/Xamarin.MacCatalyst.dll | $(foreach rid,$(DOTNET_MACCATALYST_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACCATALYST_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0)
+$(foreach rid,$(DOTNET_MACCATALYST_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACCATALYST_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Microsoft.MacCatalyst.dll): $(MACCATALYST_DOTNET_BUILD_DIR)/64/Microsoft.MacCatalyst.dll | $(foreach rid,$(DOTNET_MACCATALYST_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACCATALYST_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0)
 	$(Q) $(CP) $< $@
 
-$(foreach rid,$(DOTNET_MACCATALYST_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACCATALYST_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.MacCatalyst.pdb): $(MACCATALYST_DOTNET_BUILD_DIR)/64/Xamarin.MacCatalyst.pdb | $(foreach rid,$(DOTNET_MACCATALYST_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACCATALYST_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0)
+$(foreach rid,$(DOTNET_MACCATALYST_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACCATALYST_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Microsoft.MacCatalyst.pdb): $(MACCATALYST_DOTNET_BUILD_DIR)/64/Microsoft.MacCatalyst.pdb | $(foreach rid,$(DOTNET_MACCATALYST_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACCATALYST_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0)
 	$(Q) $(CP) $< $@
 
 $(MACCATALYST_TARGETS_DIRS):
@@ -1476,11 +1476,11 @@ $(MACCATALYST_TARGETS_DIRS):
 
 ifdef INCLUDE_TVOS
 DOTNET_TARGETS += \
-	$(TVOS_DOTNET_BUILD_DIR)/64/Xamarin.TVOS.dll \
-	$(TVOS_DOTNET_BUILD_DIR)/ref/Xamarin.TVOS.dll \
-	$(DOTNET_DESTDIR)/$(TVOS_NUGET).Ref/ref/net6.0/Xamarin.TVOS.dll \
-	$(foreach rid,$(DOTNET_TVOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(TVOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.TVOS.dll) \
-	$(foreach rid,$(DOTNET_TVOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(TVOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.TVOS.pdb) \
+	$(TVOS_DOTNET_BUILD_DIR)/64/Microsoft.tvOS.dll \
+	$(TVOS_DOTNET_BUILD_DIR)/ref/Microsoft.tvOS.dll \
+	$(DOTNET_DESTDIR)/$(TVOS_NUGET).Ref/ref/net6.0/Microsoft.tvOS.dll \
+	$(foreach rid,$(DOTNET_TVOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(TVOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Microsoft.tvOS.dll) \
+	$(foreach rid,$(DOTNET_TVOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(TVOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Microsoft.tvOS.pdb) \
 
 DOTNET_TARGETS_DIRS += \
 	$(TVOS_DOTNET_BUILD_DIR) \
@@ -1502,7 +1502,7 @@ $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS/%.pdb: $(TVOS_BUILD_DIR)
 $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS/%.config: $(TVOS_BUILD_DIR)/reference/%.config | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS
 	$(Q) install -m 0644 $< $@
 
-$(DOTNET_DESTDIR)/$(TVOS_NUGET).Ref/ref/net6.0/Xamarin.TVOS.dll: $(TVOS_DOTNET_BUILD_DIR)/ref/Xamarin.TVOS.dll | $(DOTNET_DESTDIR)/$(TVOS_NUGET).Ref/ref/net6.0
+$(DOTNET_DESTDIR)/$(TVOS_NUGET).Ref/ref/net6.0/Microsoft.tvOS.dll: $(TVOS_DOTNET_BUILD_DIR)/ref/Microsoft.tvOS.dll | $(DOTNET_DESTDIR)/$(TVOS_NUGET).Ref/ref/net6.0
 	$(Q) $(CP) $< $@
 
 # the actual architecture-specific versions
@@ -1512,10 +1512,10 @@ $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits/tvOS/Xamarin.TVOS.dll: $(TVOS_BUILD
 $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits/tvOS/Xamarin.TVOS.pdb: $(TVOS_BUILD_DIR)/tvos-64/Xamarin.TVOS.pdb | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits/tvOS
 	$(Q) install -m 0644 $< $@
 
-$(foreach rid,$(DOTNET_TVOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(TVOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.TVOS.dll): $(TVOS_DOTNET_BUILD_DIR)/64/Xamarin.TVOS.dll | $(foreach rid,$(DOTNET_TVOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(TVOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0)
+$(foreach rid,$(DOTNET_TVOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(TVOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Microsoft.tvOS.dll): $(TVOS_DOTNET_BUILD_DIR)/64/Microsoft.tvOS.dll | $(foreach rid,$(DOTNET_TVOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(TVOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0)
 	$(Q) $(CP) $< $@
 
-$(foreach rid,$(DOTNET_TVOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(TVOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.TVOS.pdb): $(TVOS_DOTNET_BUILD_DIR)/64/Xamarin.TVOS.pdb | $(foreach rid,$(DOTNET_TVOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(TVOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0)
+$(foreach rid,$(DOTNET_TVOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(TVOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Microsoft.tvOS.pdb): $(TVOS_DOTNET_BUILD_DIR)/64/Microsoft.tvOS.pdb | $(foreach rid,$(DOTNET_TVOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(TVOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0)
 	$(Q) $(CP) $< $@
 
 $(TVOS_TARGETS_DIRS):
diff --git a/src/ObjCRuntime/Registrar.cs b/src/ObjCRuntime/Registrar.cs
index da8e4f3b5807..c3e51b2f4bb1 100644
--- a/src/ObjCRuntime/Registrar.cs
+++ b/src/ObjCRuntime/Registrar.cs
@@ -1284,30 +1284,50 @@ internal string AssemblyName
 			get {
 				switch (App.Platform) {
 				case ApplePlatform.iOS:
-					return "Xamarin.iOS";
+					return Driver.IsDotNet ? "Microsoft.iOS" : "Xamarin.iOS";
 				case ApplePlatform.WatchOS:
-					return "Xamarin.WatchOS";
+					return Driver.IsDotNet ? "Microsoft.watchOS" : "Xamarin.WatchOS";
 				case ApplePlatform.TVOS:
-					return "Xamarin.TVOS";
+					return Driver.IsDotNet ? "Microsoft.tvOS" : "Xamarin.TVOS";
 				case ApplePlatform.MacOSX:
-					return "Xamarin.Mac";
+					return Driver.IsDotNet ? "Microsoft.macOS" : "Xamarin.Mac";
 				case ApplePlatform.MacCatalyst:
-					return "Xamarin.MacCatalyst";
+					return Driver.IsDotNet ? "Microsoft.MacCatalyst" : "Xamarin.MacCatalyst";
 				default:
 					throw ErrorHelper.CreateError (71, Errors.MX0071, App.Platform, App.ProductName);
 				}
 			}
 		}
 #elif MONOMAC
+#if NET
+		internal const string AssemblyName = "Microsoft.macOS";
+#else
 		internal const string AssemblyName = "Xamarin.Mac";
+#endif
 #elif WATCH
+#if NET
+		internal const string AssemblyName = "Microsoft.watchOS";
+#else
 		internal const string AssemblyName = "Xamarin.WatchOS";
+#endif
 #elif TVOS
+#if NET
+		internal const string AssemblyName = "Microsoft.tvOS";
+#else
 		internal const string AssemblyName = "Xamarin.TVOS";
+#endif
 #elif __MACCATALYST__
+#if NET
+		internal const string AssemblyName = "Microsoft.MacCatalyst";
+#else
 		internal const string AssemblyName = "Xamarin.MacCatalyst";
+#endif
 #elif IOS
+#if NET
+		internal const string AssemblyName = "Microsoft.iOS";
+#else
 		internal const string AssemblyName = "Xamarin.iOS";
+#endif
 #else
 #error Unknown platform
 #endif
diff --git a/src/generator.cs b/src/generator.cs
index 1e2d2fa8200c..a5742090d05f 100644
--- a/src/generator.cs
+++ b/src/generator.cs
@@ -6448,15 +6448,15 @@ string GetAssemblyName ()
 
 		switch (BindingTouch.TargetFramework.Platform) {
 		case ApplePlatform.iOS:
-			return "Xamarin.iOS";
+			return BindingTouch.IsDotNet ? "Microsoft.iOS" : "Xamarin.iOS";
 		case ApplePlatform.MacOSX:
-			return "Xamarin.Mac";
+			return BindingTouch.IsDotNet ? "Microsoft.macOS" : "Xamarin.Mac";
 		case ApplePlatform.TVOS:
-			return "Xamarin.TVOS";
+			return BindingTouch.IsDotNet ? "Microsoft.tvOS" : "Xamarin.TVOS";
 		case ApplePlatform.WatchOS:
-			return "Xamarin.WatchOS";
+			return BindingTouch.IsDotNet ? "Microsoft.watchOS" :"Xamarin.WatchOS";
 		case ApplePlatform.MacCatalyst:
-			return "Xamarin.MacCatalyst";
+			return "Microsoft.MacCatalyst";
 		default:
 			throw ErrorHelper.CreateError (1053, /* Internal error: unknown target framework '{0}'. */ BindingTouch.TargetFramework);
 		}
diff --git a/tests/cecil-tests/AttributeTest.cs b/tests/cecil-tests/AttributeTest.cs
index d8604e920876..d18d75cc3879 100644
--- a/tests/cecil-tests/AttributeTest.cs
+++ b/tests/cecil-tests/AttributeTest.cs
@@ -157,13 +157,13 @@ void CheckCurrentPlatformIncludedIfAny (ICustomAttributeProvider item, string pl
 		string AssemblyToAttributeName (string assemblyPath)
 		{
 			var baseName = Path.GetFileName (assemblyPath);
-			if (Configuration.GetBaseLibraryName (TargetFramework.DotNet_5_0_iOS.Platform) == baseName)
+			if (Configuration.GetBaseLibraryName (TargetFramework.DotNet_5_0_iOS.Platform, true) == baseName)
 				return "ios";
-			if (Configuration.GetBaseLibraryName (TargetFramework.DotNet_5_0_tvOS.Platform) == baseName)
+			if (Configuration.GetBaseLibraryName (TargetFramework.DotNet_5_0_tvOS.Platform, true) == baseName)
 				return "tvos";
-			if (Configuration.GetBaseLibraryName (TargetFramework.DotNet_5_0_macOS.Platform) == baseName)
+			if (Configuration.GetBaseLibraryName (TargetFramework.DotNet_5_0_macOS.Platform, true) == baseName)
 				return "macos";
-			if (Configuration.GetBaseLibraryName (TargetFramework.DotNet_5_0_MacCatalyst.Platform) == baseName)
+			if (Configuration.GetBaseLibraryName (TargetFramework.DotNet_5_0_MacCatalyst.Platform, true) == baseName)
 				return "maccatalyst";
 			throw new NotImplementedException ();
 		}
diff --git a/tests/cecil-tests/Helper.cs b/tests/cecil-tests/Helper.cs
index 54392f9344c3..d5bf0e1b5ec1 100644
--- a/tests/cecil-tests/Helper.cs
+++ b/tests/cecil-tests/Helper.cs
@@ -8,6 +8,7 @@
 using Mono.Cecil;
 
 using Xamarin.Tests;
+using Xamarin.Utils;
 
 #nullable enable
 
@@ -135,21 +136,22 @@ static IEnumerable<FieldDefinition> FilterFields (TypeDefinition type, Func<Fiel
 		public static string GetBCLDirectory (string assembly)
 		{
 			var rv = string.Empty;
+			var isDotNet = !assembly.Contains ("Library/Frameworks/Xamarin.iOS.framework") && !assembly.Contains ("Library/Frameworks/Xamarin.Mac.framework");
 
-			switch (Path.GetFileName (assembly)) {
-			case "Xamarin.iOS.dll":
+			switch (Configuration.GetPlatform (assembly, isDotNet)) {
+			case ApplePlatform.iOS:
 				rv = Path.GetDirectoryName (Configuration.XamarinIOSDll);
 				break;
-			case "Xamarin.WatchOS.dll":
+			case ApplePlatform.WatchOS:
 				rv = Path.GetDirectoryName (Configuration.XamarinWatchOSDll);
 				break;
-			case "Xamarin.TVOS.dll":
+			case ApplePlatform.TVOS:
 				rv = Path.GetDirectoryName (Configuration.XamarinTVOSDll);
 				break;
-			case "Xamarin.Mac.dll":
+			case ApplePlatform.MacOSX:
 				rv = Path.GetDirectoryName (assembly);
 				break;
-			case "Xamarin.MacCatalyst.dll":
+			case ApplePlatform.MacCatalyst:
 				rv = Path.GetDirectoryName (Configuration.XamarinCatalystDll);
 				break;
 			default:
diff --git a/tests/common/Configuration.cs b/tests/common/Configuration.cs
index 4011013b0388..cba1e552ed83 100644
--- a/tests/common/Configuration.cs
+++ b/tests/common/Configuration.cs
@@ -648,27 +648,58 @@ public static string GetBaseLibrary (Profile profile)
 
 		static string GetBaseLibraryName (TargetFramework targetFramework)
 		{
-			return GetBaseLibraryName (targetFramework.Platform);
+			return GetBaseLibraryName (targetFramework.Platform, targetFramework.IsDotNet);
 		}
 
-		public static string GetBaseLibraryName (ApplePlatform platform)
+		public static string GetBaseLibraryName (ApplePlatform platform, bool isDotNet)
 		{
 			switch (platform) {
 			case ApplePlatform.iOS:
-				return "Xamarin.iOS.dll";
+				return isDotNet ? "Microsoft.iOS.dll" : "Xamarin.iOS.dll";
 			case ApplePlatform.TVOS:
-				return "Xamarin.TVOS.dll";
+				return isDotNet ? "Microsoft.tvOS.dll" : "Xamarin.TVOS.dll";
 			case ApplePlatform.WatchOS:
-				return "Xamarin.WatchOS.dll";
+				return isDotNet ? "Microsoft.watchOS.dll" : "Xamarin.WatchOS.dll";
 			case ApplePlatform.MacOSX:
-				return "Xamarin.Mac.dll";
+				return isDotNet ? "Microsoft.macOS.dll" : "Xamarin.Mac.dll";
 			case ApplePlatform.MacCatalyst:
-				return "Xamarin.MacCatalyst.dll";
+				return isDotNet ? "Microsoft.MacCatalyst.dll" : "Xamarin.MacCatalyst.dll";
 			default:
 				throw new InvalidOperationException (platform.ToString ());
 			}
 		}
 
+		public static ApplePlatform GetPlatform (string assemblyName, bool isDotNet)
+		{
+			if (isDotNet) {
+				switch (Path.GetFileNameWithoutExtension (assemblyName)) {
+				case "Microsoft.iOS":
+					return ApplePlatform.iOS;
+				case "Microsoft.MacCatalyst":
+					return ApplePlatform.MacCatalyst;
+				case "Microsoft.tvOS":
+					return ApplePlatform.TVOS;
+				case "Microsoft.macOS":
+					return ApplePlatform.MacOSX;
+				default:
+					throw new NotSupportedException ($"Unknown assembly: {assemblyName}");
+				}
+			} else {
+				switch (Path.GetFileNameWithoutExtension (assemblyName)) {
+				case "Xamarin.iOS":
+					return ApplePlatform.iOS;
+				case "Xamarin.WatchOS":
+					return ApplePlatform.WatchOS;
+				case "Xamarin.TVOS":
+					return ApplePlatform.TVOS;
+				case "Xamarin.Mac":
+					return ApplePlatform.MacOSX;
+				default:
+					throw new NotSupportedException ($"Unknown assembly: {assemblyName}");
+				}
+			}
+		}		
+
 		public static string GetBaseLibrary (TargetFramework targetFramework)
 		{
 			if (targetFramework.IsDotNet)
@@ -730,7 +761,7 @@ public static IEnumerable<string> GetBaseLibraryImplementations (ApplePlatform p
 			var runtimeIdentifiers = GetRuntimeIdentifiers (platform);
 			foreach (var rid in runtimeIdentifiers) {
 				var libdir = Path.Combine (GetRuntimeDirectory (platform, rid), "lib", "net6.0");
-				yield return Path.Combine (libdir, GetBaseLibraryName (platform));
+				yield return Path.Combine (libdir, GetBaseLibraryName (platform, true));
 			}
 		}
 
@@ -738,7 +769,7 @@ public static IEnumerable<string> GetBaseLibraryImplementations (ApplePlatform p
 		public static IEnumerable<string> GetRefLibraries ()
 		{
 			foreach (var platform in GetIncludedPlatforms (true))
-				yield return Path.Combine (GetRefDirectory (platform), GetBaseLibraryName (platform));
+				yield return Path.Combine (GetRefDirectory (platform), GetBaseLibraryName (platform, true));
 		}
 
 		public static IEnumerable<ApplePlatform> GetIncludedPlatforms (bool dotnet)
diff --git a/tests/dotnet/MyXamarinFormsApp/AppDelegate.cs b/tests/dotnet/MyXamarinFormsApp/AppDelegate.cs
deleted file mode 100644
index 310888bf335b..000000000000
--- a/tests/dotnet/MyXamarinFormsApp/AppDelegate.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-using Foundation;
-using UIKit;
-
-namespace MyXamarinFormsApp.iOS
-{
-	// The UIApplicationDelegate for the application. This class is responsible for launching the 
-	// User Interface of the application, as well as listening (and optionally responding) to 
-	// application events from iOS.
-	[Register ("AppDelegate")]
-	public partial class AppDelegate : global::Xamarin.Forms.Platform.iOS.FormsApplicationDelegate
-	{
-		//
-		// This method is invoked when the application has loaded and is ready to run. In this 
-		// method you should instantiate the window, load the UI into it and then make the window
-		// visible.
-		//
-		// You have 17 seconds to return from this method, or iOS will terminate your application.
-		//
-		public override bool FinishedLaunching (UIApplication app, NSDictionary options)
-		{
-			global::Xamarin.Forms.Forms.Init ();
-			LoadApplication (new App ());
-
-			return base.FinishedLaunching (app, options);
-		}
-	}
-}
diff --git a/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Contents.json b/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Contents.json
deleted file mode 100644
index 4564827fc3b7..000000000000
--- a/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ /dev/null
@@ -1,117 +0,0 @@
-{
-    "images": [
-        {
-            "scale": "2x",
-            "size": "20x20",
-            "idiom": "iphone",
-            "filename": "Icon40.png"
-        },
-        {
-            "scale": "3x",
-            "size": "20x20",
-            "idiom": "iphone",
-            "filename": "Icon60.png"
-        },
-        {
-            "scale": "2x",
-            "size": "29x29",
-            "idiom": "iphone",
-            "filename": "Icon58.png"
-        },
-        {
-            "scale": "3x",
-            "size": "29x29",
-            "idiom": "iphone",
-            "filename": "Icon87.png"
-        },
-        {
-            "scale": "2x",
-            "size": "40x40",
-            "idiom": "iphone",
-            "filename": "Icon80.png"
-        },
-        {
-            "scale": "3x",
-            "size": "40x40",
-            "idiom": "iphone",
-            "filename": "Icon120.png"
-        },
-        {
-            "scale": "2x",
-            "size": "60x60",
-            "idiom": "iphone",
-            "filename": "Icon120.png"
-        },
-        {
-            "scale": "3x",
-            "size": "60x60",
-            "idiom": "iphone",
-            "filename": "Icon180.png"
-        },
-        {
-            "scale": "1x",
-            "size": "20x20",
-            "idiom": "ipad",
-            "filename": "Icon20.png"
-        },
-        {
-            "scale": "2x",
-            "size": "20x20",
-            "idiom": "ipad",
-            "filename": "Icon40.png"
-        },
-        {
-            "scale": "1x",
-            "size": "29x29",
-            "idiom": "ipad",
-            "filename": "Icon29.png"
-        },
-        {
-            "scale": "2x",
-            "size": "29x29",
-            "idiom": "ipad",
-            "filename": "Icon58.png"
-        },
-        {
-            "scale": "1x",
-            "size": "40x40",
-            "idiom": "ipad",
-            "filename": "Icon40.png"
-        },
-        {
-            "scale": "2x",
-            "size": "40x40",
-            "idiom": "ipad",
-            "filename": "Icon80.png"
-        },
-        {
-            "scale": "1x",
-            "size": "76x76",
-            "idiom": "ipad",
-            "filename": "Icon76.png"
-        },
-        {
-            "scale": "2x",
-            "size": "76x76",
-            "idiom": "ipad",
-            "filename": "Icon152.png"
-        },
-        {
-            "scale": "2x",
-            "size": "83.5x83.5",
-            "idiom": "ipad",
-            "filename": "Icon167.png"
-        },
-        {
-            "scale": "1x",
-            "size": "1024x1024",
-            "idiom": "ios-marketing",
-            "filename": "Icon1024.png"
-        }
-    ],
-    "properties": {},
-    "info": {
-        "version": 1,
-        "author": "xcode"
-    }
-}
\ No newline at end of file
diff --git a/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon1024.png b/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon1024.png
deleted file mode 100644
index 9174c989a9c8..000000000000
Binary files a/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon1024.png and /dev/null differ
diff --git a/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon120.png b/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon120.png
deleted file mode 100644
index 9c60a1761dbf..000000000000
Binary files a/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon120.png and /dev/null differ
diff --git a/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon152.png b/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon152.png
deleted file mode 100644
index 448d6efb577d..000000000000
Binary files a/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon152.png and /dev/null differ
diff --git a/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon167.png b/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon167.png
deleted file mode 100644
index 8524768f8d76..000000000000
Binary files a/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon167.png and /dev/null differ
diff --git a/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon180.png b/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon180.png
deleted file mode 100644
index 60a64703c0f1..000000000000
Binary files a/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon180.png and /dev/null differ
diff --git a/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon20.png b/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon20.png
deleted file mode 100644
index 45268a641c5c..000000000000
Binary files a/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon20.png and /dev/null differ
diff --git a/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon29.png b/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon29.png
deleted file mode 100644
index 6a6c77a8b4c4..000000000000
Binary files a/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon29.png and /dev/null differ
diff --git a/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon40.png b/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon40.png
deleted file mode 100644
index cc7edcf5cb47..000000000000
Binary files a/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon40.png and /dev/null differ
diff --git a/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon58.png b/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon58.png
deleted file mode 100644
index 1ad04f004b63..000000000000
Binary files a/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon58.png and /dev/null differ
diff --git a/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon60.png b/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon60.png
deleted file mode 100644
index 2dd52620a8f1..000000000000
Binary files a/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon60.png and /dev/null differ
diff --git a/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon76.png b/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon76.png
deleted file mode 100644
index b058cae2f440..000000000000
Binary files a/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon76.png and /dev/null differ
diff --git a/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon80.png b/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon80.png
deleted file mode 100644
index 02e47a261154..000000000000
Binary files a/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon80.png and /dev/null differ
diff --git a/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon87.png b/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon87.png
deleted file mode 100644
index 4954a4bd33f6..000000000000
Binary files a/tests/dotnet/MyXamarinFormsApp/Assets.xcassets/AppIcon.appiconset/Icon87.png and /dev/null differ
diff --git a/tests/dotnet/MyXamarinFormsApp/Directory.Build.targets b/tests/dotnet/MyXamarinFormsApp/Directory.Build.targets
deleted file mode 100644
index 13af3557dd78..000000000000
--- a/tests/dotnet/MyXamarinFormsApp/Directory.Build.targets
+++ /dev/null
@@ -1,23 +0,0 @@
-<Project>
-
-  <PropertyGroup Condition="'$(_PlatformName)' == 'iOS'">
-    <PublishTrimmed>True</PublishTrimmed>
-    <MonoAOT>True</MonoAOT>
-    <UseAppHost>False</UseAppHost>
-  </PropertyGroup>
-
-  <Target
-    Name="FixFormsNuGetAssemblies"
-    AfterTargets="ResolvePackageAssets"
-    Condition="'$(PkgXamarin_Forms)' != '' And '$(_PlatformName)' == 'iOS'">
-    <ItemGroup>
-      <!-- NOTE: the items below are workarounds for $(AssetTargetFallback) usage -->
-      <!-- see: https://github.com/NuGet/docs.microsoft.com-nuget/issues/1955 -->
-      <Reference Include="Xamarin.Forms.Platform.iOS" HintPath="$(PkgXamarin_Forms)\build\XCODE11\Xamarin.Forms.Platform.iOS.dll" />
-      <Reference Include="Xamarin.Forms.Platform" HintPath="$(PkgXamarin_Forms)\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll" />
-      <RuntimeCopyLocalItems          Remove="$(PkgXamarin_Forms)\lib\netstandard2.0\Xamarin.Forms.Platform.dll" />
-      <ResolvedCompileFileDefinitions Remove="$(PkgXamarin_Forms)\lib\netstandard2.0\Xamarin.Forms.Platform.dll" />
-    </ItemGroup>
-
-  </Target>
-</Project>
diff --git a/tests/dotnet/MyXamarinFormsApp/Entitlements.plist b/tests/dotnet/MyXamarinFormsApp/Entitlements.plist
deleted file mode 100644
index e9a3005f7831..000000000000
--- a/tests/dotnet/MyXamarinFormsApp/Entitlements.plist
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-</dict>
-</plist>
-
diff --git a/tests/dotnet/MyXamarinFormsApp/Info.plist b/tests/dotnet/MyXamarinFormsApp/Info.plist
deleted file mode 100644
index cbd697757aa3..000000000000
--- a/tests/dotnet/MyXamarinFormsApp/Info.plist
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>UIDeviceFamily</key>
-    <array>
-        <integer>1</integer>
-        <integer>2</integer>
-    </array>
-    <key>UISupportedInterfaceOrientations</key>
-    <array>
-        <string>UIInterfaceOrientationPortrait</string>
-        <string>UIInterfaceOrientationLandscapeLeft</string>
-        <string>UIInterfaceOrientationLandscapeRight</string>
-    </array>
-    <key>UISupportedInterfaceOrientations~ipad</key>
-    <array>
-        <string>UIInterfaceOrientationPortrait</string>
-        <string>UIInterfaceOrientationPortraitUpsideDown</string>
-        <string>UIInterfaceOrientationLandscapeLeft</string>
-        <string>UIInterfaceOrientationLandscapeRight</string>
-    </array>
-    <key>CFBundleDisplayName</key>
-    <string>MyXamarinFormsApp</string>
-    <key>CFBundleIdentifier</key>
-    <string>com.xamarin.MyXamarinFormsApp</string>
-    <key>CFBundleVersion</key>
-    <string>1.0</string>
-    <key>UILaunchStoryboardName</key>
-    <string>LaunchScreen</string>
-    <key>CFBundleName</key>
-    <string>MyXamarinFormsApp</string>
-    <key>XSAppIconAssets</key>
-    <string>Assets.xcassets/AppIcon.appiconset</string>
-</dict>
-</plist>
diff --git a/tests/dotnet/MyXamarinFormsApp/Main.cs b/tests/dotnet/MyXamarinFormsApp/Main.cs
deleted file mode 100644
index be5b7d07a511..000000000000
--- a/tests/dotnet/MyXamarinFormsApp/Main.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-using Foundation;
-using UIKit;
-
-namespace MyXamarinFormsApp.iOS
-{
-	public class Application
-	{
-		// This is the main entry point of the application.
-		static void Main (string [] args)
-		{
-			// if you want to use a different Application Delegate class from "AppDelegate"
-			// you can specify it here.
-			UIApplication.Main (args, null, "AppDelegate");
-		}
-	}
-}
diff --git a/tests/dotnet/MyXamarinFormsApp/Makefile b/tests/dotnet/MyXamarinFormsApp/Makefile
deleted file mode 100644
index e385064ec09e..000000000000
--- a/tests/dotnet/MyXamarinFormsApp/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-TOP=../../..
-
-include $(TOP)/Make.config
-
-build:
-	$(DOTNET6) build /bl *.csproj $(MSBUILD_VERBOSITY)
-
-run:
-	$(DOTNET6) build /bl *.csproj $(MSBUILD_VERBOSITY) -t:Run
diff --git a/tests/dotnet/MyXamarinFormsApp/MyXamarinFormsApp.csproj b/tests/dotnet/MyXamarinFormsApp/MyXamarinFormsApp.csproj
deleted file mode 100644
index 0c9e7d4b9e7e..000000000000
--- a/tests/dotnet/MyXamarinFormsApp/MyXamarinFormsApp.csproj
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net6.0-ios</TargetFramework>
-    <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
-    <OutputType>Exe</OutputType>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <SupportedOSPlatformVersion>10.0</SupportedOSPlatformVersion>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <DefaultItemExcludes>$(DefaultItemExcludes);MyXamarinFormsAppNS\**</DefaultItemExcludes>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.5.0.617" GeneratePathProperty="true" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.1.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="MyXamarinFormsAppNS\MyXamarinFormsAppNS.csproj" />
-  </ItemGroup>
-</Project>
diff --git a/tests/dotnet/MyXamarinFormsApp/MyXamarinFormsAppNS/App.xaml b/tests/dotnet/MyXamarinFormsApp/MyXamarinFormsAppNS/App.xaml
deleted file mode 100644
index a48f95ea9f45..000000000000
--- a/tests/dotnet/MyXamarinFormsApp/MyXamarinFormsAppNS/App.xaml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Application xmlns="http://xamarin.com/schemas/2014/forms" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:d="http://xamarin.com/schemas/2014/forms/design" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" x:Class="MyXamarinFormsApp.App">
-    <Application.Resources>
-    </Application.Resources>
-</Application>
\ No newline at end of file
diff --git a/tests/dotnet/MyXamarinFormsApp/MyXamarinFormsAppNS/App.xaml.cs b/tests/dotnet/MyXamarinFormsApp/MyXamarinFormsAppNS/App.xaml.cs
deleted file mode 100644
index 34b50fdf4363..000000000000
--- a/tests/dotnet/MyXamarinFormsApp/MyXamarinFormsAppNS/App.xaml.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using Xamarin.Forms;
-using Xamarin.Forms.Xaml;
-
-namespace MyXamarinFormsApp
-{
-	public partial class App : Application
-	{
-		public App ()
-		{
-			InitializeComponent ();
-
-			MainPage = new MainPage ();
-		}
-
-		protected override void OnStart ()
-		{
-			// Handle when your app starts
-		}
-
-		protected override void OnSleep ()
-		{
-			// Handle when your app sleeps
-		}
-
-		protected override void OnResume ()
-		{
-			// Handle when your app resumes
-		}
-	}
-}
diff --git a/tests/dotnet/MyXamarinFormsApp/MyXamarinFormsAppNS/AssemblyInfo.cs b/tests/dotnet/MyXamarinFormsApp/MyXamarinFormsAppNS/AssemblyInfo.cs
deleted file mode 100644
index afbe49b9050b..000000000000
--- a/tests/dotnet/MyXamarinFormsApp/MyXamarinFormsAppNS/AssemblyInfo.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-using Xamarin.Forms.Xaml;
-
-[assembly: XamlCompilation (XamlCompilationOptions.Compile)]
diff --git a/tests/dotnet/MyXamarinFormsApp/MyXamarinFormsAppNS/MainPage.xaml b/tests/dotnet/MyXamarinFormsApp/MyXamarinFormsAppNS/MainPage.xaml
deleted file mode 100644
index 4dacc6e78b90..000000000000
--- a/tests/dotnet/MyXamarinFormsApp/MyXamarinFormsAppNS/MainPage.xaml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ContentPage xmlns="http://xamarin.com/schemas/2014/forms" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:d="http://xamarin.com/schemas/2014/forms/design" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" x:Class="MyXamarinFormsApp.MainPage">
-    <StackLayout>
-        <!-- Place new controls here -->
-        <Label Text="Welcome to Xamarin.Forms!" HorizontalOptions="Center" VerticalOptions="CenterAndExpand" />
-    </StackLayout>
-</ContentPage>
\ No newline at end of file
diff --git a/tests/dotnet/MyXamarinFormsApp/MyXamarinFormsAppNS/MainPage.xaml.cs b/tests/dotnet/MyXamarinFormsApp/MyXamarinFormsAppNS/MainPage.xaml.cs
deleted file mode 100644
index edead8f2df33..000000000000
--- a/tests/dotnet/MyXamarinFormsApp/MyXamarinFormsAppNS/MainPage.xaml.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Xamarin.Forms;
-
-namespace MyXamarinFormsApp
-{
-	// Learn more about making custom code visible in the Xamarin.Forms previewer
-	// by visiting https://aka.ms/xamarinforms-previewer
-	[DesignTimeVisible (false)]
-	public partial class MainPage : ContentPage
-	{
-		public MainPage ()
-		{
-			InitializeComponent ();
-		}
-	}
-}
diff --git a/tests/dotnet/MyXamarinFormsApp/MyXamarinFormsAppNS/MyXamarinFormsAppNS.csproj b/tests/dotnet/MyXamarinFormsApp/MyXamarinFormsAppNS/MyXamarinFormsAppNS.csproj
deleted file mode 100644
index 8e85bf5e019a..000000000000
--- a/tests/dotnet/MyXamarinFormsApp/MyXamarinFormsAppNS/MyXamarinFormsAppNS.csproj
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.0.0.540366" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.1.0" />
-  </ItemGroup>
-</Project>
diff --git a/tests/dotnet/MyXamarinFormsApp/Properties/AssemblyInfo.cs b/tests/dotnet/MyXamarinFormsApp/Properties/AssemblyInfo.cs
deleted file mode 100644
index bab279231f50..000000000000
--- a/tests/dotnet/MyXamarinFormsApp/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle ("MyXamarinFormsApp.iOS")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("MyXamarinFormsApp.iOS")]
-[assembly: AssemblyCopyright ("Copyright ©  2014")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible (false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid ("72bdc44f-c588-44f3-b6df-9aace7daafdd")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion ("1.0.0.0")]
-[assembly: AssemblyFileVersion ("1.0.0.0")]
diff --git a/tests/dotnet/MyXamarinFormsApp/Resources/Default-568h@2x.png b/tests/dotnet/MyXamarinFormsApp/Resources/Default-568h@2x.png
deleted file mode 100644
index 26c6461e50ac..000000000000
Binary files a/tests/dotnet/MyXamarinFormsApp/Resources/Default-568h@2x.png and /dev/null differ
diff --git a/tests/dotnet/MyXamarinFormsApp/Resources/Default-Portrait.png b/tests/dotnet/MyXamarinFormsApp/Resources/Default-Portrait.png
deleted file mode 100644
index 5d0d1ab4c6d8..000000000000
Binary files a/tests/dotnet/MyXamarinFormsApp/Resources/Default-Portrait.png and /dev/null differ
diff --git a/tests/dotnet/MyXamarinFormsApp/Resources/Default-Portrait@2x.png b/tests/dotnet/MyXamarinFormsApp/Resources/Default-Portrait@2x.png
deleted file mode 100644
index 0ee2688e8f18..000000000000
Binary files a/tests/dotnet/MyXamarinFormsApp/Resources/Default-Portrait@2x.png and /dev/null differ
diff --git a/tests/dotnet/MyXamarinFormsApp/Resources/Default.png b/tests/dotnet/MyXamarinFormsApp/Resources/Default.png
deleted file mode 100644
index b74643c0aa3e..000000000000
Binary files a/tests/dotnet/MyXamarinFormsApp/Resources/Default.png and /dev/null differ
diff --git a/tests/dotnet/MyXamarinFormsApp/Resources/Default@2x.png b/tests/dotnet/MyXamarinFormsApp/Resources/Default@2x.png
deleted file mode 100644
index dbd6bd3e8646..000000000000
Binary files a/tests/dotnet/MyXamarinFormsApp/Resources/Default@2x.png and /dev/null differ
diff --git a/tests/dotnet/MyXamarinFormsApp/Resources/LaunchScreen.storyboard b/tests/dotnet/MyXamarinFormsApp/Resources/LaunchScreen.storyboard
deleted file mode 100644
index f12b93680132..000000000000
--- a/tests/dotnet/MyXamarinFormsApp/Resources/LaunchScreen.storyboard
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6245" systemVersion="13F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="X5k-f2-b5h">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238" />
-    </dependencies>
-    <scenes>
-        <!--View Controller-->
-        <scene sceneID="gAE-YM-kbH">
-            <objects>
-                <viewController id="X5k-f2-b5h" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="Y8P-hJ-Z43" />
-                        <viewControllerLayoutGuide type="bottom" id="9ZL-r4-8FZ" />
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="yd7-JS-zBw">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600" />
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" />
-                        <subviews>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" misplaced="YES" image="Icon-60.png" translatesAutoresizingMaskIntoConstraints="NO" id="23">
-                                <rect key="frame" x="270" y="270" width="60" height="60" />
-                                <rect key="contentStretch" x="0.0" y="0.0" width="0.0" height="0.0" />
-                            </imageView>
-                        </subviews>
-                        <color key="backgroundColor" red="0.20392156862745098" green="0.59607843137254901" blue="0.85882352941176465" alpha="1" colorSpace="calibratedRGB" />
-                        <constraints>
-                            <constraint firstItem="23" firstAttribute="centerY" secondItem="yd7-JS-zBw" secondAttribute="centerY" priority="1" id="39" />
-                            <constraint firstItem="23" firstAttribute="centerX" secondItem="yd7-JS-zBw" secondAttribute="centerX" priority="1" id="41" />
-                        </constraints>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="XAI-xm-WK6" userLabel="First Responder" sceneMemberID="firstResponder" />
-            </objects>
-            <point key="canvasLocation" x="349" y="339" />
-        </scene>
-    </scenes>
-    <resources>
-        <image name="Icon-60.png" width="180" height="180" />
-    </resources>
-</document>
\ No newline at end of file
diff --git a/tests/dotnet/UnitTests/BundleStructureTest.cs b/tests/dotnet/UnitTests/BundleStructureTest.cs
index 2907dd46df3c..5c692e96158a 100644
--- a/tests/dotnet/UnitTests/BundleStructureTest.cs
+++ b/tests/dotnet/UnitTests/BundleStructureTest.cs
@@ -12,6 +12,21 @@
 namespace Xamarin.Tests {
 	[TestFixture]
 	public class BundleStructureTest : TestBaseClass {
+		// Returns true if the assembly name is _any_ of our platform assemblies (Microsoft.iOS/tvOS/macOS/MacCatalyst/watchOS.dll)
+		bool IsPlatformAssembly (string assemblyName)
+		{
+			if (assemblyName.EndsWith (".dll", StringComparison.Ordinal) || assemblyName.EndsWith (".pdb", StringComparison.Ordinal))
+				assemblyName = Path.GetFileNameWithoutExtension (assemblyName);
+			foreach (var platform in Enum.GetValues<ApplePlatform> ()) {
+				if (platform == ApplePlatform.None)
+					continue;
+				var platformAssembly = Path.GetFileNameWithoutExtension (Configuration.GetBaseLibraryName (platform, true));
+				if (platformAssembly == assemblyName)
+					return true;
+			}
+			return false;
+		}
+
 		void CheckAppBundleContents (ApplePlatform platform, string appPath, string[] runtimeIdentifiers, CodeSignature isSigned, bool isReleaseBuild)
 		{
 			// Directory.GetFileSystemEntries will enter symlink directories and iterate inside :/
@@ -66,7 +81,7 @@ void CheckAppBundleContents (ApplePlatform platform, string appPath, string[] ru
 				if (fn.StartsWith ("System.", StringComparison.Ordinal) && (fn.EndsWith (".dll", StringComparison.Ordinal) || fn.EndsWith (".pdb", StringComparison.Ordinal)))
 					return true;
 
-				if (fn.StartsWith ("Microsoft.", StringComparison.Ordinal) && (fn.EndsWith (".dll", StringComparison.Ordinal) || fn.EndsWith (".pdb", StringComparison.Ordinal)))
+				if (!IsPlatformAssembly (fn) && fn.StartsWith ("Microsoft.", StringComparison.Ordinal) && (fn.EndsWith (".dll", StringComparison.Ordinal) || fn.EndsWith (".pdb", StringComparison.Ordinal)))
 					return true;
 
 				if (fn.StartsWith ("libSystem.", StringComparison.Ordinal) && fn.EndsWith (".dylib", StringComparison.Ordinal))
@@ -238,7 +253,7 @@ void CheckAppBundleContents (ApplePlatform platform, string appPath, string[] ru
 			expectedFiles.Add ($"{assemblyDirectory}Touch.Client.dll");
 			if (includeDebugFiles)
 				expectedFiles.Add ($"{assemblyDirectory}Touch.Client.pdb");
-			AddMultiRidAssembly (platform, expectedFiles, assemblyDirectory, Path.GetFileNameWithoutExtension (Configuration.GetBaseLibraryName (platform)), runtimeIdentifiers, forceSingleRid: (platform == ApplePlatform.MacCatalyst && !isReleaseBuild) || platform == ApplePlatform.MacOSX, hasPdb: false, includeDebugFiles: includeDebugFiles);
+			AddMultiRidAssembly (platform, expectedFiles, assemblyDirectory, Path.GetFileNameWithoutExtension (Configuration.GetBaseLibraryName (platform, true)), runtimeIdentifiers, forceSingleRid: (platform == ApplePlatform.MacCatalyst && !isReleaseBuild) || platform == ApplePlatform.MacOSX, hasPdb: false, includeDebugFiles: includeDebugFiles);
 			expectedFiles.Add ($"{assemblyDirectory}runtimeconfig.bin");
 
 			if (platform == ApplePlatform.MacOSX)
diff --git a/tests/dotnet/UnitTests/PostBuildTest.cs b/tests/dotnet/UnitTests/PostBuildTest.cs
index 1b91d22d5c46..404db9ff973d 100644
--- a/tests/dotnet/UnitTests/PostBuildTest.cs
+++ b/tests/dotnet/UnitTests/PostBuildTest.cs
@@ -85,7 +85,7 @@ public void AssemblyStripping (string project, ApplePlatform platform, string ru
 
 			AssertBundleAssembliesStripStatus (appPath, shouldStrip);
 			Assert.That (Path.Combine (appPath, $"{project}.dll"), Does.Exist, "Application Assembly");
-			Assert.That (Path.Combine (appPath, "Xamarin.iOS.dll"), Does.Exist, "Platform Assembly");
+			Assert.That (Path.Combine (appPath, "Microsoft.iOS.dll"), Does.Exist, "Platform Assembly");
 		}
 
 		[Test]
diff --git a/tests/generator/BGenTests.cs b/tests/generator/BGenTests.cs
index 2da2c63cad02..0735cfcae6aa 100644
--- a/tests/generator/BGenTests.cs
+++ b/tests/generator/BGenTests.cs
@@ -688,12 +688,16 @@ bool IsOptimizable (MethodDefinition method)
 		[Test]
 		public void DisposeAttributeOptimizable ()
 		{
-			var bgen = BuildFile (Profile.iOS, "tests/dispose-attribute.cs");
+			var profile = Profile.iOS;
+			var bgen = BuildFile (profile, "tests/dispose-attribute.cs");
 
 			// processing custom attributes (like its properties) will call Resolve so we must be able to find the platform assembly to run this test
-			var platform_dll = Path.Combine (Configuration.SdkRootXI, "lib/mono/Xamarin.iOS/Xamarin.iOS.dll");
 			var resolver = bgen.ApiAssembly.MainModule.AssemblyResolver as BaseAssemblyResolver;
+#if NET
+			resolver.AddSearchDirectory (Configuration.GetRefDirectory (profile.AsPlatform ()));
+#else
 			resolver.AddSearchDirectory (Path.Combine (Configuration.SdkRootXI, "lib/mono/Xamarin.iOS/"));
+#endif
 
 			// [Dispose] is, by default, not optimizable
 			var with_dispose = bgen.ApiAssembly.MainModule.GetType ("NS", "WithDispose").Methods.First ((v) => v.Name == "Dispose");
@@ -714,12 +718,16 @@ public void DisposeAttributeOptimizable ()
 		[Test]
 		public void SnippetAttributesOptimizable ()
 		{
-			var bgen = BuildFile (Profile.iOS, "tests/snippet-attributes.cs");
+			var profile = Profile.iOS;
+			var bgen = BuildFile (profile, "tests/snippet-attributes.cs");
 
 			// processing custom attributes (like its properties) will call Resolve so we must be able to find the platform assembly to run this test
-			var platform_dll = Path.Combine (Configuration.SdkRootXI, "lib/mono/Xamarin.iOS/Xamarin.iOS.dll");
 			var resolver = bgen.ApiAssembly.MainModule.AssemblyResolver as BaseAssemblyResolver;
+#if NET
+			resolver.AddSearchDirectory (Configuration.GetRefDirectory (profile.AsPlatform ()));
+#else
 			resolver.AddSearchDirectory (Path.Combine (Configuration.SdkRootXI, "lib/mono/Xamarin.iOS/"));
+#endif
 
 			// [SnippetAttribute] subclasses are, by default, not optimizable
 			var not_opt = bgen.ApiAssembly.MainModule.GetType ("NS", "NotOptimizable");
diff --git a/tests/linker/ios/link all/LinkAllTest.cs b/tests/linker/ios/link all/LinkAllTest.cs
index 489785953e77..469630145289 100644
--- a/tests/linker/ios/link all/LinkAllTest.cs	
+++ b/tests/linker/ios/link all/LinkAllTest.cs	
@@ -68,19 +68,39 @@ public void UnusedMethod () {}
 	public class LinkAllRegressionTest {
 #if __MACCATALYST__
 		public const string NamespacePrefix = "";
+#if NET
+		public const string AssemblyName = "Microsoft.MacCatalyst";
+#else
 		public const string AssemblyName = "Xamarin.MacCatalyst";
+#endif
 #elif __IOS__
 		public const string NamespacePrefix = "";
+#if NET
+		public const string AssemblyName = "Microsoft.iOS";
+#else
 		public const string AssemblyName = "Xamarin.iOS";
+#endif
 #elif __TVOS__
 		public const string NamespacePrefix = "";
+#if NET
+		public const string AssemblyName = "Microsoft.tvOS";
+#else
 		public const string AssemblyName = "Xamarin.TVOS";
+#endif
 #elif __WATCHOS__
 		public const string NamespacePrefix = "";
+#if NET
+		public const string AssemblyName = "Microsoft.watchOS";
+#else
 		public const string AssemblyName = "Xamarin.WatchOS";
+#endif
 #elif __MACOS__
 		public const string NamespacePrefix = "";
+#if NET
+		public const string AssemblyName = "Microsoft.macOS";
+#else
 		public const string AssemblyName = "Xamarin.Mac";
+#endif
 #else
 	#error Unknown platform
 #endif
diff --git a/tests/linker/ios/link sdk/dotnet/extra-linker-defs.xml b/tests/linker/ios/link sdk/dotnet/extra-linker-defs.xml
index f935db0b6350..d8a736420e25 100644
--- a/tests/linker/ios/link sdk/dotnet/extra-linker-defs.xml	
+++ b/tests/linker/ios/link sdk/dotnet/extra-linker-defs.xml	
@@ -8,13 +8,13 @@
 			<method name="ParseValue" />
 		</type>
 	</assembly>
-	<assembly fullname="Xamarin.iOS">
+	<assembly fullname="Microsoft.iOS">
 		<type fullname="CoreBluetooth.CBUUID" preserve="field" />
 	</assembly>
-	<assembly fullname="Xamarin.TVOS">
+	<assembly fullname="Microsoft.tvOS">
 		<type fullname="CoreBluetooth.CBUUID" preserve="field" />
 	</assembly>
-	<assembly fullname="Xamarin.MacCatalyst">
+	<assembly fullname="Microsoft.MacCatalyst">
 		<type fullname="CoreBluetooth.CBUUID" preserve="field" />
 	</assembly>
 </linker>
diff --git a/tests/msbuild/Xamarin.MacDev.Tests/DotnetTest.cs b/tests/msbuild/Xamarin.MacDev.Tests/DotnetTest.cs
index 05caf1275e42..8d3940ad51a7 100644
--- a/tests/msbuild/Xamarin.MacDev.Tests/DotnetTest.cs
+++ b/tests/msbuild/Xamarin.MacDev.Tests/DotnetTest.cs
@@ -48,7 +48,6 @@ public override string TargetFrameworkIdentifier {
 		[TestCase ("MyTVMetalGame")]
 		// [TestCase ("MyWatch2Container")] // TODO: Requires watchOS support, which has not been implemented yet
 		[TestCase ("MyWebViewApp")]
-		[TestCase ("MyXamarinFormsApp")]
 		public void CompareBuilds (string project, int expectedErrorCount = 0)
 		{
 			Configuration.AssertDotNetAvailable ();
diff --git a/tests/test-libraries/custom-type-assembly/Makefile b/tests/test-libraries/custom-type-assembly/Makefile
index c4f54c15c622..41ca76fa9fc6 100644
--- a/tests/test-libraries/custom-type-assembly/Makefile
+++ b/tests/test-libraries/custom-type-assembly/Makefile
@@ -6,7 +6,7 @@ include $(TOP)/Make.config
 	$(Q_CSC) $(MAC_mobile_CSC) $< -out:$@ -r:$(TOP)/_mac-build/Library/Frameworks/Xamarin.Mac.framework/Versions/Current/lib/mono/Xamarin.Mac/Xamarin.Mac.dll -target:library
 
 .libs/dotnet/macos/custom-type-assembly.dll: custom-type-assembly.cs Makefile | .libs/dotnet/macos
-	$(Q_CSC) $(DOTNET6_CSC) $< -out:$@ -r:$(TOP)/_build/Microsoft.macOS.Ref/ref/net6.0/Xamarin.Mac.dll -target:library -r:$(DOTNET6_BCL_DIR)/System.Runtime.dll /nologo
+	$(Q_CSC) $(DOTNET6_CSC) $< -out:$@ -r:$(TOP)/_build/Microsoft.macOS.Ref/ref/net6.0/Microsoft.macOS.dll -target:library -r:$(DOTNET6_BCL_DIR)/System.Runtime.dll /nologo
 
 .libs/macos .libs/dotnet/macos:
 	$(Q) mkdir -p $@
diff --git a/tests/xtro-sharpie/Runner.cs b/tests/xtro-sharpie/Runner.cs
index 6706649fce05..a780a5817600 100644
--- a/tests/xtro-sharpie/Runner.cs
+++ b/tests/xtro-sharpie/Runner.cs
@@ -37,11 +37,11 @@ public void Execute (string pchFile, IEnumerable<string> assemblyNames, string o
 				var name = Path.GetFileNameWithoutExtension (assemblyName);
 				if (name.EndsWith (".iOS", StringComparison.Ordinal))
 					Helpers.Platform = Platforms.iOS;
-				else if (name.EndsWith (".Mac", StringComparison.Ordinal))
+				else if (name.EndsWith (".Mac", StringComparison.Ordinal) || name.EndsWith (".macOS", StringComparison.Ordinal))
 					Helpers.Platform = Platforms.macOS;
 				else if (name.EndsWith (".WatchOS", StringComparison.Ordinal))
 					Helpers.Platform = Platforms.watchOS;
-				else if (name.EndsWith (".TVOS", StringComparison.Ordinal))
+				else if (name.EndsWith (".TVOS", StringComparison.Ordinal) || name.EndsWith (".tvOS", StringComparison.Ordinal))
 					Helpers.Platform = Platforms.tvOS;
 				else if (name.EndsWith (".MacCatalyst", StringComparison.Ordinal))
 					Helpers.Platform = Platforms.MacCatalyst;
diff --git a/tools/apidiff/Makefile b/tools/apidiff/Makefile
index d0a51e8289db..bacf0186cf8f 100644
--- a/tools/apidiff/Makefile
+++ b/tools/apidiff/Makefile
@@ -41,9 +41,9 @@ IOS_ASSEMBLIES     = $(foreach file,$(MONO_ASSEMBLIES),Xamarin.iOS/$(file))    $
 MAC_ASSEMBLIES     = $(foreach file,$(MONO_ASSEMBLIES),Xamarin.Mac/$(file))     $(MAC_SRC_ASSEMBLIES)
 WATCHOS_ASSEMBLIES = $(foreach file,$(filter-out Mono.Data.Tds Mono.Security,$(MONO_ASSEMBLIES)),Xamarin.WatchOS/$(file)) $(WATCHOS_SRC_ASSEMBLIES)
 TVOS_ASSEMBLIES    = $(foreach file,$(MONO_ASSEMBLIES),Xamarin.TVOS/$(file))    $(TVOS_SRC_ASSEMBLIES)
-DOTNET_LEGACY_ASSEMBLIES = Microsoft.iOS.Ref/ref/net6.0/Xamarin.iOS Microsoft.tvOS.Ref/ref/net6.0/Xamarin.TVOS \
-	Microsoft.macOS.Ref/ref/net6.0/Xamarin.Mac
-DOTNET_ASSEMBLIES = $(DOTNET_LEGACY_ASSEMBLIES) Microsoft.MacCatalyst.Ref/ref/net6.0/Xamarin.MacCatalyst
+DOTNET_LEGACY_ASSEMBLIES = Microsoft.iOS.Ref/ref/net6.0/Microsoft.iOS Microsoft.tvOS.Ref/ref/net6.0/Microsoft.tvOS \
+	Microsoft.macOS.Ref/ref/net6.0/Microsoft.macOS
+DOTNET_ASSEMBLIES = $(foreach platform,$(DOTNET_PLATFORMS),Microsoft.$(platform).Ref/ref/net6.0/Microsoft.$(platform))
 
 IOS_ARCH_ASSEMBLIES = native-32/Xamarin.iOS native-64/Xamarin.iOS
 MAC_ARCH_ASSEMBLIES =                       native-64/Xamarin.Mac
@@ -114,10 +114,10 @@ $(APIDIFF_DIR)/diff/dotnet/legacy-diff/Microsoft.tvOS.Ref/ref/net6.0/Xamarin.TVO
 	$(QF_GEN) $(MONO_BUILD) --debug $(MONO_API_HTML) $(NEW_REGEX) $(ADD_REGEX) $(APIDIFF_DIR)/references/xi/Xamarin.TVOS/Xamarin.TVOS.xml $< $(APIDIFF_IGNORE) $@
 	$(Q) touch $@
 
-$(APIDIFF_DIR)/diff/dotnet/iOS-MacCatalyst-diff/Microsoft.iOS.Ref/ref/net6.0/Xamarin.iOS.MacCatalyst.html: $(APIDIFF_DIR)/temp/dotnet/Microsoft.iOS.Ref/ref/net6.0/Xamarin.iOS.xml $(APIDIFF_DIR)/temp/dotnet/Microsoft.MacCatalyst.Ref/ref/net6.0/Xamarin.MacCatalyst.xml $(MONO_API_HTML)
+$(APIDIFF_DIR)/diff/dotnet/iOS-MacCatalyst-diff/Microsoft.iOS.Ref/ref/net6.0/Xamarin.iOS.MacCatalyst.html: $(APIDIFF_DIR)/temp/dotnet/Microsoft.iOS.Ref/ref/net6.0/Microsoft.iOS.xml $(APIDIFF_DIR)/temp/dotnet/Microsoft.MacCatalyst.Ref/ref/net6.0/Microsoft.MacCatalyst.xml $(MONO_API_HTML)
 	$(Q) mkdir -p $(dir $@)
-	$(Q) sed -e 's_<assembly name="Xamarin.MacCatalyst" version="0.0.0.0">_<assembly name="Xamarin.iOS" version="0.0.0.0">_' $(APIDIFF_DIR)/temp/dotnet/Microsoft.MacCatalyst.Ref/ref/net6.0/Xamarin.MacCatalyst.xml > $(APIDIFF_DIR)/temp/dotnet/Microsoft.iOS.Ref/ref/net6.0/Xamarin.MacCatalyst-as-iOS.xml
-	$(QF_GEN) $(MONO_BUILD) --debug $(MONO_API_HTML) $(NEW_REGEX) $(ADD_REGEX) $< $(APIDIFF_DIR)/temp/dotnet/Microsoft.iOS.Ref/ref/net6.0/Xamarin.MacCatalyst-as-iOS.xml $(APIDIFF_IGNORE) $@
+	$(Q) sed -e 's_<assembly name="Xamarin.MacCatalyst" version="0.0.0.0">_<assembly name="Xamarin.iOS" version="0.0.0.0">_' $(APIDIFF_DIR)/temp/dotnet/Microsoft.MacCatalyst.Ref/ref/net6.0/Microsoft.MacCatalyst.xml > $(APIDIFF_DIR)/temp/dotnet/Microsoft.iOS.Ref/ref/net6.0/Microsoft.MacCatalyst-as-iOS.xml
+	$(QF_GEN) $(MONO_BUILD) --debug $(MONO_API_HTML) $(NEW_REGEX) $(ADD_REGEX) $< $(APIDIFF_DIR)/temp/dotnet/Microsoft.iOS.Ref/ref/net6.0/Microsoft.MacCatalyst-as-iOS.xml $(APIDIFF_IGNORE) $@
 
 # this is a hack to show the difference between iOS and tvOS
 $(APIDIFF_DIR)/diff/ios-to-tvos.html: $(APIDIFF_DIR)/temp/xi/Xamarin.iOS/Xamarin.iOS.xml $(APIDIFF_DIR)/temp/xi/Xamarin.TVOS/Xamarin.TVOS.xml $(MONO_API_HTML)
diff --git a/tools/common/Driver.cs b/tools/common/Driver.cs
index a14f985d283e..60f725232cf9 100644
--- a/tools/common/Driver.cs
+++ b/tools/common/Driver.cs
@@ -916,15 +916,15 @@ public static string GetProductAssembly (Application app)
 		{
 			switch (app.Platform) {
 			case ApplePlatform.iOS:
-				return "Xamarin.iOS";
+				return IsDotNet ? "Microsoft.iOS" : "Xamarin.iOS";
 			case ApplePlatform.WatchOS:
-				return "Xamarin.WatchOS";
+				return IsDotNet ? "Microsoft.watchOS" : "Xamarin.WatchOS";
 			case ApplePlatform.TVOS:
-				return "Xamarin.TVOS";
+				return IsDotNet ? "Microsoft.tvOS" : "Xamarin.TVOS";
 			case ApplePlatform.MacOSX:
-				return "Xamarin.Mac";
+				return IsDotNet ? "Microsoft.macOS" : "Xamarin.Mac";
 			case ApplePlatform.MacCatalyst:
-				return "Xamarin.MacCatalyst";
+				return IsDotNet ? "Microsoft.MacCatalyst" : "Xamarin.MacCatalyst";
 			default:
 				throw ErrorHelper.CreateError (71, Errors.MX0071, app.Platform, app.ProductName);
 			}
diff --git a/tools/dotnet-linker/Steps/RegistrarStep.cs b/tools/dotnet-linker/Steps/RegistrarStep.cs
index 75ae6a136abb..a22391793811 100644
--- a/tools/dotnet-linker/Steps/RegistrarStep.cs
+++ b/tools/dotnet-linker/Steps/RegistrarStep.cs
@@ -22,27 +22,8 @@ protected override void TryEndProcess ()
 				// Nothing to do here
 				break;
 			case RegistrarMode.PartialStatic:
-				string method = null;
-				switch (app.Platform) {
-				case ApplePlatform.iOS:
-					method = "xamarin_create_classes_Xamarin_iOS";
-					break;
-				case ApplePlatform.WatchOS:
-					method = "xamarin_create_classes_Xamarin_WatchOS";
-					break;
-				case ApplePlatform.TVOS:
-					method = "xamarin_create_classes_Xamarin_TVOS";
-					break;
-				case ApplePlatform.MacOSX:
-					method = "xamarin_create_classes_Xamarin_Mac";
-					break;
-				case ApplePlatform.MacCatalyst:
-					method = "xamarin_create_classes_Xamarin_MacCatalyst";
-					break;
-				default:
-					Report (ErrorHelper.CreateError (71, Errors.MX0071, app.Platform, app.ProductName));
-					break;
-				}
+				// The method name is created in StaticRegistrar.Specialize.
+				var method = "xamarin_create_classes_" + Path.GetFileNameWithoutExtension (Configuration.PlatformAssembly.Replace ('.', '_').Replace ('-', '_'));
 				Configuration.RegistrationMethods.Add (method);
 				Configuration.CompilerFlags.AddLinkWith (Configuration.PartialStaticRegistrarLibrary);
 				break;
diff --git a/tools/mmp/Makefile b/tools/mmp/Makefile
index beb8b76b483b..38b5c122ce04 100644
--- a/tools/mmp/Makefile
+++ b/tools/mmp/Makefile
@@ -79,11 +79,11 @@ Xamarin.Mac.registrar.mobile.arm64.m: $(TOP)/src/build/mac/mobile-64/Xamarin.Mac
 	$(GENERATE_PART_REGISTRAR) --arch=arm64 --target-framework Xamarin.Mac,Version=v2.0,Profile=Mobile -a:$(MOBILE_BCL_DIR)/mscorlib.dll
 	$(Q) touch Xamarin.Mac.registrar.mobile.arm64.m Xamarin.Mac.registrar.mobile.arm64.h
 
-Microsoft.macOS.registrar.x86_64.m: $(TOP)/src/build/dotnet/macos/64/Xamarin.Mac.dll $(LOCAL_MMP)
+Microsoft.macOS.registrar.x86_64.m: $(TOP)/src/build/dotnet/macos/64/Microsoft.macOS.dll $(LOCAL_MMP)
 	$(GENERATE_PART_REGISTRAR) --arch=x86_64 --target-framework .NETCoreApp,Version=6.0,Profile=macos -a:$(DOTNET6_BCL_DIR)/System.Runtime.dll
 	$(Q) touch $@ $(basename $@).h
 
-Microsoft.macOS.registrar.coreclr.x86_64.m: $(TOP)/src/build/dotnet/macos/64/Xamarin.Mac.dll $(LOCAL_MMP)
+Microsoft.macOS.registrar.coreclr.x86_64.m: $(TOP)/src/build/dotnet/macos/64/Microsoft.macOS.dll $(LOCAL_MMP)
 	$(GENERATE_PART_REGISTRAR) --arch=x86_64 --target-framework .NETCoreApp,Version=6.0,Profile=macos -a:$(DOTNET6_BCL_DIR)/System.Runtime.dll --xamarin-runtime CoreCLR
 	$(Q) touch $@ $(basename $@).h
 
@@ -91,11 +91,11 @@ Xamarin.Mac.registrar.full.x86_64.m:   $(TOP)/src/build/mac/full-64/Xamarin.Mac.
 	$(GENERATE_PART_REGISTRAR) --arch=x86_64 --target-framework Xamarin.Mac,Version=v4.5,Profile=Full -a:$(FULL_BCL_DIR)/mscorlib.dll
 	$(Q) touch Xamarin.Mac.registrar.full.x86_64.m Xamarin.Mac.registrar.full.x86_64.h
 
-Microsoft.macOS.registrar.arm64.m: $(TOP)/src/build/dotnet/macos/64/Xamarin.Mac.dll $(LOCAL_MMP)
+Microsoft.macOS.registrar.arm64.m: $(TOP)/src/build/dotnet/macos/64/Microsoft.macOS.dll $(LOCAL_MMP)
 	$(GENERATE_PART_REGISTRAR) --arch=arm64 --target-framework .NETCoreApp,Version=6.0,Profile=macos -a:$(DOTNET6_BCL_DIR)/System.Runtime.dll
 	$(Q) touch $@ $(basename $@).h
 
-Microsoft.macOS.registrar.coreclr.arm64.m: $(TOP)/src/build/dotnet/macos/64/Xamarin.Mac.dll $(LOCAL_MMP)
+Microsoft.macOS.registrar.coreclr.arm64.m: $(TOP)/src/build/dotnet/macos/64/Microsoft.macOS.dll $(LOCAL_MMP)
 	$(GENERATE_PART_REGISTRAR) --arch=arm64 --target-framework .NETCoreApp,Version=6.0,Profile=macos -a:$(DOTNET6_BCL_DIR)/System.Runtime.dll --xamarin-runtime CoreCLR
 	$(Q) touch $@ $(basename $@).h
 
diff --git a/tools/mtouch/Makefile b/tools/mtouch/Makefile
index 534eb586ddc0..38693983c845 100644
--- a/tools/mtouch/Makefile
+++ b/tools/mtouch/Makefile
@@ -229,7 +229,7 @@ define RunRegistrar
 	$$(Q_GEN) $$(LOCAL_MTOUCH_COMMAND) --xamarin-framework-directory=$$(IOS_DESTDIR)/$$(MONOTOUCH_PREFIX) $$(MTOUCH_VERBOSITY) --runregistrar:$$(abspath $$(basename $$@).m) --sdkroot $$(XCODE_DEVELOPER_ROOT) --sdk $(4) $$< --registrar:static --target-framework Xamarin.$(5),v1.0 --abi $(2) -r:$(8)/mscorlib.dll
 	$$(Q) touch $$(basename $$@).m $$(basename $$@).h
 
-.libs/Microsoft.$(9).registrar.$(10)%m .libs/Microsoft.$(9).registrar.$(10)%h: $(TOP)/src/build/dotnet/$(1)/$(3)/Xamarin.$(5).dll $(LOCAL_MTOUCH) | .libs
+.libs/Microsoft.$(9).registrar.$(10)%m .libs/Microsoft.$(9).registrar.$(10)%h: $(TOP)/src/build/dotnet/$(1)/$(3)/Microsoft.$(9).dll $(LOCAL_MTOUCH) | .libs
 	$$(Q_GEN) $$(LOCAL_MTOUCH_COMMAND) --xamarin-framework-directory=$$(IOS_DESTDIR)/$$(MONOTOUCH_PREFIX) $$(MTOUCH_VERBOSITY) --runregistrar:$$(abspath $$(basename $$@).m) --sdkroot $$(XCODE_DEVELOPER_ROOT) --sdk $(4) $$< --registrar:static --target-framework .NETCoreApp,Version=6.0,Profile=$(1) --abi $(2) -r:$(DOTNET6_BCL_DIR)/System.Runtime.dll --rid $(10)
 	$$(Q) touch $$(basename $$@).m $$(basename $$@).h