Enable marshal methods support by default #7351
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <linker> | ||
| <assembly fullname="Mono.Android.Runtime" preserve="all" /> | ||
| </linker> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| using System; | ||
|
|
||
| namespace Android.Runtime | ||
|
There was a problem hiding this comment. …and more name bikeshedding: I think it was a historical mistake to use I think There was a problem hiding this comment. Likewise, I'd rather keep the |
||
| { | ||
| internal static class AndroidEnvironmentInternal | ||
| { | ||
| internal static Action<Exception>? UnhandledExceptionHandler; | ||
|
|
||
| internal static void UnhandledException (Exception e) | ||
| { | ||
| if (UnhandledExceptionHandler == null) { | ||
| return; | ||
|
There was a problem hiding this comment. I wonder if this should There was a problem hiding this comment. I wouldn't abort explicitly here. Hitting it during startup is very unlikely, and if it's not properly initialized, the app will crash anyway, implicitly aborting. |
||
| } | ||
|
|
||
| UnhandledExceptionHandler (e); | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| <Project> | ||
| <UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.ReplaceFileContents" /> | ||
| <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" /> | ||
| <Import Project="..\..\Configuration.props" /> | ||
| <Import Project="..\..\build-tools\scripts\XAVersionInfo.targets" /> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFrameworks>$(DotNetTargetFramework)</TargetFrameworks> | ||
| <AllowUnsafeBlocks>true</AllowUnsafeBlocks> | ||
| <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> | ||
| <AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile> | ||
| <EnableDefaultCompileItems>false</EnableDefaultCompileItems> | ||
| <EnableSingleFileAnalyzer>true</EnableSingleFileAnalyzer> | ||
| <GenerateAssemblyInfo>false</GenerateAssemblyInfo> | ||
| <ImplicitlyExpandDesignTimeFacades>false</ImplicitlyExpandDesignTimeFacades> | ||
| <LangVersion>10</LangVersion> | ||
| <NoStdLib>true</NoStdLib> | ||
| <Nullable>enable</Nullable> | ||
| <ProduceReferenceAssembly>true</ProduceReferenceAssembly> | ||
| <SignAssembly>true</SignAssembly> | ||
|
|
||
| <!-- Ignore "unused member" warnings from code that originates from Mono.CodeGeneration --> | ||
| <NoWarn>$(NoWarn);CS0169;CS0414;CS0649</NoWarn> | ||
|
|
||
| <DefineConstants>$(DefineConstants);INSIDE_MONO_ANDROID_RUNTIME;JAVA_INTEROP</DefineConstants> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <OutputPath>$(_MonoAndroidNETDefaultOutDir)</OutputPath> | ||
| </PropertyGroup> | ||
|
|
||
| <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" /> | ||
|
|
||
| <!-- Only build the .NET 6+ version of 'Mono.Android.Export.dll' for the latest stable Android version. --> | ||
| <PropertyGroup Condition=" '$(AndroidApiLevel)' != '$(AndroidLatestStableApiLevel)' "> | ||
| <BuildDependsOn></BuildDependsOn> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- Copy .NET ref/runtime assemblies to bin/$(Configuration)/dotnet/packs folder --> | ||
| <PropertyGroup Condition=" '$(AndroidApiLevel)' == '$(AndroidLatestStableApiLevel)' "> | ||
| <BuildDependsOn> | ||
| $(BuildDependsOn); | ||
| _CopyToPackDirs; | ||
| </BuildDependsOn> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Compile Include="$(IntermediateOutputPath)AssemblyInfo.cs" /> | ||
| <Compile Include="..\Mono.Android\Android.Runtime\AndroidRuntimeInternal.cs" /> | ||
| <Compile Include="..\Mono.Android\Android.Runtime\LogCategories.cs" /> | ||
| <Compile Include="..\Mono.Android\Android.Runtime\LogLevel.cs" /> | ||
| <Compile Include="..\Mono.Android\Android.Runtime\RuntimeConstants.cs" /> | ||
| <Compile Include="..\Mono.Android\Android.Runtime\RuntimeNativeMethods.cs" /> | ||
| <Compile Include="Android.Runtime\AndroidEnvironmentInternal.cs" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\external\Java.Interop\src\Java.Interop\Java.Interop.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| <Import Project="Mono.Android.Runtime.targets" /> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <!-- Creates 'AssemblyInfo.cs' with appropriate version information --> | ||
| <Target Name="_BuildAssemblyInfo_cs" | ||
| DependsOnTargets="GetXAVersionInfo" | ||
| BeforeTargets="CoreCompile" | ||
| Condition="!Exists ('$(IntermediateOutputPath)AssemblyInfo.cs')" | ||
| Inputs="Properties\AssemblyInfo.cs.in" | ||
| Outputs="$(IntermediateOutputPath)AssemblyInfo.cs"> | ||
| <PropertyGroup Condition=" '$(TargetFramework)' == 'monoandroid10' "> | ||
| <_PackageVersion>$(ProductVersion)</_PackageVersion> | ||
| <_PackageVersionBuild>$(XAVersionCommitCount)</_PackageVersionBuild> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(TargetFramework)' != 'monoandroid10' "> | ||
| <_PackageVersion>$(AndroidPackVersion)</_PackageVersion> | ||
| <_PackageVersionBuild>$(PackVersionCommitCount)</_PackageVersionBuild> | ||
| </PropertyGroup> | ||
| <ReplaceFileContents | ||
| SourceFile="Properties\AssemblyInfo.cs.in" | ||
| DestinationFile="$(IntermediateOutputPath)AssemblyInfo.cs" | ||
| Replacements="@PACKAGE_VERSION@=$(_PackageVersion);@PACKAGE_VERSION_BUILD@=$(_PackageVersionBuild);@PACKAGE_HEAD_REV@=$(XAVersionHash);@PACKAGE_HEAD_BRANCH@=$(XAVersionBranch);@API_LEVEL@=$(AndroidApiLevel);@MIN_API_LEVEL@=$(AndroidMinimumDotNetApiLevel)"> | ||
| </ReplaceFileContents> | ||
| </Target> | ||
|
|
||
| <Target Name="_CopyToPackDirs" > | ||
| <Copy | ||
| SourceFiles="$(OutputPath)ref\Mono.Android.Runtime.dll" | ||
| DestinationFolder="$(MicrosoftAndroidRefPackDir)" | ||
| SkipUnchangedFiles="true" | ||
| /> | ||
| <Copy | ||
| SourceFiles="$(OutputPath)Mono.Android.Runtime.dll" | ||
| DestinationFolder="$(MicrosoftAndroidArmPackDir)lib\$(DotNetTargetFramework)" | ||
| SkipUnchangedFiles="true" | ||
| /> | ||
| <Copy | ||
| SourceFiles="$(OutputPath)Mono.Android.Runtime.dll" | ||
| DestinationFolder="$(MicrosoftAndroidArm64PackDir)lib\$(DotNetTargetFramework)" | ||
| SkipUnchangedFiles="true" | ||
| /> | ||
| <Copy | ||
| SourceFiles="$(OutputPath)Mono.Android.Runtime.dll" | ||
| DestinationFolder="$(MicrosoftAndroidx86PackDir)lib\$(DotNetTargetFramework)" | ||
| SkipUnchangedFiles="true" | ||
| /> | ||
| <Copy | ||
| SourceFiles="$(OutputPath)Mono.Android.Runtime.dll" | ||
| DestinationFolder="$(MicrosoftAndroidx64PackDir)lib\$(DotNetTargetFramework)" | ||
| SkipUnchangedFiles="true" | ||
| /> | ||
| </Target> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| // | ||
| // AssemblyInfo.cs.in | ||
| // | ||
| // Authors: | ||
| // Jonathan Pryor (jonp@xamarin.com) | ||
| // | ||
| // Copyright 2014 Xamarin, Inc. | ||
| // Copyright 2016 Microsoft Corporation. | ||
|
|
||
| using System.Reflection; | ||
| using System.Runtime.CompilerServices; | ||
| using System.Runtime.Versioning; | ||
|
|
||
| [assembly: AssemblyInformationalVersion ("@PACKAGE_VERSION@.@PACKAGE_VERSION_BUILD@; git-rev-head:@PACKAGE_HEAD_REV@; git-branch:@PACKAGE_HEAD_BRANCH@")] | ||
| [assembly: AssemblyTitle ("Mono.Android.Runtime.dll")] | ||
| [assembly: AssemblyProduct ("Xamarin.Android")] | ||
| [assembly: AssemblyCompany ("Microsoft Corporation")] | ||
| [assembly: TargetPlatform("Android@API_LEVEL@.0")] | ||
| [assembly: SupportedOSPlatform("Android@MIN_API_LEVEL@.0")] | ||
|
|
||
| [assembly: InternalsVisibleTo("Mono.Android, PublicKey=0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db")] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I fear that I'm gonna be "bikeshedding" half the naming here -- and I am! -- but…
Mono.Android.Runtimeis not "future-facing". We may stick withMono.Android.dll"forever", but there are equal odds that we may do aMicrosoft.Android.dllname in the future (.NET 10?).As such, we should choose names which are unlikely to need changing. Possible suggestions:
Microsoft.Android.Startup.dllMicrosoft.Android.Internals.dllMicrosoft.Android.Interop.dllThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd rather keep it
Mono.Android.Runtimefor now, since it pairs nicely withMono.Android(and that was the reason I chose this name)