Skip to content

Commit 0ce94c8

Browse files
authored
Merge pull request #1472 from jbaehr/fix-1465-run-before-xaml
Ensure GetVersion runs prior to XAML's Markup Compiler
2 parents 8b1f6a3 + 1f0d27a commit 0ce94c8

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

src/GitVersionTask/NugetAssets/build/functionality/GitVersionCommon.props

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@
2626
<GetVersion Condition=" '$(GetVersion)' == '' and '$(NCrunch)' != '' ">false</GetVersion>
2727
<GetVersion Condition=" '$(GetVersion)' == '' ">true</GetVersion>
2828

29+
<!--
30+
Ensure GetVersion runs prior to XAML's Markup Compiler in order to have the assembly version available.
31+
Otherwise the generated resource URI's are ambiguous when multiple versions are loaded simultaneously (i.e. in plugins)
32+
-->
33+
<MarkupCompilePass1DependsOn>$(MarkupCompilePass1DependsOn);GetVersion</MarkupCompilePass1DependsOn>
34+
2935
<GetPackageVersionDependsOn>$(GetPackageVersionDependsOn);GetVersion</GetPackageVersionDependsOn>
3036

3137
<!-- Property that enables setting of Version -->

0 commit comments

Comments
 (0)