[mono] Make iOS sample simulator friendly#33740

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
EgorBo merged 1 commit into from
Mar 19, 2020
Merged

[mono] Make iOS sample simulator friendly #33740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions src/mono/netcore/sample/iOS/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,15 +2,13 @@ cmake_minimum_required(VERSION 3.14.5)

project(HelloiOS)

# make sure "make all" is executed first
file(GLOB DLLS *.dll)
file(GLOB DLLS_AOT *.dll.o)

set(APP_RESOURCES
${DLLS}
)

# add the executable
add_executable(
HelloiOS
main.m
Expand All@@ -19,6 +17,10 @@ add_executable(
${APP_RESOURCES}
)

if (MONO_ARCH STREQUAL arm64)
add_definitions(-DDEVICE)
endif()

include_directories("../../../../../artifacts/bin/mono/iOS.${MONO_ARCH}.${MONO_CONFIG}/include/mono-2.0")

set_target_properties(HelloiOS PROPERTIES
Expand Down
57 changes: 34 additions & 23 deletions src/mono/netcore/sample/iOS/Makefile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,35 @@
MONO_CONFIG=Debug

# change to x64 for simulator
MONO_ARCH=arm64
ARTIFACTS_BIN=../../../../../artifacts/bin/
ARTIFACTS_BCL=$(ARTIFACTS_BIN)runtime/netcoreapp5.0-iOS-$(MONO_CONFIG)-arm64
ARTIFACTS_MONO=$(ARTIFACTS_BIN)/mono/iOS.arm64.$(MONO_CONFIG)
ARTIFACTS_BCL=$(ARTIFACTS_BIN)runtime/netcoreapp5.0-iOS-$(MONO_CONFIG)-$(MONO_ARCH)
ARTIFACTS_MONO=$(ARTIFACTS_BIN)/mono/iOS.$(MONO_ARCH).$(MONO_CONFIG)

DOTNET := $(shell cd ../../ && bash init-tools.sh | tail -1)
SYSROOT := $(shell xcrun --sdk iphoneos --show-sdk-path)

# once a new library is added here (e.g. System.Console.dll) it should also be
# added in mono_ios_register_modules() (runtime.m) and both lib.dll and lib.dll.o
# should be added to xcodeproj
# once a new library is added here it should also be
# added in mono_ios_register_modules() (runtime.m)
all: prepare
make aot-lib LIB=$(ARTIFACTS_MONO)/System.Private.CoreLib.dll
make aot-lib LIB=$(ARTIFACTS_BCL)/System.Runtime.dll
make aot-lib LIB=$(ARTIFACTS_BCL)/System.Runtime.Extensions.dll
make aot-lib LIB=$(ARTIFACTS_BCL)/System.Collections.dll
make aot-lib LIB=$(ARTIFACTS_BCL)/System.Core.dll
make aot-lib LIB=$(ARTIFACTS_BCL)/System.Threading.dll
make aot-lib LIB=$(ARTIFACTS_BCL)/System.Threading.Tasks.dll
make aot-lib LIB=$(ARTIFACTS_BCL)/System.Linq.dll
make aot-lib LIB=$(ARTIFACTS_BCL)/System.Memory.dll
make aot-lib LIB=$(ARTIFACTS_BCL)/System.Runtime.InteropServices.dll
make aot-lib LIB=$(ARTIFACTS_BCL)/System.Text.Encoding.Extensions.dll
make aot-lib LIB=$(ARTIFACTS_BCL)/Microsoft.Win32.Primitives.dll
make aot-lib LIB=$(ARTIFACTS_BCL)/System.Console.dll
make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_MONO)/System.Private.CoreLib.dll
make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Runtime.dll
make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Runtime.Extensions.dll
make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Collections.dll
make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Core.dll
make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Threading.dll
make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Threading.Tasks.dll
make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Linq.dll
make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Memory.dll
make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Runtime.InteropServices.dll
make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Text.Encoding.Extensions.dll
make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/Microsoft.Win32.Primitives.dll
make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Console.dll
make Program.dll.o

# recompile Program.cs AOT
Program.dll.o: bin/Program.dll Makefile
make aot-lib LIB=bin/Program.dll
make aot-lib-${MONO_ARCH} LIB=bin/Program.dll

# we need to copy some BCL libs to ARTIFACTS_MONO
# to be able to aot other bcl libs
Expand All@@ -45,7 +47,11 @@ prepare:
bin/Program.dll: Program.cs
$(DOTNET) build -c Debug Program.csproj

aot-lib:
# we'll use regular jit for simulator
aot-lib-x64:
cp $(LIB) $(notdir $(LIB))

aot-lib-arm64:
DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1 MONO_PATH=$(ARTIFACTS_MONO) \
$(ARTIFACTS_MONO)/cross/./mono-aot-cross -O=gsharedvt,float32 --nollvm --debug \
--aot=mtriple=arm64-ios,static,asmonly,direct-icalls,no-direct-calls,dwarfdebug,full $(LIB) && \
Expand All@@ -56,10 +62,15 @@ aot-lib:
xcode: all
cmake -S. -BXcode -GXcode \
-DCMAKE_SYSTEM_NAME=iOS \
-DCMAKE_OSX_ARCHITECTURES=arm64 \
"-DCMAKE_OSX_ARCHITECTURES=arm64;x86_64" \
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.1 \
-DCMAKE_INSTALL_PREFIX=`pwd`/_install \
-DCMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH=YES \
-DCMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH=NO \
-DCMAKE_IOS_INSTALL_COMBINED=YES \
-DMONO_CONFIG=$(MONO_CONFIG) \
-DMONO_ARCH=arm64
-DMONO_ARCH=$(MONO_ARCH)

clean:
rm -rf *.dll
rm -rf *.dll.o
rm -rf Xcode
4 changes: 0 additions & 4 deletions src/mono/netcore/sample/iOS/Plist.in
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,10 +25,6 @@
<key>UIApplicationSupportsMultipleScenes</key>
<false/>
</dict>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>arm64</string>
</array>

@akoeplingerakoeplingerMar 18, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

did you check whether it still works on device? I remember there was some issue when this key was removed

@EgorBoEgorBoMar 18, 2020•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

@akoeplinger yeah I checked, still works for both device and simulator. I think it was armv7 by default and I changed it to arm64. I've just created a simple project in Xcode and this property doesn't even exist in the default plist.

<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
Expand Down
8 changes: 8 additions & 0 deletions src/mono/netcore/sample/iOS/runtime.m
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -200,6 +200,7 @@

void mono_jit_set_aot_mode (MonoAotMode mode);

#if DEVICE
extern void *mono_aot_module_Program_info;
extern void *mono_aot_module_System_Private_CoreLib_info;
extern void *mono_aot_module_System_Runtime_info;
Expand DownExpand Up@@ -239,6 +240,7 @@ void mono_ios_setup_execution_mode (void)
{
mono_jit_set_aot_mode (MONO_AOT_MODE_FULL);
}
#endif

void
mono_ios_runtime_init (void)
Expand All@@ -256,9 +258,11 @@ void mono_ios_setup_execution_mode (void)

register_dllmap ();

#if DEVICE
// register modules
mono_ios_register_modules ();
mono_ios_setup_execution_mode ();
#endif

mono_debug_init (MONO_DEBUG_FORMAT_MONO);
mono_install_assembly_preload_hook (assembly_preload_hook, NULL);
Expand All@@ -274,7 +278,11 @@ void mono_ios_setup_execution_mode (void)
mono_jit_parse_options (1, options);
}
mono_jit_init_version ("dotnet.ios", "mobile");

