Skip to content

Commit def54a6

Browse files
authored
Handle the case for updated binding redirects and exclude it from DTB flow (#11411)
1 parent e3af490 commit def54a6

File tree

1 file changed

+18
-0
lines changed

1 file changed

+18
-0
lines changed

src/Tasks/Microsoft.Common.CurrentVersion.targets

+18
Original file line numberDiff line numberDiff line change
@@ -2568,6 +2568,24 @@ Copyright (C) Microsoft Corporation. All rights reserved.
25682568
<AppConfig Condition="$(_NewGenerateBindingRedirectsIntermediateAppConfig) == 'true'">$(_GenerateBindingRedirectsIntermediateAppConfig)</AppConfig>
25692569
</PropertyGroup>
25702570

2571+
<PropertyGroup>
2572+
<ConfigFileExists Condition="Exists('@(AppConfigWithTargetPath->'$(OutDir)%(TargetPath)')')">true</ConfigFileExists>
2573+
<HasNoBindingRedirects Condition="'@(SuggestedBindingRedirects)' == ''">true</HasNoBindingRedirects>
2574+
</PropertyGroup>
2575+
2576+
<!-- Overwrites .config file with a App.config content if RAR returned empty @(SuggestedBindingRedirects). -->
2577+
<Copy
2578+
SourceFiles="@(AppConfigWithTargetPath->'%(FullPath)')"
2579+
DestinationFiles="$(_GenerateBindingRedirectsIntermediateAppConfig)"
2580+
SkipUnchangedFiles="true"
2581+
Condition="'$(ConfigFileExists)' == 'true' and '$(HasNoBindingRedirects)' == 'true' and '$(DesignTimeBuild)' != 'true'">
2582+
<Output TaskParameter="CopiedFiles" ItemName="FileWrites"/>
2583+
</Copy>
2584+
<Touch
2585+
Files="$(_GenerateBindingRedirectsIntermediateAppConfig)"
2586+
AlwaysCreate="true"
2587+
Condition="'$(ConfigFileExists)' == 'true' and '$(HasNoBindingRedirects)' == 'true' and '$(DesignTimeBuild)' != 'true'"/>
2588+
25712589
<ItemGroup Condition="$(_NewGenerateBindingRedirectsIntermediateAppConfig) == 'true'">
25722590
<AppConfigWithTargetPath Remove="@(AppConfigWithTargetPath)" />
25732591
<AppConfigWithTargetPath Include="$(AppConfig)">

0 commit comments

Comments
 (0)