Skip to content

Commit c63c990

Browse files
committed
Last one?
1 parent 47c76b3 commit c63c990

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
@@ -1284,7 +1284,7 @@
12841284
<Warning Condition="'$(GenerateRuntimeConfigurationFiles)' != 'true'" Text="Some features may not work correctly, because the generation of the runtime configure file (*.runtimeconfig.json) has been disabled." />
12851285
</Target>
12861286

1287-
<Target Name="_FindAotCompiler" DependsOnTargets="_ComputeVariables">
1287+
<Target Name="_FindAotCompiler" DependsOnTargets="_ComputeVariables;_DetectSdkLocations">
12881288
<PropertyGroup>
12891289
<_XamarinAOTCompilerCachePath>$(DeviceSpecificIntermediateOutputPath)aot-compiler-path-$(NETCoreSdkVersion).txt</_XamarinAOTCompilerCachePath>
12901290
</PropertyGroup>
@@ -1303,6 +1303,7 @@
13031303
KeepTemporaryOutput="$(FindAotCompilerKeepKeepTemporaryOutput)"
13041304
MonoAotCrossCompiler="@(MonoAotCrossCompiler)"
13051305
RuntimeIdentifier="$(RuntimeIdentifier)"
1306+
SdkDevPath="$(_SdkDevPath)"
13061307
TargetFrameworkMoniker="$(_ComputedTargetFrameworkMoniker)"
13071308
>
13081309
<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
@@ -1989,6 +1989,7 @@ Copyright (C) 2018 Microsoft. All rights reserved.
19891989
Condition="'$(IsMacEnabled)' == 'true' And '$(BindingProjectBuildSessionId)' != ''"
19901990
IntermediateOutputPath="$(IntermediateOutputPath)"
19911991
TargetFrameworkMoniker="$(_ComputedTargetFrameworkMoniker)"
1992+
SdkDevPath="$(_SdkDevPath)"
19921993
>
19931994
<Output TaskParameter="BaseLibDllPath" PropertyName="BaseLibDllPath" />
19941995
<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)