Add runtimeconfig.json support to AppleAppBuilder, reenable affected tests#53172

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

Merged
marek-safar merged 2 commits into from
May 24, 2021
Merged

Add runtimeconfig.json support to AppleAppBuilder, reenable affected tests #53172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8b8322
Add runtimeconfig.json support to AppleAppBuilder, reenable affected …
filipnavara May 24, 2021
74ce9a0
Update tests.mobile.targets
filipnavara May 24, 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
49 changes: 29 additions & 20 deletions eng/testing/tests.mobile.targets
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,22 +14,22 @@

<PropertyGroup Condition="'$(TargetOS)' == 'Android' and '$(UseDefaultAndroidFeatureSwitches)' == 'true'">
<DebuggerSupport>false</DebuggerSupport>
<EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
<EnableUnsafeUTF7Encoding Condition="'$(EnableUnsafeUTF7Encoding)' == ''">false</EnableUnsafeUTF7Encoding>
<EnableUnsafeBinaryFormatterSerialization>false</EnableUnsafeBinaryFormatterSerialization>
<EventSourceSupport>false</EventSourceSupport>
<UseSystemResourceKeys>true</UseSystemResourceKeys>
<UseSystemResourceKeys Condition="'$(UseSystemResourceKeys)' == ''">true</UseSystemResourceKeys>
<HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
<StartupHookSupport>false</StartupHookSupport>
<UseNativeHttpHandler>true</UseNativeHttpHandler>
</PropertyGroup>

<PropertyGroup Condition="('$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator') and '$(UseDefaultiOSFeatureSwitches)' == 'true'">
<EnableUnsafeBinaryFormatterSerialization>false</EnableUnsafeBinaryFormatterSerialization>
<EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
<EnableUnsafeUTF7Encoding Condition="'$(EnableUnsafeUTF7Encoding)' == ''">false</EnableUnsafeUTF7Encoding>
<EventSourceSupport>false</EventSourceSupport>
<HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
<StartupHookSupport>false</StartupHookSupport>
<UseSystemResourceKeys>true</UseSystemResourceKeys>
<UseSystemResourceKeys Condition="'$(UseSystemResourceKeys)' == ''">true</UseSystemResourceKeys>
<UseNativeHttpHandler>true</UseNativeHttpHandler>
</PropertyGroup>

Expand DownExpand Up@@ -58,15 +58,35 @@

<Import Project="$(MSBuildThisFileDirectory)tests.wasm.targets" Condition="'$(TargetOS)' == 'Browser'" />

<UsingTask TaskName="RuntimeConfigParserTask"
AssemblyFile="$(RuntimeConfigParserTasksAssemblyPath)"
Condition="'$(RuntimeConfigParserTasksAssemblyPath)' != ''" />

<Target Name="GenerateRuntimeConfig">
<PropertyGroup>
<RuntimeConfigFilePath>$(PublishDir)$(AssemblyName).runtimeconfig.json</RuntimeConfigFilePath>
<ParsedRuntimeConfigFilePath>$(PublishDir)runtimeconfig.bin</ParsedRuntimeConfigFilePath>
</PropertyGroup>

<ItemGroup Condition="'$(RunAOTCompilation)' == 'true'">
<RuntimeConfigReservedProperties Include="RUNTIME_IDENTIFIER"/>
<RuntimeConfigReservedProperties Include="APP_CONTEXT_BASE_DIRECTORY"/>
</ItemGroup>

<!-- Parse runtimeconfig.template.json file -->
<RuntimeConfigParserTask
RuntimeConfigFile="$(RuntimeConfigFilePath)"
OutputFile="$(ParsedRuntimeConfigFilePath)"
RuntimeConfigReservedProperties="@(RuntimeConfigReservedProperties)">
</RuntimeConfigParserTask>
</Target>

<!-- Generate a self-contained app bundle for Android with tests. -->
<UsingTask Condition="'$(TargetOS)' == 'Android'"
TaskName="AndroidAppBuilderTask"
AssemblyFile="$(AndroidAppBuilderTasksAssemblyPath)" />
<UsingTask Condition="'$(TargetOS)' == 'Android'"
TaskName="RuntimeConfigParserTask"
AssemblyFile="$(RuntimeConfigParserTasksAssemblyPath)" />

<Target Condition="'$(TargetOS)' == 'Android'" Name="BundleTestAndroidApp">
<Target Condition="'$(TargetOS)' == 'Android'" Name="BundleTestAndroidApp" DependsOnTargets="GenerateRuntimeConfig">
<Error Condition="!Exists('$(MicrosoftNetCoreAppRuntimePackRidDir)')" Text="MicrosoftNetCoreAppRuntimePackRidDir=$(MicrosoftNetCoreAppRuntimePackRidDir) doesn't exist" />

<PropertyGroup>
Expand All@@ -76,16 +96,12 @@
<AndroidAbi Condition="'$(TargetArchitecture)' == 'x86'">x86</AndroidAbi>

<MainLibraryFileName Condition="'$(MainLibraryFileName)' == ''">AndroidTestRunner.dll</MainLibraryFileName>
<RuntimeConfigFilePath>$(PublishDir)$(AssemblyName).runtimeconfig.json</RuntimeConfigFilePath>
<ParsedRuntimeConfigFilePath>$(PublishDir)runtimeconfig.bin</ParsedRuntimeConfigFilePath>
</PropertyGroup>
<ItemGroup Condition="'$(RunAOTCompilation)' == 'true'">
<AotInputAssemblies Include="$(PublishDir)\*.dll">
<AotArguments>@(MonoAOTCompilerDefaultAotArguments, ';')</AotArguments>
<ProcessArguments>@(MonoAOTCompilerDefaultProcessArguments, ';')</ProcessArguments>
</AotInputAssemblies>
<RuntimeConfigReservedProperties Include="RUNTIME_IDENTIFIER"/>
<RuntimeConfigReservedProperties Include="APP_CONTEXT_BASE_DIRECTORY"/>
</ItemGroup>

<WriteLinesToFile File="$(PublishDir)xunit-excludes.txt" Lines="$(XunitExcludesTxtFileContent)" Overwrite="true" />
Expand All@@ -94,13 +110,6 @@
Condition="'$(RunAOTCompilation)' == 'true'"/>
<RemoveDir Directories="$(BundleDir)" />

<!-- Parse runtimeconfig.template.json file -->
<RuntimeConfigParserTask
RuntimeConfigFile="$(RuntimeConfigFilePath)"
OutputFile="$(ParsedRuntimeConfigFilePath)"
RuntimeConfigReservedProperties="@(RuntimeConfigReservedProperties)">
</RuntimeConfigParserTask>

<MonoAOTCompiler Condition="'$(RunAOTCompilation)' == 'true'"
CompilerBinaryPath="$(MonoAotCrossCompilerPath)"
OutputDir="$(_MobileIntermediateOutputPath)"
Expand DownExpand Up@@ -147,7 +156,7 @@
<DevTeamProvisioning Condition="'$(TargetOS)' == 'MacCatalyst' and '$(DevTeamProvisioning)' == ''">adhoc</DevTeamProvisioning>
</PropertyGroup>

