Update to latest GitVersioning and Directory.Build.props standards
Rob Mensching committed
Sep 17, 2017 at 15:31 UTC
4ab327b217b9c3dce1f3ba0c52745bfe729db5a2
3 files changed
+4
-4
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.Data/AssemblyInfo.cs
-2
@@ -4,8 +4,6 @@ using System;
4
using System.Reflection;
5
using System.Runtime.InteropServices;
6
7
-//[assembly: AssemblyTitle("WiX Toolset Data")]
8
-//[assembly: AssemblyDescription("")]
7
[assembly: AssemblyCulture("")]
8
[assembly:CLSCompliant(true)]
9
[assembly: ComVisible(false)]
src/WixToolset.Data/WixToolset.Data.csproj
+1
-1
@@ -192,7 +192,7 @@
192
</ItemGroup>
193
194
<ItemGroup>
195
- <PackageReference Include="Nerdbank.GitVersioning" Version="2.0.37-beta" PrivateAssets="all" />
195
+ <PackageReference Include="Nerdbank.GitVersioning" Version="2.0.41" PrivateAssets="all" />
196
<PackageReference Include="WixBuildTools.MsgGen" Version="4.0.*" PrivateAssets="all" />
197
<PackageReference Include="WixBuildTools.XsdGen" Version="4.0.*" PrivateAssets="all" />
198
</ItemGroup>