Skip to content

Issue #2167 Generated files not soon enough #2168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asbjornu merged 2 commits into from
Mar 12, 2020
Merged

Issue #2167 Generated files not soon enough #2168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10748ec
Issue #2167 Generated files not soon enough
tpaxatb Mar 10, 2020
c2d1080
Merge branch 'master' into bugfix/targets
asbjornu Mar 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/GitVersionTask/build/GitVersionTask.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
6 changes: 6 additions & 0 deletions src/GitVersionTask/build/GitVersionTask.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>

Expand Down