Update to latest GitVersioning and Directory.Build.props standards
Rob Mensching committed
Sep 17, 2017 at 15:19 UTC
c83079486f01c3b1511108e202ab7f2d65ddf434
2 files changed
+7
-3
src/Directory.Build.props
+3
-1
@@ -7,7 +7,7 @@
7
<BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)..\build\obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
8
<OutputPath>$(MSBuildThisFileDirectory)..\build\$(Configuration)\</OutputPath>
9
10
- <Authors>Rob Mensching, Bob Arnson</Authors>
10
+ <Authors>WiX Toolset Team</Authors>
11
<Company>WiX Toolset</Company>
12
<Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright>
13
</PropertyGroup>
@@ -15,4 +15,6 @@
15
<PropertyGroup>
16
<WixToolsetRootFolder>$(MSBuildThisFileDirectory)..\..\</WixToolsetRootFolder>
17
</PropertyGroup>
18
+
19
+ <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " />
20
</Project>
src/WixToolset.Extensibility/WixToolset.Extensibility.csproj
+4
-2
@@ -9,9 +9,11 @@
9
</PropertyGroup>
10
11
<ItemGroup>
12
- <!-- <ProjectOrPackageReference Include="$(WixToolsetRootFolder)Data\src\WixToolset.Data\WixToolset.Data.csproj" Version="4.0.*" /> -->
13
- <!--<ProjectOrPackageReference Include="WixToolset.Data" Repo="Data" Version="1.0.*" />-->
12
<ProjectReference Include="$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj') " />
13
<PackageReference Include="WixToolset.Data" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj') " />
14
</ItemGroup>
15
+
16
+ <ItemGroup>
17
+ <PackageReference Include="Nerdbank.GitVersioning" Version="2.0.41" PrivateAssets="all" />
18
+ </ItemGroup>
19
</Project>