Merge pull request #4111 from radical/msbuild-port

[msbuild] Move from xbuild to msbuild
xamarin · Oct 15, 2018 · 250fd97 · 250fd97 · spouliot · Oct 16, 2018
2 parents 904be25 + 5fbfacc
commit 250fd97
Show file tree

Hide file tree

Showing 39 changed files with 328 additions and 257 deletions.
diff --git a/Make.config b/Make.config
@@ -247,7 +247,7 @@ SYSTEM_CSC=$(MONO_PREFIX)/bin/csc
 SYSTEM_SN=$(MONO_PREFIX)/bin/sn
 SYSTEM_MONO=$(MONO_PREFIX)/bin/mono
 SYSTEM_MONO32=$(MONO_PREFIX)/bin/mono32
-SYSTEM_XBUILD=$(MONO_PREFIX)/bin/xbuild
+SYSTEM_XBUILD=$(MONO_PREFIX)/bin/msbuild
 SYSTEM_MSBUILD=unset MSBuildExtensionsPath && $(MONO_PREFIX)/bin/msbuild
 SYSTEM_RESGEN=$(MONO_PREFIX)/bin/resgen
 

diff --git a/fsharp/Makefile b/fsharp/Makefile
@@ -156,8 +156,8 @@ build/%.dll: $(BIN_DIR)/%.dll | build/monotouch build/xamarinmacmobile build/xam
 	$(Q) cp $< $@
 	$(Q_SN) MONO_CFG_DIR="$(TOP)" sn -q -R "$@" "$(PRODUCT_KEY_PATH)"
 
