Skip to content

Commit 9937223

Browse files
committed
Last one?
1 parent 7d8df53 commit 9937223

File tree

4 files changed

+5
-2
lines changed

4 files changed

+5
-2
lines changed

dotnet/targets/Xamarin.Shared.Sdk.targets

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1275,7 +1275,7 @@
12751275
<Warning Condition="'$(GenerateRuntimeConfigurationFiles)' != 'true'" Text="Some features may not work correctly, because the generation of the runtime configure file (*.runtimeconfig.json) has been disabled." />
12761276
</Target>
12771277

1278-
<Target Name="_FindAotCompiler" DependsOnTargets="_ComputeVariables">
1278+
<Target Name="_FindAotCompiler" DependsOnTargets="_ComputeVariables;_DetectSdkLocations">
12791279
<PropertyGroup>
12801280
<_XamarinAOTCompilerCachePath>$(DeviceSpecificIntermediateOutputPath)aot-compiler-path-$(NETCoreSdkVersion).txt</_XamarinAOTCompilerCachePath>
12811281
</PropertyGroup>
@@ -1294,6 +1294,7 @@
12941294
KeepTemporaryOutput="$(FindAotCompilerKeepKeepTemporaryOutput)"
12951295
MonoAotCrossCompiler="@(MonoAotCrossCompiler)"
12961296
RuntimeIdentifier="$(RuntimeIdentifier)"
1297+
SdkDevPath="$(_SdkDevPath)"
12971298
TargetFrameworkMoniker="$(_ComputedTargetFrameworkMoniker)"
12981299
>
12991300
<Output TaskParameter="AotCompiler" PropertyName="_XamarinAOTCompiler" />

msbuild/Xamarin.MacDev.Tasks/Tasks/XamarinTask.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ static async System.Threading.Tasks.Task<Execution> ExecuteAsync (Task task, str
113113
if (!string.IsNullOrEmpty (sdkDevPath))
114114
launchEnvironment ["DEVELOPER_DIR"] = sdkDevPath;
115115

116-
if (string.IsNullOrEmpty (sdkDevPath)) {
116+
if (Environment.OSVersion.Platform == PlatformID.MacOSX && string.IsNullOrEmpty (sdkDevPath)) {
117117
log.LogError (MSBStrings.E7164 /* The task '{0}' is trying to call an external process, but a path to Xcode has not been provided. Please file an issue at https://github.com/dotnet/macios/issues/new/choose. */, task.GetType ().Name);
118118
log.LogMessage (MessageImportance.Low, Environment.StackTrace);
119119
}

msbuild/Xamarin.Shared/Xamarin.Shared.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1987,6 +1987,7 @@ Copyright (C) 2018 Microsoft. All rights reserved.
19871987
Condition="'$(IsMacEnabled)' == 'true' And '$(BindingProjectBuildSessionId)' != ''"
19881988
IntermediateOutputPath="$(IntermediateOutputPath)"
19891989
TargetFrameworkMoniker="$(_ComputedTargetFrameworkMoniker)"
1990+
SdkDevPath="$(_SdkDevPath)"
19901991
>
19911992
<Output TaskParameter="BaseLibDllPath" PropertyName="BaseLibDllPath" />
19921993
<Output TaskParameter="BGenToolExe" PropertyName="BGenToolExe" />

msbuild/Xamarin.Shared/Xamarin.iOS.Common.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,7 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
489489
Sources="@(_IpaPackageSource)"
490490
OutputFile="$(IpaPackagePath)"
491491
WorkingDirectory="$(DeviceSpecificIntermediateOutputPath)ipa"
492+
SdkDevPath="$(_SdkDevPath)"
492493
>
493494
<Output TaskParameter="OutputFile" ItemName="FileWrites" />
494495
</Zip>

0 commit comments

Comments
 (0)