Skip to content

Commit

Permalink
Fix ordering of targets impacting WPF scenarios (#1738)
Browse files Browse the repository at this point in the history
  • Loading branch information
manodasanW authored Sep 10, 2024
1 parent 7b7b412 commit b55ca83
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion build/AzurePipelineTemplates/CsWinRT-Variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ variables:
- name: MinorVersion
value: 1
- name: PatchVersion
value: 2
value: 3
- name: WinRT.Runtime.AssemblyVersion
value: '2.1.0.0'
- name: Net5.SDK.Feed
Expand Down
2 changes: 1 addition & 1 deletion nuget/Microsoft.Windows.CsWinRT.targets
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
<AllowUnsafeBlocks Condition="$(CsWinRTEnabled)">true</AllowUnsafeBlocks>
<!-- Making sure ResolveAssemblyReferences runs before CoreCompile runs as we have seen it not run in WPF scenarios
causing for our targeting pack to not get included or conflicts to be resolved. -->
<CoreCompileDependsOn>CsWinRTIncludeProjection;CsWinRTRemoveWinMDReferences;$(CoreCompileDependsOn);ResolveAssemblyReferences</CoreCompileDependsOn>
<CoreCompileDependsOn>ResolveAssemblyReferences;CsWinRTIncludeProjection;CsWinRTRemoveWinMDReferences;$(CoreCompileDependsOn)</CoreCompileDependsOn>
<TrackFileAccess Condition="'$(CsWinRTComponent)' != 'true'">false</TrackFileAccess>
<CsWinRTAotOptimizerEnabled Condition="'$(CsWinRTAotOptimizerEnabled)' == '' and $([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) >= 6">true</CsWinRTAotOptimizerEnabled>
<CsWinRTAotOptimizerEnabled Condition="'$(CsWinRTAotOptimizerEnabled)' != 'true'">false</CsWinRTAotOptimizerEnabled>
Expand Down

0 comments on commit b55ca83

Please sign in to comment.