#if DEVICE
// device runtimes are configured to use lazy gc thread creation
mono_gc_init_finalizer_thread ();
#endif

MonoAssembly *assembly = load_assembly (executable, NULL);
assert (assembly);
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
[mono] Make iOS sample simulator friendly#33740

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

EgorBo
merged 1 commit into

from

Mar 19, 2020
 Merged


[mono] Make iOS sample simulator friendly
#33740
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


6 changes: 4 additions & 2 deletions
src/mono/netcore/sample/iOS/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,15 +2,13 @@ cmake_minimum_required(VERSION 3.14.5)

project(HelloiOS)

# make sure "make all" is executed first
file(GLOB DLLS *.dll)
file(GLOB DLLS_AOT *.dll.o)

set(APP_RESOURCES
 ${DLLS}
)

# add the executable
add_executable(
 HelloiOS
 main.m
Expand All@@ -19,6 +17,10 @@ add_executable(
 ${APP_RESOURCES}
)

if (MONO_ARCH STREQUAL arm64)
 add_definitions(-DDEVICE)
endif()

include_directories("../../../../../artifacts/bin/mono/iOS.${MONO_ARCH}.${MONO_CONFIG}/include/mono-2.0")

set_target_properties(HelloiOS PROPERTIES
Expand Down

57 changes: 34 additions & 23 deletions
src/mono/netcore/sample/iOS/Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,33 +1,35 @@
MONO_CONFIG=Debug

# change to x64 for simulator
MONO_ARCH=arm64
ARTIFACTS_BIN=../../../../../artifacts/bin/
ARTIFACTS_BCL=$(ARTIFACTS_BIN)runtime/netcoreapp5.0-iOS-$(MONO_CONFIG)-arm64
ARTIFACTS_MONO=$(ARTIFACTS_BIN)/mono/iOS.arm64.$(MONO_CONFIG)
ARTIFACTS_BCL=$(ARTIFACTS_BIN)runtime/netcoreapp5.0-iOS-$(MONO_CONFIG)-$(MONO_ARCH)
ARTIFACTS_MONO=$(ARTIFACTS_BIN)/mono/iOS.$(MONO_ARCH).$(MONO_CONFIG)

DOTNET := $(shell cd ../../ && bash init-tools.sh | tail -1)
SYSROOT := $(shell xcrun --sdk iphoneos --show-sdk-path)

# once a new library is added here (e.g. System.Console.dll) it should also be 
# added in mono_ios_register_modules() (runtime.m) and both lib.dll and lib.dll.o 
# should be added to xcodeproj 
# once a new library is added here it should also be 
# added in mono_ios_register_modules() (runtime.m)
all: prepare
	make aot-lib LIB=$(ARTIFACTS_MONO)/System.Private.CoreLib.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Runtime.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Runtime.Extensions.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Collections.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Core.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Threading.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Threading.Tasks.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Linq.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Memory.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Runtime.InteropServices.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Text.Encoding.Extensions.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/Microsoft.Win32.Primitives.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Console.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_MONO)/System.Private.CoreLib.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Runtime.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Runtime.Extensions.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Collections.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Core.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Threading.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Threading.Tasks.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Linq.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Memory.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Runtime.InteropServices.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Text.Encoding.Extensions.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/Microsoft.Win32.Primitives.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Console.dll
	make Program.dll.o

# recompile Program.cs AOT
Program.dll.o: bin/Program.dll Makefile
	make aot-lib LIB=bin/Program.dll
	make aot-lib-${MONO_ARCH} LIB=bin/Program.dll

# we need to copy some BCL libs to ARTIFACTS_MONO
# to be able to aot other bcl libs
Expand All@@ -45,7 +47,11 @@ prepare:
bin/Program.dll: Program.cs
	$(DOTNET) build -c Debug Program.csproj

aot-lib:
# we'll use regular jit for simulator
aot-lib-x64:
	cp $(LIB) $(notdir $(LIB))

aot-lib-arm64:
	DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1 MONO_PATH=$(ARTIFACTS_MONO) \
	$(ARTIFACTS_MONO)/cross/./mono-aot-cross -O=gsharedvt,float32 --nollvm --debug \
	--aot=mtriple=arm64-ios,static,asmonly,direct-icalls,no-direct-calls,dwarfdebug,full $(LIB) && \
Expand All@@ -56,10 +62,15 @@ aot-lib:
xcode: all
	cmake -S. -BXcode -GXcode \
	-DCMAKE_SYSTEM_NAME=iOS \
	-DCMAKE_OSX_ARCHITECTURES=arm64 \
"-DCMAKE_OSX_ARCHITECTURES=arm64;x86_64" \
	-DCMAKE_OSX_DEPLOYMENT_TARGET=10.1 \
	-DCMAKE_INSTALL_PREFIX=`pwd`/_install \
	-DCMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH=YES \
	-DCMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH=NO \
	-DCMAKE_IOS_INSTALL_COMBINED=YES \
	-DMONO_CONFIG=$(MONO_CONFIG) \
	-DMONO_ARCH=arm64
	-DMONO_ARCH=$(MONO_ARCH)

clean:
	rm -rf *.dll
	rm -rf *.dll.o
	rm -rf Xcode

4 changes: 0 additions & 4 deletions
src/mono/netcore/sample/iOS/Plist.in

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,10 +25,6 @@
 <key>UIApplicationSupportsMultipleScenes</key>
 <false/>
	</dict>
	<key>UIRequiredDeviceCapabilities</key>
	<array>
 <string>arm64</string>
	</array>
@akoeplingerakoeplingerMar 18, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

did you check whether it still works on device? I remember there was some issue when this key was removed
@EgorBoEgorBoMar 18, 2020•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

@akoeplinger yeah I checked, still works for both device and simulator. I think it was armv7 by default and I changed it to arm64. I've just created a simple project in Xcode and this property doesn't even exist in the default plist.
	<key>UISupportedInterfaceOrientations</key>
	<array>
 <string>UIInterfaceOrientationPortrait</string>
Expand Down

8 changes: 8 additions & 0 deletions
src/mono/netcore/sample/iOS/runtime.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,6 +200,7 @@

void mono_jit_set_aot_mode (MonoAotMode mode);

#if DEVICE
extern void *mono_aot_module_Program_info;
extern void *mono_aot_module_System_Private_CoreLib_info;
extern void *mono_aot_module_System_Runtime_info;
Expand DownExpand Up@@ -239,6 +240,7 @@ void mono_ios_setup_execution_mode (void)
{
 mono_jit_set_aot_mode (MONO_AOT_MODE_FULL);
}
#endif

void
mono_ios_runtime_init (void)
Expand All@@ -256,9 +258,11 @@ void mono_ios_setup_execution_mode (void)

 register_dllmap ();

#if DEVICE
 // register modules
 mono_ios_register_modules ();
 mono_ios_setup_execution_mode ();
#endif

 mono_debug_init (MONO_DEBUG_FORMAT_MONO);
 mono_install_assembly_preload_hook (assembly_preload_hook, NULL);
Expand All@@ -274,7 +278,11 @@ void mono_ios_setup_execution_mode (void)
 mono_jit_parse_options (1, options);
 }
 mono_jit_init_version ("dotnet.ios", "mobile");

