From 1dcdbab71e3b67323ca680dedbfd70b821ed5cdc Mon Sep 17 00:00:00 2001
From: Bill Wert <billwert@microsoft.com>
Date: Thu, 19 Aug 2021 12:46:23 -0700
Subject: [PATCH 1/2] add deployandrun to ios

---
 src/mono/sample/iOS/Makefile       | 7 +++++++
 src/mono/sample/iOS/Program.csproj | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/mono/sample/iOS/Makefile b/src/mono/sample/iOS/Makefile
index 34279c41d8187c..8148d6eeb6cd75 100644
--- a/src/mono/sample/iOS/Makefile
+++ b/src/mono/sample/iOS/Makefile
@@ -4,6 +4,7 @@ DOTNET := ../../../../dotnet.sh
 USE_LLVM=true
 AOT?=false
 TARGET?=iOSSimulator
+DEPLOY_AND_RUN?=true
 
 #If DIAGNOSTIC_PORTS is enabled, RUNTIME_COMPONENTS must also be enabled.
 #If RUNTIME_COMPONENTS is enabled, DIAGNOSTIC_PORTS is optional.
@@ -31,6 +32,7 @@ run: clean appbuilder
 	/p:UseLLVM=$(USE_LLVM) \
 	/p:ForceAOT=$(AOT) \
 	'/p:RuntimeComponents="$(RUNTIME_COMPONENTS)"' \
+	'/p:DeployAndRun="$(DEPLOY_AND_RUN)"' \
 	'/p:DiagnosticPorts="$(DIAGNOSTIC_PORTS)"'
 
 run-sim: clean appbuilder
@@ -41,10 +43,12 @@ run-sim: clean appbuilder
 	/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:UseLLVM=$(USE_LLVM) /p:ForceAOT=$(AOT) /bl \
 
 run-catalyst:
@@ -52,6 +56,7 @@ run-catalyst:
 	-c $(MONO_CONFIG) \
 	/p:TargetOS=MacCatalyst \
 	/p:TargetArchitecture=$(MONO_ARCH) \
+	'/p:DeployAndRun="$(DEPLOY_AND_RUN)"' \
 	/p:UseLLVM=False \
 	/p:ForceAOT=True
 
@@ -63,6 +68,7 @@ run-sim-interp: clean appbuilder
 	/p:UseLLVM=$(USE_LLVM) \
 	/p:ForceAOT=$(AOT) \
 	/p:MonoForceInterpreter=true \
+	'/p:DeployAndRun="$(DEPLOY_AND_RUN)"' \
 	'/p:RuntimeComponents="$(RUNTIME_COMPONENTS)"' \
 	'/p:DiagnosticPorts="$(DIAGNOSTIC_PORTS)"'
 
@@ -72,6 +78,7 @@ run-catalyst-interp:
 	/p:TargetOS=MacCatalyst \
 	/p:TargetArchitecture=$(MONO_ARCH) \
 	/p:UseLLVM=False \
+	'/p:DeployAndRun="$(DEPLOY_AND_RUN)"' \
 	/p:ForceAOT=True \
 	/p:MonoForceInterpreter=true
 
diff --git a/src/mono/sample/iOS/Program.csproj b/src/mono/sample/iOS/Program.csproj
index 471abcbbe69c81..8c3b217fc90911 100644
--- a/src/mono/sample/iOS/Program.csproj
+++ b/src/mono/sample/iOS/Program.csproj
@@ -5,6 +5,7 @@
     <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
     <TargetOS Condition="'$(TargetOS)' == ''">iOS</TargetOS>
     <TargetOS Condition="'$(TargetsiOSSimulator)' == 'true'">iOSSimulator</TargetOS>
+    <DeployAndRun Condition="'$(DeployAndRun)' == ''">true</DeployAndRun>
     <RuntimeIdentifier>$(TargetOS.ToLower())-$(TargetArchitecture)</RuntimeIdentifier>
     <DefineConstants Condition="'$(ArchiveTests)' == 'true'">$(DefineConstants);CI_TEST</DefineConstants>
   </PropertyGroup>
@@ -91,7 +92,7 @@
 
   <Target Name="RunAppBundle"
           AfterTargets="BuildAppBundle"
-          Condition="'$(ArchiveTests)' != 'true'">
+          Condition="'$(ArchiveTests)' != 'true' and '$(DeployAndRun)' == 'true'">
     <!-- FIXME: only run if the TargetArchitecture matches the current architecture -->
 
     <!-- install and run on ios simulator or device -->

From f79609923c6961b7364cd0901041ac08c86921d8 Mon Sep 17 00:00:00 2001
From: Bill Wert <billwert@microsoft.com>
Date: Thu, 19 Aug 2021 12:47:01 -0700
Subject: [PATCH 2/2] build with DEPLOY_AND_RUN=false for ios

---
 eng/pipelines/coreclr/templates/build-perf-sample-apps.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/pipelines/coreclr/templates/build-perf-sample-apps.yml b/eng/pipelines/coreclr/templates/build-perf-sample-apps.yml
index 65b6226093a10f..3d5d83b6dadc88 100644
--- a/eng/pipelines/coreclr/templates/build-perf-sample-apps.yml
+++ b/eng/pipelines/coreclr/templates/build-perf-sample-apps.yml
@@ -24,7 +24,7 @@ steps:
       workingDirectory: $(Build.SourcesDirectory)/src/mono/sample/Android
       displayName: Build HelloAndroid sample app
   - ${{ if eq(parameters.osGroup, 'iOS') }}:
-    - script: make build-appbundle TARGET=iOS MONO_ARCH=arm64 MONO_CONFIG=Release AOT=True USE_LLVM=False
+    - script: make build-appbundle TARGET=iOS MONO_ARCH=arm64 MONO_CONFIG=Release AOT=True USE_LLVM=False DEPLOY_AND_RUN=false
       env:
         DevTeamProvisioning: '-'
       workingDirectory: $(Build.SourcesDirectory)/src/mono/sample/iOS
@@ -47,7 +47,7 @@ steps:
     - script: rm -r -f $(Build.SourcesDirectory)/src/mono/sample/iOS/bin
       workingDirectory: $(Build.SourcesDirectory)/src/mono/sample/iOS
       displayName: Clean bindir
-    - script: make build-appbundle TARGET=iOS MONO_ARCH=arm64 MONO_CONFIG=Release AOT=True USE_LLVM=True
+    - script: make build-appbundle TARGET=iOS MONO_ARCH=arm64 MONO_CONFIG=Release AOT=True USE_LLVM=True DEPLOY_AND_RUN=false
       env:
         DevTeamProvisioning: '-'
       workingDirectory: $(Build.SourcesDirectory)/src/mono/sample/iOS