Update dependencies.
This commit is contained in:
Родитель
2be6f67983
Коммит
13e438a69d
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"WixToolset.Sdk": "4.0.0-build-0172"
|
"WixToolset.Sdk": "4.0.0-build-0175"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,9 @@
|
||||||
-->
|
-->
|
||||||
<Project>
|
<Project>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
|
||||||
<SignAssembly>true</SignAssembly>
|
<SignAssembly>true</SignAssembly>
|
||||||
<AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile>
|
<AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile>
|
||||||
|
<NBGV_EmitThisAssemblyClass>false</NBGV_EmitThisAssemblyClass>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
@ -9,6 +9,11 @@
|
||||||
See the original here: https://github.com/dotnet/sdk/issues/1151#issuecomment-385133284
|
See the original here: https://github.com/dotnet/sdk/issues/1151#issuecomment-385133284
|
||||||
-->
|
-->
|
||||||
<Project>
|
<Project>
|
||||||
|
<PropertyGroup>
|
||||||
|
<CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation>
|
||||||
|
<DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<ReplacePackageReferences>true</ReplacePackageReferences>
|
<ReplacePackageReferences>true</ReplacePackageReferences>
|
||||||
<TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath>
|
<TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath>
|
||||||
|
@ -45,4 +50,7 @@
|
||||||
|
|
||||||
</When>
|
</When>
|
||||||
</Choose>
|
</Choose>
|
||||||
|
|
||||||
|
<Import Project="Wix.Build.targets" Condition=" Exists('Wix.Build.targets') And '$(MSBuildProjectExtension)'=='.wixproj' " />
|
||||||
|
<Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
@ -1,10 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!-- 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. -->
|
|
||||||
|
|
||||||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<PropertyGroup>
|
|
||||||
<WixTargetsPath Condition=" '$(Configuration)' == 'Debug' And Exists('$(MSBuildThisFileDirectory)..\..\Tools\README.md') ">$(MSBuildThisFileDirectory)..\..\Tools\build\Debug\net461\wix.targets</WixTargetsPath>
|
|
||||||
|
|
||||||
<WixToolsetUtilWixextPath Condition=" '$(Configuration)' == 'Debug' And Exists('$(MSBuildThisFileDirectory)..\..\Util.wixext\README.md') ">$(MSBuildThisFileDirectory)..\..\Util.wixext\build\Debug\netstandard2.0\WixToolset.Util.wixext.dll</WixToolsetUtilWixextPath>
|
|
||||||
</PropertyGroup>
|
|
||||||
</Project>
|
|
|
@ -7,10 +7,6 @@
|
||||||
<IsPackable>false</IsPackable>
|
<IsPackable>false</IsPackable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
<NoWarn>NU1701</NoWarn>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Content Include="TestData\UsingDotNetCorePackages\BundleLatest.wxs" CopyToOutputDirectory="PreserveNewest" />
|
<Content Include="TestData\UsingDotNetCorePackages\BundleLatest.wxs" CopyToOutputDirectory="PreserveNewest" />
|
||||||
<Content Include="TestData\UsingDotNetCorePackages\BundleLatest_x64.wxs" CopyToOutputDirectory="PreserveNewest" />
|
<Content Include="TestData\UsingDotNetCorePackages\BundleLatest_x64.wxs" CopyToOutputDirectory="PreserveNewest" />
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
<Description>WiX Toolset .NET Framework Extension</Description>
|
<Description>WiX Toolset .NET Framework Extension</Description>
|
||||||
<Title>WiX Toolset .NET Framework Extension</Title>
|
<Title>WiX Toolset .NET Framework Extension</Title>
|
||||||
<IsTool>true</IsTool>
|
<IsTool>true</IsTool>
|
||||||
|
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
|
||||||
<ContentTargetFolders>build</ContentTargetFolders>
|
<ContentTargetFolders>build</ContentTargetFolders>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче