Update dependencies.
Sean Hall committed
Apr 3, 2020 at 12:02 UTC
34c1ceb7d1639a3a769ba214dc024b1921af2057
6 files changed
+13
-11
src/test/WixToolsetTest.Util/UtilExtensionFixture.cs
+1
-1
@@ -105,7 +105,7 @@ namespace WixToolsetTest.Util
105
"CustomAction:Wix4ExecSecureObjectsRollback_X64\t11521\tWix4UtilCA_X64\tExecSecureObjectsRollback\t",
106
"CustomAction:Wix4SchedSecureObjects_X64\t1\tWix4UtilCA_X64\tSchedSecureObjects\t",
107
"CustomAction:Wix4SchedSecureObjectsRollback_X64\t1\tWix4UtilCA_X64\tSchedSecureObjectsRollback\t",
108
- "Wix4SecureObject:secJTI3ywlGOTsHWSdR4bEtGDc.veU\tCreateFolder\t\tEveryone\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo",
108
+ "Wix4SecureObject:INSTALLFOLDER\tCreateFolder\t\tEveryone\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo",
109
}, results.OrderBy(s => s).ToArray());
110
}
111
src/wixext/Tuples/SecureObjectsTuple.cs
+8
@@ -11,6 +11,7 @@ namespace WixToolset.Util
11
UtilTupleDefinitionType.SecureObjects.ToString(),
12
new[]
13
{
14
+ new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.SecureObject), IntermediateFieldType.String),
15
new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.Table), IntermediateFieldType.String),
16
new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.Domain), IntermediateFieldType.String),
17
new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.User), IntermediateFieldType.String),
@@ -27,6 +28,7 @@ namespace WixToolset.Util.Tuples
28
29
public enum SecureObjectsTupleFields
30
{
31
+ SecureObject,
32
Table,
33
Domain,
34
User,
@@ -46,6 +48,12 @@ namespace WixToolset.Util.Tuples
48
49
public IntermediateField this[SecureObjectsTupleFields index] => this.Fields[(int)index];
50
51
+ public string SecureObject
52
+ {
53
+ get => this.Fields[(int)SecureObjectsTupleFields.SecureObject].AsString();
54
+ set => this.Set((int)SecureObjectsTupleFields.SecureObject, value);
55
+ }
56
+
57
public string Table
58
{
59
get => this.Fields[(int)SecureObjectsTupleFields.Table].AsString();
src/wixext/UtilCompiler.cs
+1
@@ -2481,6 +2481,7 @@ namespace WixToolset.Util
2481
var id = this.ParseHelper.CreateIdentifier("sec", objectId, tableName, domain, user);
2482
var tuple = new SecureObjectsTuple(sourceLineNumbers, id)
2483
{
2484
+ SecureObject = objectId,
2485
Table = tableName,
2486
Domain = domain,
2487
User = user,
src/wixext/UtilWindowsInstallerBackendExtension.cs
-7
@@ -5,7 +5,6 @@ namespace WixToolset.Util
5
using System.Collections.Generic;
6
using System.Linq;
7
using System.Xml;
8
- using WixToolset.Data;
8
using WixToolset.Data.WindowsInstaller;
9
using WixToolset.Extensibility;
10
@@ -15,12 +14,6 @@ namespace WixToolset.Util
14
15
public override IEnumerable<TableDefinition> TableDefinitions { get => Tables; }
16
18
- public override bool TryAddTupleToOutput(IntermediateTuple tuple, WindowsInstallerData output)
19
- {
20
- var columnZeroIsId = tuple.Id != null;
21
- return this.BackendHelper.TryAddTupleToOutputMatchingTableDefinitions(tuple, output, this.TableDefinitions, columnZeroIsId);
22
- }
23
-
17
private static TableDefinition[] LoadTables()
18
{
19
using (var resourceStream = typeof(UtilWindowsInstallerBackendBinderExtension).Assembly.GetManifestResourceStream("WixToolset.Util.tables.xml"))
src/wixlib/packages.config
+1
-1
@@ -1,5 +1,5 @@
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-0080" developmentDependency="true" targetFramework="net40" />
4
+ <package id="WixToolset.MSBuild" version="4.0.0-build-0082" developmentDependency="true" targetFramework="net40" />
5
</packages>
\ No newline at end of file
src/wixlib/util.wixproj
+2
-2
@@ -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-0080\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0080\build\WixToolset.MSBuild.props')" />
4
+ <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0082\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0082\build\WixToolset.MSBuild.props')" />
5
<Import Project="..\FindLocalWix.props" />
6
<PropertyGroup>
7
<ProjectGuid>{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}</ProjectGuid>
@@ -50,7 +50,7 @@
50
<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>
51
</PropertyGroup>
52
<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'))" />
53
- <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0080\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0080\build\WixToolset.MSBuild.props'))" />
53
+ <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0082\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0082\build\WixToolset.MSBuild.props'))" />
54
</Target>
55
<Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
56
</Project>