#if DEVICE
 // device runtimes are configured to use lazy gc thread creation
 mono_gc_init_finalizer_thread ();
#endif

 MonoAssembly *assembly = load_assembly (executable, NULL);
 assert (assembly);
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
[mono] Make iOS sample simulator friendly#33740

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

EgorBo
merged 1 commit into

from

Mar 19, 2020
 Merged


[mono] Make iOS sample simulator friendly
#33740
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


6 changes: 4 additions & 2 deletions
src/mono/netcore/sample/iOS/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,15 +2,13 @@ cmake_minimum_required(VERSION 3.14.5)

project(HelloiOS)

# make sure "make all" is executed first
file(GLOB DLLS *.dll)
file(GLOB DLLS_AOT *.dll.o)

set(APP_RESOURCES
 ${DLLS}
)

# add the executable
add_executable(
 HelloiOS
 main.m
Expand All@@ -19,6 +17,10 @@ add_executable(
 ${APP_RESOURCES}
)

if (MONO_ARCH STREQUAL arm64)
 add_definitions(-DDEVICE)
endif()

include_directories("../../../../../artifacts/bin/mono/iOS.${MONO_ARCH}.${MONO_CONFIG}/include/mono-2.0")

set_target_properties(HelloiOS PROPERTIES
Expand Down

57 changes: 34 additions & 23 deletions
src/mono/netcore/sample/iOS/Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,33 +1,35 @@
MONO_CONFIG=Debug

# change to x64 for simulator
MONO_ARCH=arm64
ARTIFACTS_BIN=../../../../../artifacts/bin/
ARTIFACTS_BCL=$(ARTIFACTS_BIN)runtime/netcoreapp5.0-iOS-$(MONO_CONFIG)-arm64
ARTIFACTS_MONO=$(ARTIFACTS_BIN)/mono/iOS.arm64.$(MONO_CONFIG)
ARTIFACTS_BCL=$(ARTIFACTS_BIN)runtime/netcoreapp5.0-iOS-$(MONO_CONFIG)-$(MONO_ARCH)
ARTIFACTS_MONO=$(ARTIFACTS_BIN)/mono/iOS.$(MONO_ARCH).$(MONO_CONFIG)

DOTNET := $(shell cd ../../ && bash init-tools.sh | tail -1)
SYSROOT := $(shell xcrun --sdk iphoneos --show-sdk-path)

# once a new library is added here (e.g. System.Console.dll) it should also be 
# added in mono_ios_register_modules() (runtime.m) and both lib.dll and lib.dll.o 
# should be added to xcodeproj 
# once a new library is added here it should also be 
# added in mono_ios_register_modules() (runtime.m)
all: prepare
	make aot-lib LIB=$(ARTIFACTS_MONO)/System.Private.CoreLib.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Runtime.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Runtime.Extensions.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Collections.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Core.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Threading.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Threading.Tasks.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Linq.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Memory.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Runtime.InteropServices.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Text.Encoding.Extensions.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/Microsoft.Win32.Primitives.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Console.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_MONO)/System.Private.CoreLib.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Runtime.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Runtime.Extensions.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Collections.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Core.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Threading.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Threading.Tasks.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Linq.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Memory.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Runtime.InteropServices.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Text.Encoding.Extensions.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/Microsoft.Win32.Primitives.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Console.dll
	make Program.dll.o

# recompile Program.cs AOT
Program.dll.o: bin/Program.dll Makefile
	make aot-lib LIB=bin/Program.dll
	make aot-lib-${MONO_ARCH} LIB=bin/Program.dll

# we need to copy some BCL libs to ARTIFACTS_MONO
# to be able to aot other bcl libs
Expand All@@ -45,7 +47,11 @@ prepare:
bin/Program.dll: Program.cs
	$(DOTNET) build -c Debug Program.csproj

aot-lib:
# we'll use regular jit for simulator
aot-lib-x64:
	cp $(LIB) $(notdir $(LIB))

aot-lib-arm64:
	DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1 MONO_PATH=$(ARTIFACTS_MONO) \
	$(ARTIFACTS_MONO)/cross/./mono-aot-cross -O=gsharedvt,float32 --nollvm --debug \
	--aot=mtriple=arm64-ios,static,asmonly,direct-icalls,no-direct-calls,dwarfdebug,full $(LIB) && \
Expand All@@ -56,10 +62,15 @@ aot-lib:
xcode: all
	cmake -S. -BXcode -GXcode \
	-DCMAKE_SYSTEM_NAME=iOS \
	-DCMAKE_OSX_ARCHITECTURES=arm64 \
"-DCMAKE_OSX_ARCHITECTURES=arm64;x86_64" \
	-DCMAKE_OSX_DEPLOYMENT_TARGET=10.1 \
	-DCMAKE_INSTALL_PREFIX=`pwd`/_install \
	-DCMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH=YES \
	-DCMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH=NO \
	-DCMAKE_IOS_INSTALL_COMBINED=YES \
	-DMONO_CONFIG=$(MONO_CONFIG) \
	-DMONO_ARCH=arm64
	-DMONO_ARCH=$(MONO_ARCH)

clean:
	rm -rf *.dll
	rm -rf *.dll.o
	rm -rf Xcode

4 changes: 0 additions & 4 deletions
src/mono/netcore/sample/iOS/Plist.in

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,10 +25,6 @@
 <key>UIApplicationSupportsMultipleScenes</key>
 <false/>
	</dict>
	<key>UIRequiredDeviceCapabilities</key>
	<array>
 <string>arm64</string>
	</array>
@akoeplingerakoeplingerMar 18, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

did you check whether it still works on device? I remember there was some issue when this key was removed
@EgorBoEgorBoMar 18, 2020•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

@akoeplinger yeah I checked, still works for both device and simulator. I think it was armv7 by default and I changed it to arm64. I've just created a simple project in Xcode and this property doesn't even exist in the default plist.
	<key>UISupportedInterfaceOrientations</key>
	<array>
 <string>UIInterfaceOrientationPortrait</string>
Expand Down

8 changes: 8 additions & 0 deletions
src/mono/netcore/sample/iOS/runtime.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,6 +200,7 @@

void mono_jit_set_aot_mode (MonoAotMode mode);

#if DEVICE
extern void *mono_aot_module_Program_info;
extern void *mono_aot_module_System_Private_CoreLib_info;
extern void *mono_aot_module_System_Runtime_info;
Expand DownExpand Up@@ -239,6 +240,7 @@ void mono_ios_setup_execution_mode (void)
{
 mono_jit_set_aot_mode (MONO_AOT_MODE_FULL);
}
#endif

void
mono_ios_runtime_init (void)
Expand All@@ -256,9 +258,11 @@ void mono_ios_setup_execution_mode (void)

 register_dllmap ();

#if DEVICE
 // register modules
 mono_ios_register_modules ();
 mono_ios_setup_execution_mode ();
#endif

 mono_debug_init (MONO_DEBUG_FORMAT_MONO);
 mono_install_assembly_preload_hook (assembly_preload_hook, NULL);
Expand All@@ -274,7 +278,11 @@ void mono_ios_setup_execution_mode (void)
 mono_jit_parse_options (1, options);
 }
 mono_jit_init_version ("dotnet.ios", "mobile");

