Update dependencies.
Sean Hall committed
Dec 19, 2020 at 21:08 UTC
13e438a69daa9830ec25689d75be1637bb0bb99f
6 files changed
+12
-15
global.json
+1
-1
@@ -1,5 +1,5 @@
1
{
2
"msbuild-sdks": {
3
- "WixToolset.Sdk": "4.0.0-build-0172"
3
+ "WixToolset.Sdk": "4.0.0-build-0175"
4
}
5
}
src/CSharp.Build.props
+2
@@ -5,7 +5,9 @@
5
-->
6
<Project>
7
<PropertyGroup>
8
+ <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
9
<SignAssembly>true</SignAssembly>
10
<AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile>
11
+ <NBGV_EmitThisAssemblyClass>false</NBGV_EmitThisAssemblyClass>
12
</PropertyGroup>
13
</Project>
src/Directory.Build.targets
+8
@@ -9,6 +9,11 @@
9
See the original here: https://github.com/dotnet/sdk/issues/1151#issuecomment-385133284
10
-->
11
<Project>
12
+ <PropertyGroup>
13
+ <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation>
14
+ <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
15
+ </PropertyGroup>
16
+
17
<PropertyGroup>
18
<ReplacePackageReferences>true</ReplacePackageReferences>
19
<TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath>
@@ -45,4 +50,7 @@
50
51
</When>
52
</Choose>
53
+
54
+ <Import Project="Wix.Build.targets" Condition=" Exists('Wix.Build.targets') And '$(MSBuildProjectExtension)'=='.wixproj' " />
55
+ <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " />
56
</Project>
src/FindLocalWix.props
deleted
-10
@@ -1,10 +0,0 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
-
4
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5
- <PropertyGroup>
6
- <WixTargetsPath Condition=" '$(Configuration)' == 'Debug' And Exists('$(MSBuildThisFileDirectory)..\..\Tools\README.md') ">$(MSBuildThisFileDirectory)..\..\Tools\build\Debug\net461\wix.targets</WixTargetsPath>
7
-
8
- <WixToolsetUtilWixextPath Condition=" '$(Configuration)' == 'Debug' And Exists('$(MSBuildThisFileDirectory)..\..\Util.wixext\README.md') ">$(MSBuildThisFileDirectory)..\..\Util.wixext\build\Debug\netstandard2.0\WixToolset.Util.wixext.dll</WixToolsetUtilWixextPath>
9
- </PropertyGroup>
10
-</Project>
src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
-4
@@ -7,10 +7,6 @@
7
<IsPackable>false</IsPackable>
8
</PropertyGroup>
9
10
- <PropertyGroup>
11
- <NoWarn>NU1701</NoWarn>
12
- </PropertyGroup>
13
-
10
<ItemGroup>
11
<Content Include="TestData\UsingDotNetCorePackages\BundleLatest.wxs" CopyToOutputDirectory="PreserveNewest" />
12
<Content Include="TestData\UsingDotNetCorePackages\BundleLatest_x64.wxs" CopyToOutputDirectory="PreserveNewest" />
src/wixext/WixToolset.Netfx.wixext.csproj
+1
@@ -8,6 +8,7 @@
8
<Description>WiX Toolset .NET Framework Extension</Description>
9
<Title>WiX Toolset .NET Framework Extension</Title>
10
<IsTool>true</IsTool>
11
+ <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
12
<ContentTargetFolders>build</ContentTargetFolders>
13
</PropertyGroup>
14