Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
ea830a8
[.NET] Rename our product assemblies. Fixes #13748.
rolfbjarne Jan 21, 2022
3a1739d
[tests] Fix lookup of BCL directory for newly renamed platform assemb…
rolfbjarne Jan 25, 2022
a9db448
[dotnet-linker] Update how we compute the native method name for the …
rolfbjarne Jan 25, 2022
2d81dd2
Merge remote-tracking branch 'origin/main' into dotnet-rename-assemblies
rolfbjarne Jan 25, 2022
c269215
[runtime] Fix constants (and indentation).
rolfbjarne Jan 25, 2022
116c12d
Merge remote-tracking branch 'origin/main' into dotnet-rename-assemblies
rolfbjarne Jan 26, 2022
773ee1e
Fix name to Microsoft.macOS.dll.
rolfbjarne Jan 26, 2022
efcca47
[apidiff] Fix after assembly renames.
rolfbjarne Jan 26, 2022
5513c19
Fix more cases of hardcoded assembly names.
rolfbjarne Jan 27, 2022
3d737b7
Merge remote-tracking branch 'origin' into dotnet-rename-assemblies
rolfbjarne Jan 27, 2022
98cd1c5
Fix tests
rolfbjarne Jan 28, 2022
111501e
Add docs.
rolfbjarne Jan 28, 2022
40c5f1e
Merge remote-tracking branch 'origin' into dotnet-rename-assemblies
rolfbjarne Jan 28, 2022
6b83cfd
Fix xtro.
rolfbjarne Jan 31, 2022
2e71ebc
Merge remote-tracking branch 'origin' into dotnet-rename-assemblies
rolfbjarne Jan 31, 2022
3f70987
[dotnet] Remove test cases using Xamarin.Forms in .NET.
rolfbjarne Feb 1, 2022
5b9ef37
Merge remote-tracking branch 'origin' into dotnet-rename-assemblies
rolfbjarne Feb 2, 2022
74b45d9
Merge remote-tracking branch 'origin/main' into dotnet-rename-assemblies
rolfbjarne Feb 15, 2022
cc8e169
Bump to a 6.0.300 dotnet/runtime.
rolfbjarne Feb 15, 2022
db1b099
[tests] Adjust BundleStructureTest to cope with Microsoft.* assemblie…
rolfbjarne Feb 15, 2022
3bd3a80
Merge remote-tracking branch 'origin/main' into dotnet-rename-assemblies
rolfbjarne Feb 15, 2022
b92404c
Update link attributes.
rolfbjarne Feb 15, 2022
9314b6c
One more test update.
rolfbjarne Feb 16, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix more cases of hardcoded assembly names.
  • Loading branch information
rolfbjarne committed Jan 27, 2022
commit 5513c1941f71c4af321343a3b106ae839a37ccda
30 changes: 25 additions & 5 deletions src/ObjCRuntime/Registrar.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down