Skip to content

Commit b55ca83

Browse files
authored
Fix ordering of targets impacting WPF scenarios (#1738)
1 parent 7b7b412 commit b55ca83

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

build/AzurePipelineTemplates/CsWinRT-Variables.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ variables:
55
- name: MinorVersion
66
value: 1
77
- name: PatchVersion
8-
value: 2
8+
value: 3
99
- name: WinRT.Runtime.AssemblyVersion
1010
value: '2.1.0.0'
1111
- name: Net5.SDK.Feed

nuget/Microsoft.Windows.CsWinRT.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
1616
<AllowUnsafeBlocks Condition="$(CsWinRTEnabled)">true</AllowUnsafeBlocks>
1717
<!-- Making sure ResolveAssemblyReferences runs before CoreCompile runs as we have seen it not run in WPF scenarios
1818
causing for our targeting pack to not get included or conflicts to be resolved. -->
19-
<CoreCompileDependsOn>CsWinRTIncludeProjection;CsWinRTRemoveWinMDReferences;$(CoreCompileDependsOn);ResolveAssemblyReferences</CoreCompileDependsOn>
19+
<CoreCompileDependsOn>ResolveAssemblyReferences;CsWinRTIncludeProjection;CsWinRTRemoveWinMDReferences;$(CoreCompileDependsOn)</CoreCompileDependsOn>
2020
<TrackFileAccess Condition="'$(CsWinRTComponent)' != 'true'">false</TrackFileAccess>
2121
<CsWinRTAotOptimizerEnabled Condition="'$(CsWinRTAotOptimizerEnabled)' == '' and $([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) >= 6">true</CsWinRTAotOptimizerEnabled>
2222
<CsWinRTAotOptimizerEnabled Condition="'$(CsWinRTAotOptimizerEnabled)' != 'true'">false</CsWinRTAotOptimizerEnabled>

0 commit comments

Comments
 (0)