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

---
 src/Directory.Build.props                  | 4 +++-
 src/WixToolset.Data/AssemblyInfo.cs        | 2 --
 src/WixToolset.Data/WixToolset.Data.csproj | 2 +-
 3 files changed, 4 insertions(+), 4 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.Data/AssemblyInfo.cs b/src/WixToolset.Data/AssemblyInfo.cs
index 74fd6f90..6512230a 100644
--- a/src/WixToolset.Data/AssemblyInfo.cs
+++ b/src/WixToolset.Data/AssemblyInfo.cs
@@ -4,8 +4,6 @@ using System;
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-//[assembly: AssemblyTitle("WiX Toolset Data")]
-//[assembly: AssemblyDescription("")]
 [assembly: AssemblyCulture("")]
 [assembly:CLSCompliant(true)]
 [assembly: ComVisible(false)]
diff --git a/src/WixToolset.Data/WixToolset.Data.csproj b/src/WixToolset.Data/WixToolset.Data.csproj
index 99c24e6e..e421507a 100644
--- a/src/WixToolset.Data/WixToolset.Data.csproj
+++ b/src/WixToolset.Data/WixToolset.Data.csproj
@@ -192,7 +192,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="2.0.37-beta" PrivateAssets="all" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="2.0.41" PrivateAssets="all" />
     <PackageReference Include="WixBuildTools.MsgGen" Version="4.0.*" PrivateAssets="all" />
     <PackageReference Include="WixBuildTools.XsdGen" Version="4.0.*" PrivateAssets="all" />
   </ItemGroup>
-- 
cgit v1.2.3-55-g6feb