Use Visual Studio instead of Xamarin Studio. (#1972)
* Use Visual Studio instead of Xamarin Studio.
* VS doesn't have mdtool, it has vstool.
Also there's no need to manually invoke the mdtool.exe executable anymore
(which we did because the mdtool executable had a min macOS version of 10.9,
and we used to build tests on older macOS versions [1]), since now we only run
tests on older macOS versions, we don't build those tests there.
[1] a1932b0ccd
This commit is contained in:
Родитель
41fa74fc12
Коммит
651a9735ff
|
@ -270,13 +270,13 @@ MAC_PACKAGE_DMG_DIRNAME="$(MAC_PACKAGE_TITLE)"
|
|||
MAC_PACKAGE_UTI=com.$(MAC_PACKAGE_NAME_LOWER).pkg
|
||||
MAC_PACKAGE_INSTALL_LOCATION=$(MAC_FRAMEWORK_VERSIONED_DIR)
|
||||
|
||||
TT = $(SYSTEM_MONO) "/Applications/Xamarin Studio.app/Contents/Resources/lib/monodevelop/AddIns/MonoDevelop.TextTemplating/TextTransform.exe"
|
||||
TT = $(SYSTEM_MONO) "/Applications/Visual Studio.app/Contents/Resources/lib/monodevelop/AddIns/MonoDevelop.TextTemplating/TextTransform.exe"
|
||||
|
||||
PRODUCT_KEY_PATH?=$(TOP)/product.snk
|
||||
|
||||
include $(TOP)/mk/quiet.mk
|
||||
|
||||
MDTOOL?=DYLD_FALLBACK_LIBRARY_PATH=$(HOME)/lib:/usr/local/lib:/lib:/usr/lib:/Library/Frameworks/Mono.framework/Versions/Current/lib $(SYSTEM_MONO) "/Applications/Xamarin Studio.app/Contents/Resources/lib/monodevelop/bin/mdtool.exe" $(MDTOOL_VERBOSITY)
|
||||
MDTOOL?="/Applications/Visual Studio.app/Contents/MacOS/vstool" $(MDTOOL_VERBOSITY)
|
||||
|
||||
ifneq ($(BUILD_REVISION),)
|
||||
# wrench build only
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
TT = "/Applications/Xamarin Studio.app/Contents/MacOS/lib/monodevelop/AddIns/MonoDevelop.TextTemplating/TextTransform.exe"
|
||||
TT = "/Applications/Visual Studio.app/Contents/MacOS/lib/monodevelop/AddIns/MonoDevelop.TextTemplating/TextTransform.exe"
|
||||
|
||||
.PHONY: all test clean
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@ namespace Xamarin.Tests
|
|||
public const string XI_ProductName = "MonoTouch";
|
||||
public const string XM_ProductName = "Xamarin.Mac";
|
||||
|
||||
const string XS_PATH = "/Applications/Xamarin Studio.app/Contents/Resources";
|
||||
const string XS_PATH = "/Applications/Visual Studio.app/Contents/Resources";
|
||||
|
||||
static string mt_root;
|
||||
static string ios_destdir;
|
||||
|
|
|
@ -136,7 +136,7 @@ namespace Xamarin.MMP.Tests
|
|||
if (isUnified)
|
||||
return RunAndAssert ("/Library/Frameworks/Mono.framework/Commands/" + (useMSBuild ? "msbuild" : "xbuild"), buildArgs, "Compile", shouldFail, getBuildProjectErrorInfo);
|
||||
else
|
||||
return RunAndAssert ("/Applications/Xamarin Studio.app/Contents/MacOS/mdtool", buildArgs, "Compile", shouldFail, getBuildProjectErrorInfo);
|
||||
return RunAndAssert ("/Applications/Visual Studio.app/Contents/MacOS/vstool", buildArgs, "Compile", shouldFail, getBuildProjectErrorInfo);
|
||||
}
|
||||
|
||||
static string ProjectTextReplacement (UnifiedTestConfig config, string text)
|
||||
|
|
|
@ -15,7 +15,7 @@ namespace Xamarin.MMP.Tests
|
|||
{
|
||||
get
|
||||
{
|
||||
return TI.FindMonoVersion () < new Version ("4.3") || !PlatformHelpers.CheckSystemVersion (10, 10); // mdtool build requires us to be on a version that XS supports
|
||||
return TI.FindMonoVersion () < new Version ("4.3") || !PlatformHelpers.CheckSystemVersion (10, 10); // vstool build requires us to be on a version that XS supports
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1954,7 +1954,7 @@ function oninitialload ()
|
|||
ExecutionResult = TestExecutingResult.Building;
|
||||
using (var resource = await NotifyBlockingWaitAsync (Jenkins.DesktopResource.AcquireConcurrentAsync ())) {
|
||||
using (var xbuild = new Process ()) {
|
||||
xbuild.StartInfo.FileName = "/Applications/Xamarin Studio.app/Contents/MacOS/mdtool";
|
||||
xbuild.StartInfo.FileName = "/Applications/Visual Studio.app/Contents/MacOS/vstool";
|
||||
var args = new StringBuilder ();
|
||||
args.Append ("build ");
|
||||
var sln = Path.ChangeExtension (ProjectFile, "sln");
|
||||
|
|
|
@ -120,7 +120,7 @@ namespace xharness
|
|||
allTargetNames.Add (MakeMacClassicTargetName (target, MacTargetNameType.Build));
|
||||
allTargetCleanNames.Add (MakeMacClassicTargetName (target, MacTargetNameType.Clean));
|
||||
|
||||
// mdtool can only find referenced projects if the referenced
|
||||
// vstool can only find referenced projects if the referenced
|
||||
// projects are included in the solution. This requires us to
|
||||
// build the solution (if it exists), not the project.
|
||||
var slnPath = Path.ChangeExtension (target.ProjectPath, "sln");
|
||||
|
|
|
@ -1464,11 +1464,6 @@ namespace Xamarin.Bundler
|
|||
if (File.Exists (path))
|
||||
return path;
|
||||
|
||||
// check inside XS
|
||||
path = "/Applications/Xamarin Studio.app/Contents/Resources/lib/monodevelop/AddIns/MonoDevelop.IPhone/mlaunch.app/Contents/MacOS/mlaunch";
|
||||
if (File.Exists (path))
|
||||
return path;
|
||||
|
||||
// check an environment variable
|
||||
path = Environment.GetEnvironmentVariable ("MLAUNCH_PATH");
|
||||
if (File.Exists (path))
|
||||
|
|
Загрузка…
Ссылка в новой задаче