#if DEVICE
 // device runtimes are configured to use lazy gc thread creation
 mono_gc_init_finalizer_thread ();
#endif

 MonoAssembly *assembly = load_assembly (executable, NULL);
 assert (assembly);
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
[mono] Make iOS sample simulator friendly#33740

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

EgorBo
merged 1 commit into

from

Mar 19, 2020
 Merged


[mono] Make iOS sample simulator friendly
#33740
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


6 changes: 4 additions & 2 deletions
src/mono/netcore/sample/iOS/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,15 +2,13 @@ cmake_minimum_required(VERSION 3.14.5)

project(HelloiOS)

# make sure "make all" is executed first
file(GLOB DLLS *.dll)
file(GLOB DLLS_AOT *.dll.o)

set(APP_RESOURCES
 ${DLLS}
)

# add the executable
add_executable(
 HelloiOS
 main.m
Expand All@@ -19,6 +17,10 @@ add_executable(
 ${APP_RESOURCES}
)

if (MONO_ARCH STREQUAL arm64)
 add_definitions(-DDEVICE)
endif()

include_directories("../../../../../artifacts/bin/mono/iOS.${MONO_ARCH}.${MONO_CONFIG}/include/mono-2.0")

set_target_properties(HelloiOS PROPERTIES
Expand Down

57 changes: 34 additions & 23 deletions
src/mono/netcore/sample/iOS/Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,33 +1,35 @@
MONO_CONFIG=Debug

# change to x64 for simulator
MONO_ARCH=arm64
ARTIFACTS_BIN=../../../../../artifacts/bin/
ARTIFACTS_BCL=$(ARTIFACTS_BIN)runtime/netcoreapp5.0-iOS-$(MONO_CONFIG)-arm64
ARTIFACTS_MONO=$(ARTIFACTS_BIN)/mono/iOS.arm64.$(MONO_CONFIG)
ARTIFACTS_BCL=$(ARTIFACTS_BIN)runtime/netcoreapp5.0-iOS-$(MONO_CONFIG)-$(MONO_ARCH)
ARTIFACTS_MONO=$(ARTIFACTS_BIN)/mono/iOS.$(MONO_ARCH).$(MONO_CONFIG)

DOTNET := $(shell cd ../../ && bash init-tools.sh | tail -1)
SYSROOT := $(shell xcrun --sdk iphoneos --show-sdk-path)

# once a new library is added here (e.g. System.Console.dll) it should also be 
# added in mono_ios_register_modules() (runtime.m) and both lib.dll and lib.dll.o 
# should be added to xcodeproj 
# once a new library is added here it should also be 
# added in mono_ios_register_modules() (runtime.m)
all: prepare
	make aot-lib LIB=$(ARTIFACTS_MONO)/System.Private.CoreLib.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Runtime.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Runtime.Extensions.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Collections.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Core.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Threading.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Threading.Tasks.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Linq.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Memory.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Runtime.InteropServices.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Text.Encoding.Extensions.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/Microsoft.Win32.Primitives.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Console.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_MONO)/System.Private.CoreLib.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Runtime.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Runtime.Extensions.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Collections.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Core.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Threading.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Threading.Tasks.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Linq.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Memory.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Runtime.InteropServices.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Text.Encoding.Extensions.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/Microsoft.Win32.Primitives.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Console.dll
	make Program.dll.o

# recompile Program.cs AOT
Program.dll.o: bin/Program.dll Makefile
	make aot-lib LIB=bin/Program.dll
	make aot-lib-${MONO_ARCH} LIB=bin/Program.dll

# we need to copy some BCL libs to ARTIFACTS_MONO
# to be able to aot other bcl libs
Expand All@@ -45,7 +47,11 @@ prepare:
bin/Program.dll: Program.cs
	$(DOTNET) build -c Debug Program.csproj

aot-lib:
# we'll use regular jit for simulator
aot-lib-x64:
	cp $(LIB) $(notdir $(LIB))

aot-lib-arm64:
	DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1 MONO_PATH=$(ARTIFACTS_MONO) \
	$(ARTIFACTS_MONO)/cross/./mono-aot-cross -O=gsharedvt,float32 --nollvm --debug \
	--aot=mtriple=arm64-ios,static,asmonly,direct-icalls,no-direct-calls,dwarfdebug,full $(LIB) && \
Expand All@@ -56,10 +62,15 @@ aot-lib:
xcode: all
	cmake -S. -BXcode -GXcode \
	-DCMAKE_SYSTEM_NAME=iOS \
	-DCMAKE_OSX_ARCHITECTURES=arm64 \
"-DCMAKE_OSX_ARCHITECTURES=arm64;x86_64" \
	-DCMAKE_OSX_DEPLOYMENT_TARGET=10.1 \
	-DCMAKE_INSTALL_PREFIX=`pwd`/_install \
	-DCMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH=YES \
	-DCMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH=NO \
	-DCMAKE_IOS_INSTALL_COMBINED=YES \
	-DMONO_CONFIG=$(MONO_CONFIG) \
	-DMONO_ARCH=arm64
	-DMONO_ARCH=$(MONO_ARCH)

clean:
	rm -rf *.dll
	rm -rf *.dll.o
	rm -rf Xcode

4 changes: 0 additions & 4 deletions
src/mono/netcore/sample/iOS/Plist.in

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,10 +25,6 @@
 <key>UIApplicationSupportsMultipleScenes</key>
 <false/>
	</dict>
	<key>UIRequiredDeviceCapabilities</key>
	<array>
 <string>arm64</string>
	</array>
@akoeplingerakoeplingerMar 18, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

did you check whether it still works on device? I remember there was some issue when this key was removed
@EgorBoEgorBoMar 18, 2020•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

@akoeplinger yeah I checked, still works for both device and simulator. I think it was armv7 by default and I changed it to arm64. I've just created a simple project in Xcode and this property doesn't even exist in the default plist.
	<key>UISupportedInterfaceOrientations</key>
	<array>
 <string>UIInterfaceOrientationPortrait</string>
Expand Down

8 changes: 8 additions & 0 deletions
src/mono/netcore/sample/iOS/runtime.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,6 +200,7 @@

void mono_jit_set_aot_mode (MonoAotMode mode);

#if DEVICE
extern void *mono_aot_module_Program_info;
extern void *mono_aot_module_System_Private_CoreLib_info;
extern void *mono_aot_module_System_Runtime_info;
Expand DownExpand Up@@ -239,6 +240,7 @@ void mono_ios_setup_execution_mode (void)
{
 mono_jit_set_aot_mode (MONO_AOT_MODE_FULL);
}
#endif

void
mono_ios_runtime_init (void)
Expand All@@ -256,9 +258,11 @@ void mono_ios_setup_execution_mode (void)

 register_dllmap ();

#if DEVICE
 // register modules
 mono_ios_register_modules ();
 mono_ios_setup_execution_mode ();
#endif

 mono_debug_init (MONO_DEBUG_FORMAT_MONO);
 mono_install_assembly_preload_hook (assembly_preload_hook, NULL);
Expand All@@ -274,7 +278,11 @@ void mono_ios_setup_execution_mode (void)
 mono_jit_parse_options (1, options);
 }
 mono_jit_init_version ("dotnet.ios", "mobile");

