Fix merge failure.
This commit is contained in:
Родитель
681fce6036
Коммит
cec44fba3d
|
@ -45,7 +45,7 @@ namespace Xamarin.Tests {
|
||||||
return Path.Combine (Path.GetDirectoryName (projectPath)!, "bin", configuration, platform.ToFramework (), appPathRuntimeIdentifier, Path.GetFileNameWithoutExtension (projectPath) + ".app");
|
return Path.Combine (Path.GetDirectoryName (projectPath)!, "bin", configuration, platform.ToFramework (), appPathRuntimeIdentifier, Path.GetFileNameWithoutExtension (projectPath) + ".app");
|
||||||
}
|
}
|
||||||
|
|
||||||
protected string GetOutputPath (string project, string? subdir, string runtimeIdentifiers, ApplePlatform platform, string configuration = "Debug", string? netVersion)
|
protected string GetOutputPath (string project, string? subdir, string runtimeIdentifiers, ApplePlatform platform, string configuration = "Debug", string? netVersion = null)
|
||||||
{
|
{
|
||||||
var rv = GetProjectPath (project, subdir, platform);
|
var rv = GetProjectPath (project, subdir, platform);
|
||||||
if (string.IsNullOrEmpty (runtimeIdentifiers))
|
if (string.IsNullOrEmpty (runtimeIdentifiers))
|
||||||
|
|
Загрузка…
Ссылка в новой задаче