aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2017-12-29 04:47:15 -0800
committerRob Mensching <rob@firegiant.com>2017-12-29 04:47:33 -0800
commitab4ee36c182b67a80ca3404fdc344bf948192740 (patch)
tree949595529f20c637ff2c2606891eb3deec674964 /src/WixToolset.Core
parent8d04e35f943507d7c6338f0cc7779aeeab862d23 (diff)
downloadwix-ab4ee36c182b67a80ca3404fdc344bf948192740.tar.gz
wix-ab4ee36c182b67a80ca3404fdc344bf948192740.tar.bz2
wix-ab4ee36c182b67a80ca3404fdc344bf948192740.zip
Clean up project files and update to latest GitVersioning
Diffstat (limited to 'src/WixToolset.Core')
-rw-r--r--src/WixToolset.Core/WixToolset.Core.csproj21
1 files changed, 1 insertions, 20 deletions
diff --git a/src/WixToolset.Core/WixToolset.Core.csproj b/src/WixToolset.Core/WixToolset.Core.csproj
index 948f35ae..bfa84aa8 100644
--- a/src/WixToolset.Core/WixToolset.Core.csproj
+++ b/src/WixToolset.Core/WixToolset.Core.csproj
@@ -8,18 +8,6 @@
8 <Title>WiX Toolset Core</Title> 8 <Title>WiX Toolset Core</Title>
9 </PropertyGroup> 9 </PropertyGroup>
10 10
11 <PropertyGroup>
12 <NoWarn>NU1701</NoWarn>
13 </PropertyGroup>
14
15 <!--
16 <ItemGroup>
17 <MsgGenSource Include="Data\messages.xml">
18 <ResourcesLogicalName>WixToolset.Core.Data.messages.resources</ResourcesLogicalName>
19 </MsgGenSource>
20 </ItemGroup>
21 -->
22
23 <ItemGroup> 11 <ItemGroup>
24 <ProjectReference Include="$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj') " /> 12 <ProjectReference Include="$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj') " />
25 <PackageReference Include="WixToolset.Data" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !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') " />
@@ -32,18 +20,11 @@
32 </ItemGroup> 20 </ItemGroup>
33 21
34 <ItemGroup> 22 <ItemGroup>
35 <PackageReference Include="WixToolset.Dtf.Resources" Version="4.0.*" />
36 <PackageReference Include="WixToolset.Dtf.WindowsInstaller" Version="4.0.*" />
37 </ItemGroup>
38
39 <ItemGroup>
40 <PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.4.0" /> 23 <PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.4.0" />
41 <PackageReference Include="System.Text.Encoding.CodePages" Version="4.4.0" /> 24 <PackageReference Include="System.Text.Encoding.CodePages" Version="4.4.0" />
42 </ItemGroup> 25 </ItemGroup>
43 26
44 <ItemGroup> 27 <ItemGroup>
45 <PackageReference Include="Nerdbank.GitVersioning" Version="2.0.41" PrivateAssets="all" /> 28 <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.7" PrivateAssets="all" />
46 <PackageReference Include="WixBuildTools.MsgGen" Version="4.0.*" PrivateAssets="all" />
47 <PackageReference Include="WixBuildTools.XsdGen" Version="4.0.*" PrivateAssets="all" />
48 </ItemGroup> 29 </ItemGroup>
49</Project> 30</Project>