#if DEVICE
 // device runtimes are configured to use lazy gc thread creation
 mono_gc_init_finalizer_thread ();
#endif

 MonoAssembly *assembly = load_assembly (executable, NULL);
 assert (assembly);
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
[mono] Make iOS sample simulator friendly#33740

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

EgorBo
merged 1 commit into

from

Mar 19, 2020
 Merged


[mono] Make iOS sample simulator friendly
#33740
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


6 changes: 4 additions & 2 deletions
src/mono/netcore/sample/iOS/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,15 +2,13 @@ cmake_minimum_required(VERSION 3.14.5)

project(HelloiOS)

# make sure "make all" is executed first
file(GLOB DLLS *.dll)
file(GLOB DLLS_AOT *.dll.o)

set(APP_RESOURCES
 ${DLLS}
)

# add the executable
add_executable(
 HelloiOS
 main.m
Expand All@@ -19,6 +17,10 @@ add_executable(
 ${APP_RESOURCES}
)

if (MONO_ARCH STREQUAL arm64)
 add_definitions(-DDEVICE)
endif()

include_directories("../../../../../artifacts/bin/mono/iOS.${MONO_ARCH}.${MONO_CONFIG}/include/mono-2.0")

set_target_properties(HelloiOS PROPERTIES
Expand Down

57 changes: 34 additions & 23 deletions
src/mono/netcore/sample/iOS/Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,33 +1,35 @@
MONO_CONFIG=Debug

# change to x64 for simulator
MONO_ARCH=arm64
ARTIFACTS_BIN=../../../../../artifacts/bin/
ARTIFACTS_BCL=$(ARTIFACTS_BIN)runtime/netcoreapp5.0-iOS-$(MONO_CONFIG)-arm64
ARTIFACTS_MONO=$(ARTIFACTS_BIN)/mono/iOS.arm64.$(MONO_CONFIG)
ARTIFACTS_BCL=$(ARTIFACTS_BIN)runtime/netcoreapp5.0-iOS-$(MONO_CONFIG)-$(MONO_ARCH)
ARTIFACTS_MONO=$(ARTIFACTS_BIN)/mono/iOS.$(MONO_ARCH).$(MONO_CONFIG)

DOTNET := $(shell cd ../../ && bash init-tools.sh | tail -1)
SYSROOT := $(shell xcrun --sdk iphoneos --show-sdk-path)

# once a new library is added here (e.g. System.Console.dll) it should also be 
# added in mono_ios_register_modules() (runtime.m) and both lib.dll and lib.dll.o 
# should be added to xcodeproj 
# once a new library is added here it should also be 
# added in mono_ios_register_modules() (runtime.m)
all: prepare
	make aot-lib LIB=$(ARTIFACTS_MONO)/System.Private.CoreLib.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Runtime.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Runtime.Extensions.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Collections.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Core.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Threading.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Threading.Tasks.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Linq.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Memory.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Runtime.InteropServices.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Text.Encoding.Extensions.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/Microsoft.Win32.Primitives.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Console.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_MONO)/System.Private.CoreLib.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Runtime.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Runtime.Extensions.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Collections.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Core.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Threading.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Threading.Tasks.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Linq.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Memory.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Runtime.InteropServices.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Text.Encoding.Extensions.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/Microsoft.Win32.Primitives.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Console.dll
	make Program.dll.o

# recompile Program.cs AOT
Program.dll.o: bin/Program.dll Makefile
	make aot-lib LIB=bin/Program.dll
	make aot-lib-${MONO_ARCH} LIB=bin/Program.dll

# we need to copy some BCL libs to ARTIFACTS_MONO
# to be able to aot other bcl libs
Expand All@@ -45,7 +47,11 @@ prepare:
bin/Program.dll: Program.cs
	$(DOTNET) build -c Debug Program.csproj

aot-lib:
# we'll use regular jit for simulator
aot-lib-x64:
	cp $(LIB) $(notdir $(LIB))

aot-lib-arm64:
	DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1 MONO_PATH=$(ARTIFACTS_MONO) \
	$(ARTIFACTS_MONO)/cross/./mono-aot-cross -O=gsharedvt,float32 --nollvm --debug \
	--aot=mtriple=arm64-ios,static,asmonly,direct-icalls,no-direct-calls,dwarfdebug,full $(LIB) && \
Expand All@@ -56,10 +62,15 @@ aot-lib:
xcode: all
	cmake -S. -BXcode -GXcode \
	-DCMAKE_SYSTEM_NAME=iOS \
	-DCMAKE_OSX_ARCHITECTURES=arm64 \
"-DCMAKE_OSX_ARCHITECTURES=arm64;x86_64" \
	-DCMAKE_OSX_DEPLOYMENT_TARGET=10.1 \
	-DCMAKE_INSTALL_PREFIX=`pwd`/_install \
	-DCMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH=YES \
	-DCMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH=NO \
	-DCMAKE_IOS_INSTALL_COMBINED=YES \
	-DMONO_CONFIG=$(MONO_CONFIG) \
	-DMONO_ARCH=arm64
	-DMONO_ARCH=$(MONO_ARCH)

clean:
	rm -rf *.dll
	rm -rf *.dll.o
	rm -rf Xcode

4 changes: 0 additions & 4 deletions
src/mono/netcore/sample/iOS/Plist.in

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,10 +25,6 @@
 <key>UIApplicationSupportsMultipleScenes</key>
 <false/>
	</dict>
	<key>UIRequiredDeviceCapabilities</key>
	<array>
 <string>arm64</string>
	</array>
@akoeplingerakoeplingerMar 18, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

did you check whether it still works on device? I remember there was some issue when this key was removed
@EgorBoEgorBoMar 18, 2020•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

@akoeplinger yeah I checked, still works for both device and simulator. I think it was armv7 by default and I changed it to arm64. I've just created a simple project in Xcode and this property doesn't even exist in the default plist.
	<key>UISupportedInterfaceOrientations</key>
	<array>
 <string>UIInterfaceOrientationPortrait</string>
Expand Down

8 changes: 8 additions & 0 deletions
src/mono/netcore/sample/iOS/runtime.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,6 +200,7 @@

void mono_jit_set_aot_mode (MonoAotMode mode);

#if DEVICE
extern void *mono_aot_module_Program_info;
extern void *mono_aot_module_System_Private_CoreLib_info;
extern void *mono_aot_module_System_Runtime_info;
Expand DownExpand Up@@ -239,6 +240,7 @@ void mono_ios_setup_execution_mode (void)
{
 mono_jit_set_aot_mode (MONO_AOT_MODE_FULL);
}
#endif

void
mono_ios_runtime_init (void)
Expand All@@ -256,9 +258,11 @@ void mono_ios_setup_execution_mode (void)

 register_dllmap ();

#if DEVICE
 // register modules
 mono_ios_register_modules ();
 mono_ios_setup_execution_mode ();
#endif

 mono_debug_init (MONO_DEBUG_FORMAT_MONO);
 mono_install_assembly_preload_hook (assembly_preload_hook, NULL);
Expand All@@ -274,7 +278,11 @@ void mono_ios_setup_execution_mode (void)
 mono_jit_parse_options (1, options);
 }
 mono_jit_init_version ("dotnet.ios", "mobile");

#if DEVICE
 // device runtimes are configured to use lazy gc thread creation
 mono_gc_init_finalizer_thread ();
