Remove IsXcode8 (#12671)
* Remove IsXcode8 * Remove other _ForgeMetal references
This commit is contained in:
Родитель
cb998a3589
Коммит
219fb1a753
|
@ -216,7 +216,6 @@
|
||||||
_CompileCoreMLModels;
|
_CompileCoreMLModels;
|
||||||
_CreatePkgInfo;
|
_CreatePkgInfo;
|
||||||
_SmeltMetal;
|
_SmeltMetal;
|
||||||
_ForgeMetal;
|
|
||||||
_TemperMetal;
|
_TemperMetal;
|
||||||
_CompileEntitlements;
|
_CompileEntitlements;
|
||||||
_DetectAppManifest;
|
_DetectAppManifest;
|
||||||
|
|
|
@ -51,7 +51,6 @@ Copyright (C) 2014 Xamarin. All rights reserved.
|
||||||
_DetectSigningIdentity;
|
_DetectSigningIdentity;
|
||||||
_CopyResourcesToBundle;
|
_CopyResourcesToBundle;
|
||||||
_SmeltMetal;
|
_SmeltMetal;
|
||||||
_ForgeMetal;
|
|
||||||
_TemperMetal;
|
_TemperMetal;
|
||||||
_CompileEntitlements;
|
_CompileEntitlements;
|
||||||
_WriteAppManifest;
|
_WriteAppManifest;
|
||||||
|
|
|
@ -55,11 +55,6 @@ namespace Xamarin.MacDev.Tasks {
|
||||||
get; set;
|
get; set;
|
||||||
}
|
}
|
||||||
|
|
||||||
[Output]
|
|
||||||
public bool IsXcode8 {
|
|
||||||
get; set;
|
|
||||||
}
|
|
||||||
|
|
||||||
// This is also an input
|
// This is also an input
|
||||||
[Output]
|
[Output]
|
||||||
public string XamarinSdkRoot {
|
public string XamarinSdkRoot {
|
||||||
|
@ -157,8 +152,6 @@ namespace Xamarin.MacDev.Tasks {
|
||||||
EnsureSdkPath ();
|
EnsureSdkPath ();
|
||||||
EnsureXamarinSdkRoot ();
|
EnsureXamarinSdkRoot ();
|
||||||
|
|
||||||
IsXcode8 = AppleSdkSettings.XcodeVersion.Major >= 8;
|
|
||||||
|
|
||||||
return !Log.HasLoggedErrors;
|
return !Log.HasLoggedErrors;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -901,27 +901,12 @@ Copyright (C) 2018 Microsoft. All rights reserved.
|
||||||
</Metal>
|
</Metal>
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Target Name="_ForgeMetal" Condition="'$(_CanOutputAppBundle)' == 'true' And '@(_SmeltedMetal)' != ''" DependsOnTargets="_SmeltMetal"
|
<Target Name="_TemperMetal" Condition="'$(_CanOutputAppBundle)' == 'true' And '@(_SmeltedMetal)' != ''" DependsOnTargets="_GenerateBundleName"
|
||||||
Inputs="@(_SmeltedMetal)" Outputs="$(DeviceSpeficicIntermediateOutputPath)metal\default.metal-ar">
|
Inputs="@(_SmeltedMetal)" Outputs="$(_AppResourcesPath)default.metallib">
|
||||||
<ArTool
|
|
||||||
SessionId="$(BuildSessionId)"
|
|
||||||
Condition="'$(IsMacEnabled)' == 'true' and '$(_IsXcode8)' == 'false'"
|
|
||||||
Items="@(_SmeltedMetal)"
|
|
||||||
Archive="$(DeviceSpecificIntermediateOutputPath)metal\default.metal-ar">
|
|
||||||
</ArTool>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<_ForgedMetal Condition="'$(_IsXcode8)' == 'false'" Include="$(DeviceSpecificIntermediateOutputPath)metal\default.metal-ar" />
|
|
||||||
<_ForgedMetal Condition="'$(_IsXcode8)' == 'true'" Include="@(_SmeltedMetal)" />
|
|
||||||
</ItemGroup>
|
|
||||||
</Target>
|
|
||||||
|
|
||||||
<Target Name="_TemperMetal" Condition="'$(_CanOutputAppBundle)' == 'true' And '@(_ForgedMetal)' != ''" DependsOnTargets="_ForgeMetal;_GenerateBundleName"
|
|
||||||
Inputs="@(_ForgedMetal)" Outputs="$(_AppResourcesPath)default.metallib">
|
|
||||||
<MetalLib
|
<MetalLib
|
||||||
SessionId="$(BuildSessionId)"
|
SessionId="$(BuildSessionId)"
|
||||||
Condition="'$(IsMacEnabled)' == 'true'"
|
Condition="'$(IsMacEnabled)' == 'true'"
|
||||||
Items="@(_ForgedMetal)"
|
Items="@(_SmeltedMetal)"
|
||||||
SdkDevPath="$(_SdkDevPath)"
|
SdkDevPath="$(_SdkDevPath)"
|
||||||
SdkRoot="$(_SdkRoot)"
|
SdkRoot="$(_SdkRoot)"
|
||||||
OutputLibrary="$(_AppResourcesPath)default.metallib">
|
OutputLibrary="$(_AppResourcesPath)default.metallib">
|
||||||
|
@ -1107,7 +1092,6 @@ Copyright (C) 2018 Microsoft. All rights reserved.
|
||||||
<Output TaskParameter="SdkUsrPath" PropertyName="_SdkUsrPath" />
|
<Output TaskParameter="SdkUsrPath" PropertyName="_SdkUsrPath" />
|
||||||
<Output TaskParameter="SdkPlatform" PropertyName="_SdkPlatform" />
|
<Output TaskParameter="SdkPlatform" PropertyName="_SdkPlatform" />
|
||||||
<Output TaskParameter="SdkIsSimulator" PropertyName="_SdkIsSimulator" />
|
<Output TaskParameter="SdkIsSimulator" PropertyName="_SdkIsSimulator" />
|
||||||
<Output TaskParameter="IsXcode8" PropertyName="_IsXcode8" />
|
|
||||||
<Output TaskParameter="XamarinSdkRoot" PropertyName="_XamarinSdkRoot" />
|
<Output TaskParameter="XamarinSdkRoot" PropertyName="_XamarinSdkRoot" />
|
||||||
</DetectSdkLocations>
|
</DetectSdkLocations>
|
||||||
</Target>
|
</Target>
|
||||||
|
|
|
@ -112,7 +112,6 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
|
||||||
_CopyResourcesToBundle;
|
_CopyResourcesToBundle;
|
||||||
_CreateAssetPackManifest;
|
_CreateAssetPackManifest;
|
||||||
_SmeltMetal;
|
_SmeltMetal;
|
||||||
_ForgeMetal;
|
|
||||||
_TemperMetal;
|
_TemperMetal;
|
||||||
_CompileCoreMLModels;
|
_CompileCoreMLModels;
|
||||||
_PrepareResourceRules;
|
_PrepareResourceRules;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче