Update to latest Tools and Util.wixext.
Bob Arnson committed
Oct 28, 2019 at 20:39 UTC
d86b61727a51cde11c44a0c54d1d1bc132808d64
5 files changed
+18
-12
src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
+3
@@ -23,6 +23,9 @@
23
</ItemGroup>
24
25
<ItemGroup>
26
+ <PackageReference Include="WixToolset.Core" Version="4.0.*" PrivateAssets="all" />
27
+ <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" PrivateAssets="all" />
28
+ <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" PrivateAssets="all" />
29
<PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" PrivateAssets="all" />
30
</ItemGroup>
31
src/wixext/NetFxCompiler.cs
+5
-5
@@ -150,11 +150,11 @@ namespace WixToolset.Netfx
150
{
151
section.Tuples.Add(new NetFxNativeImageTuple(sourceLineNumbers, id)
152
{
153
- FileRef=fileId,
154
- Priority=priority,
155
- Attributes=attributes,
156
- ApplicationFileRef=assemblyApplication,
157
- ApplicationBaseDirectoryRef=appBaseDirectory,
153
+ FileRef = fileId,
154
+ Priority = priority,
155
+ Attributes = attributes,
156
+ ApplicationFileRef = assemblyApplication,
157
+ ApplicationBaseDirectoryRef = appBaseDirectory,
158
});
159
}
160
}
src/wixext/NetfxWindowsInstallerBackendExtension.cs
+4
-1
@@ -1,7 +1,8 @@
1
-// 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.
1
+// 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.
2
3
namespace WixToolset.Netfx
4
{
5
+ using WixToolset.Data;
6
using WixToolset.Data.WindowsInstaller;
7
using WixToolset.Extensibility;
8
@@ -23,5 +24,7 @@ namespace WixToolset.Netfx
24
};
25
26
protected override TableDefinition[] TableDefinitionsForTuples => Tables;
27
+
28
+ public override bool TryAddTupleToOutput(IntermediateTuple tuple, WindowsInstallerData output) => this.BackendHelper.TryAddTupleToOutputMatchingTableDefinitions(tuple, output, this.TableDefinitionsForTuples, true);
29
}
30
}
src/wixlib/netfx.wixproj
+4
-4
@@ -1,7 +1,7 @@
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
<Project DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
4
- <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0049\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0049\build\WixToolset.MSBuild.props')" />
4
+ <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0051\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0051\build\WixToolset.MSBuild.props')" />
5
<Import Project="..\FindLocalWix.props" />
6
<PropertyGroup>
7
<ProjectGuid>{45e4a6ac-3190-4e17-83f0-9935ffa5dc2b}</ProjectGuid>
@@ -45,9 +45,9 @@
45
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
46
</PropertyGroup>
47
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
48
- <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0049\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0049\build\WixToolset.MSBuild.props'))" />
49
- <Error Condition="!Exists('..\..\packages\WixToolset.Util.wixext.4.0.15\build\WixToolset.Util.wixext.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.Util.wixext.4.0.15\build\WixToolset.Util.wixext.targets'))" />
48
+ <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0051\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0051\build\WixToolset.MSBuild.props'))" />
49
+ <Error Condition="!Exists('..\..\packages\WixToolset.Util.wixext.4.0.16\build\WixToolset.Util.wixext.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.Util.wixext.4.0.16\build\WixToolset.Util.wixext.targets'))" />
50
</Target>
51
<Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
52
- <Import Project="..\..\packages\WixToolset.Util.wixext.4.0.15\build\WixToolset.Util.wixext.targets" Condition="Exists('..\..\packages\WixToolset.Util.wixext.4.0.15\build\WixToolset.Util.wixext.targets')" />
52
+ <Import Project="..\..\packages\WixToolset.Util.wixext.4.0.16\build\WixToolset.Util.wixext.targets" Condition="Exists('..\..\packages\WixToolset.Util.wixext.4.0.16\build\WixToolset.Util.wixext.targets')" />
53
</Project>
\ No newline at end of file
src/wixlib/packages.config
+2
-2
@@ -1,6 +1,6 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<packages>
3
<package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" />
4
- <package id="WixToolset.MSBuild" version="4.0.0-build-0049" developmentDependency="true" targetFramework="net40" />
5
- <package id="WixToolset.Util.wixext" version="4.0.15" targetFramework="net40" />
4
+ <package id="WixToolset.MSBuild" version="4.0.0-build-0051" developmentDependency="true" targetFramework="net40" />
5
+ <package id="WixToolset.Util.wixext" version="4.0.16" targetFramework="net40" />
6
</packages>
\ No newline at end of file