<Target Condition="'$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator'" Name="BundleTestAppleApp">
<Target Condition="'$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator'" Name="BundleTestAppleApp" DependsOnTargets="GenerateRuntimeConfig">
<Error Condition="!Exists('$(MicrosoftNetCoreAppRuntimePackRidDir)')" Text="MicrosoftNetCoreAppRuntimePackRidDir=$(MicrosoftNetCoreAppRuntimePackRidDir) doesn't exist" />
<Error Condition="('$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'arm' or '$(TargetOS)' == 'MacCatalyst') and '$(DevTeamProvisioning)' == ''"
Text="'DevTeamProvisioning' needs to be set for device builds. Set it to 'UBF8T346G9' if you're part of the Microsoft team account, or 'adhoc' to sign with an adhoc key.." />
Expand Down
4 changes: 0 additions & 4 deletions src/libraries/System.Text.Encoding/tests/Encoding/Encoding.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,8 +67,6 @@ public static void GetEncodingsTest()
[ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
[Theory]
[MemberData(nameof(Encoding_TestData))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
public static void VerifyCodePageAttributes(int codepage, string name, string bodyName, string headerName, bool isBrowserDisplay,
bool isBrowserSave, bool isMailNewsDisplay, bool isMailNewsSave, int windowsCodePage)
{
Expand All@@ -86,8 +84,6 @@ public static void VerifyCodePageAttributes(int codepage, string name, string bo
[ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
[Theory]
[MemberData(nameof(Normalization_TestData))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
public static void NormalizationTest(int codepage, bool normalized, bool normalizedC, bool normalizedD, bool normalizedKC, bool normalizedKD)
{
Encoding encoding = Encoding.GetEncoding(codepage);
Expand Down
6 changes: 0 additions & 6 deletions src/libraries/System.Text.Encoding/tests/Encoding/EncodingGetEncodingTests.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,8 +90,6 @@ public CodePageMapping(string name, int codepage)

[ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
public void TestEncodingNameAndCopdepageNumber()
{
foreach (var map in s_mapping)
Expand All@@ -103,8 +101,6 @@ public void TestEncodingNameAndCopdepageNumber()

[ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
public void GetEncoding_EncodingName()
{
using (new ThreadCultureChange(CultureInfo.InvariantCulture))
Expand All@@ -125,8 +121,6 @@ public void GetEncoding_EncodingName()

[ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
public void GetEncoding_WebName()
{
foreach (var mapping in s_codePageToWebNameMappings)
Expand Down
4 changes: 1 addition & 3 deletions src/libraries/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<!-- Encoding.UTF7 and UTF7Encoding are obsolete, but we're the unit test project for it, so suppress warnings -->
<NoWarn>$(NoWarn),SYSLIB0001</NoWarn>
<EnableUnsafeUTF7Encoding>true</EnableUnsafeUTF7Encoding>
</PropertyGroup>
<ItemGroup>
<Compile Include="ASCIIEncoding\ASCIIEncodingEncode.cs" />
Expand DownExpand Up@@ -85,9 +86,6 @@
<Compile Include="$(CommonPath)System\Net\MultiArrayBuffer.cs" Link="ProductionCode\Common\System\Net\MultiArrayBuffer.cs" />
<Compile Include="$(CommonPath)System\Net\StreamBuffer.cs" Link="ProductionCode\Common\System\Net\StreamBuffer.cs" />
</ItemGroup>
<ItemGroup>
<None Include="runtimeconfig.template.json" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Moq" Version="$(MoqVersion)" />
</ItemGroup>
Expand Down
2 changes: 0 additions & 2 deletions src/libraries/System.Text.Encoding/tests/UTF7Encoding/UTF7EncodingEncode.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,8 +61,6 @@ public static IEnumerable<object[]> Encode_Basic_TestData()

[Theory]
[MemberData(nameof(Encode_Basic_TestData))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
public void Encode_Basic(string source, int index, int count, byte[] expected)
{
Encode_Advanced(true, source, index, count, expected);
Expand Down
13 changes: 1 addition & 12 deletions src/libraries/System.Text.Encoding/tests/UTF7Encoding/UTF7EncodingTests.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,46 +52,37 @@ public static IEnumerable<object[]> Encodings_TestData()
yield return new object[] { Encoding.UTF7 };
yield return new object[] { Encoding.GetEncoding("utf-7") };
}

[Theory]
[MemberData(nameof(Encodings_TestData))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
public void WebName(UTF7Encoding encoding)
{
Assert.Equal("utf-7", encoding.WebName);
}

[Theory]
[MemberData(nameof(Encodings_TestData))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
public void CodePage(UTF7Encoding encoding)
{
Assert.Equal(65000, encoding.CodePage);
}

[Theory]
[MemberData(nameof(Encodings_TestData))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
public void EncodingName(UTF7Encoding encoding)
{
Assert.NotEmpty(encoding.EncodingName); // Unicode (UTF-7) in en-US
}

[Theory]
[MemberData(nameof(Encodings_TestData))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
public void IsSingleByte(UTF7Encoding encoding)
{
Assert.False(encoding.IsSingleByte);
}

[Theory]
[MemberData(nameof(Encodings_TestData))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
public void Clone(UTF7Encoding encoding)
{
UTF7Encoding clone = (UTF7Encoding)encoding.Clone();
Expand DownExpand Up@@ -125,8 +116,6 @@ public static IEnumerable<object[]> Equals_TestData()

[Theory]
[MemberData(nameof(Equals_TestData))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
public void EqualsTest(UTF7Encoding encoding, object value, bool expected)
{
Assert.Equal(expected, encoding.Equals(value));
Expand Down
5 changes: 0 additions & 5 deletions src/libraries/System.Text.Encoding/tests/runtimeconfig.template.json
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions src/tasks/AndroidAppBuilder/Templates/monodroid.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -239,6 +239,8 @@ mono_droid_runtime_init (const char* executable, int managed_argc, char* managed
arg->kind = 0;
arg->runtimeconfig.name.path = file_path;
monovm_runtimeconfig_initialize (arg, cleanup_runtime_config, file_path);
} else {
free (file_path);

@CoffeeFluxCoffeeFluxMay 24, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, thanks.

}

monovm_initialize(2, appctx_keys, appctx_values);
Expand Down
26 changes: 26 additions & 0 deletions src/tasks/AppleAppBuilder/Templates/runtime.m
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@

#define APPLE_RUNTIME_IDENTIFIER "//%APPLE_RUNTIME_IDENTIFIER%"

#define RUNTIMECONFIG_BIN_FILE "runtimeconfig.bin"

const char *
get_bundle_path (void)
{
Expand DownExpand Up@@ -205,6 +207,13 @@
//%DllMap%
}

void
cleanup_runtime_config (MonovmRuntimeConfigArguments *args, void *user_data)
{
free (args);
free (user_data);
}

#if FORCE_INTERPRETER || FORCE_AOT || (!TARGET_OS_SIMULATOR && !TARGET_OS_MACCATALYST)
void mono_jit_set_aot_mode (MonoAotMode mode);
void register_aot_modules (void);
Expand DownExpand Up@@ -258,6 +267,23 @@
#endif
};

char *file_name = RUNTIMECONFIG_BIN_FILE;
int str_len = strlen (bundle) + strlen (file_name) + 2;
char *file_path = (char *)malloc (sizeof (char) * str_len);
int num_char = snprintf (file_path, str_len, "%s/%s", bundle, file_name);
struct stat buffer;

assert (num_char > 0 && num_char < str_len);

if (stat (file_path, &buffer) == 0) {
MonovmRuntimeConfigArguments *arg = (MonovmRuntimeConfigArguments *)malloc (sizeof (MonovmRuntimeConfigArguments));
arg->kind = 0;
arg->runtimeconfig.name.path = file_path;
monovm_runtimeconfig_initialize (arg, cleanup_runtime_config, file_path);
} else {
free (file_path);
}

monovm_initialize (sizeof (appctx_keys) / sizeof (appctx_keys [0]), appctx_keys, appctx_values);

#if FORCE_INTERPRETER
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Add runtimeconfig.json support to AppleAppBuilder, reenable affected tests#53172

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

 Merged

marek-safar
merged 2 commits into

from

May 24, 2021
 Merged


Add runtimeconfig.json support to AppleAppBuilder, reenable affected tests
#53172
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f8b8322

Add runtimeconfig.json support to AppleAppBuilder, reenable affected …


filipnavara May 24, 2021
74ce9a0

Update tests.mobile.targets


filipnavara May 24, 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


49 changes: 29 additions & 20 deletions
eng/testing/tests.mobile.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,22 +14,22 @@

 <PropertyGroup Condition="'$(TargetOS)' == 'Android' and '$(UseDefaultAndroidFeatureSwitches)' == 'true'">
 <DebuggerSupport>false</DebuggerSupport>
 <EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
 <EnableUnsafeUTF7Encoding Condition="'$(EnableUnsafeUTF7Encoding)' == ''">false</EnableUnsafeUTF7Encoding>
 <EnableUnsafeBinaryFormatterSerialization>false</EnableUnsafeBinaryFormatterSerialization>
 <EventSourceSupport>false</EventSourceSupport>
 <UseSystemResourceKeys>true</UseSystemResourceKeys>
 <UseSystemResourceKeys Condition="'$(UseSystemResourceKeys)' == ''">true</UseSystemResourceKeys>
 <HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
 <StartupHookSupport>false</StartupHookSupport>
 <UseNativeHttpHandler>true</UseNativeHttpHandler>
 </PropertyGroup>

 <PropertyGroup Condition="('$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator') and '$(UseDefaultiOSFeatureSwitches)' == 'true'">
 <EnableUnsafeBinaryFormatterSerialization>false</EnableUnsafeBinaryFormatterSerialization>
 <EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
 <EnableUnsafeUTF7Encoding Condition="'$(EnableUnsafeUTF7Encoding)' == ''">false</EnableUnsafeUTF7Encoding>
 <EventSourceSupport>false</EventSourceSupport>
 <HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
 <StartupHookSupport>false</StartupHookSupport>
 <UseSystemResourceKeys>true</UseSystemResourceKeys>
 <UseSystemResourceKeys Condition="'$(UseSystemResourceKeys)' == ''">true</UseSystemResourceKeys>
 <UseNativeHttpHandler>true</UseNativeHttpHandler>
 </PropertyGroup>

Expand DownExpand Up@@ -58,15 +58,35 @@

 <Import Project="$(MSBuildThisFileDirectory)tests.wasm.targets" Condition="'$(TargetOS)' == 'Browser'" />

 <UsingTask TaskName="RuntimeConfigParserTask"
 AssemblyFile="$(RuntimeConfigParserTasksAssemblyPath)"
 Condition="'$(RuntimeConfigParserTasksAssemblyPath)' != ''" />

 <Target Name="GenerateRuntimeConfig">
 <PropertyGroup>
 <RuntimeConfigFilePath>$(PublishDir)$(AssemblyName).runtimeconfig.json</RuntimeConfigFilePath>
 <ParsedRuntimeConfigFilePath>$(PublishDir)runtimeconfig.bin</ParsedRuntimeConfigFilePath>
 </PropertyGroup>

 <ItemGroup Condition="'$(RunAOTCompilation)' == 'true'">
 <RuntimeConfigReservedProperties Include="RUNTIME_IDENTIFIER"/>
 <RuntimeConfigReservedProperties Include="APP_CONTEXT_BASE_DIRECTORY"/>
 </ItemGroup>

 <!-- Parse runtimeconfig.template.json file -->
 <RuntimeConfigParserTask
 RuntimeConfigFile="$(RuntimeConfigFilePath)"
 OutputFile="$(ParsedRuntimeConfigFilePath)"
 RuntimeConfigReservedProperties="@(RuntimeConfigReservedProperties)">
 </RuntimeConfigParserTask>
 </Target>

 <!-- Generate a self-contained app bundle for Android with tests. -->
 <UsingTask Condition="'$(TargetOS)' == 'Android'"
 TaskName="AndroidAppBuilderTask"
 AssemblyFile="$(AndroidAppBuilderTasksAssemblyPath)" />
 <UsingTask Condition="'$(TargetOS)' == 'Android'"
 TaskName="RuntimeConfigParserTask"
 AssemblyFile="$(RuntimeConfigParserTasksAssemblyPath)" />

 <Target Condition="'$(TargetOS)' == 'Android'" Name="BundleTestAndroidApp">
 <Target Condition="'$(TargetOS)' == 'Android'" Name="BundleTestAndroidApp" DependsOnTargets="GenerateRuntimeConfig">
 <Error Condition="!Exists('$(MicrosoftNetCoreAppRuntimePackRidDir)')" Text="MicrosoftNetCoreAppRuntimePackRidDir=$(MicrosoftNetCoreAppRuntimePackRidDir) doesn't exist" />

 <PropertyGroup>
Expand All@@ -76,16 +96,12 @@
 <AndroidAbi Condition="'$(TargetArchitecture)' == 'x86'">x86</AndroidAbi>

 <MainLibraryFileName Condition="'$(MainLibraryFileName)' == ''">AndroidTestRunner.dll</MainLibraryFileName>
 <RuntimeConfigFilePath>$(PublishDir)$(AssemblyName).runtimeconfig.json</RuntimeConfigFilePath>
 <ParsedRuntimeConfigFilePath>$(PublishDir)runtimeconfig.bin</ParsedRuntimeConfigFilePath>
 </PropertyGroup>
 <ItemGroup Condition="'$(RunAOTCompilation)' == 'true'">
 <AotInputAssemblies Include="$(PublishDir)\*.dll">
 <AotArguments>@(MonoAOTCompilerDefaultAotArguments, ';')</AotArguments>
 <ProcessArguments>@(MonoAOTCompilerDefaultProcessArguments, ';')</ProcessArguments>
 </AotInputAssemblies>
 <RuntimeConfigReservedProperties Include="RUNTIME_IDENTIFIER"/>
 <RuntimeConfigReservedProperties Include="APP_CONTEXT_BASE_DIRECTORY"/>
 </ItemGroup>

 <WriteLinesToFile File="$(PublishDir)xunit-excludes.txt" Lines="$(XunitExcludesTxtFileContent)" Overwrite="true" />
Expand All@@ -94,13 +110,6 @@
 Condition="'$(RunAOTCompilation)' == 'true'"/>
 <RemoveDir Directories="$(BundleDir)" />

 <!-- Parse runtimeconfig.template.json file -->
 <RuntimeConfigParserTask
 RuntimeConfigFile="$(RuntimeConfigFilePath)"
 OutputFile="$(ParsedRuntimeConfigFilePath)"
 RuntimeConfigReservedProperties="@(RuntimeConfigReservedProperties)">
 </RuntimeConfigParserTask>

 <MonoAOTCompiler Condition="'$(RunAOTCompilation)' == 'true'"
 CompilerBinaryPath="$(MonoAotCrossCompilerPath)"
 OutputDir="$(_MobileIntermediateOutputPath)"
Expand DownExpand Up@@ -147,7 +156,7 @@
 <DevTeamProvisioning Condition="'$(TargetOS)' == 'MacCatalyst' and '$(DevTeamProvisioning)' == ''">adhoc</DevTeamProvisioning>
 </PropertyGroup>

 <Target Condition="'$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator'" Name="BundleTestAppleApp">
 <Target Condition="'$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator'" Name="BundleTestAppleApp" DependsOnTargets="GenerateRuntimeConfig">
 <Error Condition="!Exists('$(MicrosoftNetCoreAppRuntimePackRidDir)')" Text="MicrosoftNetCoreAppRuntimePackRidDir=$(MicrosoftNetCoreAppRuntimePackRidDir) doesn't exist" />
 <Error Condition="('$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'arm' or '$(TargetOS)' == 'MacCatalyst') and '$(DevTeamProvisioning)' == ''"
 Text="'DevTeamProvisioning' needs to be set for device builds. Set it to 'UBF8T346G9' if you're part of the Microsoft team account, or 'adhoc' to sign with an adhoc key.." />
Expand Down

4 changes: 0 additions & 4 deletions
src/libraries/System.Text.Encoding/tests/Encoding/Encoding.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,8 +67,6 @@ public static void GetEncodingsTest()
 [ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
 [Theory]
 [MemberData(nameof(Encoding_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public static void VerifyCodePageAttributes(int codepage, string name, string bodyName, string headerName, bool isBrowserDisplay,
 bool isBrowserSave, bool isMailNewsDisplay, bool isMailNewsSave, int windowsCodePage)
 {
Expand All@@ -86,8 +84,6 @@ public static void VerifyCodePageAttributes(int codepage, string name, string bo
 [ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
 [Theory]
 [MemberData(nameof(Normalization_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public static void NormalizationTest(int codepage, bool normalized, bool normalizedC, bool normalizedD, bool normalizedKC, bool normalizedKD)
 {
 Encoding encoding = Encoding.GetEncoding(codepage);
Expand Down

6 changes: 0 additions & 6 deletions
src/libraries/System.Text.Encoding/tests/Encoding/EncodingGetEncodingTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,8 +90,6 @@ public CodePageMapping(string name, int codepage)

 [ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
 [Fact]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void TestEncodingNameAndCopdepageNumber()
 {
 foreach (var map in s_mapping)
Expand All@@ -103,8 +101,6 @@ public void TestEncodingNameAndCopdepageNumber()

 [ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
 [Fact]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void GetEncoding_EncodingName()
 {
 using (new ThreadCultureChange(CultureInfo.InvariantCulture))
Expand All@@ -125,8 +121,6 @@ public void GetEncoding_EncodingName()

 [ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
 [Fact]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void GetEncoding_WebName()
 {
 foreach (var mapping in s_codePageToWebNameMappings)
Expand Down

4 changes: 1 addition & 3 deletions
src/libraries/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
 <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
 <!-- Encoding.UTF7 and UTF7Encoding are obsolete, but we're the unit test project for it, so suppress warnings -->
 <NoWarn>$(NoWarn),SYSLIB0001</NoWarn>
 <EnableUnsafeUTF7Encoding>true</EnableUnsafeUTF7Encoding>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="ASCIIEncoding\ASCIIEncodingEncode.cs" />
Expand DownExpand Up@@ -85,9 +86,6 @@
 <Compile Include="$(CommonPath)System\Net\MultiArrayBuffer.cs" Link="ProductionCode\Common\System\Net\MultiArrayBuffer.cs" />
 <Compile Include="$(CommonPath)System\Net\StreamBuffer.cs" Link="ProductionCode\Common\System\Net\StreamBuffer.cs" />
 </ItemGroup>
 <ItemGroup>
 <None Include="runtimeconfig.template.json" />
 </ItemGroup>
 <ItemGroup>
 <PackageReference Include="Moq" Version="$(MoqVersion)" />
 </ItemGroup>
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Text.Encoding/tests/UTF7Encoding/UTF7EncodingEncode.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,8 +61,6 @@ public static IEnumerable<object[]> Encode_Basic_TestData()

 [Theory]
 [MemberData(nameof(Encode_Basic_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void Encode_Basic(string source, int index, int count, byte[] expected)
 {
 Encode_Advanced(true, source, index, count, expected);
Expand Down

13 changes: 1 addition & 12 deletions
src/libraries/System.Text.Encoding/tests/UTF7Encoding/UTF7EncodingTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,46 +52,37 @@ public static IEnumerable<object[]> Encodings_TestData()
 yield return new object[] { Encoding.UTF7 };
 yield return new object[] { Encoding.GetEncoding("utf-7") };
 }

 [Theory]
 [MemberData(nameof(Encodings_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void WebName(UTF7Encoding encoding)
 {
 Assert.Equal("utf-7", encoding.WebName);
 }

 [Theory]
 [MemberData(nameof(Encodings_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void CodePage(UTF7Encoding encoding)
 {
 Assert.Equal(65000, encoding.CodePage);
 }

 [Theory]
 [MemberData(nameof(Encodings_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void EncodingName(UTF7Encoding encoding)
 {
 Assert.NotEmpty(encoding.EncodingName); // Unicode (UTF-7) in en-US
 }

 [Theory]
 [MemberData(nameof(Encodings_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void IsSingleByte(UTF7Encoding encoding)
 {
 Assert.False(encoding.IsSingleByte);
 }

 [Theory]
 [MemberData(nameof(Encodings_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void Clone(UTF7Encoding encoding)
 {
 UTF7Encoding clone = (UTF7Encoding)encoding.Clone();
Expand DownExpand Up@@ -125,8 +116,6 @@ public static IEnumerable<object[]> Equals_TestData()

 [Theory]
 [MemberData(nameof(Equals_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void EqualsTest(UTF7Encoding encoding, object value, bool expected)
 {
 Assert.Equal(expected, encoding.Equals(value));
Expand Down

5 changes: 0 additions & 5 deletions
src/libraries/System.Text.Encoding/tests/runtimeconfig.template.json

View file


Open in desktop


This file was deleted.


2 changes: 2 additions & 0 deletions
src/tasks/AndroidAppBuilder/Templates/monodroid.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,6 +239,8 @@ mono_droid_runtime_init (const char* executable, int managed_argc, char* managed
 arg->kind = 0;
 arg->runtimeconfig.name.path = file_path;
 monovm_runtimeconfig_initialize (arg, cleanup_runtime_config, file_path);
 } else {
 free (file_path);
@CoffeeFluxCoffeeFluxMay 24, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, thanks.
 }

 monovm_initialize(2, appctx_keys, appctx_values);
Expand Down

26 changes: 26 additions & 0 deletions
src/tasks/AppleAppBuilder/Templates/runtime.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@

#define APPLE_RUNTIME_IDENTIFIER "//%APPLE_RUNTIME_IDENTIFIER%"

#define RUNTIMECONFIG_BIN_FILE "runtimeconfig.bin"

const char *
get_bundle_path (void)
{
Expand DownExpand Up@@ -205,6 +207,13 @@
//%DllMap%
}

void
cleanup_runtime_config (MonovmRuntimeConfigArguments *args, void *user_data)
{
 free (args);
 free (user_data);
}

#if FORCE_INTERPRETER || FORCE_AOT || (!TARGET_OS_SIMULATOR && !TARGET_OS_MACCATALYST)
void mono_jit_set_aot_mode (MonoAotMode mode);
void register_aot_modules (void);
Expand DownExpand Up@@ -258,6 +267,23 @@
#endif
 };

 char *file_name = RUNTIMECONFIG_BIN_FILE;
 int str_len = strlen (bundle) + strlen (file_name) + 2;
 char *file_path = (char *)malloc (sizeof (char) * str_len);
 int num_char = snprintf (file_path, str_len, "%s/%s", bundle, file_name);
 struct stat buffer;

 assert (num_char > 0 && num_char < str_len);

 if (stat (file_path, &buffer) == 0) {
 MonovmRuntimeConfigArguments *arg = (MonovmRuntimeConfigArguments *)malloc (sizeof (MonovmRuntimeConfigArguments));
 arg->kind = 0;
 arg->runtimeconfig.name.path = file_path;
 monovm_runtimeconfig_initialize (arg, cleanup_runtime_config, file_path);
 } else {
 free (file_path);
 }

 monovm_initialize (sizeof (appctx_keys) / sizeof (appctx_keys [0]), appctx_keys, appctx_values);

#if FORCE_INTERPRETER
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add runtimeconfig.json support to AppleAppBuilder, reenable affected tests#53172

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

 Merged

marek-safar
merged 2 commits into

from

May 24, 2021
 Merged


Add runtimeconfig.json support to AppleAppBuilder, reenable affected tests
#53172
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f8b8322

Add runtimeconfig.json support to AppleAppBuilder, reenable affected …


filipnavara May 24, 2021
74ce9a0

Update tests.mobile.targets


filipnavara May 24, 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


49 changes: 29 additions & 20 deletions
eng/testing/tests.mobile.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,22 +14,22 @@

 <PropertyGroup Condition="'$(TargetOS)' == 'Android' and '$(UseDefaultAndroidFeatureSwitches)' == 'true'">
 <DebuggerSupport>false</DebuggerSupport>
 <EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
 <EnableUnsafeUTF7Encoding Condition="'$(EnableUnsafeUTF7Encoding)' == ''">false</EnableUnsafeUTF7Encoding>
 <EnableUnsafeBinaryFormatterSerialization>false</EnableUnsafeBinaryFormatterSerialization>
 <EventSourceSupport>false</EventSourceSupport>
 <UseSystemResourceKeys>true</UseSystemResourceKeys>
 <UseSystemResourceKeys Condition="'$(UseSystemResourceKeys)' == ''">true</UseSystemResourceKeys>
 <HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
 <StartupHookSupport>false</StartupHookSupport>
 <UseNativeHttpHandler>true</UseNativeHttpHandler>
 </PropertyGroup>

 <PropertyGroup Condition="('$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator') and '$(UseDefaultiOSFeatureSwitches)' == 'true'">
 <EnableUnsafeBinaryFormatterSerialization>false</EnableUnsafeBinaryFormatterSerialization>
 <EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
 <EnableUnsafeUTF7Encoding Condition="'$(EnableUnsafeUTF7Encoding)' == ''">false</EnableUnsafeUTF7Encoding>
 <EventSourceSupport>false</EventSourceSupport>
 <HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
 <StartupHookSupport>false</StartupHookSupport>
 <UseSystemResourceKeys>true</UseSystemResourceKeys>
 <UseSystemResourceKeys Condition="'$(UseSystemResourceKeys)' == ''">true</UseSystemResourceKeys>
 <UseNativeHttpHandler>true</UseNativeHttpHandler>
 </PropertyGroup>

Expand DownExpand Up@@ -58,15 +58,35 @@

 <Import Project="$(MSBuildThisFileDirectory)tests.wasm.targets" Condition="'$(TargetOS)' == 'Browser'" />

 <UsingTask TaskName="RuntimeConfigParserTask"
 AssemblyFile="$(RuntimeConfigParserTasksAssemblyPath)"
 Condition="'$(RuntimeConfigParserTasksAssemblyPath)' != ''" />

 <Target Name="GenerateRuntimeConfig">
 <PropertyGroup>
 <RuntimeConfigFilePath>$(PublishDir)$(AssemblyName).runtimeconfig.json</RuntimeConfigFilePath>
 <ParsedRuntimeConfigFilePath>$(PublishDir)runtimeconfig.bin</ParsedRuntimeConfigFilePath>
 </PropertyGroup>

 <ItemGroup Condition="'$(RunAOTCompilation)' == 'true'">
 <RuntimeConfigReservedProperties Include="RUNTIME_IDENTIFIER"/>
 <RuntimeConfigReservedProperties Include="APP_CONTEXT_BASE_DIRECTORY"/>
 </ItemGroup>

 <!-- Parse runtimeconfig.template.json file -->
 <RuntimeConfigParserTask
 RuntimeConfigFile="$(RuntimeConfigFilePath)"
 OutputFile="$(ParsedRuntimeConfigFilePath)"
 RuntimeConfigReservedProperties="@(RuntimeConfigReservedProperties)">
 </RuntimeConfigParserTask>
 </Target>

 <!-- Generate a self-contained app bundle for Android with tests. -->
 <UsingTask Condition="'$(TargetOS)' == 'Android'"
 TaskName="AndroidAppBuilderTask"
 AssemblyFile="$(AndroidAppBuilderTasksAssemblyPath)" />
 <UsingTask Condition="'$(TargetOS)' == 'Android'"
 TaskName="RuntimeConfigParserTask"
 AssemblyFile="$(RuntimeConfigParserTasksAssemblyPath)" />

 <Target Condition="'$(TargetOS)' == 'Android'" Name="BundleTestAndroidApp">
 <Target Condition="'$(TargetOS)' == 'Android'" Name="BundleTestAndroidApp" DependsOnTargets="GenerateRuntimeConfig">
 <Error Condition="!Exists('$(MicrosoftNetCoreAppRuntimePackRidDir)')" Text="MicrosoftNetCoreAppRuntimePackRidDir=$(MicrosoftNetCoreAppRuntimePackRidDir) doesn't exist" />

 <PropertyGroup>
Expand All@@ -76,16 +96,12 @@
 <AndroidAbi Condition="'$(TargetArchitecture)' == 'x86'">x86</AndroidAbi>

 <MainLibraryFileName Condition="'$(MainLibraryFileName)' == ''">AndroidTestRunner.dll</MainLibraryFileName>
 <RuntimeConfigFilePath>$(PublishDir)$(AssemblyName).runtimeconfig.json</RuntimeConfigFilePath>
 <ParsedRuntimeConfigFilePath>$(PublishDir)runtimeconfig.bin</ParsedRuntimeConfigFilePath>
 </PropertyGroup>
 <ItemGroup Condition="'$(RunAOTCompilation)' == 'true'">
 <AotInputAssemblies Include="$(PublishDir)\*.dll">
 <AotArguments>@(MonoAOTCompilerDefaultAotArguments, ';')</AotArguments>
 <ProcessArguments>@(MonoAOTCompilerDefaultProcessArguments, ';')</ProcessArguments>
 </AotInputAssemblies>
 <RuntimeConfigReservedProperties Include="RUNTIME_IDENTIFIER"/>
 <RuntimeConfigReservedProperties Include="APP_CONTEXT_BASE_DIRECTORY"/>
 </ItemGroup>

 <WriteLinesToFile File="$(PublishDir)xunit-excludes.txt" Lines="$(XunitExcludesTxtFileContent)" Overwrite="true" />
Expand All@@ -94,13 +110,6 @@
 Condition="'$(RunAOTCompilation)' == 'true'"/>
 <RemoveDir Directories="$(BundleDir)" />

 <!-- Parse runtimeconfig.template.json file -->
 <RuntimeConfigParserTask
 RuntimeConfigFile="$(RuntimeConfigFilePath)"
 OutputFile="$(ParsedRuntimeConfigFilePath)"
 RuntimeConfigReservedProperties="@(RuntimeConfigReservedProperties)">
 </RuntimeConfigParserTask>

 <MonoAOTCompiler Condition="'$(RunAOTCompilation)' == 'true'"
 CompilerBinaryPath="$(MonoAotCrossCompilerPath)"
 OutputDir="$(_MobileIntermediateOutputPath)"
Expand DownExpand Up@@ -147,7 +156,7 @@
 <DevTeamProvisioning Condition="'$(TargetOS)' == 'MacCatalyst' and '$(DevTeamProvisioning)' == ''">adhoc</DevTeamProvisioning>
 </PropertyGroup>

 <Target Condition="'$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator'" Name="BundleTestAppleApp">
 <Target Condition="'$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator'" Name="BundleTestAppleApp" DependsOnTargets="GenerateRuntimeConfig">
 <Error Condition="!Exists('$(MicrosoftNetCoreAppRuntimePackRidDir)')" Text="MicrosoftNetCoreAppRuntimePackRidDir=$(MicrosoftNetCoreAppRuntimePackRidDir) doesn't exist" />
 <Error Condition="('$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'arm' or '$(TargetOS)' == 'MacCatalyst') and '$(DevTeamProvisioning)' == ''"
 Text="'DevTeamProvisioning' needs to be set for device builds. Set it to 'UBF8T346G9' if you're part of the Microsoft team account, or 'adhoc' to sign with an adhoc key.." />
Expand Down

4 changes: 0 additions & 4 deletions
src/libraries/System.Text.Encoding/tests/Encoding/Encoding.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,8 +67,6 @@ public static void GetEncodingsTest()
 [ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
 [Theory]
 [MemberData(nameof(Encoding_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public static void VerifyCodePageAttributes(int codepage, string name, string bodyName, string headerName, bool isBrowserDisplay,
 bool isBrowserSave, bool isMailNewsDisplay, bool isMailNewsSave, int windowsCodePage)
 {
Expand All@@ -86,8 +84,6 @@ public static void VerifyCodePageAttributes(int codepage, string name, string bo
 [ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
 [Theory]
 [MemberData(nameof(Normalization_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public static void NormalizationTest(int codepage, bool normalized, bool normalizedC, bool normalizedD, bool normalizedKC, bool normalizedKD)
 {
 Encoding encoding = Encoding.GetEncoding(codepage);
Expand Down

6 changes: 0 additions & 6 deletions
src/libraries/System.Text.Encoding/tests/Encoding/EncodingGetEncodingTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,8 +90,6 @@ public CodePageMapping(string name, int codepage)

 [ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
 [Fact]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void TestEncodingNameAndCopdepageNumber()
 {
 foreach (var map in s_mapping)
Expand All@@ -103,8 +101,6 @@ public void TestEncodingNameAndCopdepageNumber()

 [ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
 [Fact]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void GetEncoding_EncodingName()
 {
 using (new ThreadCultureChange(CultureInfo.InvariantCulture))
Expand All@@ -125,8 +121,6 @@ public void GetEncoding_EncodingName()

 [ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
 [Fact]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void GetEncoding_WebName()
 {
 foreach (var mapping in s_codePageToWebNameMappings)
Expand Down

4 changes: 1 addition & 3 deletions
src/libraries/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
 <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
 <!-- Encoding.UTF7 and UTF7Encoding are obsolete, but we're the unit test project for it, so suppress warnings -->
 <NoWarn>$(NoWarn),SYSLIB0001</NoWarn>
 <EnableUnsafeUTF7Encoding>true</EnableUnsafeUTF7Encoding>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="ASCIIEncoding\ASCIIEncodingEncode.cs" />
Expand DownExpand Up@@ -85,9 +86,6 @@
 <Compile Include="$(CommonPath)System\Net\MultiArrayBuffer.cs" Link="ProductionCode\Common\System\Net\MultiArrayBuffer.cs" />
 <Compile Include="$(CommonPath)System\Net\StreamBuffer.cs" Link="ProductionCode\Common\System\Net\StreamBuffer.cs" />
 </ItemGroup>
 <ItemGroup>
 <None Include="runtimeconfig.template.json" />
 </ItemGroup>
 <ItemGroup>
 <PackageReference Include="Moq" Version="$(MoqVersion)" />
 </ItemGroup>
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Text.Encoding/tests/UTF7Encoding/UTF7EncodingEncode.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,8 +61,6 @@ public static IEnumerable<object[]> Encode_Basic_TestData()

 [Theory]
 [MemberData(nameof(Encode_Basic_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void Encode_Basic(string source, int index, int count, byte[] expected)
 {
 Encode_Advanced(true, source, index, count, expected);
Expand Down

13 changes: 1 addition & 12 deletions
src/libraries/System.Text.Encoding/tests/UTF7Encoding/UTF7EncodingTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,46 +52,37 @@ public static IEnumerable<object[]> Encodings_TestData()
 yield return new object[] { Encoding.UTF7 };
 yield return new object[] { Encoding.GetEncoding("utf-7") };
 }

 [Theory]
 [MemberData(nameof(Encodings_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void WebName(UTF7Encoding encoding)
 {
 Assert.Equal("utf-7", encoding.WebName);
 }

 [Theory]
 [MemberData(nameof(Encodings_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void CodePage(UTF7Encoding encoding)
 {
 Assert.Equal(65000, encoding.CodePage);
 }

 [Theory]
 [MemberData(nameof(Encodings_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void EncodingName(UTF7Encoding encoding)
 {
 Assert.NotEmpty(encoding.EncodingName); // Unicode (UTF-7) in en-US
 }

 [Theory]
 [MemberData(nameof(Encodings_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void IsSingleByte(UTF7Encoding encoding)
 {
 Assert.False(encoding.IsSingleByte);
 }

 [Theory]
 [MemberData(nameof(Encodings_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void Clone(UTF7Encoding encoding)
 {
 UTF7Encoding clone = (UTF7Encoding)encoding.Clone();
Expand DownExpand Up@@ -125,8 +116,6 @@ public static IEnumerable<object[]> Equals_TestData()

 [Theory]
 [MemberData(nameof(Equals_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void EqualsTest(UTF7Encoding encoding, object value, bool expected)
 {
 Assert.Equal(expected, encoding.Equals(value));
Expand Down

5 changes: 0 additions & 5 deletions
src/libraries/System.Text.Encoding/tests/runtimeconfig.template.json

View file


Open in desktop


This file was deleted.


2 changes: 2 additions & 0 deletions
src/tasks/AndroidAppBuilder/Templates/monodroid.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,6 +239,8 @@ mono_droid_runtime_init (const char* executable, int managed_argc, char* managed
 arg->kind = 0;
 arg->runtimeconfig.name.path = file_path;
 monovm_runtimeconfig_initialize (arg, cleanup_runtime_config, file_path);
 } else {
 free (file_path);
@CoffeeFluxCoffeeFluxMay 24, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, thanks.
 }

 monovm_initialize(2, appctx_keys, appctx_values);
Expand Down

26 changes: 26 additions & 0 deletions
src/tasks/AppleAppBuilder/Templates/runtime.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@

#define APPLE_RUNTIME_IDENTIFIER "//%APPLE_RUNTIME_IDENTIFIER%"

#define RUNTIMECONFIG_BIN_FILE "runtimeconfig.bin"

const char *
get_bundle_path (void)
{
Expand DownExpand Up@@ -205,6 +207,13 @@
//%DllMap%
}

void
cleanup_runtime_config (MonovmRuntimeConfigArguments *args, void *user_data)
{
 free (args);
 free (user_data);
}

#if FORCE_INTERPRETER || FORCE_AOT || (!TARGET_OS_SIMULATOR && !TARGET_OS_MACCATALYST)
void mono_jit_set_aot_mode (MonoAotMode mode);
void register_aot_modules (void);
Expand DownExpand Up@@ -258,6 +267,23 @@
#endif
 };

 char *file_name = RUNTIMECONFIG_BIN_FILE;
 int str_len = strlen (bundle) + strlen (file_name) + 2;
 char *file_path = (char *)malloc (sizeof (char) * str_len);
 int num_char = snprintf (file_path, str_len, "%s/%s", bundle, file_name);
 struct stat buffer;

 assert (num_char > 0 && num_char < str_len);

 if (stat (file_path, &buffer) == 0) {
 MonovmRuntimeConfigArguments *arg = (MonovmRuntimeConfigArguments *)malloc (sizeof (MonovmRuntimeConfigArguments));
 arg->kind = 0;
 arg->runtimeconfig.name.path = file_path;
 monovm_runtimeconfig_initialize (arg, cleanup_runtime_config, file_path);
 } else {
 free (file_path);
 }

 monovm_initialize (sizeof (appctx_keys) / sizeof (appctx_keys [0]), appctx_keys, appctx_values);

#if FORCE_INTERPRETER
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add runtimeconfig.json support to AppleAppBuilder, reenable affected tests#53172

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

 Merged

marek-safar
merged 2 commits into

from

May 24, 2021
 Merged


Add runtimeconfig.json support to AppleAppBuilder, reenable affected tests
#53172
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f8b8322

Add runtimeconfig.json support to AppleAppBuilder, reenable affected …


filipnavara May 24, 2021
74ce9a0

Update tests.mobile.targets


filipnavara May 24, 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


49 changes: 29 additions & 20 deletions
eng/testing/tests.mobile.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,22 +14,22 @@

 <PropertyGroup Condition="'$(TargetOS)' == 'Android' and '$(UseDefaultAndroidFeatureSwitches)' == 'true'">
 <DebuggerSupport>false</DebuggerSupport>
 <EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
 <EnableUnsafeUTF7Encoding Condition="'$(EnableUnsafeUTF7Encoding)' == ''">false</EnableUnsafeUTF7Encoding>
 <EnableUnsafeBinaryFormatterSerialization>false</EnableUnsafeBinaryFormatterSerialization>
 <EventSourceSupport>false</EventSourceSupport>
 <UseSystemResourceKeys>true</UseSystemResourceKeys>
 <UseSystemResourceKeys Condition="'$(UseSystemResourceKeys)' == ''">true</UseSystemResourceKeys>
 <HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
 <StartupHookSupport>false</StartupHookSupport>
 <UseNativeHttpHandler>true</UseNativeHttpHandler>
 </PropertyGroup>

 <PropertyGroup Condition="('$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator') and '$(UseDefaultiOSFeatureSwitches)' == 'true'">
 <EnableUnsafeBinaryFormatterSerialization>false</EnableUnsafeBinaryFormatterSerialization>
 <EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
 <EnableUnsafeUTF7Encoding Condition="'$(EnableUnsafeUTF7Encoding)' == ''">false</EnableUnsafeUTF7Encoding>
 <EventSourceSupport>false</EventSourceSupport>
 <HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
 <StartupHookSupport>false</StartupHookSupport>
 <UseSystemResourceKeys>true</UseSystemResourceKeys>
 <UseSystemResourceKeys Condition="'$(UseSystemResourceKeys)' == ''">true</UseSystemResourceKeys>
 <UseNativeHttpHandler>true</UseNativeHttpHandler>
 </PropertyGroup>

Expand DownExpand Up@@ -58,15 +58,35 @@

 <Import Project="$(MSBuildThisFileDirectory)tests.wasm.targets" Condition="'$(TargetOS)' == 'Browser'" />

 <UsingTask TaskName="RuntimeConfigParserTask"
 AssemblyFile="$(RuntimeConfigParserTasksAssemblyPath)"
 Condition="'$(RuntimeConfigParserTasksAssemblyPath)' != ''" />

 <Target Name="GenerateRuntimeConfig">
 <PropertyGroup>
 <RuntimeConfigFilePath>$(PublishDir)$(AssemblyName).runtimeconfig.json</RuntimeConfigFilePath>
 <ParsedRuntimeConfigFilePath>$(PublishDir)runtimeconfig.bin</ParsedRuntimeConfigFilePath>
 </PropertyGroup>

 <ItemGroup Condition="'$(RunAOTCompilation)' == 'true'">
 <RuntimeConfigReservedProperties Include="RUNTIME_IDENTIFIER"/>
 <RuntimeConfigReservedProperties Include="APP_CONTEXT_BASE_DIRECTORY"/>
 </ItemGroup>

 <!-- Parse runtimeconfig.template.json file -->
 <RuntimeConfigParserTask
 RuntimeConfigFile="$(RuntimeConfigFilePath)"
 OutputFile="$(ParsedRuntimeConfigFilePath)"
 RuntimeConfigReservedProperties="@(RuntimeConfigReservedProperties)">
 </RuntimeConfigParserTask>
 </Target>

 <!-- Generate a self-contained app bundle for Android with tests. -->
 <UsingTask Condition="'$(TargetOS)' == 'Android'"
 TaskName="AndroidAppBuilderTask"
 AssemblyFile="$(AndroidAppBuilderTasksAssemblyPath)" />
 <UsingTask Condition="'$(TargetOS)' == 'Android'"
 TaskName="RuntimeConfigParserTask"
 AssemblyFile="$(RuntimeConfigParserTasksAssemblyPath)" />

 <Target Condition="'$(TargetOS)' == 'Android'" Name="BundleTestAndroidApp">
 <Target Condition="'$(TargetOS)' == 'Android'" Name="BundleTestAndroidApp" DependsOnTargets="GenerateRuntimeConfig">
 <Error Condition="!Exists('$(MicrosoftNetCoreAppRuntimePackRidDir)')" Text="MicrosoftNetCoreAppRuntimePackRidDir=$(MicrosoftNetCoreAppRuntimePackRidDir) doesn't exist" />

 <PropertyGroup>
Expand All@@ -76,16 +96,12 @@
 <AndroidAbi Condition="'$(TargetArchitecture)' == 'x86'">x86</AndroidAbi>

 <MainLibraryFileName Condition="'$(MainLibraryFileName)' == ''">AndroidTestRunner.dll</MainLibraryFileName>
 <RuntimeConfigFilePath>$(PublishDir)$(AssemblyName).runtimeconfig.json</RuntimeConfigFilePath>
 <ParsedRuntimeConfigFilePath>$(PublishDir)runtimeconfig.bin</ParsedRuntimeConfigFilePath>
 </PropertyGroup>
 <ItemGroup Condition="'$(RunAOTCompilation)' == 'true'">
 <AotInputAssemblies Include="$(PublishDir)\*.dll">
 <AotArguments>@(MonoAOTCompilerDefaultAotArguments, ';')</AotArguments>
 <ProcessArguments>@(MonoAOTCompilerDefaultProcessArguments, ';')</ProcessArguments>
 </AotInputAssemblies>
 <RuntimeConfigReservedProperties Include="RUNTIME_IDENTIFIER"/>
 <RuntimeConfigReservedProperties Include="APP_CONTEXT_BASE_DIRECTORY"/>
 </ItemGroup>

 <WriteLinesToFile File="$(PublishDir)xunit-excludes.txt" Lines="$(XunitExcludesTxtFileContent)" Overwrite="true" />
Expand All@@ -94,13 +110,6 @@
 Condition="'$(RunAOTCompilation)' == 'true'"/>
 <RemoveDir Directories="$(BundleDir)" />

 <!-- Parse runtimeconfig.template.json file -->
 <RuntimeConfigParserTask
 RuntimeConfigFile="$(RuntimeConfigFilePath)"
 OutputFile="$(ParsedRuntimeConfigFilePath)"
 RuntimeConfigReservedProperties="@(RuntimeConfigReservedProperties)">
 </RuntimeConfigParserTask>

 <MonoAOTCompiler Condition="'$(RunAOTCompilation)' == 'true'"
 CompilerBinaryPath="$(MonoAotCrossCompilerPath)"
 OutputDir="$(_MobileIntermediateOutputPath)"
Expand DownExpand Up@@ -147,7 +156,7 @@
 <DevTeamProvisioning Condition="'$(TargetOS)' == 'MacCatalyst' and '$(DevTeamProvisioning)' == ''">adhoc</DevTeamProvisioning>
 </PropertyGroup>

 <Target Condition="'$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator'" Name="BundleTestAppleApp">
 <Target Condition="'$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator'" Name="BundleTestAppleApp" DependsOnTargets="GenerateRuntimeConfig">
 <Error Condition="!Exists('$(MicrosoftNetCoreAppRuntimePackRidDir)')" Text="MicrosoftNetCoreAppRuntimePackRidDir=$(MicrosoftNetCoreAppRuntimePackRidDir) doesn't exist" />
 <Error Condition="('$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'arm' or '$(TargetOS)' == 'MacCatalyst') and '$(DevTeamProvisioning)' == ''"
 Text="'DevTeamProvisioning' needs to be set for device builds. Set it to 'UBF8T346G9' if you're part of the Microsoft team account, or 'adhoc' to sign with an adhoc key.." />
Expand Down

4 changes: 0 additions & 4 deletions
src/libraries/System.Text.Encoding/tests/Encoding/Encoding.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,8 +67,6 @@ public static void GetEncodingsTest()
 [ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
 [Theory]
 [MemberData(nameof(Encoding_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public static void VerifyCodePageAttributes(int codepage, string name, string bodyName, string headerName, bool isBrowserDisplay,
 bool isBrowserSave, bool isMailNewsDisplay, bool isMailNewsSave, int windowsCodePage)
 {
Expand All@@ -86,8 +84,6 @@ public static void VerifyCodePageAttributes(int codepage, string name, string bo
 [ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
 [Theory]
 [MemberData(nameof(Normalization_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public static void NormalizationTest(int codepage, bool normalized, bool normalizedC, bool normalizedD, bool normalizedKC, bool normalizedKD)
 {
 Encoding encoding = Encoding.GetEncoding(codepage);
Expand Down

6 changes: 0 additions & 6 deletions
src/libraries/System.Text.Encoding/tests/Encoding/EncodingGetEncodingTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,8 +90,6 @@ public CodePageMapping(string name, int codepage)

 [ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
 [Fact]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void TestEncodingNameAndCopdepageNumber()
 {
 foreach (var map in s_mapping)
Expand All@@ -103,8 +101,6 @@ public void TestEncodingNameAndCopdepageNumber()

 [ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
 [Fact]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void GetEncoding_EncodingName()
 {
 using (new ThreadCultureChange(CultureInfo.InvariantCulture))
Expand All@@ -125,8 +121,6 @@ public void GetEncoding_EncodingName()

 [ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
 [Fact]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void GetEncoding_WebName()
 {
 foreach (var mapping in s_codePageToWebNameMappings)
Expand Down

4 changes: 1 addition & 3 deletions
src/libraries/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
 <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
 <!-- Encoding.UTF7 and UTF7Encoding are obsolete, but we're the unit test project for it, so suppress warnings -->
 <NoWarn>$(NoWarn),SYSLIB0001</NoWarn>
 <EnableUnsafeUTF7Encoding>true</EnableUnsafeUTF7Encoding>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="ASCIIEncoding\ASCIIEncodingEncode.cs" />
Expand DownExpand Up@@ -85,9 +86,6 @@
 <Compile Include="$(CommonPath)System\Net\MultiArrayBuffer.cs" Link="ProductionCode\Common\System\Net\MultiArrayBuffer.cs" />
 <Compile Include="$(CommonPath)System\Net\StreamBuffer.cs" Link="ProductionCode\Common\System\Net\StreamBuffer.cs" />
 </ItemGroup>
 <ItemGroup>
 <None Include="runtimeconfig.template.json" />
 </ItemGroup>
 <ItemGroup>
 <PackageReference Include="Moq" Version="$(MoqVersion)" />
 </ItemGroup>
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Text.Encoding/tests/UTF7Encoding/UTF7EncodingEncode.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,8 +61,6 @@ public static IEnumerable<object[]> Encode_Basic_TestData()

 [Theory]
 [MemberData(nameof(Encode_Basic_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void Encode_Basic(string source, int index, int count, byte[] expected)
 {
 Encode_Advanced(true, source, index, count, expected);
Expand Down

13 changes: 1 addition & 12 deletions
src/libraries/System.Text.Encoding/tests/UTF7Encoding/UTF7EncodingTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,46 +52,37 @@ public static IEnumerable<object[]> Encodings_TestData()
 yield return new object[] { Encoding.UTF7 };
 yield return new object[] { Encoding.GetEncoding("utf-7") };
 }

 [Theory]
 [MemberData(nameof(Encodings_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void WebName(UTF7Encoding encoding)
 {
 Assert.Equal("utf-7", encoding.WebName);
 }

 [Theory]
 [MemberData(nameof(Encodings_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void CodePage(UTF7Encoding encoding)
 {
 Assert.Equal(65000, encoding.CodePage);
 }

 [Theory]
 [MemberData(nameof(Encodings_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void EncodingName(UTF7Encoding encoding)
 {
 Assert.NotEmpty(encoding.EncodingName); // Unicode (UTF-7) in en-US
 }

 [Theory]
 [MemberData(nameof(Encodings_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void IsSingleByte(UTF7Encoding encoding)
 {
 Assert.False(encoding.IsSingleByte);
 }

 [Theory]
 [MemberData(nameof(Encodings_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void Clone(UTF7Encoding encoding)
 {
 UTF7Encoding clone = (UTF7Encoding)encoding.Clone();
Expand DownExpand Up@@ -125,8 +116,6 @@ public static IEnumerable<object[]> Equals_TestData()

 [Theory]
 [MemberData(nameof(Equals_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void EqualsTest(UTF7Encoding encoding, object value, bool expected)
 {
 Assert.Equal(expected, encoding.Equals(value));
Expand Down

5 changes: 0 additions & 5 deletions
src/libraries/System.Text.Encoding/tests/runtimeconfig.template.json

View file


Open in desktop


This file was deleted.


2 changes: 2 additions & 0 deletions
src/tasks/AndroidAppBuilder/Templates/monodroid.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,6 +239,8 @@ mono_droid_runtime_init (const char* executable, int managed_argc, char* managed
 arg->kind = 0;
 arg->runtimeconfig.name.path = file_path;
 monovm_runtimeconfig_initialize (arg, cleanup_runtime_config, file_path);
 } else {
 free (file_path);
@CoffeeFluxCoffeeFluxMay 24, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, thanks.
 }

 monovm_initialize(2, appctx_keys, appctx_values);
Expand Down

26 changes: 26 additions & 0 deletions
src/tasks/AppleAppBuilder/Templates/runtime.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@

#define APPLE_RUNTIME_IDENTIFIER "//%APPLE_RUNTIME_IDENTIFIER%"

#define RUNTIMECONFIG_BIN_FILE "runtimeconfig.bin"

const char *
get_bundle_path (void)
{
Expand DownExpand Up@@ -205,6 +207,13 @@
//%DllMap%
}

void
cleanup_runtime_config (MonovmRuntimeConfigArguments *args, void *user_data)
{
 free (args);
 free (user_data);
}

#if FORCE_INTERPRETER || FORCE_AOT || (!TARGET_OS_SIMULATOR && !TARGET_OS_MACCATALYST)
void mono_jit_set_aot_mode (MonoAotMode mode);
void register_aot_modules (void);
Expand DownExpand Up@@ -258,6 +267,23 @@
#endif
 };

 char *file_name = RUNTIMECONFIG_BIN_FILE;
 int str_len = strlen (bundle) + strlen (file_name) + 2;
 char *file_path = (char *)malloc (sizeof (char) * str_len);
 int num_char = snprintf (file_path, str_len, "%s/%s", bundle, file_name);
 struct stat buffer;

 assert (num_char > 0 && num_char < str_len);

 if (stat (file_path, &buffer) == 0) {
 MonovmRuntimeConfigArguments *arg = (MonovmRuntimeConfigArguments *)malloc (sizeof (MonovmRuntimeConfigArguments));
 arg->kind = 0;
 arg->runtimeconfig.name.path = file_path;
 monovm_runtimeconfig_initialize (arg, cleanup_runtime_config, file_path);
 } else {
 free (file_path);
 }

 monovm_initialize (sizeof (appctx_keys) / sizeof (appctx_keys [0]), appctx_keys, appctx_values);

#if FORCE_INTERPRETER
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Add runtimeconfig.json support to AppleAppBuilder, reenable affected tests#53172

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

 Merged

marek-safar
merged 2 commits into

from

May 24, 2021
 Merged


Add runtimeconfig.json support to AppleAppBuilder, reenable affected tests
#53172
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f8b8322

Add runtimeconfig.json support to AppleAppBuilder, reenable affected …


filipnavara May 24, 2021
74ce9a0

Update tests.mobile.targets


filipnavara May 24, 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


49 changes: 29 additions & 20 deletions
eng/testing/tests.mobile.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,22 +14,22 @@

 <PropertyGroup Condition="'$(TargetOS)' == 'Android' and '$(UseDefaultAndroidFeatureSwitches)' == 'true'">
 <DebuggerSupport>false</DebuggerSupport>
 <EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
 <EnableUnsafeUTF7Encoding Condition="'$(EnableUnsafeUTF7Encoding)' == ''">false</EnableUnsafeUTF7Encoding>
 <EnableUnsafeBinaryFormatterSerialization>false</EnableUnsafeBinaryFormatterSerialization>
 <EventSourceSupport>false</EventSourceSupport>
 <UseSystemResourceKeys>true</UseSystemResourceKeys>
 <UseSystemResourceKeys Condition="'$(UseSystemResourceKeys)' == ''">true</UseSystemResourceKeys>
 <HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
 <StartupHookSupport>false</StartupHookSupport>
 <UseNativeHttpHandler>true</UseNativeHttpHandler>
 </PropertyGroup>

 <PropertyGroup Condition="('$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator') and '$(UseDefaultiOSFeatureSwitches)' == 'true'">
 <EnableUnsafeBinaryFormatterSerialization>false</EnableUnsafeBinaryFormatterSerialization>
 <EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
 <EnableUnsafeUTF7Encoding Condition="'$(EnableUnsafeUTF7Encoding)' == ''">false</EnableUnsafeUTF7Encoding>
 <EventSourceSupport>false</EventSourceSupport>
 <HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
 <StartupHookSupport>false</StartupHookSupport>
 <UseSystemResourceKeys>true</UseSystemResourceKeys>
 <UseSystemResourceKeys Condition="'$(UseSystemResourceKeys)' == ''">true</UseSystemResourceKeys>
 <UseNativeHttpHandler>true</UseNativeHttpHandler>
 </PropertyGroup>

Expand DownExpand Up@@ -58,15 +58,35 @@

 <Import Project="$(MSBuildThisFileDirectory)tests.wasm.targets" Condition="'$(TargetOS)' == 'Browser'" />

 <UsingTask TaskName="RuntimeConfigParserTask"
 AssemblyFile="$(RuntimeConfigParserTasksAssemblyPath)"
 Condition="'$(RuntimeConfigParserTasksAssemblyPath)' != ''" />

 <Target Name="GenerateRuntimeConfig">
 <PropertyGroup>
 <RuntimeConfigFilePath>$(PublishDir)$(AssemblyName).runtimeconfig.json</RuntimeConfigFilePath>
 <ParsedRuntimeConfigFilePath>$(PublishDir)runtimeconfig.bin</ParsedRuntimeConfigFilePath>
 </PropertyGroup>

 <ItemGroup Condition="'$(RunAOTCompilation)' == 'true'">
 <RuntimeConfigReservedProperties Include="RUNTIME_IDENTIFIER"/>
 <RuntimeConfigReservedProperties Include="APP_CONTEXT_BASE_DIRECTORY"/>
 </ItemGroup>

 <!-- Parse runtimeconfig.template.json file -->
 <RuntimeConfigParserTask
 RuntimeConfigFile="$(RuntimeConfigFilePath)"
 OutputFile="$(ParsedRuntimeConfigFilePath)"
 RuntimeConfigReservedProperties="@(RuntimeConfigReservedProperties)">
 </RuntimeConfigParserTask>
 </Target>

 <!-- Generate a self-contained app bundle for Android with tests. -->
 <UsingTask Condition="'$(TargetOS)' == 'Android'"
 TaskName="AndroidAppBuilderTask"
 AssemblyFile="$(AndroidAppBuilderTasksAssemblyPath)" />
 <UsingTask Condition="'$(TargetOS)' == 'Android'"
 TaskName="RuntimeConfigParserTask"
 AssemblyFile="$(RuntimeConfigParserTasksAssemblyPath)" />

 <Target Condition="'$(TargetOS)' == 'Android'" Name="BundleTestAndroidApp">
 <Target Condition="'$(TargetOS)' == 'Android'" Name="BundleTestAndroidApp" DependsOnTargets="GenerateRuntimeConfig">
 <Error Condition="!Exists('$(MicrosoftNetCoreAppRuntimePackRidDir)')" Text="MicrosoftNetCoreAppRuntimePackRidDir=$(MicrosoftNetCoreAppRuntimePackRidDir) doesn't exist" />

 <PropertyGroup>
Expand All@@ -76,16 +96,12 @@
 <AndroidAbi Condition="'$(TargetArchitecture)' == 'x86'">x86</AndroidAbi>

 <MainLibraryFileName Condition="'$(MainLibraryFileName)' == ''">AndroidTestRunner.dll</MainLibraryFileName>
 <RuntimeConfigFilePath>$(PublishDir)$(AssemblyName).runtimeconfig.json</RuntimeConfigFilePath>
 <ParsedRuntimeConfigFilePath>$(PublishDir)runtimeconfig.bin</ParsedRuntimeConfigFilePath>
 </PropertyGroup>
 <ItemGroup Condition="'$(RunAOTCompilation)' == 'true'">
 <AotInputAssemblies Include="$(PublishDir)\*.dll">
 <AotArguments>@(MonoAOTCompilerDefaultAotArguments, ';')</AotArguments>
 <ProcessArguments>@(MonoAOTCompilerDefaultProcessArguments, ';')</ProcessArguments>
 </AotInputAssemblies>
 <RuntimeConfigReservedProperties Include="RUNTIME_IDENTIFIER"/>
 <RuntimeConfigReservedProperties Include="APP_CONTEXT_BASE_DIRECTORY"/>
 </ItemGroup>

 <WriteLinesToFile File="$(PublishDir)xunit-excludes.txt" Lines="$(XunitExcludesTxtFileContent)" Overwrite="true" />
Expand All@@ -94,13 +110,6 @@
 Condition="'$(RunAOTCompilation)' == 'true'"/>
 <RemoveDir Directories="$(BundleDir)" />

 <!-- Parse runtimeconfig.template.json file -->
 <RuntimeConfigParserTask
 RuntimeConfigFile="$(RuntimeConfigFilePath)"
 OutputFile="$(ParsedRuntimeConfigFilePath)"
 RuntimeConfigReservedProperties="@(RuntimeConfigReservedProperties)">
 </RuntimeConfigParserTask>

 <MonoAOTCompiler Condition="'$(RunAOTCompilation)' == 'true'"
 CompilerBinaryPath="$(MonoAotCrossCompilerPath)"
 OutputDir="$(_MobileIntermediateOutputPath)"
Expand DownExpand Up@@ -147,7 +156,7 @@
 <DevTeamProvisioning Condition="'$(TargetOS)' == 'MacCatalyst' and '$(DevTeamProvisioning)' == ''">adhoc</DevTeamProvisioning>
 </PropertyGroup>

 <Target Condition="'$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator'" Name="BundleTestAppleApp">
 <Target Condition="'$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator'" Name="BundleTestAppleApp" DependsOnTargets="GenerateRuntimeConfig">
 <Error Condition="!Exists('$(MicrosoftNetCoreAppRuntimePackRidDir)')" Text="MicrosoftNetCoreAppRuntimePackRidDir=$(MicrosoftNetCoreAppRuntimePackRidDir) doesn't exist" />
 <Error Condition="('$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'arm' or '$(TargetOS)' == 'MacCatalyst') and '$(DevTeamProvisioning)' == ''"
 Text="'DevTeamProvisioning' needs to be set for device builds. Set it to 'UBF8T346G9' if you're part of the Microsoft team account, or 'adhoc' to sign with an adhoc key.." />
Expand Down

4 changes: 0 additions & 4 deletions
src/libraries/System.Text.Encoding/tests/Encoding/Encoding.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,8 +67,6 @@ public static void GetEncodingsTest()
 [ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
 [Theory]
 [MemberData(nameof(Encoding_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public static void VerifyCodePageAttributes(int codepage, string name, string bodyName, string headerName, bool isBrowserDisplay,
 bool isBrowserSave, bool isMailNewsDisplay, bool isMailNewsSave, int windowsCodePage)
 {
Expand All@@ -86,8 +84,6 @@ public static void VerifyCodePageAttributes(int codepage, string name, string bo
 [ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
 [Theory]
 [MemberData(nameof(Normalization_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public static void NormalizationTest(int codepage, bool normalized, bool normalizedC, bool normalizedD, bool normalizedKC, bool normalizedKD)
 {
 Encoding encoding = Encoding.GetEncoding(codepage);
Expand Down

6 changes: 0 additions & 6 deletions
src/libraries/System.Text.Encoding/tests/Encoding/EncodingGetEncodingTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,8 +90,6 @@ public CodePageMapping(string name, int codepage)

 [ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
 [Fact]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void TestEncodingNameAndCopdepageNumber()
 {
 foreach (var map in s_mapping)
Expand All@@ -103,8 +101,6 @@ public void TestEncodingNameAndCopdepageNumber()

 [ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
 [Fact]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void GetEncoding_EncodingName()
 {
 using (new ThreadCultureChange(CultureInfo.InvariantCulture))
Expand All@@ -125,8 +121,6 @@ public void GetEncoding_EncodingName()

 [ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
 [Fact]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void GetEncoding_WebName()
 {
 foreach (var mapping in s_codePageToWebNameMappings)
Expand Down

4 changes: 1 addition & 3 deletions
src/libraries/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
 <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
 <!-- Encoding.UTF7 and UTF7Encoding are obsolete, but we're the unit test project for it, so suppress warnings -->
 <NoWarn>$(NoWarn),SYSLIB0001</NoWarn>
 <EnableUnsafeUTF7Encoding>true</EnableUnsafeUTF7Encoding>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="ASCIIEncoding\ASCIIEncodingEncode.cs" />
Expand DownExpand Up@@ -85,9 +86,6 @@
 <Compile Include="$(CommonPath)System\Net\MultiArrayBuffer.cs" Link="ProductionCode\Common\System\Net\MultiArrayBuffer.cs" />
 <Compile Include="$(CommonPath)System\Net\StreamBuffer.cs" Link="ProductionCode\Common\System\Net\StreamBuffer.cs" />
 </ItemGroup>
 <ItemGroup>
 <None Include="runtimeconfig.template.json" />
 </ItemGroup>
 <ItemGroup>
 <PackageReference Include="Moq" Version="$(MoqVersion)" />
 </ItemGroup>
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Text.Encoding/tests/UTF7Encoding/UTF7EncodingEncode.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,8 +61,6 @@ public static IEnumerable<object[]> Encode_Basic_TestData()

 [Theory]
 [MemberData(nameof(Encode_Basic_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void Encode_Basic(string source, int index, int count, byte[] expected)
 {
 Encode_Advanced(true, source, index, count, expected);
Expand Down

13 changes: 1 addition & 12 deletions
src/libraries/System.Text.Encoding/tests/UTF7Encoding/UTF7EncodingTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,46 +52,37 @@ public static IEnumerable<object[]> Encodings_TestData()
 yield return new object[] { Encoding.UTF7 };
 yield return new object[] { Encoding.GetEncoding("utf-7") };
 }

 [Theory]
 [MemberData(nameof(Encodings_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void WebName(UTF7Encoding encoding)
 {
 Assert.Equal("utf-7", encoding.WebName);
 }

 [Theory]
 [MemberData(nameof(Encodings_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void CodePage(UTF7Encoding encoding)
 {
 Assert.Equal(65000, encoding.CodePage);
 }

 [Theory]
 [MemberData(nameof(Encodings_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void EncodingName(UTF7Encoding encoding)
 {
 Assert.NotEmpty(encoding.EncodingName); // Unicode (UTF-7) in en-US
 }

 [Theory]
 [MemberData(nameof(Encodings_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void IsSingleByte(UTF7Encoding encoding)
 {
 Assert.False(encoding.IsSingleByte);
 }

 [Theory]
 [MemberData(nameof(Encodings_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void Clone(UTF7Encoding encoding)
 {
 UTF7Encoding clone = (UTF7Encoding)encoding.Clone();
Expand DownExpand Up@@ -125,8 +116,6 @@ public static IEnumerable<object[]> Equals_TestData()

 [Theory]
 [MemberData(nameof(Equals_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void EqualsTest(UTF7Encoding encoding, object value, bool expected)
 {
 Assert.Equal(expected, encoding.Equals(value));
Expand Down

5 changes: 0 additions & 5 deletions
src/libraries/System.Text.Encoding/tests/runtimeconfig.template.json

View file


Open in desktop


This file was deleted.


2 changes: 2 additions & 0 deletions
src/tasks/AndroidAppBuilder/Templates/monodroid.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,6 +239,8 @@ mono_droid_runtime_init (const char* executable, int managed_argc, char* managed
 arg->kind = 0;
 arg->runtimeconfig.name.path = file_path;
 monovm_runtimeconfig_initialize (arg, cleanup_runtime_config, file_path);
 } else {
 free (file_path);
@CoffeeFluxCoffeeFluxMay 24, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, thanks.
 }

 monovm_initialize(2, appctx_keys, appctx_values);
Expand Down

26 changes: 26 additions & 0 deletions
src/tasks/AppleAppBuilder/Templates/runtime.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@

#define APPLE_RUNTIME_IDENTIFIER "//%APPLE_RUNTIME_IDENTIFIER%"

#define RUNTIMECONFIG_BIN_FILE "runtimeconfig.bin"

const char *
get_bundle_path (void)
{
Expand DownExpand Up@@ -205,6 +207,13 @@
//%DllMap%
}

void
cleanup_runtime_config (MonovmRuntimeConfigArguments *args, void *user_data)
{
 free (args);
 free (user_data);
}

#if FORCE_INTERPRETER || FORCE_AOT || (!TARGET_OS_SIMULATOR && !TARGET_OS_MACCATALYST)
void mono_jit_set_aot_mode (MonoAotMode mode);
void register_aot_modules (void);
Expand DownExpand Up@@ -258,6 +267,23 @@
#endif
 };

 char *file_name = RUNTIMECONFIG_BIN_FILE;
 int str_len = strlen (bundle) + strlen (file_name) + 2;
 char *file_path = (char *)malloc (sizeof (char) * str_len);
 int num_char = snprintf (file_path, str_len, "%s/%s", bundle, file_name);
 struct stat buffer;

 assert (num_char > 0 && num_char < str_len);

 if (stat (file_path, &buffer) == 0) {
 MonovmRuntimeConfigArguments *arg = (MonovmRuntimeConfigArguments *)malloc (sizeof (MonovmRuntimeConfigArguments));
 arg->kind = 0;
 arg->runtimeconfig.name.path = file_path;
 monovm_runtimeconfig_initialize (arg, cleanup_runtime_config, file_path);
 } else {
 free (file_path);
 }

 monovm_initialize (sizeof (appctx_keys) / sizeof (appctx_keys [0]), appctx_keys, appctx_values);

#if FORCE_INTERPRETER
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add runtimeconfig.json support to AppleAppBuilder, reenable affected tests#53172

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

 Merged

marek-safar
merged 2 commits into

from

May 24, 2021
 Merged


Add runtimeconfig.json support to AppleAppBuilder, reenable affected tests
#53172
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f8b8322

Add runtimeconfig.json support to AppleAppBuilder, reenable affected …


filipnavara May 24, 2021
74ce9a0

Update tests.mobile.targets


filipnavara May 24, 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


49 changes: 29 additions & 20 deletions
eng/testing/tests.mobile.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,22 +14,22 @@

 <PropertyGroup Condition="'$(TargetOS)' == 'Android' and '$(UseDefaultAndroidFeatureSwitches)' == 'true'">
 <DebuggerSupport>false</DebuggerSupport>
 <EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
 <EnableUnsafeUTF7Encoding Condition="'$(EnableUnsafeUTF7Encoding)' == ''">false</EnableUnsafeUTF7Encoding>
 <EnableUnsafeBinaryFormatterSerialization>false</EnableUnsafeBinaryFormatterSerialization>
 <EventSourceSupport>false</EventSourceSupport>
 <UseSystemResourceKeys>true</UseSystemResourceKeys>
 <UseSystemResourceKeys Condition="'$(UseSystemResourceKeys)' == ''">true</UseSystemResourceKeys>
 <HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
 <StartupHookSupport>false</StartupHookSupport>
 <UseNativeHttpHandler>true</UseNativeHttpHandler>
 </PropertyGroup>

 <PropertyGroup Condition="('$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator') and '$(UseDefaultiOSFeatureSwitches)' == 'true'">
 <EnableUnsafeBinaryFormatterSerialization>false</EnableUnsafeBinaryFormatterSerialization>
 <EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
 <EnableUnsafeUTF7Encoding Condition="'$(EnableUnsafeUTF7Encoding)' == ''">false</EnableUnsafeUTF7Encoding>
 <EventSourceSupport>false</EventSourceSupport>
 <HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
 <StartupHookSupport>false</StartupHookSupport>
 <UseSystemResourceKeys>true</UseSystemResourceKeys>
 <UseSystemResourceKeys Condition="'$(UseSystemResourceKeys)' == ''">true</UseSystemResourceKeys>
 <UseNativeHttpHandler>true</UseNativeHttpHandler>
 </PropertyGroup>

Expand DownExpand Up@@ -58,15 +58,35 @@

 <Import Project="$(MSBuildThisFileDirectory)tests.wasm.targets" Condition="'$(TargetOS)' == 'Browser'" />

 <UsingTask TaskName="RuntimeConfigParserTask"
 AssemblyFile="$(RuntimeConfigParserTasksAssemblyPath)"
 Condition="'$(RuntimeConfigParserTasksAssemblyPath)' != ''" />

 <Target Name="GenerateRuntimeConfig">
 <PropertyGroup>
 <RuntimeConfigFilePath>$(PublishDir)$(AssemblyName).runtimeconfig.json</RuntimeConfigFilePath>
 <ParsedRuntimeConfigFilePath>$(PublishDir)runtimeconfig.bin</ParsedRuntimeConfigFilePath>
 </PropertyGroup>

 <ItemGroup Condition="'$(RunAOTCompilation)' == 'true'">
 <RuntimeConfigReservedProperties Include="RUNTIME_IDENTIFIER"/>
 <RuntimeConfigReservedProperties Include="APP_CONTEXT_BASE_DIRECTORY"/>
 </ItemGroup>

 <!-- Parse runtimeconfig.template.json file -->
 <RuntimeConfigParserTask
 RuntimeConfigFile="$(RuntimeConfigFilePath)"
 OutputFile="$(ParsedRuntimeConfigFilePath)"
 RuntimeConfigReservedProperties="@(RuntimeConfigReservedProperties)">
 </RuntimeConfigParserTask>
 </Target>

 <!-- Generate a self-contained app bundle for Android with tests. -->
 <UsingTask Condition="'$(TargetOS)' == 'Android'"
 TaskName="AndroidAppBuilderTask"
 AssemblyFile="$(AndroidAppBuilderTasksAssemblyPath)" />
 <UsingTask Condition="'$(TargetOS)' == 'Android'"
 TaskName="RuntimeConfigParserTask"
 AssemblyFile="$(RuntimeConfigParserTasksAssemblyPath)" />

 <Target Condition="'$(TargetOS)' == 'Android'" Name="BundleTestAndroidApp">
 <Target Condition="'$(TargetOS)' == 'Android'" Name="BundleTestAndroidApp" DependsOnTargets="GenerateRuntimeConfig">
 <Error Condition="!Exists('$(MicrosoftNetCoreAppRuntimePackRidDir)')" Text="MicrosoftNetCoreAppRuntimePackRidDir=$(MicrosoftNetCoreAppRuntimePackRidDir) doesn't exist" />

 <PropertyGroup>
Expand All@@ -76,16 +96,12 @@
 <AndroidAbi Condition="'$(TargetArchitecture)' == 'x86'">x86</AndroidAbi>

 <MainLibraryFileName Condition="'$(MainLibraryFileName)' == ''">AndroidTestRunner.dll</MainLibraryFileName>
 <RuntimeConfigFilePath>$(PublishDir)$(AssemblyName).runtimeconfig.json</RuntimeConfigFilePath>
 <ParsedRuntimeConfigFilePath>$(PublishDir)runtimeconfig.bin</ParsedRuntimeConfigFilePath>
 </PropertyGroup>
 <ItemGroup Condition="'$(RunAOTCompilation)' == 'true'">
 <AotInputAssemblies Include="$(PublishDir)\*.dll">
 <AotArguments>@(MonoAOTCompilerDefaultAotArguments, ';')</AotArguments>
 <ProcessArguments>@(MonoAOTCompilerDefaultProcessArguments, ';')</ProcessArguments>
 </AotInputAssemblies>
 <RuntimeConfigReservedProperties Include="RUNTIME_IDENTIFIER"/>
 <RuntimeConfigReservedProperties Include="APP_CONTEXT_BASE_DIRECTORY"/>
 </ItemGroup>

 <WriteLinesToFile File="$(PublishDir)xunit-excludes.txt" Lines="$(XunitExcludesTxtFileContent)" Overwrite="true" />
Expand All@@ -94,13 +110,6 @@
 Condition="'$(RunAOTCompilation)' == 'true'"/>
 <RemoveDir Directories="$(BundleDir)" />

 <!-- Parse runtimeconfig.template.json file -->
 <RuntimeConfigParserTask
 RuntimeConfigFile="$(RuntimeConfigFilePath)"
 OutputFile="$(ParsedRuntimeConfigFilePath)"
 RuntimeConfigReservedProperties="@(RuntimeConfigReservedProperties)">
 </RuntimeConfigParserTask>

 <MonoAOTCompiler Condition="'$(RunAOTCompilation)' == 'true'"
 CompilerBinaryPath="$(MonoAotCrossCompilerPath)"
 OutputDir="$(_MobileIntermediateOutputPath)"
Expand DownExpand Up@@ -147,7 +156,7 @@
 <DevTeamProvisioning Condition="'$(TargetOS)' == 'MacCatalyst' and '$(DevTeamProvisioning)' == ''">adhoc</DevTeamProvisioning>
 </PropertyGroup>

 <Target Condition="'$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator'" Name="BundleTestAppleApp">
 <Target Condition="'$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator'" Name="BundleTestAppleApp" DependsOnTargets="GenerateRuntimeConfig">
 <Error Condition="!Exists('$(MicrosoftNetCoreAppRuntimePackRidDir)')" Text="MicrosoftNetCoreAppRuntimePackRidDir=$(MicrosoftNetCoreAppRuntimePackRidDir) doesn't exist" />
 <Error Condition="('$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'arm' or '$(TargetOS)' == 'MacCatalyst') and '$(DevTeamProvisioning)' == ''"
 Text="'DevTeamProvisioning' needs to be set for device builds. Set it to 'UBF8T346G9' if you're part of the Microsoft team account, or 'adhoc' to sign with an adhoc key.." />
Expand Down

4 changes: 0 additions & 4 deletions
src/libraries/System.Text.Encoding/tests/Encoding/Encoding.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,8 +67,6 @@ public static void GetEncodingsTest()
 [ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
 [Theory]
 [MemberData(nameof(Encoding_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public static void VerifyCodePageAttributes(int codepage, string name, string bodyName, string headerName, bool isBrowserDisplay,
 bool isBrowserSave, bool isMailNewsDisplay, bool isMailNewsSave, int windowsCodePage)
 {
Expand All@@ -86,8 +84,6 @@ public static void VerifyCodePageAttributes(int codepage, string name, string bo
 [ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
 [Theory]
 [MemberData(nameof(Normalization_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public static void NormalizationTest(int codepage, bool normalized, bool normalizedC, bool normalizedD, bool normalizedKC, bool normalizedKD)
 {
 Encoding encoding = Encoding.GetEncoding(codepage);
Expand Down

6 changes: 0 additions & 6 deletions
src/libraries/System.Text.Encoding/tests/Encoding/EncodingGetEncodingTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,8 +90,6 @@ public CodePageMapping(string name, int codepage)

 [ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
 [Fact]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void TestEncodingNameAndCopdepageNumber()
 {
 foreach (var map in s_mapping)
Expand All@@ -103,8 +101,6 @@ public void TestEncodingNameAndCopdepageNumber()

 [ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
 [Fact]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void GetEncoding_EncodingName()
 {
 using (new ThreadCultureChange(CultureInfo.InvariantCulture))
Expand All@@ -125,8 +121,6 @@ public void GetEncoding_EncodingName()

 [ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
 [Fact]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void GetEncoding_WebName()
 {
 foreach (var mapping in s_codePageToWebNameMappings)
Expand Down

4 changes: 1 addition & 3 deletions
src/libraries/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
 <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
 <!-- Encoding.UTF7 and UTF7Encoding are obsolete, but we're the unit test project for it, so suppress warnings -->
 <NoWarn>$(NoWarn),SYSLIB0001</NoWarn>
 <EnableUnsafeUTF7Encoding>true</EnableUnsafeUTF7Encoding>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="ASCIIEncoding\ASCIIEncodingEncode.cs" />
Expand DownExpand Up@@ -85,9 +86,6 @@
 <Compile Include="$(CommonPath)System\Net\MultiArrayBuffer.cs" Link="ProductionCode\Common\System\Net\MultiArrayBuffer.cs" />
 <Compile Include="$(CommonPath)System\Net\StreamBuffer.cs" Link="ProductionCode\Common\System\Net\StreamBuffer.cs" />
 </ItemGroup>
 <ItemGroup>
 <None Include="runtimeconfig.template.json" />
 </ItemGroup>
 <ItemGroup>
 <PackageReference Include="Moq" Version="$(MoqVersion)" />
 </ItemGroup>
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Text.Encoding/tests/UTF7Encoding/UTF7EncodingEncode.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,8 +61,6 @@ public static IEnumerable<object[]> Encode_Basic_TestData()

 [Theory]
 [MemberData(nameof(Encode_Basic_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void Encode_Basic(string source, int index, int count, byte[] expected)
 {
 Encode_Advanced(true, source, index, count, expected);
Expand Down

13 changes: 1 addition & 12 deletions
src/libraries/System.Text.Encoding/tests/UTF7Encoding/UTF7EncodingTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,46 +52,37 @@ public static IEnumerable<object[]> Encodings_TestData()
 yield return new object[] { Encoding.UTF7 };
 yield return new object[] { Encoding.GetEncoding("utf-7") };
 }

 [Theory]
 [MemberData(nameof(Encodings_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void WebName(UTF7Encoding encoding)
 {
 Assert.Equal("utf-7", encoding.WebName);
 }

 [Theory]
 [MemberData(nameof(Encodings_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void CodePage(UTF7Encoding encoding)
 {
 Assert.Equal(65000, encoding.CodePage);
 }

 [Theory]
 [MemberData(nameof(Encodings_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void EncodingName(UTF7Encoding encoding)
 {
 Assert.NotEmpty(encoding.EncodingName); // Unicode (UTF-7) in en-US
 }

 [Theory]
 [MemberData(nameof(Encodings_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void IsSingleByte(UTF7Encoding encoding)
 {
 Assert.False(encoding.IsSingleByte);
 }

 [Theory]
 [MemberData(nameof(Encodings_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void Clone(UTF7Encoding encoding)
 {
 UTF7Encoding clone = (UTF7Encoding)encoding.Clone();
Expand DownExpand Up@@ -125,8 +116,6 @@ public static IEnumerable<object[]> Equals_TestData()

 [Theory]
 [MemberData(nameof(Equals_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void EqualsTest(UTF7Encoding encoding, object value, bool expected)
 {
 Assert.Equal(expected, encoding.Equals(value));
Expand Down

5 changes: 0 additions & 5 deletions
src/libraries/System.Text.Encoding/tests/runtimeconfig.template.json

View file


Open in desktop


This file was deleted.


2 changes: 2 additions & 0 deletions
src/tasks/AndroidAppBuilder/Templates/monodroid.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,6 +239,8 @@ mono_droid_runtime_init (const char* executable, int managed_argc, char* managed
 arg->kind = 0;
 arg->runtimeconfig.name.path = file_path;
 monovm_runtimeconfig_initialize (arg, cleanup_runtime_config, file_path);
 } else {
 free (file_path);
@CoffeeFluxCoffeeFluxMay 24, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, thanks.
 }

 monovm_initialize(2, appctx_keys, appctx_values);
Expand Down

26 changes: 26 additions & 0 deletions
src/tasks/AppleAppBuilder/Templates/runtime.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@

#define APPLE_RUNTIME_IDENTIFIER "//%APPLE_RUNTIME_IDENTIFIER%"

#define RUNTIMECONFIG_BIN_FILE "runtimeconfig.bin"

const char *
get_bundle_path (void)
{
Expand DownExpand Up@@ -205,6 +207,13 @@
//%DllMap%
}

void
cleanup_runtime_config (MonovmRuntimeConfigArguments *args, void *user_data)
{
 free (args);
 free (user_data);
}

#if FORCE_INTERPRETER || FORCE_AOT || (!TARGET_OS_SIMULATOR && !TARGET_OS_MACCATALYST)
void mono_jit_set_aot_mode (MonoAotMode mode);
void register_aot_modules (void);
Expand DownExpand Up@@ -258,6 +267,23 @@
#endif
 };

 char *file_name = RUNTIMECONFIG_BIN_FILE;
 int str_len = strlen (bundle) + strlen (file_name) + 2;
 char *file_path = (char *)malloc (sizeof (char) * str_len);
 int num_char = snprintf (file_path, str_len, "%s/%s", bundle, file_name);
 struct stat buffer;

 assert (num_char > 0 && num_char < str_len);

 if (stat (file_path, &buffer) == 0) {
 MonovmRuntimeConfigArguments *arg = (MonovmRuntimeConfigArguments *)malloc (sizeof (MonovmRuntimeConfigArguments));
 arg->kind = 0;
 arg->runtimeconfig.name.path = file_path;
 monovm_runtimeconfig_initialize (arg, cleanup_runtime_config, file_path);
 } else {
 free (file_path);
 }

 monovm_initialize (sizeof (appctx_keys) / sizeof (appctx_keys [0]), appctx_keys, appctx_values);

#if FORCE_INTERPRETER
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add runtimeconfig.json support to AppleAppBuilder, reenable affected tests#53172

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

 Merged

marek-safar
merged 2 commits into

from

May 24, 2021
 Merged


Add runtimeconfig.json support to AppleAppBuilder, reenable affected tests
#53172
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f8b8322

Add runtimeconfig.json support to AppleAppBuilder, reenable affected …


filipnavara May 24, 2021
74ce9a0

Update tests.mobile.targets


filipnavara May 24, 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


49 changes: 29 additions & 20 deletions
eng/testing/tests.mobile.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,22 +14,22 @@

 <PropertyGroup Condition="'$(TargetOS)' == 'Android' and '$(UseDefaultAndroidFeatureSwitches)' == 'true'">
 <DebuggerSupport>false</DebuggerSupport>
 <EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
 <EnableUnsafeUTF7Encoding Condition="'$(EnableUnsafeUTF7Encoding)' == ''">false</EnableUnsafeUTF7Encoding>
 <EnableUnsafeBinaryFormatterSerialization>false</EnableUnsafeBinaryFormatterSerialization>
 <EventSourceSupport>false</EventSourceSupport>
 <UseSystemResourceKeys>true</UseSystemResourceKeys>
 <UseSystemResourceKeys Condition="'$(UseSystemResourceKeys)' == ''">true</UseSystemResourceKeys>
 <HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
 <StartupHookSupport>false</StartupHookSupport>
 <UseNativeHttpHandler>true</UseNativeHttpHandler>
 </PropertyGroup>

 <PropertyGroup Condition="('$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator') and '$(UseDefaultiOSFeatureSwitches)' == 'true'">
 <EnableUnsafeBinaryFormatterSerialization>false</EnableUnsafeBinaryFormatterSerialization>
 <EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
 <EnableUnsafeUTF7Encoding Condition="'$(EnableUnsafeUTF7Encoding)' == ''">false</EnableUnsafeUTF7Encoding>
 <EventSourceSupport>false</EventSourceSupport>
 <HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
 <StartupHookSupport>false</StartupHookSupport>
 <UseSystemResourceKeys>true</UseSystemResourceKeys>
 <UseSystemResourceKeys Condition="'$(UseSystemResourceKeys)' == ''">true</UseSystemResourceKeys>
 <UseNativeHttpHandler>true</UseNativeHttpHandler>
 </PropertyGroup>

Expand DownExpand Up@@ -58,15 +58,35 @@

 <Import Project="$(MSBuildThisFileDirectory)tests.wasm.targets" Condition="'$(TargetOS)' == 'Browser'" />

 <UsingTask TaskName="RuntimeConfigParserTask"
 AssemblyFile="$(RuntimeConfigParserTasksAssemblyPath)"
 Condition="'$(RuntimeConfigParserTasksAssemblyPath)' != ''" />

 <Target Name="GenerateRuntimeConfig">
 <PropertyGroup>
 <RuntimeConfigFilePath>$(PublishDir)$(AssemblyName).runtimeconfig.json</RuntimeConfigFilePath>
 <ParsedRuntimeConfigFilePath>$(PublishDir)runtimeconfig.bin</ParsedRuntimeConfigFilePath>
 </PropertyGroup>

 <ItemGroup Condition="'$(RunAOTCompilation)' == 'true'">
 <RuntimeConfigReservedProperties Include="RUNTIME_IDENTIFIER"/>
 <RuntimeConfigReservedProperties Include="APP_CONTEXT_BASE_DIRECTORY"/>
 </ItemGroup>

 <!-- Parse runtimeconfig.template.json file -->
 <RuntimeConfigParserTask
 RuntimeConfigFile="$(RuntimeConfigFilePath)"
 OutputFile="$(ParsedRuntimeConfigFilePath)"
 RuntimeConfigReservedProperties="@(RuntimeConfigReservedProperties)">
 </RuntimeConfigParserTask>
 </Target>

 <!-- Generate a self-contained app bundle for Android with tests. -->
 <UsingTask Condition="'$(TargetOS)' == 'Android'"
 TaskName="AndroidAppBuilderTask"
 AssemblyFile="$(AndroidAppBuilderTasksAssemblyPath)" />
 <UsingTask Condition="'$(TargetOS)' == 'Android'"
 TaskName="RuntimeConfigParserTask"
 AssemblyFile="$(RuntimeConfigParserTasksAssemblyPath)" />

 <Target Condition="'$(TargetOS)' == 'Android'" Name="BundleTestAndroidApp">
 <Target Condition="'$(TargetOS)' == 'Android'" Name="BundleTestAndroidApp" DependsOnTargets="GenerateRuntimeConfig">
 <Error Condition="!Exists('$(MicrosoftNetCoreAppRuntimePackRidDir)')" Text="MicrosoftNetCoreAppRuntimePackRidDir=$(MicrosoftNetCoreAppRuntimePackRidDir) doesn't exist" />

 <PropertyGroup>
Expand All@@ -76,16 +96,12 @@
 <AndroidAbi Condition="'$(TargetArchitecture)' == 'x86'">x86</AndroidAbi>

 <MainLibraryFileName Condition="'$(MainLibraryFileName)' == ''">AndroidTestRunner.dll</MainLibraryFileName>
 <RuntimeConfigFilePath>$(PublishDir)$(AssemblyName).runtimeconfig.json</RuntimeConfigFilePath>
 <ParsedRuntimeConfigFilePath>$(PublishDir)runtimeconfig.bin</ParsedRuntimeConfigFilePath>
 </PropertyGroup>
 <ItemGroup Condition="'$(RunAOTCompilation)' == 'true'">
 <AotInputAssemblies Include="$(PublishDir)\*.dll">
 <AotArguments>@(MonoAOTCompilerDefaultAotArguments, ';')</AotArguments>
 <ProcessArguments>@(MonoAOTCompilerDefaultProcessArguments, ';')</ProcessArguments>
 </AotInputAssemblies>
 <RuntimeConfigReservedProperties Include="RUNTIME_IDENTIFIER"/>
 <RuntimeConfigReservedProperties Include="APP_CONTEXT_BASE_DIRECTORY"/>
 </ItemGroup>

 <WriteLinesToFile File="$(PublishDir)xunit-excludes.txt" Lines="$(XunitExcludesTxtFileContent)" Overwrite="true" />
Expand All@@ -94,13 +110,6 @@
 Condition="'$(RunAOTCompilation)' == 'true'"/>
 <RemoveDir Directories="$(BundleDir)" />

 <!-- Parse runtimeconfig.template.json file -->
 <RuntimeConfigParserTask
 RuntimeConfigFile="$(RuntimeConfigFilePath)"
 OutputFile="$(ParsedRuntimeConfigFilePath)"
 RuntimeConfigReservedProperties="@(RuntimeConfigReservedProperties)">
 </RuntimeConfigParserTask>

 <MonoAOTCompiler Condition="'$(RunAOTCompilation)' == 'true'"
 CompilerBinaryPath="$(MonoAotCrossCompilerPath)"
 OutputDir="$(_MobileIntermediateOutputPath)"
Expand DownExpand Up@@ -147,7 +156,7 @@
 <DevTeamProvisioning Condition="'$(TargetOS)' == 'MacCatalyst' and '$(DevTeamProvisioning)' == ''">adhoc</DevTeamProvisioning>
 </PropertyGroup>

 <Target Condition="'$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator'" Name="BundleTestAppleApp">
 <Target Condition="'$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator'" Name="BundleTestAppleApp" DependsOnTargets="GenerateRuntimeConfig">
 <Error Condition="!Exists('$(MicrosoftNetCoreAppRuntimePackRidDir)')" Text="MicrosoftNetCoreAppRuntimePackRidDir=$(MicrosoftNetCoreAppRuntimePackRidDir) doesn't exist" />
 <Error Condition="('$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'arm' or '$(TargetOS)' == 'MacCatalyst') and '$(DevTeamProvisioning)' == ''"
 Text="'DevTeamProvisioning' needs to be set for device builds. Set it to 'UBF8T346G9' if you're part of the Microsoft team account, or 'adhoc' to sign with an adhoc key.." />
Expand Down

4 changes: 0 additions & 4 deletions
src/libraries/System.Text.Encoding/tests/Encoding/Encoding.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,8 +67,6 @@ public static void GetEncodingsTest()
 [ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
 [Theory]
 [MemberData(nameof(Encoding_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public static void VerifyCodePageAttributes(int codepage, string name, string bodyName, string headerName, bool isBrowserDisplay,
 bool isBrowserSave, bool isMailNewsDisplay, bool isMailNewsSave, int windowsCodePage)
 {
Expand All@@ -86,8 +84,6 @@ public static void VerifyCodePageAttributes(int codepage, string name, string bo
 [ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
 [Theory]
 [MemberData(nameof(Normalization_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public static void NormalizationTest(int codepage, bool normalized, bool normalizedC, bool normalizedD, bool normalizedKC, bool normalizedKD)
 {
 Encoding encoding = Encoding.GetEncoding(codepage);
Expand Down

6 changes: 0 additions & 6 deletions
src/libraries/System.Text.Encoding/tests/Encoding/EncodingGetEncodingTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,8 +90,6 @@ public CodePageMapping(string name, int codepage)

 [ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
 [Fact]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void TestEncodingNameAndCopdepageNumber()
 {
 foreach (var map in s_mapping)
Expand All@@ -103,8 +101,6 @@ public void TestEncodingNameAndCopdepageNumber()

 [ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
 [Fact]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void GetEncoding_EncodingName()
 {
 using (new ThreadCultureChange(CultureInfo.InvariantCulture))
Expand All@@ -125,8 +121,6 @@ public void GetEncoding_EncodingName()

 [ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
 [Fact]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void GetEncoding_WebName()
 {
 foreach (var mapping in s_codePageToWebNameMappings)
Expand Down

4 changes: 1 addition & 3 deletions
src/libraries/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
 <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
 <!-- Encoding.UTF7 and UTF7Encoding are obsolete, but we're the unit test project for it, so suppress warnings -->
 <NoWarn>$(NoWarn),SYSLIB0001</NoWarn>
 <EnableUnsafeUTF7Encoding>true</EnableUnsafeUTF7Encoding>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="ASCIIEncoding\ASCIIEncodingEncode.cs" />
Expand DownExpand Up@@ -85,9 +86,6 @@
 <Compile Include="$(CommonPath)System\Net\MultiArrayBuffer.cs" Link="ProductionCode\Common\System\Net\MultiArrayBuffer.cs" />
 <Compile Include="$(CommonPath)System\Net\StreamBuffer.cs" Link="ProductionCode\Common\System\Net\StreamBuffer.cs" />
 </ItemGroup>
 <ItemGroup>
 <None Include="runtimeconfig.template.json" />
 </ItemGroup>
 <ItemGroup>
 <PackageReference Include="Moq" Version="$(MoqVersion)" />
 </ItemGroup>
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Text.Encoding/tests/UTF7Encoding/UTF7EncodingEncode.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,8 +61,6 @@ public static IEnumerable<object[]> Encode_Basic_TestData()

 [Theory]
 [MemberData(nameof(Encode_Basic_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void Encode_Basic(string source, int index, int count, byte[] expected)
 {
 Encode_Advanced(true, source, index, count, expected);
Expand Down

13 changes: 1 addition & 12 deletions
src/libraries/System.Text.Encoding/tests/UTF7Encoding/UTF7EncodingTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,46 +52,37 @@ public static IEnumerable<object[]> Encodings_TestData()
 yield return new object[] { Encoding.UTF7 };
 yield return new object[] { Encoding.GetEncoding("utf-7") };
 }

 [Theory]
 [MemberData(nameof(Encodings_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void WebName(UTF7Encoding encoding)
 {
 Assert.Equal("utf-7", encoding.WebName);
 }

 [Theory]
 [MemberData(nameof(Encodings_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void CodePage(UTF7Encoding encoding)
 {
 Assert.Equal(65000, encoding.CodePage);
 }

 [Theory]
 [MemberData(nameof(Encodings_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void EncodingName(UTF7Encoding encoding)
 {
 Assert.NotEmpty(encoding.EncodingName); // Unicode (UTF-7) in en-US
 }

 [Theory]
 [MemberData(nameof(Encodings_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void IsSingleByte(UTF7Encoding encoding)
 {
 Assert.False(encoding.IsSingleByte);
 }

 [Theory]
 [MemberData(nameof(Encodings_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void Clone(UTF7Encoding encoding)
 {
 UTF7Encoding clone = (UTF7Encoding)encoding.Clone();
Expand DownExpand Up@@ -125,8 +116,6 @@ public static IEnumerable<object[]> Equals_TestData()

 [Theory]
 [MemberData(nameof(Equals_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void EqualsTest(UTF7Encoding encoding, object value, bool expected)
 {
 Assert.Equal(expected, encoding.Equals(value));
Expand Down

5 changes: 0 additions & 5 deletions
src/libraries/System.Text.Encoding/tests/runtimeconfig.template.json

View file


Open in desktop


This file was deleted.


2 changes: 2 additions & 0 deletions
src/tasks/AndroidAppBuilder/Templates/monodroid.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,6 +239,8 @@ mono_droid_runtime_init (const char* executable, int managed_argc, char* managed
 arg->kind = 0;
 arg->runtimeconfig.name.path = file_path;
 monovm_runtimeconfig_initialize (arg, cleanup_runtime_config, file_path);
 } else {
 free (file_path);
@CoffeeFluxCoffeeFluxMay 24, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, thanks.
 }

 monovm_initialize(2, appctx_keys, appctx_values);
Expand Down

26 changes: 26 additions & 0 deletions
src/tasks/AppleAppBuilder/Templates/runtime.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@

#define APPLE_RUNTIME_IDENTIFIER "//%APPLE_RUNTIME_IDENTIFIER%"

#define RUNTIMECONFIG_BIN_FILE "runtimeconfig.bin"

const char *
get_bundle_path (void)
{
Expand DownExpand Up@@ -205,6 +207,13 @@
//%DllMap%
}

void
cleanup_runtime_config (MonovmRuntimeConfigArguments *args, void *user_data)
{
 free (args);
 free (user_data);
}

#if FORCE_INTERPRETER || FORCE_AOT || (!TARGET_OS_SIMULATOR && !TARGET_OS_MACCATALYST)
void mono_jit_set_aot_mode (MonoAotMode mode);
void register_aot_modules (void);
Expand DownExpand Up@@ -258,6 +267,23 @@
#endif
 };

 char *file_name = RUNTIMECONFIG_BIN_FILE;
 int str_len = strlen (bundle) + strlen (file_name) + 2;
 char *file_path = (char *)malloc (sizeof (char) * str_len);
 int num_char = snprintf (file_path, str_len, "%s/%s", bundle, file_name);
 struct stat buffer;

 assert (num_char > 0 && num_char < str_len);

 if (stat (file_path, &buffer) == 0) {
 MonovmRuntimeConfigArguments *arg = (MonovmRuntimeConfigArguments *)malloc (sizeof (MonovmRuntimeConfigArguments));
 arg->kind = 0;
 arg->runtimeconfig.name.path = file_path;
 monovm_runtimeconfig_initialize (arg, cleanup_runtime_config, file_path);
 } else {
 free (file_path);
 }

 monovm_initialize (sizeof (appctx_keys) / sizeof (appctx_keys [0]), appctx_keys, appctx_values);

#if FORCE_INTERPRETER
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Add runtimeconfig.json support to AppleAppBuilder, reenable affected tests#53172

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

 Merged

marek-safar
merged 2 commits into

from

May 24, 2021
 Merged


Add runtimeconfig.json support to AppleAppBuilder, reenable affected tests
#53172
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f8b8322

Add runtimeconfig.json support to AppleAppBuilder, reenable affected …


filipnavara May 24, 2021
74ce9a0

Update tests.mobile.targets


filipnavara May 24, 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


49 changes: 29 additions & 20 deletions
eng/testing/tests.mobile.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,22 +14,22 @@

 <PropertyGroup Condition="'$(TargetOS)' == 'Android' and '$(UseDefaultAndroidFeatureSwitches)' == 'true'">
 <DebuggerSupport>false</DebuggerSupport>
 <EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
 <EnableUnsafeUTF7Encoding Condition="'$(EnableUnsafeUTF7Encoding)' == ''">false</EnableUnsafeUTF7Encoding>
 <EnableUnsafeBinaryFormatterSerialization>false</EnableUnsafeBinaryFormatterSerialization>
 <EventSourceSupport>false</EventSourceSupport>
 <UseSystemResourceKeys>true</UseSystemResourceKeys>
 <UseSystemResourceKeys Condition="'$(UseSystemResourceKeys)' == ''">true</UseSystemResourceKeys>
 <HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
 <StartupHookSupport>false</StartupHookSupport>
 <UseNativeHttpHandler>true</UseNativeHttpHandler>
 </PropertyGroup>

 <PropertyGroup Condition="('$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator') and '$(UseDefaultiOSFeatureSwitches)' == 'true'">
 <EnableUnsafeBinaryFormatterSerialization>false</EnableUnsafeBinaryFormatterSerialization>
 <EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
 <EnableUnsafeUTF7Encoding Condition="'$(EnableUnsafeUTF7Encoding)' == ''">false</EnableUnsafeUTF7Encoding>
 <EventSourceSupport>false</EventSourceSupport>
 <HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
 <StartupHookSupport>false</StartupHookSupport>
 <UseSystemResourceKeys>true</UseSystemResourceKeys>
 <UseSystemResourceKeys Condition="'$(UseSystemResourceKeys)' == ''">true</UseSystemResourceKeys>
 <UseNativeHttpHandler>true</UseNativeHttpHandler>
 </PropertyGroup>

Expand DownExpand Up@@ -58,15 +58,35 @@

 <Import Project="$(MSBuildThisFileDirectory)tests.wasm.targets" Condition="'$(TargetOS)' == 'Browser'" />

 <UsingTask TaskName="RuntimeConfigParserTask"
 AssemblyFile="$(RuntimeConfigParserTasksAssemblyPath)"
 Condition="'$(RuntimeConfigParserTasksAssemblyPath)' != ''" />

 <Target Name="GenerateRuntimeConfig">
 <PropertyGroup>
 <RuntimeConfigFilePath>$(PublishDir)$(AssemblyName).runtimeconfig.json</RuntimeConfigFilePath>
 <ParsedRuntimeConfigFilePath>$(PublishDir)runtimeconfig.bin</ParsedRuntimeConfigFilePath>
 </PropertyGroup>

 <ItemGroup Condition="'$(RunAOTCompilation)' == 'true'">
 <RuntimeConfigReservedProperties Include="RUNTIME_IDENTIFIER"/>
 <RuntimeConfigReservedProperties Include="APP_CONTEXT_BASE_DIRECTORY"/>
 </ItemGroup>

 <!-- Parse runtimeconfig.template.json file -->
 <RuntimeConfigParserTask
 RuntimeConfigFile="$(RuntimeConfigFilePath)"
 OutputFile="$(ParsedRuntimeConfigFilePath)"
 RuntimeConfigReservedProperties="@(RuntimeConfigReservedProperties)">
 </RuntimeConfigParserTask>
 </Target>

 <!-- Generate a self-contained app bundle for Android with tests. -->
 <UsingTask Condition="'$(TargetOS)' == 'Android'"
 TaskName="AndroidAppBuilderTask"
 AssemblyFile="$(AndroidAppBuilderTasksAssemblyPath)" />
 <UsingTask Condition="'$(TargetOS)' == 'Android'"
 TaskName="RuntimeConfigParserTask"
 AssemblyFile="$(RuntimeConfigParserTasksAssemblyPath)" />

 <Target Condition="'$(TargetOS)' == 'Android'" Name="BundleTestAndroidApp">
 <Target Condition="'$(TargetOS)' == 'Android'" Name="BundleTestAndroidApp" DependsOnTargets="GenerateRuntimeConfig">
 <Error Condition="!Exists('$(MicrosoftNetCoreAppRuntimePackRidDir)')" Text="MicrosoftNetCoreAppRuntimePackRidDir=$(MicrosoftNetCoreAppRuntimePackRidDir) doesn't exist" />

 <PropertyGroup>
Expand All@@ -76,16 +96,12 @@
 <AndroidAbi Condition="'$(TargetArchitecture)' == 'x86'">x86</AndroidAbi>

 <MainLibraryFileName Condition="'$(MainLibraryFileName)' == ''">AndroidTestRunner.dll</MainLibraryFileName>
 <RuntimeConfigFilePath>$(PublishDir)$(AssemblyName).runtimeconfig.json</RuntimeConfigFilePath>
 <ParsedRuntimeConfigFilePath>$(PublishDir)runtimeconfig.bin</ParsedRuntimeConfigFilePath>
 </PropertyGroup>
 <ItemGroup Condition="'$(RunAOTCompilation)' == 'true'">
 <AotInputAssemblies Include="$(PublishDir)\*.dll">
 <AotArguments>@(MonoAOTCompilerDefaultAotArguments, ';')</AotArguments>
 <ProcessArguments>@(MonoAOTCompilerDefaultProcessArguments, ';')</ProcessArguments>
 </AotInputAssemblies>
 <RuntimeConfigReservedProperties Include="RUNTIME_IDENTIFIER"/>
 <RuntimeConfigReservedProperties Include="APP_CONTEXT_BASE_DIRECTORY"/>
 </ItemGroup>

 <WriteLinesToFile File="$(PublishDir)xunit-excludes.txt" Lines="$(XunitExcludesTxtFileContent)" Overwrite="true" />
Expand All@@ -94,13 +110,6 @@
 Condition="'$(RunAOTCompilation)' == 'true'"/>
 <RemoveDir Directories="$(BundleDir)" />

 <!-- Parse runtimeconfig.template.json file -->
 <RuntimeConfigParserTask
 RuntimeConfigFile="$(RuntimeConfigFilePath)"
 OutputFile="$(ParsedRuntimeConfigFilePath)"
 RuntimeConfigReservedProperties="@(RuntimeConfigReservedProperties)">
 </RuntimeConfigParserTask>

 <MonoAOTCompiler Condition="'$(RunAOTCompilation)' == 'true'"
 CompilerBinaryPath="$(MonoAotCrossCompilerPath)"
 OutputDir="$(_MobileIntermediateOutputPath)"
Expand DownExpand Up@@ -147,7 +156,7 @@
 <DevTeamProvisioning Condition="'$(TargetOS)' == 'MacCatalyst' and '$(DevTeamProvisioning)' == ''">adhoc</DevTeamProvisioning>
 </PropertyGroup>

 <Target Condition="'$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator'" Name="BundleTestAppleApp">
 <Target Condition="'$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator'" Name="BundleTestAppleApp" DependsOnTargets="GenerateRuntimeConfig">
 <Error Condition="!Exists('$(MicrosoftNetCoreAppRuntimePackRidDir)')" Text="MicrosoftNetCoreAppRuntimePackRidDir=$(MicrosoftNetCoreAppRuntimePackRidDir) doesn't exist" />
 <Error Condition="('$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'arm' or '$(TargetOS)' == 'MacCatalyst') and '$(DevTeamProvisioning)' == ''"
 Text="'DevTeamProvisioning' needs to be set for device builds. Set it to 'UBF8T346G9' if you're part of the Microsoft team account, or 'adhoc' to sign with an adhoc key.." />
Expand Down

4 changes: 0 additions & 4 deletions
src/libraries/System.Text.Encoding/tests/Encoding/Encoding.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,8 +67,6 @@ public static void GetEncodingsTest()
 [ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
 [Theory]
 [MemberData(nameof(Encoding_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public static void VerifyCodePageAttributes(int codepage, string name, string bodyName, string headerName, bool isBrowserDisplay,
 bool isBrowserSave, bool isMailNewsDisplay, bool isMailNewsSave, int windowsCodePage)
 {
Expand All@@ -86,8 +84,6 @@ public static void VerifyCodePageAttributes(int codepage, string name, string bo
 [ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
 [Theory]
 [MemberData(nameof(Normalization_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public static void NormalizationTest(int codepage, bool normalized, bool normalizedC, bool normalizedD, bool normalizedKC, bool normalizedKD)
 {
 Encoding encoding = Encoding.GetEncoding(codepage);
Expand Down

6 changes: 0 additions & 6 deletions
src/libraries/System.Text.Encoding/tests/Encoding/EncodingGetEncodingTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,8 +90,6 @@ public CodePageMapping(string name, int codepage)

 [ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
 [Fact]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void TestEncodingNameAndCopdepageNumber()
 {
 foreach (var map in s_mapping)
Expand All@@ -103,8 +101,6 @@ public void TestEncodingNameAndCopdepageNumber()

 [ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
 [Fact]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void GetEncoding_EncodingName()
 {
 using (new ThreadCultureChange(CultureInfo.InvariantCulture))
Expand All@@ -125,8 +121,6 @@ public void GetEncoding_EncodingName()

 [ActiveIssue("https://github.com/dotnet/runtime/issues/38433", TestPlatforms.Browser)] // wasm doesn't honor runtimeconfig.json
 [Fact]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void GetEncoding_WebName()
 {
 foreach (var mapping in s_codePageToWebNameMappings)
Expand Down

4 changes: 1 addition & 3 deletions
src/libraries/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
 <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
 <!-- Encoding.UTF7 and UTF7Encoding are obsolete, but we're the unit test project for it, so suppress warnings -->
 <NoWarn>$(NoWarn),SYSLIB0001</NoWarn>
 <EnableUnsafeUTF7Encoding>true</EnableUnsafeUTF7Encoding>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="ASCIIEncoding\ASCIIEncodingEncode.cs" />
Expand DownExpand Up@@ -85,9 +86,6 @@
 <Compile Include="$(CommonPath)System\Net\MultiArrayBuffer.cs" Link="ProductionCode\Common\System\Net\MultiArrayBuffer.cs" />
 <Compile Include="$(CommonPath)System\Net\StreamBuffer.cs" Link="ProductionCode\Common\System\Net\StreamBuffer.cs" />
 </ItemGroup>
 <ItemGroup>
 <None Include="runtimeconfig.template.json" />
 </ItemGroup>
 <ItemGroup>
 <PackageReference Include="Moq" Version="$(MoqVersion)" />
 </ItemGroup>
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Text.Encoding/tests/UTF7Encoding/UTF7EncodingEncode.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,8 +61,6 @@ public static IEnumerable<object[]> Encode_Basic_TestData()

 [Theory]
 [MemberData(nameof(Encode_Basic_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void Encode_Basic(string source, int index, int count, byte[] expected)
 {
 Encode_Advanced(true, source, index, count, expected);
Expand Down

13 changes: 1 addition & 12 deletions
src/libraries/System.Text.Encoding/tests/UTF7Encoding/UTF7EncodingTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,46 +52,37 @@ public static IEnumerable<object[]> Encodings_TestData()
 yield return new object[] { Encoding.UTF7 };
 yield return new object[] { Encoding.GetEncoding("utf-7") };
 }

 [Theory]
 [MemberData(nameof(Encodings_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void WebName(UTF7Encoding encoding)
 {
 Assert.Equal("utf-7", encoding.WebName);
 }

 [Theory]
 [MemberData(nameof(Encodings_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void CodePage(UTF7Encoding encoding)
 {
 Assert.Equal(65000, encoding.CodePage);
 }

 [Theory]
 [MemberData(nameof(Encodings_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void EncodingName(UTF7Encoding encoding)
 {
 Assert.NotEmpty(encoding.EncodingName); // Unicode (UTF-7) in en-US
 }

 [Theory]
 [MemberData(nameof(Encodings_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void IsSingleByte(UTF7Encoding encoding)
 {
 Assert.False(encoding.IsSingleByte);
 }

 [Theory]
 [MemberData(nameof(Encodings_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void Clone(UTF7Encoding encoding)
 {
 UTF7Encoding clone = (UTF7Encoding)encoding.Clone();
Expand DownExpand Up@@ -125,8 +116,6 @@ public static IEnumerable<object[]> Equals_TestData()

 [Theory]
 [MemberData(nameof(Equals_TestData))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/50573", TestPlatforms.Android)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/51394", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 public void EqualsTest(UTF7Encoding encoding, object value, bool expected)
 {
 Assert.Equal(expected, encoding.Equals(value));
Expand Down

5 changes: 0 additions & 5 deletions
src/libraries/System.Text.Encoding/tests/runtimeconfig.template.json

View file


Open in desktop


This file was deleted.


2 changes: 2 additions & 0 deletions
src/tasks/AndroidAppBuilder/Templates/monodroid.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,6 +239,8 @@ mono_droid_runtime_init (const char* executable, int managed_argc, char* managed
 arg->kind = 0;
 arg->runtimeconfig.name.path = file_path;
 monovm_runtimeconfig_initialize (arg, cleanup_runtime_config, file_path);
 } else {
 free (file_path);
@CoffeeFluxCoffeeFluxMay 24, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, thanks.
 }

 monovm_initialize(2, appctx_keys, appctx_values);
Expand Down

26 changes: 26 additions & 0 deletions
src/tasks/AppleAppBuilder/Templates/runtime.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@

#define APPLE_RUNTIME_IDENTIFIER "//%APPLE_RUNTIME_IDENTIFIER%"

#define RUNTIMECONFIG_BIN_FILE "runtimeconfig.bin"

const char *
get_bundle_path (void)
{
Expand DownExpand Up@@ -205,6 +207,13 @@
//%DllMap%
}

void
cleanup_runtime_config (MonovmRuntimeConfigArguments *args, void *user_data)
{
 free (args);
 free (user_data);
}

#if FORCE_INTERPRETER || FORCE_AOT || (!TARGET_OS_SIMULATOR && !TARGET_OS_MACCATALYST)
void mono_jit_set_aot_mode (MonoAotMode mode);
void register_aot_modules (void);
Expand DownExpand Up@@ -258,6 +267,23 @@
#endif
 };

 char *file_name = RUNTIMECONFIG_BIN_FILE;
 int str_len = strlen (bundle) + strlen (file_name) + 2;
 char *file_path = (char *)malloc (sizeof (char) * str_len);
 int num_char = snprintf (file_path, str_len, "%s/%s", bundle, file_name);
 struct stat buffer;

 assert (num_char > 0 && num_char < str_len);

 if (stat (file_path, &buffer) == 0) {
 MonovmRuntimeConfigArguments *arg = (MonovmRuntimeConfigArguments *)malloc (sizeof (MonovmRuntimeConfigArguments));
 arg->kind = 0;
 arg->runtimeconfig.name.path = file_path;
 monovm_runtimeconfig_initialize (arg, cleanup_runtime_config, file_path);
 } else {
 free (file_path);
 }

 monovm_initialize (sizeof (appctx_keys) / sizeof (appctx_keys [0]), appctx_keys, appctx_values);

#if FORCE_INTERPRETER
Expand Down