#endif

 MonoAssembly *assembly = load_assembly (executable, NULL);
 assert (assembly);
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
[mono] Make iOS sample simulator friendly#33740

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

EgorBo
merged 1 commit into

from

Mar 19, 2020
 Merged


[mono] Make iOS sample simulator friendly
#33740
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


6 changes: 4 additions & 2 deletions
src/mono/netcore/sample/iOS/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,15 +2,13 @@ cmake_minimum_required(VERSION 3.14.5)

project(HelloiOS)

# make sure "make all" is executed first
file(GLOB DLLS *.dll)
file(GLOB DLLS_AOT *.dll.o)

set(APP_RESOURCES
 ${DLLS}
)

# add the executable
add_executable(
 HelloiOS
 main.m
Expand All@@ -19,6 +17,10 @@ add_executable(
 ${APP_RESOURCES}
)

if (MONO_ARCH STREQUAL arm64)
 add_definitions(-DDEVICE)
endif()

include_directories("../../../../../artifacts/bin/mono/iOS.${MONO_ARCH}.${MONO_CONFIG}/include/mono-2.0")

set_target_properties(HelloiOS PROPERTIES
Expand Down

57 changes: 34 additions & 23 deletions
src/mono/netcore/sample/iOS/Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,33 +1,35 @@
MONO_CONFIG=Debug

# change to x64 for simulator
MONO_ARCH=arm64
ARTIFACTS_BIN=../../../../../artifacts/bin/
ARTIFACTS_BCL=$(ARTIFACTS_BIN)runtime/netcoreapp5.0-iOS-$(MONO_CONFIG)-arm64
ARTIFACTS_MONO=$(ARTIFACTS_BIN)/mono/iOS.arm64.$(MONO_CONFIG)
ARTIFACTS_BCL=$(ARTIFACTS_BIN)runtime/netcoreapp5.0-iOS-$(MONO_CONFIG)-$(MONO_ARCH)
ARTIFACTS_MONO=$(ARTIFACTS_BIN)/mono/iOS.$(MONO_ARCH).$(MONO_CONFIG)

DOTNET := $(shell cd ../../ && bash init-tools.sh | tail -1)
SYSROOT := $(shell xcrun --sdk iphoneos --show-sdk-path)

# once a new library is added here (e.g. System.Console.dll) it should also be 
# added in mono_ios_register_modules() (runtime.m) and both lib.dll and lib.dll.o 
# should be added to xcodeproj 
# once a new library is added here it should also be 
# added in mono_ios_register_modules() (runtime.m)
all: prepare
	make aot-lib LIB=$(ARTIFACTS_MONO)/System.Private.CoreLib.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Runtime.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Runtime.Extensions.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Collections.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Core.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Threading.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Threading.Tasks.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Linq.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Memory.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Runtime.InteropServices.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Text.Encoding.Extensions.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/Microsoft.Win32.Primitives.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Console.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_MONO)/System.Private.CoreLib.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Runtime.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Runtime.Extensions.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Collections.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Core.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Threading.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Threading.Tasks.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Linq.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Memory.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Runtime.InteropServices.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Text.Encoding.Extensions.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/Microsoft.Win32.Primitives.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Console.dll
	make Program.dll.o

# recompile Program.cs AOT
Program.dll.o: bin/Program.dll Makefile
	make aot-lib LIB=bin/Program.dll
	make aot-lib-${MONO_ARCH} LIB=bin/Program.dll

# we need to copy some BCL libs to ARTIFACTS_MONO
# to be able to aot other bcl libs
Expand All@@ -45,7 +47,11 @@ prepare:
bin/Program.dll: Program.cs
	$(DOTNET) build -c Debug Program.csproj

aot-lib:
# we'll use regular jit for simulator
aot-lib-x64:
	cp $(LIB) $(notdir $(LIB))

aot-lib-arm64:
	DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1 MONO_PATH=$(ARTIFACTS_MONO) \
	$(ARTIFACTS_MONO)/cross/./mono-aot-cross -O=gsharedvt,float32 --nollvm --debug \
	--aot=mtriple=arm64-ios,static,asmonly,direct-icalls,no-direct-calls,dwarfdebug,full $(LIB) && \
Expand All@@ -56,10 +62,15 @@ aot-lib:
xcode: all
	cmake -S. -BXcode -GXcode \
	-DCMAKE_SYSTEM_NAME=iOS \
	-DCMAKE_OSX_ARCHITECTURES=arm64 \
"-DCMAKE_OSX_ARCHITECTURES=arm64;x86_64" \
	-DCMAKE_OSX_DEPLOYMENT_TARGET=10.1 \
	-DCMAKE_INSTALL_PREFIX=`pwd`/_install \
	-DCMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH=YES \
	-DCMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH=NO \
	-DCMAKE_IOS_INSTALL_COMBINED=YES \
	-DMONO_CONFIG=$(MONO_CONFIG) \
	-DMONO_ARCH=arm64
	-DMONO_ARCH=$(MONO_ARCH)

clean:
	rm -rf *.dll
	rm -rf *.dll.o
	rm -rf Xcode

4 changes: 0 additions & 4 deletions
src/mono/netcore/sample/iOS/Plist.in

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,10 +25,6 @@
 <key>UIApplicationSupportsMultipleScenes</key>
 <false/>
	</dict>
	<key>UIRequiredDeviceCapabilities</key>
	<array>
 <string>arm64</string>
	</array>
@akoeplingerakoeplingerMar 18, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

did you check whether it still works on device? I remember there was some issue when this key was removed
@EgorBoEgorBoMar 18, 2020•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

@akoeplinger yeah I checked, still works for both device and simulator. I think it was armv7 by default and I changed it to arm64. I've just created a simple project in Xcode and this property doesn't even exist in the default plist.
	<key>UISupportedInterfaceOrientations</key>
	<array>
 <string>UIInterfaceOrientationPortrait</string>
Expand Down

8 changes: 8 additions & 0 deletions
src/mono/netcore/sample/iOS/runtime.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,6 +200,7 @@

void mono_jit_set_aot_mode (MonoAotMode mode);

#if DEVICE
extern void *mono_aot_module_Program_info;
extern void *mono_aot_module_System_Private_CoreLib_info;
extern void *mono_aot_module_System_Runtime_info;
Expand DownExpand Up@@ -239,6 +240,7 @@ void mono_ios_setup_execution_mode (void)
{
 mono_jit_set_aot_mode (MONO_AOT_MODE_FULL);
}
#endif

void
mono_ios_runtime_init (void)
Expand All@@ -256,9 +258,11 @@ void mono_ios_setup_execution_mode (void)

 register_dllmap ();

#if DEVICE
 // register modules
 mono_ios_register_modules ();
 mono_ios_setup_execution_mode ();
#endif

 mono_debug_init (MONO_DEBUG_FORMAT_MONO);
 mono_install_assembly_preload_hook (assembly_preload_hook, NULL);
Expand All@@ -274,7 +278,11 @@ void mono_ios_setup_execution_mode (void)
 mono_jit_parse_options (1, options);
 }
 mono_jit_init_version ("dotnet.ios", "mobile");

#if DEVICE
 // device runtimes are configured to use lazy gc thread creation
 mono_gc_init_finalizer_thread ();
#endif

 MonoAssembly *assembly = load_assembly (executable, NULL);
 assert (assembly);
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
[mono] Make iOS sample simulator friendly#33740

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

