From c83079486f01c3b1511108e202ab7f2d65ddf434 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sun, 17 Sep 2017 15:19:33 -0700
Subject: Update to latest GitVersioning and Directory.Build.props standards

---
 src/Directory.Build.props                                    | 4 +++-
 src/WixToolset.Extensibility/WixToolset.Extensibility.csproj | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 0ea54cfe..25cb6d36 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -7,7 +7,7 @@
     <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)..\build\obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
     <OutputPath>$(MSBuildThisFileDirectory)..\build\$(Configuration)\</OutputPath>
 
-    <Authors>Rob Mensching, Bob Arnson</Authors>
+    <Authors>WiX Toolset Team</Authors>
     <Company>WiX Toolset</Company>
     <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright>
   </PropertyGroup>
@@ -15,4 +15,6 @@
   <PropertyGroup>
     <WixToolsetRootFolder>$(MSBuildThisFileDirectory)..\..\</WixToolsetRootFolder>
   </PropertyGroup>
+
+  <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " />
 </Project>
diff --git a/src/WixToolset.Extensibility/WixToolset.Extensibility.csproj b/src/WixToolset.Extensibility/WixToolset.Extensibility.csproj
index 8efae769..a2cb5e26 100644
--- a/src/WixToolset.Extensibility/WixToolset.Extensibility.csproj
+++ b/src/WixToolset.Extensibility/WixToolset.Extensibility.csproj
@@ -9,9 +9,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- <ProjectOrPackageReference Include="$(WixToolsetRootFolder)Data\src\WixToolset.Data\WixToolset.Data.csproj" Version="4.0.*" /> -->
-    <!--<ProjectOrPackageReference Include="WixToolset.Data" Repo="Data" Version="1.0.*" />-->
     <ProjectReference Include="$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj') " />
     <PackageReference Include="WixToolset.Data" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj') " />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Nerdbank.GitVersioning" Version="2.0.41" PrivateAssets="all" />
+  </ItemGroup>
 </Project>
-- 
cgit v1.2.3-55-g6feb