-build.stamp: export XBUILD_FRAMEWORK_FOLDERS_PATH=$(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild-frameworks
-build.stamp: export MSBuildExtensionsPath=$(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild
+build.stamp: export TargetFrameworkFallbackSearchPaths=$(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild-frameworks
+build.stamp: export MSBuildExtensionsPathFallbackPathsOverride=$(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild
 build.stamp: $(FSHARP_FILES) $(FSHARP_PATH)/Makefile
 	$(MAKE) -C $(FSHARP_PATH)/src/fsharp build-proto
 	$(MAKE) -C $(FSHARP_PATH)/src/fsharp $(FSHARP_BUILD_TARGETS)

diff --git a/msbuild/Xamarin.Mac.Tasks.Core/Xamarin.Mac.Tasks.Core.csproj b/msbuild/Xamarin.Mac.Tasks.Core/Xamarin.Mac.Tasks.Core.csproj
@@ -24,11 +24,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="Microsoft.Build.Engine" />
-    <Reference Include="Microsoft.Build" />
-    <Reference Include="Microsoft.Build.Utilities.v4.0" />
-    <Reference Include="Microsoft.Build.Tasks.v4.0" />
+    <Reference Include="Microsoft.Build.Framework" HintPath="$(MSBuildBinPath)\Microsoft.Build.Framework.dll" />
+    <Reference Include="Microsoft.Build" HintPath="$(MSBuildBinPath)\Microsoft.Build.dll" />
+    <Reference Include="Microsoft.Build.Utilities.Core" HintPath="$(MSBuildBinPath)\Microsoft.Build.Utilities.Core.dll" />
+    <Reference Include="Microsoft.Build.Tasks.Core" HintPath="$(MSBuildBinPath)\Microsoft.Build.Tasks.Core.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
@@ -53,4 +52,4 @@
       <Name>Xamarin.MacDev.Tasks.Core</Name>
     </ProjectReference>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.Tasks.csproj b/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.Tasks.csproj
@@ -23,11 +23,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="Microsoft.Build.Engine" />
-    <Reference Include="Microsoft.Build" />
-    <Reference Include="Microsoft.Build.Utilities.v4.0" />
-    <Reference Include="Microsoft.Build.Tasks.v4.0" />
+    <Reference Include="Microsoft.Build.Framework" HintPath="$(MSBuildBinPath)\Microsoft.Build.Framework.dll" />
+    <Reference Include="Microsoft.Build" HintPath="$(MSBuildBinPath)\Microsoft.Build.dll" />
+    <Reference Include="Microsoft.Build.Utilities.Core" HintPath="$(MSBuildBinPath)\Microsoft.Build.Utilities.Core.dll" />
+    <Reference Include="Microsoft.Build.Tasks.Core" HintPath="$(MSBuildBinPath)\Microsoft.Build.Tasks.Core.dll" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Tasks\ACTool.cs" />

diff --git a/msbuild/Xamarin.MacDev.Tasks.Core/MsBuildTasks/CopyBase.cs b/msbuild/Xamarin.MacDev.Tasks.Core/MsBuildTasks/CopyBase.cs
@@ -3,6 +3,5 @@
 	public abstract class CopyBase : Copy
 	{
 		public string SessionId { get; set; }
-		public bool UseSymboliclinksIfPossible { get; set; }		
 	}
 }
diff --git a/msbuild/Xamarin.MacDev.Tasks.Core/Xamarin.MacDev.Tasks.Core.csproj b/msbuild/Xamarin.MacDev.Tasks.Core/Xamarin.MacDev.Tasks.Core.csproj
@@ -33,10 +33,9 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="Microsoft.Build.Engine" />
-    <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="Microsoft.Build.Tasks.v4.0" />
-    <Reference Include="Microsoft.Build.Utilities.v4.0" />
+    <Reference Include="Microsoft.Build.Framework" HintPath="$(MSBuildBinPath)\Microsoft.Build.Framework.dll" />
+    <Reference Include="Microsoft.Build.Tasks.Core" HintPath="$(MSBuildBinPath)\Microsoft.Build.Tasks.Core.dll" />
+    <Reference Include="Microsoft.Build.Utilities.Core" HintPath="$(MSBuildBinPath)\Microsoft.Build.Utilities.Core.dll" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml" />
     <Reference Include="Mono.Posix" />

diff --git a/msbuild/Xamarin.MacDev.Tasks/Xamarin.MacDev.Tasks.csproj b/msbuild/Xamarin.MacDev.Tasks/Xamarin.MacDev.Tasks.csproj
@@ -33,10 +33,9 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="Microsoft.Build.Engine" />
-    <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="Microsoft.Build.Tasks.v4.0" />
-    <Reference Include="Microsoft.Build.Utilities.v4.0" />
+    <Reference Include="Microsoft.Build.Framework" HintPath="$(MSBuildBinPath)\Microsoft.Build.Framework.dll" />
+    <Reference Include="Microsoft.Build.Tasks.Core" HintPath="$(MSBuildBinPath)\Microsoft.Build.Tasks.Core.dll" />
+    <Reference Include="Microsoft.Build.Utilities.Core" HintPath="$(MSBuildBinPath)\Microsoft.Build.Utilities.Core.dll" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml" />
     <Reference Include="Mono.Cecil, Version=0.9.5.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">

diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Tasks/GetPropertyValueTaskBase.cs b/msbuild/Xamarin.iOS.Tasks.Core/Tasks/GetPropertyValueTaskBase.cs
@@ -55,7 +55,7 @@ static bool TryRunMSBuildGetPropertyValueTarget (string path, string propertyNam
 				arguments = string.Format ("{0} /p:TargetFrameworkIdentifier={1}", arguments, targetFrameworkIdentifier);
 			}
 
-			var psi = new ProcessStartInfo ("/Library/Frameworks/Mono.framework/Commands/xbuild", arguments);
+			var psi = new ProcessStartInfo ("/Library/Frameworks/Mono.framework/Commands/msbuild", arguments);
 
 			psi.UseShellExecute = false;
 			psi.RedirectStandardError = true;

diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Tasks.Core.csproj b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Tasks.Core.csproj
@@ -32,14 +32,13 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Build" />
+    <Reference Include="Microsoft.Build" HintPath="$(MSBuildBinPath)\Microsoft.Build.dll" />
     <Reference Include="System" />
-    <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="Microsoft.Build.Tasks.v4.0" />
-    <Reference Include="Microsoft.Build.Utilities.v4.0" />
+    <Reference Include="Microsoft.Build.Framework" HintPath="$(MSBuildBinPath)\Microsoft.Build.Framework.dll" />
+    <Reference Include="Microsoft.Build.Tasks.Core" HintPath="$(MSBuildBinPath)\Microsoft.Build.Tasks.Core.dll" />
+    <Reference Include="Microsoft.Build.Utilities.Core" HintPath="$(MSBuildBinPath)\Microsoft.Build.Utilities.Core.dll" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.Build.Engine" />
     <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
   </ItemGroup>

diff --git a/msbuild/Xamarin.iOS.Tasks/Xamarin.iOS.Tasks.csproj b/msbuild/Xamarin.iOS.Tasks/Xamarin.iOS.Tasks.csproj
@@ -95,9 +95,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="Microsoft.Build.Utilities.v4.0" />
-    <Reference Include="Microsoft.Build.Tasks.v4.0" />
+    <Reference Include="Microsoft.Build.Framework" HintPath="$(MSBuildBinPath)\Microsoft.Build.Framework.dll" />
+    <Reference Include="Microsoft.Build.Utilities.Core" HintPath="$(MSBuildBinPath)\Microsoft.Build.Utilities.Core.dll" />
+    <Reference Include="Microsoft.Build.Tasks.Core" HintPath="$(MSBuildBinPath)\Microsoft.Build.Tasks.Core.dll" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

diff --git a/msbuild/tests/Xamarin.iOS.Tasks.Tests/ProjectsTests/BindingProject.cs b/msbuild/tests/Xamarin.iOS.Tasks.Tests/ProjectsTests/BindingProject.cs
@@ -24,7 +24,7 @@ public void BuildTest ()
 			AppBundlePath = mtouchPaths.AppBundlePath;
 			var dllPath = Path.Combine(mtouchPaths.ProjectBinPath, "bindings-test.dll");
 
-			Engine.GlobalProperties.SetProperty ("Platform", Platform);
+			Engine.ProjectCollection.SetGlobalProperty ("Platform", Platform);
 
 			RunTarget (proj, "Build", 0);
 			Assert.IsTrue (File.Exists (dllPath), "{1} binding dll does not exist: {0} ", dllPath, Platform);
@@ -43,7 +43,7 @@ public void FrameworkTest ()
 			AppBundlePath = mtouchPaths.AppBundlePath;
 			var dllPath = Path.Combine(mtouchPaths.ProjectBinPath, "bindings-test.dll");
 
-			Engine.GlobalProperties.SetProperty ("Platform", Platform);
+			Engine.ProjectCollection.SetGlobalProperty ("Platform", Platform);
 
 			RunTarget (proj, "Build", 0);
 			Assert.IsTrue (File.Exists (dllPath), "{1} binding dll does not exist: {0} ", dllPath, Platform);

diff --git a/msbuild/tests/Xamarin.iOS.Tasks.Tests/ProjectsTests/Bug60536.cs b/msbuild/tests/Xamarin.iOS.Tasks.Tests/ProjectsTests/Bug60536.cs
@@ -3,9 +3,9 @@
 using System.Linq;
 using System.Collections;
 
-using NUnit.Framework;
+using Microsoft.Build.Evaluation;
 
-using Microsoft.Build.BuildEngine;
+using NUnit.Framework;
 
 namespace Xamarin.iOS.Tasks
 {
@@ -30,8 +30,8 @@ public void TestACToolTaskCatchesJsonException ()
 			var project = SetupProject (Engine, csproj);
 
 			AppBundlePath = mtouchPaths ["app_bundlepath"];
-			Engine.GlobalProperties.SetProperty("Platform", platform);
-			Engine.GlobalProperties.SetProperty("Configuration", config);
+			Engine.ProjectCollection.SetGlobalProperty("Platform", platform);
+			Engine.ProjectCollection.SetGlobalProperty("Configuration", config);
 
 			if (clean) {
 				RunTarget (project, "Clean");
@@ -56,8 +56,9 @@ public void TestACToolTaskCatchesJsonException ()
 			}
 
 			project = SetupProject (Engine, mtouchPaths.ProjectCSProjPath);
+			var projectInstance = project.CreateProjectInstance ();
 
-			Engine.BuildProject (project, new [] { target }, new Hashtable { {"Platform", "iPhone"} }, BuildSettings.None);
+			Engine.BuildProject (projectInstance, new [] { target }, new Hashtable { {"Platform", "iPhone"} });
 			if (Engine.Logger.ErrorEvents.Count != 1) {
 				string messages = string.Empty;
 				if (Engine.Logger.ErrorEvents.Count > 0)

diff --git a/msbuild/tests/Xamarin.iOS.Tasks.Tests/ProjectsTests/Extensions/ExtensionTestBase.cs b/msbuild/tests/Xamarin.iOS.Tasks.Tests/ProjectsTests/Extensions/ExtensionTestBase.cs
@@ -35,8 +35,8 @@ public void BuildExtension (string hostAppName, string extensionName, string bun
 
 			AppBundlePath = mtouchPaths ["app_bundlepath"];
 			string extensionPath = Path.Combine(AppBundlePath, "PlugIns", extensionName + ".appex");
-			Engine.GlobalProperties.SetProperty ("Platform", platform);
-			Engine.GlobalProperties.SetProperty ("Configuration", config);
+			Engine.ProjectCollection.SetGlobalProperty ("Platform", platform);
+			Engine.ProjectCollection.SetGlobalProperty ("Configuration", config);
 
 			RunTarget (proj, "Clean");
 			Assert.IsFalse (Directory.Exists (AppBundlePath), "{1}: App bundle exists after cleanup: {0} ", AppBundlePath, bundlePath);

diff --git a/msbuild/tests/Xamarin.iOS.Tasks.Tests/ProjectsTests/Extensions/WatchKit.cs b/msbuild/tests/Xamarin.iOS.Tasks.Tests/ProjectsTests/Extensions/WatchKit.cs
@@ -47,7 +47,7 @@ public void InvalidBundleIdTest ()
 				File.WriteAllText (appInfoPath, appInfoContents.Replace ("<string>com.xamarin.MyWatchApp</string>", "<string>com.xamarin.MyWatchAppX</string>"));
 
 				var proj = SetupProject (Engine, mtouchPaths.ProjectCSProjPath);
-				Engine.GlobalProperties.SetProperty ("Platform", Platform);
+				Engine.ProjectCollection.SetGlobalProperty ("Platform", Platform);
 				AppBundlePath = mtouchPaths ["app_bundlepath"];
 				RunTarget (proj, "Build", 2);
 				Assert.AreEqual ("The App Extension 'WatchExtension' has an invalid CFBundleIdentifier (com.xamarin.MyWatchApp.WatchExtension), it does not begin with the main app bundle's CFBundleIdentifier (com.xamarin.MyWatchAppX).", Engine.Logger.ErrorEvents [0].Message, "#1");
@@ -73,12 +73,12 @@ public void CreateIpa ()
 
 			AppBundlePath = mtouchPaths.AppBundlePath;
 
-			Engine.GlobalProperties.SetProperty ("Platform", Platform);
-			Engine.GlobalProperties.SetProperty ("BuildIpa", "true");
-			Engine.GlobalProperties.SetProperty ("IpaIncludeArtwork", "true");
-			Engine.GlobalProperties.SetProperty ("CodesignProvision", "Automatic"); // Provisioning profile
-			Engine.GlobalProperties.SetProperty ("CodesignKey", "iPhone Developer");
-			Engine.GlobalProperties.SetProperty ("Configuration", configuration);
+			Engine.ProjectCollection.SetGlobalProperty ("Platform", Platform);
+			Engine.ProjectCollection.SetGlobalProperty ("BuildIpa", "true");
+			Engine.ProjectCollection.SetGlobalProperty ("IpaIncludeArtwork", "true");
+			Engine.ProjectCollection.SetGlobalProperty ("CodesignProvision", "Automatic"); // Provisioning profile
+			Engine.ProjectCollection.SetGlobalProperty ("CodesignKey", "iPhone Developer");
+			Engine.ProjectCollection.SetGlobalProperty ("Configuration", configuration);
 
 			RunTarget (proj, "Clean");
 			Assert.IsFalse (Directory.Exists (AppBundlePath), "{1}: App bundle exists after cleanup: {0} ", AppBundlePath, Platform);
@@ -115,7 +115,7 @@ public void CreateIpa ()
 			string wkPath = "WatchKitSupport/WK";
 			Assert.Contains (wkPath, lines, wkPath + " does not exist");
 
-			var ipaIncludeArtwork = proj.GetEvaluatedProperty ("IpaIncludeArtwork");
+			var ipaIncludeArtwork = proj.GetPropertyValue ("IpaIncludeArtwork");
 			Assert.IsTrue (output.Contains ("iTunesMetadata.plist"), string.Format ("The ipa should contain at least one iTunesMetadata.plist file if we are using an AppStore config and IpaIncludeArtwork is true. IpaIncludeArtwork: {0}", ipaIncludeArtwork));
 
 			RunTarget (proj, "Clean");

diff --git a/msbuild/tests/Xamarin.iOS.Tasks.Tests/ProjectsTests/NativeReferences.cs b/msbuild/tests/Xamarin.iOS.Tasks.Tests/ProjectsTests/NativeReferences.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Linq;
 using NUnit.Framework;
 
 namespace Xamarin.iOS.Tasks {
@@ -16,12 +17,12 @@ public void BasicTest ()
 		{
 			var mtouchPaths = SetupProjectPaths ("MyTabbedApplication", "../", true, Platform);
 
-			Engine.GlobalProperties.SetProperty ("Platform", Platform);
+			Engine.ProjectCollection.SetGlobalProperty ("Platform", Platform);
 
 			var proj = SetupProject (Engine, mtouchPaths.ProjectCSProjPath);
-			var nr = proj.AddNewItem ("NativeReference", Path.Combine (".", "..", "..", "..", "tests", "test-libraries", ".libs", "ios", "XTest.framework"));
-			nr.SetMetadata ("IsCxx", "False");
-			nr.SetMetadata ("Kind", "Framework");
+			var nr = proj.AddItem ("NativeReference", Path.Combine (".", "..", "..", "..", "tests", "test-libraries", ".libs", "ios", "XTest.framework")).First ();
+			nr.SetMetadataValue ("IsCxx", "False");
+			nr.SetMetadataValue ("Kind", "Framework");
 
 			AppBundlePath = mtouchPaths.AppBundlePath;
 
@@ -40,14 +41,14 @@ public void WithIncrementalBuilds ()
 
 			var mtouchPaths = SetupProjectPaths ("MyiOSAppWithBinding", "../", true, Platform);
 
-			Engine.GlobalProperties.SetProperty ("Platform", Platform);
+			Engine.ProjectCollection.SetGlobalProperty ("Platform", Platform);
 
 			var proj = SetupProject (Engine, mtouchPaths.ProjectCSProjPath);
 
-			proj.GlobalProperties.SetProperty ("MtouchFastDev", "true");
-			proj.GlobalProperties.SetProperty ("MtouchExtraArgs", "-vvvv");
-			proj.GlobalProperties.SetProperty ("MtouchArch", "ARM64"); // only use ARM64 to speed up the build.
-			proj.GlobalProperties.SetProperty ("MtouchLink", "Full"); // also to speed up the build.
+			proj.SetGlobalProperty ("MtouchFastDev", "true");
+			proj.SetGlobalProperty ("MtouchExtraArgs", "-vvvv");
+			proj.SetGlobalProperty ("MtouchArch", "ARM64"); // only use ARM64 to speed up the build.
+			proj.SetGlobalProperty ("MtouchLink", "Full"); // also to speed up the build.
 
 			AppBundlePath = mtouchPaths.AppBundlePath;
 

diff --git a/msbuild/tests/Xamarin.iOS.Tasks.Tests/ProjectsTests/ProjectTest.cs b/msbuild/tests/Xamarin.iOS.Tasks.Tests/ProjectsTests/ProjectTest.cs
@@ -42,8 +42,8 @@ public string BuildProject (string appName, string platform, string config, int
 			var proj = SetupProject (Engine, csproj);
 
 			AppBundlePath = mtouchPaths ["app_bundlepath"];
-			Engine.GlobalProperties.SetProperty("Platform", platform);
-			Engine.GlobalProperties.SetProperty("Configuration", config);
+			Engine.ProjectCollection.SetGlobalProperty("Platform", platform);
+			Engine.ProjectCollection.SetGlobalProperty("Configuration", config);
 
 			if (clean) {
 				RunTarget (proj, "Clean");