EgorBo
merged 1 commit into

from

Mar 19, 2020
 Merged


[mono] Make iOS sample simulator friendly
#33740
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


6 changes: 4 additions & 2 deletions
src/mono/netcore/sample/iOS/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,15 +2,13 @@ cmake_minimum_required(VERSION 3.14.5)

project(HelloiOS)

# make sure "make all" is executed first
file(GLOB DLLS *.dll)
file(GLOB DLLS_AOT *.dll.o)

set(APP_RESOURCES
 ${DLLS}
)

# add the executable
add_executable(
 HelloiOS
 main.m
Expand All@@ -19,6 +17,10 @@ add_executable(
 ${APP_RESOURCES}
)

if (MONO_ARCH STREQUAL arm64)
 add_definitions(-DDEVICE)
endif()

include_directories("../../../../../artifacts/bin/mono/iOS.${MONO_ARCH}.${MONO_CONFIG}/include/mono-2.0")

set_target_properties(HelloiOS PROPERTIES
Expand Down

57 changes: 34 additions & 23 deletions
src/mono/netcore/sample/iOS/Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,33 +1,35 @@
MONO_CONFIG=Debug

# change to x64 for simulator
MONO_ARCH=arm64
ARTIFACTS_BIN=../../../../../artifacts/bin/
ARTIFACTS_BCL=$(ARTIFACTS_BIN)runtime/netcoreapp5.0-iOS-$(MONO_CONFIG)-arm64
ARTIFACTS_MONO=$(ARTIFACTS_BIN)/mono/iOS.arm64.$(MONO_CONFIG)
ARTIFACTS_BCL=$(ARTIFACTS_BIN)runtime/netcoreapp5.0-iOS-$(MONO_CONFIG)-$(MONO_ARCH)
ARTIFACTS_MONO=$(ARTIFACTS_BIN)/mono/iOS.$(MONO_ARCH).$(MONO_CONFIG)

DOTNET := $(shell cd ../../ && bash init-tools.sh | tail -1)
SYSROOT := $(shell xcrun --sdk iphoneos --show-sdk-path)

# once a new library is added here (e.g. System.Console.dll) it should also be 
# added in mono_ios_register_modules() (runtime.m) and both lib.dll and lib.dll.o 
# should be added to xcodeproj 
# once a new library is added here it should also be 
# added in mono_ios_register_modules() (runtime.m)
all: prepare
	make aot-lib LIB=$(ARTIFACTS_MONO)/System.Private.CoreLib.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Runtime.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Runtime.Extensions.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Collections.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Core.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Threading.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Threading.Tasks.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Linq.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Memory.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Runtime.InteropServices.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Text.Encoding.Extensions.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/Microsoft.Win32.Primitives.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Console.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_MONO)/System.Private.CoreLib.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Runtime.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Runtime.Extensions.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Collections.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Core.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Threading.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Threading.Tasks.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Linq.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Memory.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Runtime.InteropServices.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Text.Encoding.Extensions.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/Microsoft.Win32.Primitives.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Console.dll
	make Program.dll.o

# recompile Program.cs AOT
Program.dll.o: bin/Program.dll Makefile
	make aot-lib LIB=bin/Program.dll
	make aot-lib-${MONO_ARCH} LIB=bin/Program.dll

# we need to copy some BCL libs to ARTIFACTS_MONO
# to be able to aot other bcl libs
Expand All@@ -45,7 +47,11 @@ prepare:
bin/Program.dll: Program.cs
	$(DOTNET) build -c Debug Program.csproj

aot-lib:
# we'll use regular jit for simulator
aot-lib-x64:
	cp $(LIB) $(notdir $(LIB))

aot-lib-arm64:
	DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1 MONO_PATH=$(ARTIFACTS_MONO) \
	$(ARTIFACTS_MONO)/cross/./mono-aot-cross -O=gsharedvt,float32 --nollvm --debug \
	--aot=mtriple=arm64-ios,static,asmonly,direct-icalls,no-direct-calls,dwarfdebug,full $(LIB) && \
Expand All@@ -56,10 +62,15 @@ aot-lib:
xcode: all
	cmake -S. -BXcode -GXcode \
	-DCMAKE_SYSTEM_NAME=iOS \
	-DCMAKE_OSX_ARCHITECTURES=arm64 \
"-DCMAKE_OSX_ARCHITECTURES=arm64;x86_64" \
	-DCMAKE_OSX_DEPLOYMENT_TARGET=10.1 \
	-DCMAKE_INSTALL_PREFIX=`pwd`/_install \
	-DCMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH=YES \
	-DCMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH=NO \
	-DCMAKE_IOS_INSTALL_COMBINED=YES \
	-DMONO_CONFIG=$(MONO_CONFIG) \
	-DMONO_ARCH=arm64
	-DMONO_ARCH=$(MONO_ARCH)

clean:
	rm -rf *.dll
	rm -rf *.dll.o
	rm -rf Xcode

4 changes: 0 additions & 4 deletions
src/mono/netcore/sample/iOS/Plist.in

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,10 +25,6 @@
 <key>UIApplicationSupportsMultipleScenes</key>
 <false/>
	</dict>
	<key>UIRequiredDeviceCapabilities</key>
	<array>
 <string>arm64</string>
	</array>
@akoeplingerakoeplingerMar 18, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

did you check whether it still works on device? I remember there was some issue when this key was removed
@EgorBoEgorBoMar 18, 2020•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

@akoeplinger yeah I checked, still works for both device and simulator. I think it was armv7 by default and I changed it to arm64. I've just created a simple project in Xcode and this property doesn't even exist in the default plist.
	<key>UISupportedInterfaceOrientations</key>
	<array>
 <string>UIInterfaceOrientationPortrait</string>
Expand Down

8 changes: 8 additions & 0 deletions
src/mono/netcore/sample/iOS/runtime.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,6 +200,7 @@

void mono_jit_set_aot_mode (MonoAotMode mode);

#if DEVICE
extern void *mono_aot_module_Program_info;
extern void *mono_aot_module_System_Private_CoreLib_info;
extern void *mono_aot_module_System_Runtime_info;
Expand DownExpand Up@@ -239,6 +240,7 @@ void mono_ios_setup_execution_mode (void)
{
 mono_jit_set_aot_mode (MONO_AOT_MODE_FULL);
}
#endif

void
mono_ios_runtime_init (void)
Expand All@@ -256,9 +258,11 @@ void mono_ios_setup_execution_mode (void)

 register_dllmap ();

#if DEVICE
 // register modules
 mono_ios_register_modules ();
 mono_ios_setup_execution_mode ();
#endif

 mono_debug_init (MONO_DEBUG_FORMAT_MONO);
 mono_install_assembly_preload_hook (assembly_preload_hook, NULL);
Expand All@@ -274,7 +278,11 @@ void mono_ios_setup_execution_mode (void)
 mono_jit_parse_options (1, options);
 }
 mono_jit_init_version ("dotnet.ios", "mobile");

#if DEVICE
 // device runtimes are configured to use lazy gc thread creation
 mono_gc_init_finalizer_thread ();
#endif

 MonoAssembly *assembly = load_assembly (executable, NULL);
 assert (assembly);
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
[mono] Make iOS sample simulator friendly#33740

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

EgorBo
merged 1 commit into

