Skip to content
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

Jump to bottom

Bump to net6 preview2 (6.0.100-preview.2.21114.3) #5669

Merged
merged 6 commits into from
Mar 4, 2021
Merged

Bump to net6 preview2 (6.0.100-preview.2.21114.3) #5669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
66de155
Bump to net6 preview2 (6.0.100-preview.2.21114.3)
radekdoulik Mar 1, 2021
64725bb
Update DotNetRuntimePacksVersion
radekdoulik Mar 3, 2021
c735a55
Do not use 2 missing functions on NET6
radekdoulik Mar 3, 2021
e600544
Do not remove the fields
radekdoulik Mar 3, 2021
438afbb
Add temporary workaround
radekdoulik Mar 3, 2021
e0bf2c8
Temporarily ignore PerformanceTest in .NET 6
jonathanpeppers Mar 4, 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
4 changes: 2 additions & 2 deletions Configuration.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@
<!-- Version number from: https://github.com/dotnet/installer#installers-and-binaries -->
<!-- Please update DotNetRuntimePacksVersion below accordingly -->
<DotNetPreviewVersionBand Condition=" '$(DotNetPreviewVersionBand)' == '' ">6.0.100</DotNetPreviewVersionBand>
<DotNetPreviewVersionFull Condition=" '$(DotNetPreviewVersionFull)' == '' ">$(DotNetPreviewVersionBand)-preview.1.21109.8</DotNetPreviewVersionFull>
<DotNetPreviewVersionFull Condition=" '$(DotNetPreviewVersionFull)' == '' ">$(DotNetPreviewVersionBand)-preview.2.21114.3</DotNetPreviewVersionFull>
<!-- This version comes from the a file in the dotnet distribution: sdk/$(DotNetPreviewVersionFull)/dotnet.runtimeconfig.json (the `runtimeOptions/framework/version key`) -->
<DotNetRuntimePacksVersion Condition=" '$(DotNetRuntimePacksVersion)' == '' ">6.0.0-preview.2.21108.2</DotNetRuntimePacksVersion>
<DotNetRuntimePacksVersion Condition=" '$(DotNetRuntimePacksVersion)' == '' ">6.0.0-preview.2.21114.2</DotNetRuntimePacksVersion>
<ILLinkVersionBand Condition=" '$(ILLinkVersionBand)' == '' ">6.0.0</ILLinkVersionBand>
<ILLinkVersionFull Condition=" '$(ILLinkVersionFull)' == '' ">$(ILLinkVersionBand)-alpha.1.21109.1</ILLinkVersionFull>
<WixToolPath Condition=" '$(WixToolPath)' == '' ">$(AndroidToolchainDirectory)\wix\</WixToolPath>
Expand Down
7 changes: 7 additions & 0 deletions src/Microsoft.Android.Sdk.ILLink/PreserveLists/System.Private.CoreLib.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<!-- Temporary workaround for crash in GlobalizationNative_GetSortHandle, context: https://github.com/xamarin/xamarin-android/pull/5669 -->
<linker>
<assembly fullname="System.Private.CoreLib">
<type fullname="System.Globalization.GlobalizationMode" />
</assembly>
</linker>
2 changes: 2 additions & 0 deletions src/monodroid/jni/embedded-assemblies-zip.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ EmbeddedAssemblies::zip_load_entries (int fd, const char *apk_name, monodroid_sh
continue;
}

#if !defined(NET6)
if (utils.ends_with (file_name, ".config") && bundled_assemblies != nullptr) {
char *assembly_name = strdup (basename (file_name));
// Remove '.config' suffix
Expand All @@ -115,6 +116,7 @@ EmbeddedAssemblies::zip_load_entries (int fd, const char *apk_name, monodroid_sh

continue;
}
#endif // ndef NET6

if (!utils.ends_with (file_name, ".dll"))
continue;
Expand Down
17 changes: 16 additions & 1 deletion src/monodroid/jni/monodroid-glue.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,10 +801,18 @@ MonodroidRuntime::mono_runtime_init ([[maybe_unused]] dynamic_local_string<PROPE
if (mono_mkbundle_initialize_mono_api) {
BundleMonoAPI bundle_mono_api = {
.mono_register_bundled_assemblies = mono_register_bundled_assemblies,
#if !defined(NET6)
.mono_register_config_for_assembly = mono_register_config_for_assembly,
#else
.mono_register_config_for_assembly = nullptr,
#endif // ndef NET6
.mono_jit_set_aot_mode = reinterpret_cast<void (*)(int)>(mono_jit_set_aot_mode),
.mono_aot_register_module = mono_aot_register_module,
#if !defined(NET6)
.mono_config_parse_memory = mono_config_parse_memory,
#else
.mono_config_parse_memory = nullptr,
#endif // ndef NET6
.mono_register_machine_config = reinterpret_cast<void (*)(const char *)>(mono_register_machine_config),
};

Expand All @@ -813,7 +821,14 @@ MonodroidRuntime::mono_runtime_init ([[maybe_unused]] dynamic_local_string<PROPE
}

if (mono_mkbundle_init)
mono_mkbundle_init (mono_register_bundled_assemblies, mono_register_config_for_assembly, reinterpret_cast<void (*)(int)>(mono_jit_set_aot_mode));
mono_mkbundle_init (
mono_register_bundled_assemblies,
#if defined(NET6)
nullptr,
#else
mono_register_config_for_assembly,
#endif // def NET6
reinterpret_cast<void (*)(int)>(mono_jit_set_aot_mode));

/*
* Assembly preload hooks are invoked in _reverse_ registration order.
Expand Down
5 changes: 5 additions & 0 deletions tests/MSBuildDeviceIntegration/Tests/PerformanceTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,11 @@ void Profile (ProjectBuilder builder, Action<ProjectBuilder> action, [CallerMemb

double GetDurationFromBinLog (ProjectBuilder builder)
{
//TODO: BuildEventArgsReader.Read() returns null in .NET 6 Preview 2
// See: https://github.com/dotnet/msbuild/issues/6225
if (Builder.UseDotNet)
Assert.Ignore ("Cannot currently parse .binlog files in .NET 6 Preview 2");

var duration = TimeSpan.Zero;
var binlog = Path.Combine (Root, builder.ProjectDirectory, "msbuild.binlog");
FileAssert.Exists (binlog);
Expand Down