From cdca2234da051442f39171626023b34e13ff06d5 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Mon, 22 May 2023 13:46:26 +0200 Subject: [PATCH 01/25] Run Mono and Native AOT iOS sample on Helix --- src/libraries/tests.proj | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj index fcbe99e9ea4e2b..eb4f560ad7877e 100644 --- a/src/libraries/tests.proj +++ b/src/libraries/tests.proj @@ -628,9 +628,10 @@ - - + + @@ -643,9 +644,10 @@ - - + + From 17d7dee18a8b3120c247a2a51f605381fad06b3a Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Tue, 23 May 2023 10:08:22 +0200 Subject: [PATCH 02/25] Run sample on iOS, tvOS, and maccatalyst --- src/libraries/tests.proj | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj index eb4f560ad7877e..8d1df55c68389f 100644 --- a/src/libraries/tests.proj +++ b/src/libraries/tests.proj @@ -621,6 +621,10 @@ + + @@ -628,16 +632,16 @@ - - + + From 14c2ff5d70223eb240d06c404458a0a26db1abe3 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Tue, 23 May 2023 11:12:32 +0200 Subject: [PATCH 03/25] Disable Native AOT sample app --- src/libraries/tests.proj | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj index 8d1df55c68389f..1bf05e3c65c07c 100644 --- a/src/libraries/tests.proj +++ b/src/libraries/tests.proj @@ -623,8 +623,9 @@ - + + @@ -640,8 +641,9 @@ - + + @@ -650,8 +652,9 @@ - + + From f190a4a0c7e7a42d093f00eb4aca47b6ead26a14 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Tue, 23 May 2023 13:15:40 +0200 Subject: [PATCH 04/25] Disable tvOS platform --- src/libraries/tests.proj | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj index 1bf05e3c65c07c..fc701017505acb 100644 --- a/src/libraries/tests.proj +++ b/src/libraries/tests.proj @@ -639,11 +639,6 @@ - - - From 304896eafb3f46a942630a33315329aeeeb9b26d Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Tue, 23 May 2023 15:02:44 +0200 Subject: [PATCH 05/25] Add HelloiOS sample on iossimulator --- src/libraries/tests.proj | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj index fc701017505acb..5a04760ffdb355 100644 --- a/src/libraries/tests.proj +++ b/src/libraries/tests.proj @@ -633,6 +633,11 @@ + + + From 2ff8a3d274cf1334739a416de0d8aa3250f039bd Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Tue, 23 May 2023 22:28:59 +0200 Subject: [PATCH 06/25] Enable AOT compilation on iossimulator --- src/mono/sample/iOS/Program.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/sample/iOS/Program.csproj b/src/mono/sample/iOS/Program.csproj index ec995073d11f00..6d9d76ff50fca8 100644 --- a/src/mono/sample/iOS/Program.csproj +++ b/src/mono/sample/iOS/Program.csproj @@ -38,7 +38,7 @@ $(MSBuildThisFileDirectory)$(PublishDir)\app iPhone 11 True - true + true From da8630feba4110eb5cc0ca5f3a1f5637e29663bb Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Wed, 24 May 2023 16:51:24 +0200 Subject: [PATCH 07/25] Use JustInterp AOTMode on iossimulator --- src/mono/sample/iOS/Program.csproj | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/mono/sample/iOS/Program.csproj b/src/mono/sample/iOS/Program.csproj index 6d9d76ff50fca8..0f3b9dc0028b63 100644 --- a/src/mono/sample/iOS/Program.csproj +++ b/src/mono/sample/iOS/Program.csproj @@ -65,9 +65,8 @@ - Full - Full - JustInterp + Full + JustInterp Date: Mon, 29 May 2023 08:03:54 +0200 Subject: [PATCH 08/25] Remove custom tasks from the sample app --- .../templates/build-perf-sample-apps.yml | 4 +- .../msbuild/apple/build/AppleBuild.targets | 3 +- src/mono/sample/iOS/Makefile | 77 +++++------ src/mono/sample/iOS/Program.csproj | 125 +++--------------- 4 files changed, 65 insertions(+), 144 deletions(-) diff --git a/eng/pipelines/coreclr/templates/build-perf-sample-apps.yml b/eng/pipelines/coreclr/templates/build-perf-sample-apps.yml index bdc0475fb5da84..5f6ec89b37cd89 100644 --- a/eng/pipelines/coreclr/templates/build-perf-sample-apps.yml +++ b/eng/pipelines/coreclr/templates/build-perf-sample-apps.yml @@ -50,7 +50,7 @@ steps: artifactName: ${{ parameters.artifactName }} - template: /eng/pipelines/common/upload-artifact-step.yml parameters: - rootFolder: $(Build.SourcesDirectory)/src/mono/sample/iOS/bin/ios-arm64/publish/app/HelloiOS/Release-iphoneos/HelloiOS.app + rootFolder: $(Build.SourcesDirectory)/src/mono/sample/iOS/bin/ios-arm64/Bundle/HelloiOS/Release-iphoneos/HelloiOS.app includeRootFolder: true displayName: iOS Sample App NoLLVM artifactName: iOSSampleAppNoLLVM @@ -72,7 +72,7 @@ steps: artifactName: ${{ parameters.artifactName }} - template: /eng/pipelines/common/upload-artifact-step.yml parameters: - rootFolder: $(Build.SourcesDirectory)/src/mono/sample/iOS/bin/ios-arm64/publish/app/HelloiOS/Release-iphoneos/HelloiOS.app + rootFolder: $(Build.SourcesDirectory)/src/mono/sample/iOS/bin/ios-arm64/Bundle/HelloiOS/Release-iphoneos/HelloiOS.app includeRootFolder: true displayName: iOS Sample App LLVM artifactName: iOSSampleAppLLVM diff --git a/src/mono/msbuild/apple/build/AppleBuild.targets b/src/mono/msbuild/apple/build/AppleBuild.targets index 63431a1865d172..49c73425d4b250 100644 --- a/src/mono/msbuild/apple/build/AppleBuild.targets +++ b/src/mono/msbuild/apple/build/AppleBuild.targets @@ -84,6 +84,7 @@ <_AppleRuntimeConfigFilePath Condition="'$(_AppleRuntimeConfigFilePath)' == ''">$([MSBuild]::NormalizePath($(AppleBuildDir), '$(AssemblyName).runtimeconfig.json')) <_ParsedRuntimeConfigFilePath Condition="'$(_ParsedRuntimeConfigFilePath)' == ''">$([MSBuild]::NormalizePath($(AppleBuildDir), 'runtimeconfig.bin')) + true @@ -258,7 +259,7 @@ ProjectName="$(AssemblyName)" RuntimeComponents="$(RuntimeComponents)" TargetOS="$(TargetOS)" - UseConsoleUITemplate="True"> + UseConsoleUITemplate="$(UseConsoleUITemplate)"> diff --git a/src/mono/sample/iOS/Makefile b/src/mono/sample/iOS/Makefile index ef24938c6fd304..8057cb3f7518b9 100644 --- a/src/mono/sample/iOS/Makefile +++ b/src/mono/sample/iOS/Makefile @@ -2,7 +2,6 @@ MONO_CONFIG?=Debug MONO_ARCH?=x64 DOTNET := ../../../../dotnet.sh USE_LLVM=true -AOT?=false TARGET?=iossimulator DEPLOY_AND_RUN?=true APP_SANDBOX?=false @@ -25,68 +24,72 @@ appbuilder: $(DOTNET) build -c Debug $(TOOLS_DIR)/AppleAppBuilder/AppleAppBuilder.csproj runtimepack: - ../../../../build.sh Mono+Libs -os $(TARGET) -arch $(MONO_ARCH) -c $(MONO_CONFIG) + ../../../../build.sh mono+libs -os $(TARGET) -arch $(MONO_ARCH) -c $(MONO_CONFIG) -run: clean appbuilder +build-appbundle: clean appbuilder $(DOTNET) publish \ -c $(MONO_CONFIG) \ - /p:TargetOS=ios \ + /p:TargetOS=$(TARGET) \ /p:TargetArchitecture=$(MONO_ARCH) \ - /p:UseLLVM=$(USE_LLVM) \ - /p:ForceAOT=$(AOT) \ - '/p:RuntimeComponents="$(RUNTIME_COMPONENTS)"' \ - '/p:DeployAndRun="$(DEPLOY_AND_RUN)"' \ - '/p:DiagnosticPorts="$(DIAGNOSTIC_PORTS)"' + /p:MonoEnableLLVM=$(USE_LLVM) \ + /p:StripDebugSymbols=$(STRIP_DEBUG_SYMBOLS) \ + /p:DeployAndRun=false \ + /bl -run-sim: clean appbuilder +run: clean appbuilder $(DOTNET) publish \ -c $(MONO_CONFIG) \ - /p:TargetOS=iossimulator \ + /p:TargetOS=ios \ /p:TargetArchitecture=$(MONO_ARCH) \ - /p:UseLLVM=$(USE_LLVM) \ - /p:ForceAOT=$(AOT) \ - '/p:RuntimeComponents="$(RUNTIME_COMPONENTS)"' \ - '/p:DeployAndRun="$(DEPLOY_AND_RUN)"' \ - '/p:DiagnosticPorts="$(DIAGNOSTIC_PORTS)"' - -build-appbundle: clean appbuilder - $(DOTNET) publish -c $(MONO_CONFIG) /p:TargetOS=$(TARGET) /p:TargetArchitecture=$(MONO_ARCH) \ - '/p:DeployAndRun="$(DEPLOY_AND_RUN)"' \ - /p:StripDebugSymbols=$(STRIP_DEBUG_SYMBOLS) \ - /p:UseLLVM=$(USE_LLVM) /p:ForceAOT=$(AOT) /bl \ + /p:MonoEnableLLVM=$(USE_LLVM) \ + /p:DeployAndRun=$(DEPLOY_AND_RUN) \ + /p:RuntimeComponents="$(RUNTIME_COMPONENTS)" \ + /p:DiagnosticPorts="$(DIAGNOSTIC_PORTS)" \ + /bl -run-catalyst: +run-sim: clean appbuilder $(DOTNET) publish \ -c $(MONO_CONFIG) \ - /p:TargetOS=maccatalyst \ + /p:TargetOS=iossimulator \ /p:TargetArchitecture=$(MONO_ARCH) \ - '/p:DeployAndRun="$(DEPLOY_AND_RUN)"' \ - /p:UseLLVM=False \ - /p:ForceAOT=True \ - /p:EnableAppSandbox=$(APP_SANDBOX) + /p:MonoEnableLLVM=$(USE_LLVM) \ + /p:DeployAndRun=$(DEPLOY_AND_RUN) \ + /p:RuntimeComponents="$(RUNTIME_COMPONENTS)" \ + /p:DiagnosticPorts="$(DIAGNOSTIC_PORTS)" \ + /bl run-sim-interp: clean appbuilder $(DOTNET) publish \ -c $(MONO_CONFIG) \ /p:TargetOS=iossimulator \ /p:TargetArchitecture=$(MONO_ARCH) \ - /p:UseLLVM=$(USE_LLVM) \ - /p:ForceAOT=$(AOT) \ + /p:MonoEnableLLVM=$(USE_LLVM) \ /p:MonoForceInterpreter=true \ - '/p:DeployAndRun="$(DEPLOY_AND_RUN)"' \ - '/p:RuntimeComponents="$(RUNTIME_COMPONENTS)"' \ - '/p:DiagnosticPorts="$(DIAGNOSTIC_PORTS)"' + /p:DeployAndRun=$(DEPLOY_AND_RUN) \ + /p:RuntimeComponents="$(RUNTIME_COMPONENTS)" \ + /p:DiagnosticPorts="$(DIAGNOSTIC_PORTS)" \ + /bl -run-catalyst-interp: +run-catalyst: clean appbuilder $(DOTNET) publish \ -c $(MONO_CONFIG) \ /p:TargetOS=maccatalyst \ /p:TargetArchitecture=$(MONO_ARCH) \ - /p:UseLLVM=False \ - '/p:DeployAndRun="$(DEPLOY_AND_RUN)"' \ - /p:ForceAOT=True \ + /p:MonoEnableLLVM=false \ + /p:DeployAndRun=$(DEPLOY_AND_RUN) \ /p:EnableAppSandbox=$(APP_SANDBOX) \ + /bl + +run-catalyst-interp: clean appbuilder + $(DOTNET) publish \ + -c $(MONO_CONFIG) \ + /p:TargetOS=maccatalyst \ + /p:TargetArchitecture=$(MONO_ARCH) \ + /p:MonoEnableLLVM=False \ /p:MonoForceInterpreter=true + /p:DeployAndRun=$(DEPLOY_AND_RUN) \ + /p:EnableAppSandbox=$(APP_SANDBOX) \ + /bl clean: rm -rf bin diff --git a/src/mono/sample/iOS/Program.csproj b/src/mono/sample/iOS/Program.csproj index 0f3b9dc0028b63..bb8719097f074c 100644 --- a/src/mono/sample/iOS/Program.csproj +++ b/src/mono/sample/iOS/Program.csproj @@ -4,137 +4,54 @@ bin $(NetCoreAppCurrent) ios - iossimulator - true - true $(TargetOS)-$(TargetArchitecture) $(DefineConstants);CI_TEST HelloiOS + Program.dll + - + true false - + true - true Link + + true + true + true + true + false - adhoc + adhoc false - - - - - - - - - - $(MSBuildThisFileDirectory)$(PublishDir)\app - iPhone 11 - True - true - - - - - - <_iOSLikeDedupAssembly>$(MSBuildThisFileDirectory)$(PublishDir)\aot-instances.dll - - - - - - - - @(MonoAOTCompilerDefaultAotArguments, ';') - @(MonoAOTCompilerDefaultProcessArguments, ';') - - - + - Full - JustInterp + $(AppName) - - - - - - - - marshal-ilgen - - - - - - - - - + + + + - - - + - + - + DependsOnTargets="_AppleGenerateAppBundle" > From 81d95288999c7456c1787c8b515f49f7122c2ae5 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Mon, 29 May 2023 08:18:11 +0200 Subject: [PATCH 09/25] Add ExcludeFromAppDir to AppleAppBuilderTask --- src/mono/msbuild/apple/build/AppleBuild.targets | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mono/msbuild/apple/build/AppleBuild.targets b/src/mono/msbuild/apple/build/AppleBuild.targets index 49c73425d4b250..2e6271cda94a2e 100644 --- a/src/mono/msbuild/apple/build/AppleBuild.targets +++ b/src/mono/msbuild/apple/build/AppleBuild.targets @@ -184,6 +184,7 @@ @(MonoAOTCompilerDefaultAotArguments, ';') @(MonoAOTCompilerDefaultProcessArguments, ';') + <_ExcludeFromAppDir Include="$(_iOSLikeDedupAssembly)" /> From b22546fc5b81a29c642a693badb63bf85f6a8509 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Mon, 29 May 2023 18:43:48 +0200 Subject: [PATCH 12/25] Update src/mono/sample/iOS/Program.csproj Co-authored-by: Filip Navara --- src/mono/sample/iOS/Program.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/sample/iOS/Program.csproj b/src/mono/sample/iOS/Program.csproj index 177f08fc149bda..b18e3ce8b98c72 100644 --- a/src/mono/sample/iOS/Program.csproj +++ b/src/mono/sample/iOS/Program.csproj @@ -15,7 +15,7 @@ true Link - True + True true true From fd1a0f6852cff4d35c8c678a4090d0c64620531c Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Tue, 30 May 2023 08:51:04 +0200 Subject: [PATCH 13/25] Enable ILStrip in Full AOT mode only --- src/mono/sample/iOS/Program.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/sample/iOS/Program.csproj b/src/mono/sample/iOS/Program.csproj index b18e3ce8b98c72..5a2cfbcd8098a3 100644 --- a/src/mono/sample/iOS/Program.csproj +++ b/src/mono/sample/iOS/Program.csproj @@ -17,7 +17,7 @@ Link True - true + true true true true From 09878902a3f1e6922662b17b628e353f2855e564 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Thu, 1 Jun 2023 13:22:55 +0200 Subject: [PATCH 14/25] Update app bundle path --- .../coreclr/templates/build-perf-sample-apps.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/coreclr/templates/build-perf-sample-apps.yml b/eng/pipelines/coreclr/templates/build-perf-sample-apps.yml index 7c6c60a3f0c9a3..60b8ab5852423c 100644 --- a/eng/pipelines/coreclr/templates/build-perf-sample-apps.yml +++ b/eng/pipelines/coreclr/templates/build-perf-sample-apps.yml @@ -72,7 +72,7 @@ steps: artifactName: ${{ parameters.artifactName }} - template: /eng/pipelines/common/upload-artifact-step.yml parameters: - rootFolder: $(Build.SourcesDirectory)/src/mono/sample/iOS/bin/ios-arm64/publish/app/HelloiOS/Release-iphoneos/HelloiOS.app + rootFolder: $(Build.SourcesDirectory)/src/mono/sample/iOS/bin/ios-arm64/Bundle/HelloiOS/Release-iphoneos/HelloiOS.app includeRootFolder: true displayName: iOS Sample App NoLLVM NoSymbols artifactName: iOSSampleAppNoLLVMNoSymbols @@ -116,7 +116,7 @@ steps: artifactName: ${{ parameters.artifactName }} - template: /eng/pipelines/common/upload-artifact-step.yml parameters: - rootFolder: $(Build.SourcesDirectory)/src/mono/sample/iOS/bin/ios-arm64/publish/app/HelloiOS/Release-iphoneos/HelloiOS.app + rootFolder: $(Build.SourcesDirectory)/src/mono/sample/iOS/bin/ios-arm64/Bundle/HelloiOS/Release-iphoneos/HelloiOS.app includeRootFolder: true displayName: iOS Sample App LLVM NoSymbols artifactName: iOSSampleAppLLVMNoSymbols @@ -137,7 +137,7 @@ steps: artifactName: ${{ parameters.artifactName }} - template: /eng/pipelines/common/upload-artifact-step.yml parameters: - rootFolder: $(Build.SourcesDirectory)/src/mono/sample/iOS-NativeAOT/bin/publish/app/HelloiOS/Release-iphoneos/HelloiOS.app + rootFolder: $(Build.SourcesDirectory)/src/mono/sample/iOS-NativeAOT/bin/Bundle/HelloiOS/Release-iphoneos/HelloiOS.app includeRootFolder: true displayName: iOS Sample App Symbols artifactName: iOSSampleAppSymbols @@ -159,7 +159,7 @@ steps: artifactName: ${{ parameters.artifactName }} - template: /eng/pipelines/common/upload-artifact-step.yml parameters: - rootFolder: $(Build.SourcesDirectory)/src/mono/sample/iOS-NativeAOT/bin/publish/app/HelloiOS/Release-iphoneos/HelloiOS.app + rootFolder: $(Build.SourcesDirectory)/src/mono/sample/iOS-NativeAOT/bin/Bundle/HelloiOS/Release-iphoneos/HelloiOS.app includeRootFolder: true displayName: iOS Sample App NoSymbols artifactName: iOSSampleAppNoSymbols From 1e52a6b302869b478febb0a9b9a4e47524bc98f3 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Thu, 1 Jun 2023 17:30:57 +0200 Subject: [PATCH 15/25] Change default values for TargetOS and DeployAndRun --- src/mono/sample/iOS/Program.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mono/sample/iOS/Program.csproj b/src/mono/sample/iOS/Program.csproj index 5a2cfbcd8098a3..24834c17e6a603 100644 --- a/src/mono/sample/iOS/Program.csproj +++ b/src/mono/sample/iOS/Program.csproj @@ -3,13 +3,13 @@ Exe bin $(NetCoreAppCurrent) - ios + iossimulator $(TargetOS)-$(TargetArchitecture) $(DefineConstants);CI_TEST HelloiOS Program.dll - - true + false false true From 2151b27ac26e9c2954ea625a09cc684a40de6863 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Thu, 1 Jun 2023 17:37:51 +0200 Subject: [PATCH 16/25] Disable the functional test on a device --- src/libraries/tests.proj | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj index 5a04760ffdb355..df9383b2d9c179 100644 --- a/src/libraries/tests.proj +++ b/src/libraries/tests.proj @@ -621,8 +621,9 @@ - + + From 6f8a02d8eae84e15aac121489b0aa3af43287cfa Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Thu, 1 Jun 2023 21:49:54 +0200 Subject: [PATCH 17/25] Avoid circular target reference --- src/mono/sample/iOS/Program.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/sample/iOS/Program.csproj b/src/mono/sample/iOS/Program.csproj index 24834c17e6a603..3df2f85cfabe58 100644 --- a/src/mono/sample/iOS/Program.csproj +++ b/src/mono/sample/iOS/Program.csproj @@ -39,7 +39,7 @@ - + Date: Fri, 2 Jun 2023 17:05:08 +0200 Subject: [PATCH 18/25] Use different beforeTargets for _CustomAppleAotCompileProps according to the ArchiveTests --- src/mono/sample/iOS/Program.csproj | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/mono/sample/iOS/Program.csproj b/src/mono/sample/iOS/Program.csproj index 3df2f85cfabe58..81acc69fde1bdc 100644 --- a/src/mono/sample/iOS/Program.csproj +++ b/src/mono/sample/iOS/Program.csproj @@ -9,6 +9,7 @@ HelloiOS Program.dll - + true false false true @@ -22,6 +23,9 @@ true true false + + CopyFilesToPublishDirectory + Build @@ -39,7 +43,7 @@ - + Date: Fri, 2 Jun 2023 21:24:03 +0200 Subject: [PATCH 19/25] Update BuildAppBundle target dependencies when run on the CI --- src/mono/sample/iOS/Program.csproj | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mono/sample/iOS/Program.csproj b/src/mono/sample/iOS/Program.csproj index 81acc69fde1bdc..4c338820540850 100644 --- a/src/mono/sample/iOS/Program.csproj +++ b/src/mono/sample/iOS/Program.csproj @@ -25,7 +25,8 @@ false CopyFilesToPublishDirectory - Build + CopyFilesToPublishDirectory;Build + Publish @@ -43,7 +44,7 @@ - + Date: Mon, 5 Jun 2023 14:24:54 +0200 Subject: [PATCH 20/25] Test the CI with ProjectName='' --- src/mono/msbuild/apple/build/AppleBuild.targets | 2 +- src/mono/sample/iOS/Program.csproj | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/mono/msbuild/apple/build/AppleBuild.targets b/src/mono/msbuild/apple/build/AppleBuild.targets index 2e6271cda94a2e..1c07e04c3c3ca9 100644 --- a/src/mono/msbuild/apple/build/AppleBuild.targets +++ b/src/mono/msbuild/apple/build/AppleBuild.targets @@ -257,7 +257,7 @@ NativeMainSource="$(NativeMainSource)" Optimized="$(Optimized)" OutputDirectory="$(AppleBundleDir)" - ProjectName="$(AssemblyName)" + ProjectName="$(AppName)" RuntimeComponents="$(RuntimeComponents)" TargetOS="$(TargetOS)" ExcludeFromAppDir="@(_ExcludeFromAppDir)" diff --git a/src/mono/sample/iOS/Program.csproj b/src/mono/sample/iOS/Program.csproj index 4c338820540850..1df3b125cd1c3e 100644 --- a/src/mono/sample/iOS/Program.csproj +++ b/src/mono/sample/iOS/Program.csproj @@ -7,7 +7,8 @@ $(TargetOS)-$(TargetArchitecture) $(DefineConstants);CI_TEST HelloiOS - Program.dll + $(AppName) + $(AssemblyName).dll - true false @@ -34,12 +35,6 @@ false - - - $(AppName) - - - From a0dfebc8c79a1ba5aeae7960cffeab3e6aa5b286 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Mon, 5 Jun 2023 15:39:14 +0200 Subject: [PATCH 21/25] Use AppName as ProjectName in AppleBuild.targets --- src/mono/msbuild/apple/build/AppleBuild.targets | 1 + src/mono/sample/iOS/Program.csproj | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mono/msbuild/apple/build/AppleBuild.targets b/src/mono/msbuild/apple/build/AppleBuild.targets index 1c07e04c3c3ca9..990269a3f4f78e 100644 --- a/src/mono/msbuild/apple/build/AppleBuild.targets +++ b/src/mono/msbuild/apple/build/AppleBuild.targets @@ -48,6 +48,7 @@ $(AppleBundleDir) <_MonoHeaderPath>$([MSBuild]::NormalizeDirectory($(MicrosoftNetCoreAppRuntimePackRidNativeDir), 'include', 'mono-2.0')) <_AotModuleTablePath>$(AppleBundleDir)\modules.m + $(AssemblyName) diff --git a/src/mono/sample/iOS/Program.csproj b/src/mono/sample/iOS/Program.csproj index 1df3b125cd1c3e..176d13749da838 100644 --- a/src/mono/sample/iOS/Program.csproj +++ b/src/mono/sample/iOS/Program.csproj @@ -7,8 +7,7 @@ $(TargetOS)-$(TargetArchitecture) $(DefineConstants);CI_TEST HelloiOS - $(AppName) - $(AssemblyName).dll + Program.dll - true false From 5b211e116de6f731ebba2dbb6fd8dd7ff205ca09 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Tue, 6 Jun 2023 11:19:38 +0200 Subject: [PATCH 22/25] Remove disabled runs --- src/libraries/tests.proj | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj index d5d04ee88efac2..e18b6fe90f59d6 100644 --- a/src/libraries/tests.proj +++ b/src/libraries/tests.proj @@ -618,12 +618,6 @@ - - - - @@ -633,9 +627,6 @@ - - @@ -650,9 +641,6 @@ - - From aa100eee920619c906e5585bc1ecccaea7ec8a30 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Tue, 6 Jun 2023 15:23:44 +0200 Subject: [PATCH 23/25] Simplify .csproj file --- src/mono/sample/iOS/Program.csproj | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/mono/sample/iOS/Program.csproj b/src/mono/sample/iOS/Program.csproj index 176d13749da838..bbe9be84c05175 100644 --- a/src/mono/sample/iOS/Program.csproj +++ b/src/mono/sample/iOS/Program.csproj @@ -8,16 +8,14 @@ $(DefineConstants);CI_TEST HelloiOS Program.dll - - - true - false - false - true + true true Link - True + true + - + true true true true @@ -29,12 +27,6 @@ Publish - - adhoc - false - - - From 16e3e728e9c2d55533290d88e148eee4e9c3652c Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Tue, 6 Jun 2023 15:33:07 +0200 Subject: [PATCH 24/25] Use AssemblyName as MainLibraryFileName --- src/mono/sample/iOS/Program.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/sample/iOS/Program.csproj b/src/mono/sample/iOS/Program.csproj index bbe9be84c05175..e75fe62160b3b3 100644 --- a/src/mono/sample/iOS/Program.csproj +++ b/src/mono/sample/iOS/Program.csproj @@ -7,7 +7,7 @@ $(TargetOS)-$(TargetArchitecture) $(DefineConstants);CI_TEST HelloiOS - Program.dll + $(AssemblyName).dll true true From 5e2be8c89d79178d00ded84f572a7beac77074b3 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Sat, 10 Jun 2023 21:20:54 +0200 Subject: [PATCH 25/25] Set default props for the sample app. Use diagnostics_tracing and marshal-ilgen for RuntimeComponents --- src/mono/msbuild/apple/build/AppleBuild.InTree.targets | 3 ++- src/mono/sample/iOS/Makefile | 2 +- src/mono/sample/iOS/Program.csproj | 10 ++++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/mono/msbuild/apple/build/AppleBuild.InTree.targets b/src/mono/msbuild/apple/build/AppleBuild.InTree.targets index 91450d2939d2f6..d8519a2114822d 100644 --- a/src/mono/msbuild/apple/build/AppleBuild.InTree.targets +++ b/src/mono/msbuild/apple/build/AppleBuild.InTree.targets @@ -3,8 +3,9 @@ - + + - adhoc diff --git a/src/mono/sample/iOS/Makefile b/src/mono/sample/iOS/Makefile index 8057cb3f7518b9..93d015549db20b 100644 --- a/src/mono/sample/iOS/Makefile +++ b/src/mono/sample/iOS/Makefile @@ -86,7 +86,7 @@ run-catalyst-interp: clean appbuilder /p:TargetOS=maccatalyst \ /p:TargetArchitecture=$(MONO_ARCH) \ /p:MonoEnableLLVM=False \ - /p:MonoForceInterpreter=true + /p:MonoForceInterpreter=true \ /p:DeployAndRun=$(DEPLOY_AND_RUN) \ /p:EnableAppSandbox=$(APP_SANDBOX) \ /bl diff --git a/src/mono/sample/iOS/Program.csproj b/src/mono/sample/iOS/Program.csproj index e75fe62160b3b3..38d39840877f9a 100644 --- a/src/mono/sample/iOS/Program.csproj +++ b/src/mono/sample/iOS/Program.csproj @@ -14,15 +14,12 @@ Link true - - - true - true true true true false - CopyFilesToPublishDirectory + CopyFilesToPublishDirectory CopyFilesToPublishDirectory;Build Publish @@ -31,6 +28,11 @@ + + + diagnostics_tracing;marshal-ilgen + +