[msbuild] Don't execute the entire _CreateBindingResourcePackage if 'NoBindingEmbedding!=true'. (#13374)
This fixes an issue where we'd create the stamp file even if 'NoBindingEmbedding' wasn't set. Also remove SkipBindingResourcePackage property, it doesn't show up anywhere else in our code base, nor in the history, nor anywhere relevant in Google.
This commit is contained in:
Родитель
eaef8d4da6
Коммит
17e7f65b2c
|
@ -156,7 +156,8 @@ Copyright (C) 2018 Microsoft. All rights reserved.
|
|||
<BindingResourcePath>$(OutputPath)$(AssemblyName).resources</BindingResourcePath>
|
||||
</PropertyGroup>
|
||||
|
||||
<Target Name="_CreateBindingResourcePackage" Condition="'$(DesignTimeBuild)' != 'true'"
|
||||
<Target Name="_CreateBindingResourcePackage"
|
||||
Condition="'$(DesignTimeBuild)' != 'true' And '$(NoBindingEmbedding)' == 'true'"
|
||||
DependsOnTargets="_ExpandNativeReferences"
|
||||
Inputs="$(MSBuildAllProjects);$(MSBuildProjectFullPath);@(ObjcBindingApiDefinition);@(ObjcBindingCoreSource);@(ReferencePath);@(ObjcBindingNativeLibrary);@(_FrameworkNativeReference);@(_FileNativeReference)"
|
||||
Outputs="$(BindingResourcePath).stamp">
|
||||
|
@ -172,7 +173,7 @@ Copyright (C) 2018 Microsoft. All rights reserved.
|
|||
<CompressBindingResourcePackage Condition="'$(UsingAppleNETSdk)' != 'true'">false</CompressBindingResourcePackage>
|
||||
</PropertyGroup>
|
||||
|
||||
<CreateBindingResourcePackage Condition="'$(IsMacEnabled)' == 'true' And '$(NoBindingEmbedding)' == 'true' And '$(SkipBindingResourcePackage)' != 'true'"
|
||||
<CreateBindingResourcePackage Condition="'$(IsMacEnabled)' == 'true'"
|
||||
SessionId="$(BuildSessionId)"
|
||||
NativeReferences="@(NativeReference)"
|
||||
BindingResourcePath="$(BindingResourcePath)"
|
||||
|
|
Загрузка…
Ссылка в новой задаче