Merge pull request #2168 from tpaxatb/bugfix/targets

Issue #2167 Generated files not soon enough

Author: asbjornu

src/GitVersionTask/build/GitVersionTask.props

@@ -40,7 +40,7 @@
           Ensure GetVersion runs prior to XAML's Markup Compiler in order to have the assembly version available.
           Otherwise the generated resource URI's are ambiguous when multiple versions are loaded simultaneously (i.e. in plugins)
         -->
-        <MarkupCompilePass1DependsOn>$(MarkupCompilePass1DependsOn);GetVersion</MarkupCompilePass1DependsOn>
+        <MarkupCompilePass1DependsOn>$(MarkupCompilePass1DependsOn);GetVersion;UpdateAssemblyInfo;GenerateGitVersionInformation</MarkupCompilePass1DependsOn>
         <GetPackageVersionDependsOn>$(GetPackageVersionDependsOn);GetVersion</GetPackageVersionDependsOn>
 
         <!-- Property that enables setting of Version -->

src/GitVersionTask/build/GitVersionTask.targets

@@ -30,9 +30,13 @@
 
         <ItemGroup Condition="'$(Language)' == 'F#'">
             <CompileBefore Include="$(AssemblyInfoTempFilePath)" />
+            <FileWrites Include="$(AssemblyInfoTempFilePath)" />
+            <_GeneratedCodeFiles Include="$(AssemblyInfoTempFilePath)" />
         </ItemGroup>
         <ItemGroup Condition="'$(Language)' != 'F#'">
             <Compile Include="$(AssemblyInfoTempFilePath)" />
+            <FileWrites Include="$(AssemblyInfoTempFilePath)" />
+            <_GeneratedCodeFiles Include="$(AssemblyInfoTempFilePath)" />
         </ItemGroup>
 
     </Target>
@@ -53,10 +57,12 @@
         <ItemGroup Condition="'$(Language)' == 'F#'">
             <CompileBefore Include="$(GitVersionInformationFilePath)" />
             <FileWrites Include="$(GitVersionInformationFilePath)" />
+            <_GeneratedCodeFiles Include="$(GitVersionInformationFilePath)" />
         </ItemGroup>
         <ItemGroup Condition="'$(Language)' != 'F#'">
             <Compile Include="$(GitVersionInformationFilePath)" />
             <FileWrites Include="$(GitVersionInformationFilePath)" />
+            <_GeneratedCodeFiles Include="$(GitVersionInformationFilePath)" />
         </ItemGroup>
     </Target>