from

Mar 19, 2020
 Merged


[mono] Make iOS sample simulator friendly
#33740
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


6 changes: 4 additions & 2 deletions
src/mono/netcore/sample/iOS/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,15 +2,13 @@ cmake_minimum_required(VERSION 3.14.5)

project(HelloiOS)

# make sure "make all" is executed first
file(GLOB DLLS *.dll)
file(GLOB DLLS_AOT *.dll.o)

set(APP_RESOURCES
 ${DLLS}
)

# add the executable
add_executable(
 HelloiOS
 main.m
Expand All@@ -19,6 +17,10 @@ add_executable(
 ${APP_RESOURCES}
)

if (MONO_ARCH STREQUAL arm64)
 add_definitions(-DDEVICE)
endif()

include_directories("../../../../../artifacts/bin/mono/iOS.${MONO_ARCH}.${MONO_CONFIG}/include/mono-2.0")

set_target_properties(HelloiOS PROPERTIES
Expand Down

57 changes: 34 additions & 23 deletions
src/mono/netcore/sample/iOS/Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,33 +1,35 @@
MONO_CONFIG=Debug

# change to x64 for simulator
MONO_ARCH=arm64
ARTIFACTS_BIN=../../../../../artifacts/bin/
ARTIFACTS_BCL=$(ARTIFACTS_BIN)runtime/netcoreapp5.0-iOS-$(MONO_CONFIG)-arm64
ARTIFACTS_MONO=$(ARTIFACTS_BIN)/mono/iOS.arm64.$(MONO_CONFIG)
ARTIFACTS_BCL=$(ARTIFACTS_BIN)runtime/netcoreapp5.0-iOS-$(MONO_CONFIG)-$(MONO_ARCH)
ARTIFACTS_MONO=$(ARTIFACTS_BIN)/mono/iOS.$(MONO_ARCH).$(MONO_CONFIG)

DOTNET := $(shell cd ../../ && bash init-tools.sh | tail -1)
SYSROOT := $(shell xcrun --sdk iphoneos --show-sdk-path)

# once a new library is added here (e.g. System.Console.dll) it should also be 
# added in mono_ios_register_modules() (runtime.m) and both lib.dll and lib.dll.o 
# should be added to xcodeproj 
# once a new library is added here it should also be 
# added in mono_ios_register_modules() (runtime.m)
all: prepare
	make aot-lib LIB=$(ARTIFACTS_MONO)/System.Private.CoreLib.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Runtime.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Runtime.Extensions.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Collections.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Core.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Threading.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Threading.Tasks.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Linq.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Memory.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Runtime.InteropServices.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Text.Encoding.Extensions.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/Microsoft.Win32.Primitives.dll
	make aot-lib LIB=$(ARTIFACTS_BCL)/System.Console.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_MONO)/System.Private.CoreLib.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Runtime.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Runtime.Extensions.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Collections.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Core.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Threading.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Threading.Tasks.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Linq.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Memory.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Runtime.InteropServices.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Text.Encoding.Extensions.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/Microsoft.Win32.Primitives.dll
	make aot-lib-${MONO_ARCH} LIB=$(ARTIFACTS_BCL)/System.Console.dll
	make Program.dll.o

# recompile Program.cs AOT
Program.dll.o: bin/Program.dll Makefile
	make aot-lib LIB=bin/Program.dll
	make aot-lib-${MONO_ARCH} LIB=bin/Program.dll

# we need to copy some BCL libs to ARTIFACTS_MONO
# to be able to aot other bcl libs
Expand All@@ -45,7 +47,11 @@ prepare:
bin/Program.dll: Program.cs
	$(DOTNET) build -c Debug Program.csproj

aot-lib:
# we'll use regular jit for simulator
aot-lib-x64:
	cp $(LIB) $(notdir $(LIB))

aot-lib-arm64:
	DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1 MONO_PATH=$(ARTIFACTS_MONO) \
	$(ARTIFACTS_MONO)/cross/./mono-aot-cross -O=gsharedvt,float32 --nollvm --debug \
	--aot=mtriple=arm64-ios,static,asmonly,direct-icalls,no-direct-calls,dwarfdebug,full $(LIB) && \
Expand All@@ -56,10 +62,15 @@ aot-lib:
xcode: all
	cmake -S. -BXcode -GXcode \
	-DCMAKE_SYSTEM_NAME=iOS \
	-DCMAKE_OSX_ARCHITECTURES=arm64 \
"-DCMAKE_OSX_ARCHITECTURES=arm64;x86_64" \
	-DCMAKE_OSX_DEPLOYMENT_TARGET=10.1 \
	-DCMAKE_INSTALL_PREFIX=`pwd`/_install \
	-DCMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH=YES \
	-DCMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH=NO \
	-DCMAKE_IOS_INSTALL_COMBINED=YES \
	-DMONO_CONFIG=$(MONO_CONFIG) \
	-DMONO_ARCH=arm64
	-DMONO_ARCH=$(MONO_ARCH)

clean:
	rm -rf *.dll
	rm -rf *.dll.o
	rm -rf Xcode

4 changes: 0 additions & 4 deletions
src/mono/netcore/sample/iOS/Plist.in

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,10 +25,6 @@
 <key>UIApplicationSupportsMultipleScenes</key>
 <false/>
	</dict>
	<key>UIRequiredDeviceCapabilities</key>
	<array>
 <string>arm64</string>
	</array>
@akoeplingerakoeplingerMar 18, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

did you check whether it still works on device? I remember there was some issue when this key was removed
@EgorBoEgorBoMar 18, 2020•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

@akoeplinger yeah I checked, still works for both device and simulator. I think it was armv7 by default and I changed it to arm64. I've just created a simple project in Xcode and this property doesn't even exist in the default plist.
	<key>UISupportedInterfaceOrientations</key>
	<array>
 <string>UIInterfaceOrientationPortrait</string>
Expand Down

8 changes: 8 additions & 0 deletions
src/mono/netcore/sample/iOS/runtime.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,6 +200,7 @@

void mono_jit_set_aot_mode (MonoAotMode mode);

#if DEVICE
extern void *mono_aot_module_Program_info;
extern void *mono_aot_module_System_Private_CoreLib_info;
extern void *mono_aot_module_System_Runtime_info;
Expand DownExpand Up@@ -239,6 +240,7 @@ void mono_ios_setup_execution_mode (void)
{
 mono_jit_set_aot_mode (MONO_AOT_MODE_FULL);
}
#endif

void
mono_ios_runtime_init (void)
Expand All@@ -256,9 +258,11 @@ void mono_ios_setup_execution_mode (void)

 register_dllmap ();

#if DEVICE
 // register modules
 mono_ios_register_modules ();
 mono_ios_setup_execution_mode ();
#endif

 mono_debug_init (MONO_DEBUG_FORMAT_MONO);
 mono_install_assembly_preload_hook (assembly_preload_hook, NULL);
Expand All@@ -274,7 +278,11 @@ void mono_ios_setup_execution_mode (void)
 mono_jit_parse_options (1, options);
 }
 mono_jit_init_version ("dotnet.ios", "mobile");

#if DEVICE
 // device runtimes are configured to use lazy gc thread creation
 mono_gc_init_finalizer_thread ();
#endif

 MonoAssembly *assembly = load_assembly (executable, NULL);
 assert (assembly);
Expand Down