Skip to content

[illink] Don't initialize managed peer #5444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
radekdoulik wants to merge 8 commits into from
Closed

[illink] Don't initialize managed peer #5444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
eef95d9
[illink] Don't initialize managed peer
radekdoulik Dec 18, 2020
04caada
Update CheckIncludedAssemblies test
radekdoulik Dec 18, 2020
717ea16
Cleaning
radekdoulik Dec 18, 2020
e683eda
Bump JI
radekdoulik Jan 12, 2021
b532122
Update the comment to contain link to the XA
radekdoulik Jan 12, 2021
c429ea9
Create the directory before writing file to it
radekdoulik Jan 12, 2021
85dd39c
Refactor
radekdoulik Jan 12, 2021
a04ba26
Bump JI
radekdoulik Jan 15, 2021
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
32 changes: 32 additions & 0 deletions build-tools/xaprepare/xaprepare/Application/GeneratedJavaInteropConfigPropsFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
using System.IO;

namespace Xamarin.Android.Prepare
{
class GeneratedJavaInteropConfigPropsFile : GeneratedFile
{
const string Content = @"<?xml version=""1.0"" encoding=""utf-8""?>
<!-- This is a GENERATED FILE -->
<!-- See https://github.com/xamarin/xamarin-android/tree/master/build-tools/xaprepare/xaprepare/Application/GeneratedJavaInteropConfigPropsFile.cs -->
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
<PropertyGroup>
<JavaInteropDefineConstants>XA_JI_EXCLUDE</JavaInteropDefineConstants>
</PropertyGroup>
</Project>
";

public GeneratedJavaInteropConfigPropsFile (Context context)
: base (Path.Combine (Configurables.Paths.ExternalJavaInteropDir, "bin", $"Build{context.Configuration}", "XAConfig.props"))
{}

public override void Generate (Context context)
{
var dir = Path.GetDirectoryName (OutputPath);
if (!Directory.Exists (dir))
Directory.CreateDirectory (dir);

using var fs = File.Open (OutputPath, FileMode.Create);
using var sw = new StreamWriter (fs);
sw.Write (Content);
}
}
}
1 change: 1 addition & 0 deletions build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ protected override async Task<bool> Execute (Context context)
var steps = new List <GeneratedFile> {
new GeneratedProfileAssembliesProjitemsFile (Configurables.Paths.ProfileAssembliesProjitemsPath),
new GeneratedMonoAndroidProjitemsFile (),
new GeneratedJavaInteropConfigPropsFile (context),
};

AddOSSpecificSteps (context, steps);
Expand Down
2 changes: 1 addition & 1 deletion external/Java.Interop
Open in desktop
Submodule Java.Interop updated from 3894cd to 00862a
3 changes: 0 additions & 3 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,8 @@ public void CheckIncludedAssemblies ()
"Java.Interop.dll",
"Mono.Android.dll",
"System.Console.dll",
"System.Linq.Expressions.dll",
"System.ObjectModel.dll",
"System.Private.CoreLib.dll",
"System.Collections.Concurrent.dll",
"System.Collections.dll",
"System.Linq.dll",
"UnnamedProject.dll",
} :
Expand Down