aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2017-09-17 15:31:56 -0700
committerRob Mensching <rob@firegiant.com>2017-09-17 15:31:56 -0700
commit4ab327b217b9c3dce1f3ba0c52745bfe729db5a2 (patch)
treed77496a4cebb023519cc1a1ae7625d9dd3defe49 /src
parenta77ee1d51a3683542abd10aff768ad1c14554a98 (diff)
downloadwix-4ab327b217b9c3dce1f3ba0c52745bfe729db5a2.tar.gz
wix-4ab327b217b9c3dce1f3ba0c52745bfe729db5a2.tar.bz2
wix-4ab327b217b9c3dce1f3ba0c52745bfe729db5a2.zip
Update to latest GitVersioning and Directory.Build.props standards
Diffstat (limited to 'src')
-rw-r--r--src/Directory.Build.props4
-rw-r--r--src/WixToolset.Data/AssemblyInfo.cs2
-rw-r--r--src/WixToolset.Data/WixToolset.Data.csproj2
3 files changed, 4 insertions, 4 deletions
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 @@
7 <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)..\build\obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath> 7 <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)..\build\obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
8 <OutputPath>$(MSBuildThisFileDirectory)..\build\$(Configuration)\</OutputPath> 8 <OutputPath>$(MSBuildThisFileDirectory)..\build\$(Configuration)\</OutputPath>
9 9
10 <Authors>Rob Mensching, Bob Arnson</Authors> 10 <Authors>WiX Toolset Team</Authors>
11 <Company>WiX Toolset</Company> 11 <Company>WiX Toolset</Company>
12 <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright> 12 <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright>
13 </PropertyGroup> 13 </PropertyGroup>
@@ -15,4 +15,6 @@
15 <PropertyGroup> 15 <PropertyGroup>
16 <WixToolsetRootFolder>$(MSBuildThisFileDirectory)..\..\</WixToolsetRootFolder> 16 <WixToolsetRootFolder>$(MSBuildThisFileDirectory)..\..\</WixToolsetRootFolder>
17 </PropertyGroup> 17 </PropertyGroup>
18
19 <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " />
18</Project> 20</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;
4using System.Reflection; 4using System.Reflection;
5using System.Runtime.InteropServices; 5using System.Runtime.InteropServices;
6 6
7//[assembly: AssemblyTitle("WiX Toolset Data")]
8//[assembly: AssemblyDescription("")]
9[assembly: AssemblyCulture("")] 7[assembly: AssemblyCulture("")]
10[assembly:CLSCompliant(true)] 8[assembly:CLSCompliant(true)]
11[assembly: ComVisible(false)] 9[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 @@
192 </ItemGroup> 192 </ItemGroup>
193 193
194 <ItemGroup> 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" /> 196 <PackageReference Include="WixBuildTools.MsgGen" Version="4.0.*" PrivateAssets="all" />
197 <PackageReference Include="WixBuildTools.XsdGen" Version="4.0.*" PrivateAssets="all" /> 197 <PackageReference Include="WixBuildTools.XsdGen" Version="4.0.*" PrivateAssets="all" />
198 </ItemGroup> 198 </ItemGroup>