diff --git a/Build.proj b/Build.proj
index ef12cca9de1c..dc4a15ab5f41 100644
--- a/Build.proj
+++ b/Build.proj
@@ -27,43 +27,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- $(RepoTasksDir)
- $(ArtifactsObjDir)runtime.tasks\Debug\build-semaphore.txt
-
-
-
-
-
+
+
$([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'System.Private.CoreLib', 'src'))
+
+ $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'AppleAppBuilder', 'Debug', '$(NetCoreAppCurrent)'))
+ $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'AndroidAppBuilder', 'Debug', '$(NetCoreAppCurrent)'))
+ $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'MonoAOTCompiler', 'Debug', '$(NetCoreAppCurrent)'))
+
+ $([MSBuild]::NormalizePath('$(AppleAppBuilderDir)', 'AppleAppBuilder.dll'))
+ $([MSBuild]::NormalizePath('$(AndroidAppBuilderDir)', 'AndroidAppBuilder.dll'))
+ $([MSBuild]::NormalizePath('$(MonoAOTCompilerDir)', 'MonoAOTCompiler.dll'))
+
+
-
+
@@ -48,12 +49,13 @@
-
+
+ AssemblyFile="$(MonoAOTCompilerTasksAssemblyPath)" />
-
+
diff --git a/eng/testing/tests.props b/eng/testing/tests.props
index 6a35aef60eba..9b7bc1d270ee 100644
--- a/eng/testing/tests.props
+++ b/eng/testing/tests.props
@@ -21,11 +21,6 @@
- $(NetCoreAppCurrent)-$(MonoConfiguration)
- $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'AppleAppBuilder', '$(MobileHelperTasksDirSuffix)'))
- $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'AndroidAppBuilder', '$(MobileHelperTasksDirSuffix)'))
- $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'MonoAOTCompiler', '$(MobileHelperTasksDirSuffix)'))
-
$(NetCoreAppCurrent)-$(Configuration)
$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'AppleTestRunner', '$(MobileRunnersDirSuffix)'))
diff --git a/src/mono/Directory.Build.props b/src/mono/Directory.Build.props
index aa7e500eb75a..a17c7ae91872 100644
--- a/src/mono/Directory.Build.props
+++ b/src/mono/Directory.Build.props
@@ -104,10 +104,10 @@
- $([MSBuild]::NormalizeDirectory('$(MonoProjectRoot)', 'msbuild', 'AppleAppBuilder'))
- $([MSBuild]::NormalizeDirectory('$(MonoProjectRoot)', 'msbuild', 'AppleTestRunner'))
- $([MSBuild]::NormalizeDirectory('$(MonoProjectRoot)', 'msbuild', 'AndroidAppBuilder'))
- $([MSBuild]::NormalizeDirectory('$(MonoProjectRoot)', 'msbuild', 'AndroidTestRunner'))
- $([MSBuild]::NormalizeDirectory('$(MonoProjectRoot)', 'msbuild', 'AotCompilerTask'))
+ $([MSBuild]::NormalizeDirectory('$(RepoTasksDir)', 'mobile.tasks', 'AppleAppBuilder'))
+ $([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'Common', tests, 'AppleTestRunner'))
+ $([MSBuild]::NormalizeDirectory('$(RepoTasksDir)', 'mobile.tasks', 'AndroidAppBuilder'))
+ $([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'Common', tests, 'AndroidTestRunner'))
+ $([MSBuild]::NormalizeDirectory('$(RepoTasksDir)', 'mobile.tasks', 'AotCompilerTask'))
diff --git a/src/mono/mono.proj b/src/mono/mono.proj
index 76f5dba28afc..83ddd9891641 100644
--- a/src/mono/mono.proj
+++ b/src/mono/mono.proj
@@ -885,18 +885,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
<_MonoRuntimeFilePath Condition="'$(TargetsWindows)' == 'true' and '$(Platform)' == 'x64'">$(MonoObjDir)x64\Bin\$(Configuration)\mono-2.0-sgen.dll
<_MonoRuntimeFilePath Condition="'$(TargetsWindows)' == 'true' and '$(Platform)' == 'x86'">$(MonoObjDir)Win32\Bin\$(Configuration)\mono-2.0-sgen.dll
diff --git a/src/mono/netcore/sample/Android/Makefile b/src/mono/netcore/sample/Android/Makefile
index b069bb1fb27e..898c8cf1bea5 100644
--- a/src/mono/netcore/sample/Android/Makefile
+++ b/src/mono/netcore/sample/Android/Makefile
@@ -5,7 +5,7 @@ DOTNET := ../../../../.././dotnet.sh
#export ANDROID_NDK_ROOT=/path/to/android/ndk
#export ANDROID_SDK_ROOT=/path/to/android/sdk
-all: runtimepack bundle
+all: bundle
bundle: clean
$(DOTNET) build -c $(MONO_CONFIG) Program.csproj
@@ -14,8 +14,5 @@ bundle: clean
deploy-launch: bundle
$(DOTNET) msbuild /t:ReinstallAndLaunch
-runtimepack:
- ../../../../.././build.sh -c $(MONO_CONFIG) -os Android -arch $(MONO_ARCH) -subset Mono+Libs /p:DisableCrossgen=true
-
clean:
rm -rf bin
diff --git a/src/mono/netcore/sample/Android/Program.csproj b/src/mono/netcore/sample/Android/Program.csproj
index 00acd1e7cf41..600ac6dd7472 100644
--- a/src/mono/netcore/sample/Android/Program.csproj
+++ b/src/mono/netcore/sample/Android/Program.csproj
@@ -7,7 +7,8 @@
x64
$(ArtifactsDir)bin\lib-runtime-packs\$(NetCoreAppCurrent)-Android-$(Configuration)-$(TargetArchitecture)\runtimes\android-$(TargetArchitecture)
$(MSBuildThisFileDirectory)\bin\bundle
- $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'AndroidAppBuilder', '$(NetCoreAppCurrent)-$(Configuration)'))
+ $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'AndroidAppBuilder', 'Debug', '$(NetCoreAppCurrent)'))
+
diff --git a/src/mono/netcore/sample/iOS/Makefile b/src/mono/netcore/sample/iOS/Makefile
index 40a59f0c07e8..240d55da76a1 100644
--- a/src/mono/netcore/sample/iOS/Makefile
+++ b/src/mono/netcore/sample/iOS/Makefile
@@ -1,11 +1,11 @@
MONO_CONFIG=Debug
-MONO_ARCH=arm64
+MONO_ARCH=x64
DOTNET := ../../../../.././dotnet.sh
USE_LLVM=True
# usage example:
# 'make all MONO_ARCH=x64 MONO_CONFIG=Release' to build the app for simulator
-all: runtimepack bundle
+all: bundle
program:
$(DOTNET) build -c $(MONO_CONFIG) Program.csproj
@@ -17,8 +17,5 @@ bundle: clean program
deploy-sim:
$(DOTNET) msbuild /t:IosDeployToSimulator /p:Configuration=$(MONO_CONFIG) /p:TargetArchitecture=$(MONO_ARCH)
-runtimepack:
- ../../../../.././build.sh -c $(MONO_CONFIG) -os iOS -arch $(MONO_ARCH) -subset Mono+Libs /p:DisableCrossgen=true
-
clean:
rm -rf bin
diff --git a/src/mono/netcore/sample/iOS/Program.csproj b/src/mono/netcore/sample/iOS/Program.csproj
index 473832246ae0..6105c1f58fbb 100644
--- a/src/mono/netcore/sample/iOS/Program.csproj
+++ b/src/mono/netcore/sample/iOS/Program.csproj
@@ -9,9 +9,11 @@
$(ArtifactsDir)bin\lib-runtime-packs\$(NetCoreAppCurrent)-iOS-$(Configuration)-$(TargetArchitecture)\runtimes\ios-$(TargetArchitecture)
$(ArtifactsDir)bin\mono\iOS.$(TargetArchitecture).$(Configuration)
$(MSBuildThisFileDirectory)\bin\bundle
- $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'AppleAppBuilder', '$(NetCoreAppCurrent)-$(Configuration)'))
- $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'MonoAOTCompiler', '$(NetCoreAppCurrent)-$(Configuration)'))
+ $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'AppleAppBuilder', 'Debug', '$(NetCoreAppCurrent)'))
+ $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'MonoAOTCompiler', 'Debug', '$(NetCoreAppCurrent)'))
true
+ true
+ false
@@ -84,7 +86,7 @@
BuildAppBundle="True"
DevTeamProvisioning="$(DevTeamProvisioning)"
OutputDirectory="$(BundleDir)"
- Optimized="True"
+ Optimized="$(Optimized)"
AppDir="$(BundleDir)">
diff --git a/src/mono/msbuild/AndroidAppBuilder/AndroidAppBuilder.cs b/tools-local/tasks/mobile.tasks/AndroidAppBuilder/AndroidAppBuilder.cs
similarity index 100%
rename from src/mono/msbuild/AndroidAppBuilder/AndroidAppBuilder.cs
rename to tools-local/tasks/mobile.tasks/AndroidAppBuilder/AndroidAppBuilder.cs
diff --git a/src/mono/msbuild/AndroidAppBuilder/AndroidAppBuilder.csproj b/tools-local/tasks/mobile.tasks/AndroidAppBuilder/AndroidAppBuilder.csproj
similarity index 90%
rename from src/mono/msbuild/AndroidAppBuilder/AndroidAppBuilder.csproj
rename to tools-local/tasks/mobile.tasks/AndroidAppBuilder/AndroidAppBuilder.csproj
index 987d10d54c5f..179ca9aa2af4 100644
--- a/src/mono/msbuild/AndroidAppBuilder/AndroidAppBuilder.csproj
+++ b/tools-local/tasks/mobile.tasks/AndroidAppBuilder/AndroidAppBuilder.csproj
@@ -1,8 +1,10 @@
+ $(NetCoreAppCurrent)
Library
true
false
+ enable
diff --git a/src/mono/msbuild/AndroidAppBuilder/ApkBuilder.cs b/tools-local/tasks/mobile.tasks/AndroidAppBuilder/ApkBuilder.cs
similarity index 100%
rename from src/mono/msbuild/AndroidAppBuilder/ApkBuilder.cs
rename to tools-local/tasks/mobile.tasks/AndroidAppBuilder/ApkBuilder.cs
diff --git a/src/mono/msbuild/AndroidAppBuilder/Templates/AndroidManifest.xml b/tools-local/tasks/mobile.tasks/AndroidAppBuilder/Templates/AndroidManifest.xml
similarity index 100%
rename from src/mono/msbuild/AndroidAppBuilder/Templates/AndroidManifest.xml
rename to tools-local/tasks/mobile.tasks/AndroidAppBuilder/Templates/AndroidManifest.xml
diff --git a/src/mono/msbuild/AndroidAppBuilder/Templates/CMakeLists-android.txt b/tools-local/tasks/mobile.tasks/AndroidAppBuilder/Templates/CMakeLists-android.txt
similarity index 100%
rename from src/mono/msbuild/AndroidAppBuilder/Templates/CMakeLists-android.txt
rename to tools-local/tasks/mobile.tasks/AndroidAppBuilder/Templates/CMakeLists-android.txt
diff --git a/src/mono/msbuild/AndroidAppBuilder/Templates/MainActivity.java b/tools-local/tasks/mobile.tasks/AndroidAppBuilder/Templates/MainActivity.java
similarity index 100%
rename from src/mono/msbuild/AndroidAppBuilder/Templates/MainActivity.java
rename to tools-local/tasks/mobile.tasks/AndroidAppBuilder/Templates/MainActivity.java
diff --git a/src/mono/msbuild/AndroidAppBuilder/Templates/MonoRunner.java b/tools-local/tasks/mobile.tasks/AndroidAppBuilder/Templates/MonoRunner.java
similarity index 100%
rename from src/mono/msbuild/AndroidAppBuilder/Templates/MonoRunner.java
rename to tools-local/tasks/mobile.tasks/AndroidAppBuilder/Templates/MonoRunner.java
diff --git a/src/mono/msbuild/AndroidAppBuilder/Templates/runtime-android.c b/tools-local/tasks/mobile.tasks/AndroidAppBuilder/Templates/runtime-android.c
similarity index 100%
rename from src/mono/msbuild/AndroidAppBuilder/Templates/runtime-android.c
rename to tools-local/tasks/mobile.tasks/AndroidAppBuilder/Templates/runtime-android.c
diff --git a/src/mono/msbuild/AndroidAppBuilder/Utils.cs b/tools-local/tasks/mobile.tasks/AndroidAppBuilder/Utils.cs
similarity index 100%
rename from src/mono/msbuild/AndroidAppBuilder/Utils.cs
rename to tools-local/tasks/mobile.tasks/AndroidAppBuilder/Utils.cs
diff --git a/src/mono/msbuild/AotCompilerTask/MonoAOTCompiler.cs b/tools-local/tasks/mobile.tasks/AotCompilerTask/MonoAOTCompiler.cs
similarity index 100%
rename from src/mono/msbuild/AotCompilerTask/MonoAOTCompiler.cs
rename to tools-local/tasks/mobile.tasks/AotCompilerTask/MonoAOTCompiler.cs
diff --git a/src/mono/msbuild/AotCompilerTask/MonoAOTCompiler.csproj b/tools-local/tasks/mobile.tasks/AotCompilerTask/MonoAOTCompiler.csproj
similarity index 76%
rename from src/mono/msbuild/AotCompilerTask/MonoAOTCompiler.csproj
rename to tools-local/tasks/mobile.tasks/AotCompilerTask/MonoAOTCompiler.csproj
index f5766a3fdcfb..b487236cc362 100644
--- a/src/mono/msbuild/AotCompilerTask/MonoAOTCompiler.csproj
+++ b/tools-local/tasks/mobile.tasks/AotCompilerTask/MonoAOTCompiler.csproj
@@ -1,8 +1,10 @@
+ $(NetCoreAppCurrent)
Library
true
false
+ enable
@@ -14,4 +16,9 @@
+
+
+ PreserveNewest
+
+
diff --git a/src/mono/msbuild/AotCompilerTask/MonoAOTCompiler.props b/tools-local/tasks/mobile.tasks/AotCompilerTask/MonoAOTCompiler.props
similarity index 100%
rename from src/mono/msbuild/AotCompilerTask/MonoAOTCompiler.props
rename to tools-local/tasks/mobile.tasks/AotCompilerTask/MonoAOTCompiler.props
diff --git a/src/mono/msbuild/AotCompilerTask/Utils.cs b/tools-local/tasks/mobile.tasks/AotCompilerTask/Utils.cs
similarity index 100%
rename from src/mono/msbuild/AotCompilerTask/Utils.cs
rename to tools-local/tasks/mobile.tasks/AotCompilerTask/Utils.cs
diff --git a/src/mono/msbuild/AppleAppBuilder/AppleAppBuilder.cs b/tools-local/tasks/mobile.tasks/AppleAppBuilder/AppleAppBuilder.cs
similarity index 100%
rename from src/mono/msbuild/AppleAppBuilder/AppleAppBuilder.cs
rename to tools-local/tasks/mobile.tasks/AppleAppBuilder/AppleAppBuilder.cs
diff --git a/src/mono/msbuild/AppleAppBuilder/AppleAppBuilder.csproj b/tools-local/tasks/mobile.tasks/AppleAppBuilder/AppleAppBuilder.csproj
similarity index 90%
rename from src/mono/msbuild/AppleAppBuilder/AppleAppBuilder.csproj
rename to tools-local/tasks/mobile.tasks/AppleAppBuilder/AppleAppBuilder.csproj
index 859da678a7d2..255150988f9c 100644
--- a/src/mono/msbuild/AppleAppBuilder/AppleAppBuilder.csproj
+++ b/tools-local/tasks/mobile.tasks/AppleAppBuilder/AppleAppBuilder.csproj
@@ -1,8 +1,10 @@
+ $(NetCoreAppCurrent)
Library
true
false
+ enable
diff --git a/src/mono/msbuild/AppleAppBuilder/Templates/CMakeLists.txt.template b/tools-local/tasks/mobile.tasks/AppleAppBuilder/Templates/CMakeLists.txt.template
similarity index 100%
rename from src/mono/msbuild/AppleAppBuilder/Templates/CMakeLists.txt.template
rename to tools-local/tasks/mobile.tasks/AppleAppBuilder/Templates/CMakeLists.txt.template
diff --git a/src/mono/msbuild/AppleAppBuilder/Templates/Info.plist.template b/tools-local/tasks/mobile.tasks/AppleAppBuilder/Templates/Info.plist.template
similarity index 100%
rename from src/mono/msbuild/AppleAppBuilder/Templates/Info.plist.template
rename to tools-local/tasks/mobile.tasks/AppleAppBuilder/Templates/Info.plist.template
diff --git a/src/mono/msbuild/AppleAppBuilder/Templates/main-console.m b/tools-local/tasks/mobile.tasks/AppleAppBuilder/Templates/main-console.m
similarity index 100%
rename from src/mono/msbuild/AppleAppBuilder/Templates/main-console.m
rename to tools-local/tasks/mobile.tasks/AppleAppBuilder/Templates/main-console.m
diff --git a/src/mono/msbuild/AppleAppBuilder/Templates/main-simple.m b/tools-local/tasks/mobile.tasks/AppleAppBuilder/Templates/main-simple.m
similarity index 100%
rename from src/mono/msbuild/AppleAppBuilder/Templates/main-simple.m
rename to tools-local/tasks/mobile.tasks/AppleAppBuilder/Templates/main-simple.m
diff --git a/src/mono/msbuild/AppleAppBuilder/Templates/runtime.h b/tools-local/tasks/mobile.tasks/AppleAppBuilder/Templates/runtime.h
similarity index 100%
rename from src/mono/msbuild/AppleAppBuilder/Templates/runtime.h
rename to tools-local/tasks/mobile.tasks/AppleAppBuilder/Templates/runtime.h
diff --git a/src/mono/msbuild/AppleAppBuilder/Templates/runtime.m b/tools-local/tasks/mobile.tasks/AppleAppBuilder/Templates/runtime.m
similarity index 100%
rename from src/mono/msbuild/AppleAppBuilder/Templates/runtime.m
rename to tools-local/tasks/mobile.tasks/AppleAppBuilder/Templates/runtime.m
diff --git a/src/mono/msbuild/AppleAppBuilder/Utils.cs b/tools-local/tasks/mobile.tasks/AppleAppBuilder/Utils.cs
similarity index 100%
rename from src/mono/msbuild/AppleAppBuilder/Utils.cs
rename to tools-local/tasks/mobile.tasks/AppleAppBuilder/Utils.cs
diff --git a/src/mono/msbuild/AppleAppBuilder/Xcode.cs b/tools-local/tasks/mobile.tasks/AppleAppBuilder/Xcode.cs
similarity index 100%
rename from src/mono/msbuild/AppleAppBuilder/Xcode.cs
rename to tools-local/tasks/mobile.tasks/AppleAppBuilder/Xcode.cs
diff --git a/tools-local/tasks/tasks.proj b/tools-local/tasks/tasks.proj
new file mode 100644
index 000000000000..5fc0d0abf5de
--- /dev/null
+++ b/tools-local/tasks/tasks.proj
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $([MSBuild]::NormalizePath('$(ArtifactsObjDir)', '$(MSBuildProjectName)', 'Debug', 'build-semaphore.txt'))
+
+
+
+
+
+
+
\ No newline at end of file