Clean up project files and update to latest GitVersioning
Rob Mensching committed
Dec 29, 2017 at 04:47 UTC
ab4ee36c182b67a80ca3404fdc344bf948192740
9 files changed
+9
-55
src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
+1
-1
@@ -33,7 +33,7 @@
33
</ItemGroup>
34
35
<ItemGroup>
36
- <PackageReference Include="Nerdbank.GitVersioning" Version="2.0.41" PrivateAssets="all" />
36
+ <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.7" PrivateAssets="all" />
37
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" PrivateAssets="all" Condition="'$(TargetFramework)'=='net461' " />
38
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.3.409" PrivateAssets="all" Condition="'$(TargetFramework)'=='netstandard2.0' " />
39
</ItemGroup>
src/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj
+1
-10
@@ -13,15 +13,6 @@
13
</PropertyGroup>
14
15
<ItemGroup>
16
- <ProjectReference Include="$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj') " />
17
- <PackageReference Include="WixToolset.Data" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj') " />
18
-
19
- <ProjectReference Include="$(WixToolsetRootFolder)\Extensibility\src\WixToolset.Extensibility\WixToolset.Extensibility.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Extensibility\src\WixToolset.Extensibility\WixToolset.Extensibility.csproj') " />
20
- <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Extensibility\src\WixToolset.Extensibility\WixToolset.Extensibility.csproj') " />
21
-
22
- <ProjectReference Include="$(WixToolsetRootFolder)\Core.Native\src\WixToolset.Core.Native\WixToolset.Core.Native.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Core.Native\src\WixToolset.Core.Native\WixToolset.Core.Native.csproj') " />
23
- <PackageReference Include="WixToolset.Core.Native" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Core.Native\src\WixToolset.Core.Native\WixToolset.Core.Native.csproj') " />
24
-
16
<ProjectReference Include="..\WixToolset.Core\WixToolset.Core.csproj" />
17
</ItemGroup>
18
@@ -31,6 +22,6 @@
22
</ItemGroup>
23
24
<ItemGroup>
34
- <PackageReference Include="Nerdbank.GitVersioning" Version="2.0.41" PrivateAssets="all" />
25
+ <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.7" PrivateAssets="all" />
26
</ItemGroup>
27
</Project>
src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.csproj
+1
-1
@@ -12,7 +12,7 @@
12
</PropertyGroup>
13
14
<ItemGroup>
15
- <PackageReference Include="Nerdbank.GitVersioning" Version="2.0.41" PrivateAssets="all" />
15
+ <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.7" PrivateAssets="all" />
16
</ItemGroup>
17
18
<PropertyGroup>
src/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj
+1
-1
@@ -29,6 +29,6 @@
29
</ItemGroup>
30
31
<ItemGroup>
32
- <PackageReference Include="Nerdbank.GitVersioning" Version="2.0.41" PrivateAssets="all" />
32
+ <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.7" PrivateAssets="all" />
33
</ItemGroup>
34
</Project>
src/WixToolset.Core.WindowsInstaller/WixToolset.Core.WindowsInstaller.csproj
+1
-11
@@ -18,24 +18,14 @@
18
</ItemGroup>
19
20
<ItemGroup>
21
- <ProjectReference Include="$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj') " />
22
- <PackageReference Include="WixToolset.Data" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj') " />
23
-
24
- <ProjectReference Include="$(WixToolsetRootFolder)\Extensibility\src\WixToolset.Extensibility\WixToolset.Extensibility.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Extensibility\src\WixToolset.Extensibility\WixToolset.Extensibility.csproj') " />
25
- <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Extensibility\src\WixToolset.Extensibility\WixToolset.Extensibility.csproj') " />
26
-
27
- <ProjectReference Include="$(WixToolsetRootFolder)\Core.Native\src\WixToolset.Core.Native\WixToolset.Core.Native.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Core.Native\src\WixToolset.Core.Native\WixToolset.Core.Native.csproj') " />
28
-
21
<ProjectReference Include="..\WixToolset.Core\WixToolset.Core.csproj" />
30
- <PackageReference Include="WixToolset.Core.Native" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Core.Native\src\WixToolset.Core.Native\WixToolset.Core.Native.csproj') " />
22
</ItemGroup>
23
24
<ItemGroup>
34
- <PackageReference Include="WixToolset.Dtf.Resources" Version="4.0.*" />
25
<PackageReference Include="WixToolset.Dtf.WindowsInstaller" Version="4.0.*" />
26
</ItemGroup>
27
28
<ItemGroup>
39
- <PackageReference Include="Nerdbank.GitVersioning" Version="2.0.41" PrivateAssets="all" />
29
+ <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.7" PrivateAssets="all" />
30
</ItemGroup>
31
</Project>
src/WixToolset.Core/WixToolset.Core.csproj
+1
-20
@@ -8,18 +8,6 @@
8
<Title>WiX Toolset Core</Title>
9
</PropertyGroup>
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
-
11
<ItemGroup>
12
<ProjectReference Include="$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj" Condition=" '$(Configuration)' == 'Debug' And 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') " />
@@ -31,19 +19,12 @@
19
<PackageReference Include="WixToolset.Core.Native" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Core.Native\src\WixToolset.Core.Native\WixToolset.Core.Native.csproj') " />
20
</ItemGroup>
21
34
- <ItemGroup>
35
- <PackageReference Include="WixToolset.Dtf.Resources" Version="4.0.*" />
36
- <PackageReference Include="WixToolset.Dtf.WindowsInstaller" Version="4.0.*" />
37
- </ItemGroup>
38
-
22
<ItemGroup>
23
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.4.0" />
24
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.4.0" />
25
</ItemGroup>
26
27
<ItemGroup>
45
- <PackageReference Include="Nerdbank.GitVersioning" Version="2.0.41" PrivateAssets="all" />
46
- <PackageReference Include="WixBuildTools.MsgGen" Version="4.0.*" PrivateAssets="all" />
47
- <PackageReference Include="WixBuildTools.XsdGen" Version="4.0.*" PrivateAssets="all" />
28
+ <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.7" PrivateAssets="all" />
29
</ItemGroup>
30
</Project>
src/light/light.csproj
+1
-1
@@ -16,6 +16,6 @@
16
</ItemGroup>
17
18
<ItemGroup>
19
- <PackageReference Include="Nerdbank.GitVersioning" Version="2.0.41" PrivateAssets="all" />
19
+ <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.7" PrivateAssets="all" />
20
</ItemGroup>
21
</Project>
src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
+1
-1
@@ -16,6 +16,6 @@
16
</ItemGroup>
17
18
<ItemGroup>
19
- <PackageReference Include="Nerdbank.GitVersioning" Version="2.0.41" PrivateAssets="all" />
19
+ <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.7" PrivateAssets="all" />
20
</ItemGroup>
21
</Project>
src/wix/wix.csproj
+1
-9
@@ -23,17 +23,9 @@
23
<ProjectReference Include="..\WixToolset.Core\WixToolset.Core.csproj" />
24
<ProjectReference Include="..\WixToolset.Core.Burn\WixToolset.Core.Burn.csproj" />
25
<ProjectReference Include="..\WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj" />
26
-
27
- <ProjectReference Include="$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj') " />
28
- <PackageReference Include="WixToolset.Data" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj') " />
29
-
30
- <ProjectReference Include="$(WixToolsetRootFolder)\Extensibility\src\WixToolset.Extensibility\WixToolset.Extensibility.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Extensibility\src\WixToolset.Extensibility\WixToolset.Extensibility.csproj') " />
31
- <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Extensibility\src\WixToolset.Extensibility\WixToolset.Extensibility.csproj') " />
26
</ItemGroup>
27
28
<ItemGroup>
35
- <PackageReference Include="Nerdbank.GitVersioning" Version="2.0.41" PrivateAssets="all" />
36
- <PackageReference Include="WixBuildTools.MsgGen" Version="4.0.*" PrivateAssets="all" />
37
- <PackageReference Include="WixBuildTools.XsdGen" Version="4.0.*" PrivateAssets="all" />
29
+ <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.7" PrivateAssets="all" />
30
</ItemGroup>
31
</Project>