Skip to content

Commit 6de7886

Browse files
committed
move Version.props
1 parent 52835d2 commit 6de7886

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
Condition=" Exists('$([System.IO.Path]::GetDirectoryName($(MSBuildThisFileDirectory))).override.props') "
2222
/>
2323
<Import
24-
Project="$(MSBuildThisFileDirectory)Version.props"
25-
Condition=" Exists('$(MSBuildThisFileDirectory)Version.props') "
24+
Project="$(MSBuildThisFileDirectory)bin\Build$(Configuration)\Version.props"
25+
Condition=" Exists('$(MSBuildThisFileDirectory)bin\Build$(Configuration)\Version.props') "
2626
/>
2727
<Import
2828
Project="$(_OutputPath)JdkInfo.props"

build-tools/scripts/VersionInfo.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
<Target Name="GenerateVersionInfo"
1515
AfterTargets="Build"
1616
DependsOnTargets="GitVersion"
17-
Condition="!Exists ('$(MSBuildThisFileDirectory)..\..\Version.props')">
17+
Condition="!Exists ('$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\Version.props')">
1818
<ItemGroup>
1919
<Replacements Include="@VERSION@" Replacement="$(GitSemVerMajor).$(GitSemVerMinor).$(GitSemVerPatch)"/>
2020
<Replacements Include="@COMMIT@" Replacement="$(GitCommit)"/>
2121
<Replacements Include="@BRANCH@" Replacement="$(GitBranch)"/>
2222
</ItemGroup>
2323
<GenerateVersionFile
2424
InputFile="$(MSBuildThisFileDirectory)Version.props.in"
25-
OutputFile="$(MSBuildThisFileDirectory)..\..\Version.props"
25+
OutputFile="$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\Version.props"
2626
Replacements="@(Replacements)"
2727
/>
2828
</Target>

0 commit comments

Comments
 (0)