diff options
author | Rob Mensching <rob@firegiant.com> | 2021-04-22 20:00:30 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2021-04-29 16:47:06 -0700 |
commit | aa0bd9f66dabc6460f93cf9a029e06b079f10db8 (patch) | |
tree | fd7a3f883a4cc0473e883105eadee3cca668cd68 /src | |
parent | a2f0de28fc0f1ab71d4685c77f0b21d946f3e702 (diff) | |
download | wix-aa0bd9f66dabc6460f93cf9a029e06b079f10db8.tar.gz wix-aa0bd9f66dabc6460f93cf9a029e06b079f10db8.tar.bz2 wix-aa0bd9f66dabc6460f93cf9a029e06b079f10db8.zip |
Move Core.Native into wix
Diffstat (limited to 'src')
-rw-r--r-- | src/.editorconfig | 37 | ||||
-rw-r--r-- | src/signing.json | 13 | ||||
-rw-r--r-- | src/version.txt | 1 | ||||
-rw-r--r-- | src/wix/README-CoreNative.md | 2 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native.sln | 63 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native.v3.ncrunchsolution | 6 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/AssemblyExtensions.cs (renamed from src/WixToolset.Core.Native/AssemblyExtensions.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/Cabinet.cs (renamed from src/WixToolset.Core.Native/Cabinet.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/CabinetCompressFile.cs (renamed from src/WixToolset.Core.Native/CabinetCompressFile.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/CabinetFileInfo.cs (renamed from src/WixToolset.Core.Native/CabinetFileInfo.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/DateTimeInterop.cs (renamed from src/WixToolset.Core.Native/DateTimeInterop.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/FileSystem.cs (renamed from src/WixToolset.Core.Native/FileSystem.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/IWindowsInstallerValidatorCallback.cs (renamed from src/WixToolset.Core.Native/IWindowsInstallerValidatorCallback.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/Msi/Database.cs (renamed from src/WixToolset.Core.Native/Msi/Database.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/Msi/InstallLogModes.cs (renamed from src/WixToolset.Core.Native/Msi/InstallLogModes.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/Msi/InstallMessage.cs (renamed from src/WixToolset.Core.Native/Msi/InstallMessage.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/Msi/InstallUILevels.cs (renamed from src/WixToolset.Core.Native/Msi/InstallUILevels.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/Msi/Installer.cs (renamed from src/WixToolset.Core.Native/Msi/Installer.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/Msi/MSIFILEHASHINFO.cs (renamed from src/WixToolset.Core.Native/Msi/MSIFILEHASHINFO.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/Msi/ModifyView.cs (renamed from src/WixToolset.Core.Native/Msi/ModifyView.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/Msi/MsiException.cs (renamed from src/WixToolset.Core.Native/Msi/MsiException.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/Msi/MsiHandle.cs (renamed from src/WixToolset.Core.Native/Msi/MsiHandle.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/Msi/MsiInterop.cs (renamed from src/WixToolset.Core.Native/Msi/MsiInterop.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/Msi/OpenDatabase.cs (renamed from src/WixToolset.Core.Native/Msi/OpenDatabase.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/Msi/Record.cs (renamed from src/WixToolset.Core.Native/Msi/Record.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/Msi/Session.cs (renamed from src/WixToolset.Core.Native/Msi/Session.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/Msi/SummaryInformation.cs (renamed from src/WixToolset.Core.Native/Msi/SummaryInformation.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/Msi/TransformErrorConditions.cs (renamed from src/WixToolset.Core.Native/Msi/TransformErrorConditions.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/Msi/TransformValidations.cs (renamed from src/WixToolset.Core.Native/Msi/TransformValidations.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/Msi/View.cs (renamed from src/WixToolset.Core.Native/Msi/View.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/Msi/WixInvalidIdtException.cs (renamed from src/WixToolset.Core.Native/Msi/WixInvalidIdtException.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/Msm/ConfigurationCallback.cs (renamed from src/WixToolset.Core.Native/Msm/ConfigurationCallback.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/Msm/IMsmConfigureModule.cs (renamed from src/WixToolset.Core.Native/Msm/IMsmConfigureModule.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/Msm/IMsmError.cs (renamed from src/WixToolset.Core.Native/Msm/IMsmError.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/Msm/IMsmErrors.cs (renamed from src/WixToolset.Core.Native/Msm/IMsmErrors.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/Msm/IMsmMerge2.cs (renamed from src/WixToolset.Core.Native/Msm/IMsmMerge2.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/Msm/IMsmStrings.cs (renamed from src/WixToolset.Core.Native/Msm/IMsmStrings.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/Msm/MsmErrorType.cs (renamed from src/WixToolset.Core.Native/Msm/MsmErrorType.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/Msm/MsmInterop.cs (renamed from src/WixToolset.Core.Native/Msm/MsmInterop.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/Ole32/Storage.cs (renamed from src/WixToolset.Core.Native/Ole32/Storage.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/Ole32/StorageMode.cs (renamed from src/WixToolset.Core.Native/Ole32/StorageMode.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/PatchAPI/PatchInterop.cs (renamed from src/WixToolset.Core.Native/PatchAPI/PatchInterop.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/ValidationMessage.cs (renamed from src/WixToolset.Core.Native/ValidationMessage.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/ValidationMessageType.cs (renamed from src/WixToolset.Core.Native/ValidationMessageType.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/WindowsInstallerValidator.cs (renamed from src/WixToolset.Core.Native/WindowsInstallerValidator.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/WixNativeExe.cs (renamed from src/WixToolset.Core.Native/WixNativeExe.cs) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/WixToolset.Core.Native.csproj (renamed from src/WixToolset.Core.Native/WixToolset.Core.Native.csproj) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/WixToolset.Core.Native.nuspec (renamed from src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec) | 0 | ||||
-rw-r--r-- | src/wix/WixToolset.Core.Native/cubes/darice.cub (renamed from src/WixToolset.Core.Native/cubes/darice.cub) | bin | 684032 -> 684032 bytes | |||
-rw-r--r-- | src/wix/WixToolset.Core.Native/cubes/mergemod.cub (renamed from src/WixToolset.Core.Native/cubes/mergemod.cub) | bin | 483328 -> 483328 bytes | |||
-rw-r--r-- | src/wix/WixToolset.Core.Native/targets/WixToolset.Core.Native.targets (renamed from src/WixToolset.Core.Native/targets/WixToolset.Core.Native.targets) | 0 | ||||
-rw-r--r-- | src/wix/appveyor-CoreNative.cmd | 19 | ||||
-rw-r--r-- | src/wix/appveyor-CoreNative.yml | 44 | ||||
-rw-r--r-- | src/wix/nuget-CoreNative.config | 9 | ||||
-rw-r--r-- | src/wix/test/WixToolsetTest.Core.Native/CabinetFixture.cs (renamed from src/test/WixToolsetTest.Core.Native/CabinetFixture.cs) | 0 | ||||
-rw-r--r-- | src/wix/test/WixToolsetTest.Core.Native/MsmFixture.cs (renamed from src/test/WixToolsetTest.Core.Native/MsmFixture.cs) | 0 | ||||
-rw-r--r-- | src/wix/test/WixToolsetTest.Core.Native/TestData/test.cab (renamed from src/test/WixToolsetTest.Core.Native/TestData/test.cab) | bin | 115 -> 115 bytes | |||
-rw-r--r-- | src/wix/test/WixToolsetTest.Core.Native/TestData/test.txt (renamed from src/test/WixToolsetTest.Core.Native/TestData/test.txt) | 0 | ||||
-rw-r--r-- | src/wix/test/WixToolsetTest.Core.Native/Utility/DisposableFileSystem.cs (renamed from src/test/WixToolsetTest.Core.Native/Utility/DisposableFileSystem.cs) | 0 | ||||
-rw-r--r-- | src/wix/test/WixToolsetTest.Core.Native/Utility/Pushd.cs (renamed from src/test/WixToolsetTest.Core.Native/Utility/Pushd.cs) | 0 | ||||
-rw-r--r-- | src/wix/test/WixToolsetTest.Core.Native/Utility/TestData.cs (renamed from src/test/WixToolsetTest.Core.Native/Utility/TestData.cs) | 0 | ||||
-rw-r--r-- | src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj (renamed from src/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj) | 0 | ||||
-rw-r--r-- | src/wix/test/version.txt (renamed from src/test/version.txt) | 0 | ||||
-rw-r--r-- | src/wix/wixnative/ARM/mergemod.dll (renamed from src/wixnative/ARM/mergemod.dll) | bin | 172704 -> 172704 bytes | |||
-rw-r--r-- | src/wix/wixnative/ARM64/mergemod.dll (renamed from src/wixnative/ARM64/mergemod.dll) | bin | 194512 -> 194512 bytes | |||
-rw-r--r-- | src/wix/wixnative/Win32/mergemod.dll (renamed from src/wixnative/Win32/mergemod.dll) | bin | 159176 -> 159176 bytes | |||
-rw-r--r-- | src/wix/wixnative/enumcab.cpp (renamed from src/wixnative/enumcab.cpp) | 0 | ||||
-rw-r--r-- | src/wix/wixnative/extractcab.cpp (renamed from src/wixnative/extractcab.cpp) | 0 | ||||
-rw-r--r-- | src/wix/wixnative/packages.config (renamed from src/wixnative/packages.config) | 0 | ||||
-rw-r--r-- | src/wix/wixnative/precomp.cpp (renamed from src/wixnative/precomp.cpp) | 0 | ||||
-rw-r--r-- | src/wix/wixnative/precomp.h (renamed from src/wixnative/precomp.h) | 0 | ||||
-rw-r--r-- | src/wix/wixnative/resetacls.cpp (renamed from src/wixnative/resetacls.cpp) | 0 | ||||
-rw-r--r-- | src/wix/wixnative/smartcab.cpp (renamed from src/wixnative/smartcab.cpp) | 0 | ||||
-rw-r--r-- | src/wix/wixnative/wixnative.cpp (renamed from src/wixnative/wixnative.cpp) | 0 | ||||
-rw-r--r-- | src/wix/wixnative/wixnative.v3.ncrunchproject (renamed from src/wixnative/wixnative.v3.ncrunchproject) | 0 | ||||
-rw-r--r-- | src/wix/wixnative/wixnative.vcxproj (renamed from src/wixnative/wixnative.vcxproj) | 0 | ||||
-rw-r--r-- | src/wix/wixnative/x64/mergemod.dll (renamed from src/wixnative/x64/mergemod.dll) | bin | 180376 -> 180376 bytes |
77 files changed, 194 insertions, 0 deletions
diff --git a/src/.editorconfig b/src/.editorconfig new file mode 100644 index 00000000..1d72e683 --- /dev/null +++ b/src/.editorconfig | |||
@@ -0,0 +1,37 @@ | |||
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 | # Do NOT modify this file. Update the canonical version in Home\repo-template\src\.editorconfig | ||
4 | # then update all of the repos. | ||
5 | |||
6 | root = true | ||
7 | |||
8 | [*] | ||
9 | charset = utf-8 | ||
10 | indent_style = space | ||
11 | indent_size = 4 | ||
12 | trim_trailing_whitespace = true | ||
13 | |||
14 | [*.{cs,vb}] | ||
15 | dotnet_sort_system_directives_first = true | ||
16 | |||
17 | [*.cs] | ||
18 | csharp_indent_case_contents = true : error | ||
19 | csharp_indent_switch_labels = true : error | ||
20 | csharp_new_line_before_open_brace = all | ||
21 | csharp_prefer_braces = true : error | ||
22 | csharp_style_expression_bodied_methods = when_on_single_line : suggestion | ||
23 | csharp_style_expression_bodied_constructors = when_on_single_line : suggestion | ||
24 | csharp_style_expression_bodied_operators = when_on_single_line : suggestion | ||
25 | csharp_style_expression_bodied_properties = when_on_single_line : suggestion | ||
26 | csharp_style_expression_bodied_indexers = when_on_single_line : suggestion | ||
27 | csharp_style_expression_bodied_accessors = when_on_single_line : suggestion | ||
28 | csharp_style_var_elsewhere = true : suggestion | ||
29 | csharp_style_var_for_built_in_types = true : suggestion | ||
30 | csharp_style_var_when_type_is_apparent = true : suggestion | ||
31 | dotnet_style_qualification_for_event = true : error | ||
32 | dotnet_style_qualification_for_field = true : error | ||
33 | dotnet_style_qualification_for_method = true : error | ||
34 | dotnet_style_qualification_for_property = true : error | ||
35 | |||
36 | [*.targets] | ||
37 | indent_size = 2 | ||
diff --git a/src/signing.json b/src/signing.json new file mode 100644 index 00000000..fe1c8c9b --- /dev/null +++ b/src/signing.json | |||
@@ -0,0 +1,13 @@ | |||
1 | { | ||
2 | "SignClient": { | ||
3 | "AzureAd": { | ||
4 | "AADInstance": "https://login.microsoftonline.com/", | ||
5 | "ClientId": "c248d68a-ba6f-4aa9-8a68-71fe872063f8", | ||
6 | "TenantId": "16076fdc-fcc1-4a15-b1ca-32c9a255900e" | ||
7 | }, | ||
8 | "Service": { | ||
9 | "Url": "https://codesign.dotnetfoundation.org/", | ||
10 | "ResourceId": "https://SignService/3c30251f-36f3-490b-a955-520addb85001" | ||
11 | } | ||
12 | } | ||
13 | } | ||
diff --git a/src/version.txt b/src/version.txt new file mode 100644 index 00000000..dc60d914 --- /dev/null +++ b/src/version.txt | |||
@@ -0,0 +1 @@ | |||
v4.{apiversion}-preview.0-build.{height} | |||
diff --git a/src/wix/README-CoreNative.md b/src/wix/README-CoreNative.md new file mode 100644 index 00000000..787123cc --- /dev/null +++ b/src/wix/README-CoreNative.md | |||
@@ -0,0 +1,2 @@ | |||
1 | # Core.Native | ||
2 | Core.Native - native component of WixToolset.Core | ||
diff --git a/src/wix/WixToolset.Core.Native.sln b/src/wix/WixToolset.Core.Native.sln new file mode 100644 index 00000000..0d7a5921 --- /dev/null +++ b/src/wix/WixToolset.Core.Native.sln | |||
@@ -0,0 +1,63 @@ | |||
1 | | ||
2 | Microsoft Visual Studio Solution File, Format Version 12.00 | ||
3 | # Visual Studio 15 | ||
4 | VisualStudioVersion = 15.0.27004.2009 | ||
5 | MinimumVisualStudioVersion = 15.0.26124.0 | ||
6 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Core.Native", "src\WixToolset.Core.Native\WixToolset.Core.Native.csproj", "{C1F36B7C-6A5B-44CB-BD05-3C9CDEC2DD63}" | ||
7 | EndProject | ||
8 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wixnative", "src\wixnative\wixnative.vcxproj", "{8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}" | ||
9 | EndProject | ||
10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Core.Native", "src\test\WixToolsetTest.Core.Native\WixToolsetTest.Core.Native.csproj", "{54F5329A-C113-471A-8EE1-83021E8A4853}" | ||
11 | EndProject | ||
12 | Global | ||
13 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
14 | Debug|Any CPU = Debug|Any CPU | ||
15 | Debug|x64 = Debug|x64 | ||
16 | Debug|x86 = Debug|x86 | ||
17 | Release|Any CPU = Release|Any CPU | ||
18 | Release|x64 = Release|x64 | ||
19 | Release|x86 = Release|x86 | ||
20 | EndGlobalSection | ||
21 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
22 | {C1F36B7C-6A5B-44CB-BD05-3C9CDEC2DD63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
23 | {C1F36B7C-6A5B-44CB-BD05-3C9CDEC2DD63}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
24 | {C1F36B7C-6A5B-44CB-BD05-3C9CDEC2DD63}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
25 | {C1F36B7C-6A5B-44CB-BD05-3C9CDEC2DD63}.Debug|x64.Build.0 = Debug|Any CPU | ||
26 | {C1F36B7C-6A5B-44CB-BD05-3C9CDEC2DD63}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
27 | {C1F36B7C-6A5B-44CB-BD05-3C9CDEC2DD63}.Debug|x86.Build.0 = Debug|Any CPU | ||
28 | {C1F36B7C-6A5B-44CB-BD05-3C9CDEC2DD63}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
29 | {C1F36B7C-6A5B-44CB-BD05-3C9CDEC2DD63}.Release|Any CPU.Build.0 = Release|Any CPU | ||
30 | {C1F36B7C-6A5B-44CB-BD05-3C9CDEC2DD63}.Release|x64.ActiveCfg = Release|Any CPU | ||
31 | {C1F36B7C-6A5B-44CB-BD05-3C9CDEC2DD63}.Release|x64.Build.0 = Release|Any CPU | ||
32 | {C1F36B7C-6A5B-44CB-BD05-3C9CDEC2DD63}.Release|x86.ActiveCfg = Release|Any CPU | ||
33 | {C1F36B7C-6A5B-44CB-BD05-3C9CDEC2DD63}.Release|x86.Build.0 = Release|Any CPU | ||
34 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Debug|Any CPU.ActiveCfg = Debug|Win32 | ||
35 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Debug|x64.ActiveCfg = Debug|x64 | ||
36 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Debug|x64.Build.0 = Debug|x64 | ||
37 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Debug|x86.ActiveCfg = Debug|Win32 | ||
38 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Debug|x86.Build.0 = Debug|Win32 | ||
39 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Release|Any CPU.ActiveCfg = Release|Win32 | ||
40 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Release|x64.ActiveCfg = Release|x64 | ||
41 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Release|x64.Build.0 = Release|x64 | ||
42 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Release|x86.ActiveCfg = Release|Win32 | ||
43 | {8497EC72-B8D0-4272-A9D0-7E9D871CEFBF}.Release|x86.Build.0 = Release|Win32 | ||
44 | {54F5329A-C113-471A-8EE1-83021E8A4853}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
45 | {54F5329A-C113-471A-8EE1-83021E8A4853}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
46 | {54F5329A-C113-471A-8EE1-83021E8A4853}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
47 | {54F5329A-C113-471A-8EE1-83021E8A4853}.Debug|x64.Build.0 = Debug|Any CPU | ||
48 | {54F5329A-C113-471A-8EE1-83021E8A4853}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
49 | {54F5329A-C113-471A-8EE1-83021E8A4853}.Debug|x86.Build.0 = Debug|Any CPU | ||
50 | {54F5329A-C113-471A-8EE1-83021E8A4853}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
51 | {54F5329A-C113-471A-8EE1-83021E8A4853}.Release|Any CPU.Build.0 = Release|Any CPU | ||
52 | {54F5329A-C113-471A-8EE1-83021E8A4853}.Release|x64.ActiveCfg = Release|Any CPU | ||
53 | {54F5329A-C113-471A-8EE1-83021E8A4853}.Release|x64.Build.0 = Release|Any CPU | ||
54 | {54F5329A-C113-471A-8EE1-83021E8A4853}.Release|x86.ActiveCfg = Release|Any CPU | ||
55 | {54F5329A-C113-471A-8EE1-83021E8A4853}.Release|x86.Build.0 = Release|Any CPU | ||
56 | EndGlobalSection | ||
57 | GlobalSection(SolutionProperties) = preSolution | ||
58 | HideSolutionNode = FALSE | ||
59 | EndGlobalSection | ||
60 | GlobalSection(ExtensibilityGlobals) = postSolution | ||
61 | SolutionGuid = {1E952530-A3ED-4E65-AF39-9025EFB85322} | ||
62 | EndGlobalSection | ||
63 | EndGlobal | ||
diff --git a/src/wix/WixToolset.Core.Native.v3.ncrunchsolution b/src/wix/WixToolset.Core.Native.v3.ncrunchsolution new file mode 100644 index 00000000..10420ac9 --- /dev/null +++ b/src/wix/WixToolset.Core.Native.v3.ncrunchsolution | |||
@@ -0,0 +1,6 @@ | |||
1 | <SolutionConfiguration> | ||
2 | <Settings> | ||
3 | <AllowParallelTestExecution>True</AllowParallelTestExecution> | ||
4 | <SolutionConfigured>True</SolutionConfigured> | ||
5 | </Settings> | ||
6 | </SolutionConfiguration> \ No newline at end of file | ||
diff --git a/src/WixToolset.Core.Native/AssemblyExtensions.cs b/src/wix/WixToolset.Core.Native/AssemblyExtensions.cs index 590a6887..590a6887 100644 --- a/src/WixToolset.Core.Native/AssemblyExtensions.cs +++ b/src/wix/WixToolset.Core.Native/AssemblyExtensions.cs | |||
diff --git a/src/WixToolset.Core.Native/Cabinet.cs b/src/wix/WixToolset.Core.Native/Cabinet.cs index 9b77bd37..9b77bd37 100644 --- a/src/WixToolset.Core.Native/Cabinet.cs +++ b/src/wix/WixToolset.Core.Native/Cabinet.cs | |||
diff --git a/src/WixToolset.Core.Native/CabinetCompressFile.cs b/src/wix/WixToolset.Core.Native/CabinetCompressFile.cs index 6778f4a1..6778f4a1 100644 --- a/src/WixToolset.Core.Native/CabinetCompressFile.cs +++ b/src/wix/WixToolset.Core.Native/CabinetCompressFile.cs | |||
diff --git a/src/WixToolset.Core.Native/CabinetFileInfo.cs b/src/wix/WixToolset.Core.Native/CabinetFileInfo.cs index 07387191..07387191 100644 --- a/src/WixToolset.Core.Native/CabinetFileInfo.cs +++ b/src/wix/WixToolset.Core.Native/CabinetFileInfo.cs | |||
diff --git a/src/WixToolset.Core.Native/DateTimeInterop.cs b/src/wix/WixToolset.Core.Native/DateTimeInterop.cs index d2a0ba2b..d2a0ba2b 100644 --- a/src/WixToolset.Core.Native/DateTimeInterop.cs +++ b/src/wix/WixToolset.Core.Native/DateTimeInterop.cs | |||
diff --git a/src/WixToolset.Core.Native/FileSystem.cs b/src/wix/WixToolset.Core.Native/FileSystem.cs index d843a9e8..d843a9e8 100644 --- a/src/WixToolset.Core.Native/FileSystem.cs +++ b/src/wix/WixToolset.Core.Native/FileSystem.cs | |||
diff --git a/src/WixToolset.Core.Native/IWindowsInstallerValidatorCallback.cs b/src/wix/WixToolset.Core.Native/IWindowsInstallerValidatorCallback.cs index f4aff134..f4aff134 100644 --- a/src/WixToolset.Core.Native/IWindowsInstallerValidatorCallback.cs +++ b/src/wix/WixToolset.Core.Native/IWindowsInstallerValidatorCallback.cs | |||
diff --git a/src/WixToolset.Core.Native/Msi/Database.cs b/src/wix/WixToolset.Core.Native/Msi/Database.cs index b9c5c35b..b9c5c35b 100644 --- a/src/WixToolset.Core.Native/Msi/Database.cs +++ b/src/wix/WixToolset.Core.Native/Msi/Database.cs | |||
diff --git a/src/WixToolset.Core.Native/Msi/InstallLogModes.cs b/src/wix/WixToolset.Core.Native/Msi/InstallLogModes.cs index f7012b35..f7012b35 100644 --- a/src/WixToolset.Core.Native/Msi/InstallLogModes.cs +++ b/src/wix/WixToolset.Core.Native/Msi/InstallLogModes.cs | |||
diff --git a/src/WixToolset.Core.Native/Msi/InstallMessage.cs b/src/wix/WixToolset.Core.Native/Msi/InstallMessage.cs index 35773e13..35773e13 100644 --- a/src/WixToolset.Core.Native/Msi/InstallMessage.cs +++ b/src/wix/WixToolset.Core.Native/Msi/InstallMessage.cs | |||
diff --git a/src/WixToolset.Core.Native/Msi/InstallUILevels.cs b/src/wix/WixToolset.Core.Native/Msi/InstallUILevels.cs index e84b5215..e84b5215 100644 --- a/src/WixToolset.Core.Native/Msi/InstallUILevels.cs +++ b/src/wix/WixToolset.Core.Native/Msi/InstallUILevels.cs | |||
diff --git a/src/WixToolset.Core.Native/Msi/Installer.cs b/src/wix/WixToolset.Core.Native/Msi/Installer.cs index 8a45aaa8..8a45aaa8 100644 --- a/src/WixToolset.Core.Native/Msi/Installer.cs +++ b/src/wix/WixToolset.Core.Native/Msi/Installer.cs | |||
diff --git a/src/WixToolset.Core.Native/Msi/MSIFILEHASHINFO.cs b/src/wix/WixToolset.Core.Native/Msi/MSIFILEHASHINFO.cs index ae88ec7e..ae88ec7e 100644 --- a/src/WixToolset.Core.Native/Msi/MSIFILEHASHINFO.cs +++ b/src/wix/WixToolset.Core.Native/Msi/MSIFILEHASHINFO.cs | |||
diff --git a/src/WixToolset.Core.Native/Msi/ModifyView.cs b/src/wix/WixToolset.Core.Native/Msi/ModifyView.cs index 989de174..989de174 100644 --- a/src/WixToolset.Core.Native/Msi/ModifyView.cs +++ b/src/wix/WixToolset.Core.Native/Msi/ModifyView.cs | |||
diff --git a/src/WixToolset.Core.Native/Msi/MsiException.cs b/src/wix/WixToolset.Core.Native/Msi/MsiException.cs index 07c83d81..07c83d81 100644 --- a/src/WixToolset.Core.Native/Msi/MsiException.cs +++ b/src/wix/WixToolset.Core.Native/Msi/MsiException.cs | |||
diff --git a/src/WixToolset.Core.Native/Msi/MsiHandle.cs b/src/wix/WixToolset.Core.Native/Msi/MsiHandle.cs index dc2ce605..dc2ce605 100644 --- a/src/WixToolset.Core.Native/Msi/MsiHandle.cs +++ b/src/wix/WixToolset.Core.Native/Msi/MsiHandle.cs | |||
diff --git a/src/WixToolset.Core.Native/Msi/MsiInterop.cs b/src/wix/WixToolset.Core.Native/Msi/MsiInterop.cs index 11ac4094..11ac4094 100644 --- a/src/WixToolset.Core.Native/Msi/MsiInterop.cs +++ b/src/wix/WixToolset.Core.Native/Msi/MsiInterop.cs | |||
diff --git a/src/WixToolset.Core.Native/Msi/OpenDatabase.cs b/src/wix/WixToolset.Core.Native/Msi/OpenDatabase.cs index 18a78f77..18a78f77 100644 --- a/src/WixToolset.Core.Native/Msi/OpenDatabase.cs +++ b/src/wix/WixToolset.Core.Native/Msi/OpenDatabase.cs | |||
diff --git a/src/WixToolset.Core.Native/Msi/Record.cs b/src/wix/WixToolset.Core.Native/Msi/Record.cs index c25e76e2..c25e76e2 100644 --- a/src/WixToolset.Core.Native/Msi/Record.cs +++ b/src/wix/WixToolset.Core.Native/Msi/Record.cs | |||
diff --git a/src/WixToolset.Core.Native/Msi/Session.cs b/src/wix/WixToolset.Core.Native/Msi/Session.cs index 743fb2be..743fb2be 100644 --- a/src/WixToolset.Core.Native/Msi/Session.cs +++ b/src/wix/WixToolset.Core.Native/Msi/Session.cs | |||
diff --git a/src/WixToolset.Core.Native/Msi/SummaryInformation.cs b/src/wix/WixToolset.Core.Native/Msi/SummaryInformation.cs index da629df2..da629df2 100644 --- a/src/WixToolset.Core.Native/Msi/SummaryInformation.cs +++ b/src/wix/WixToolset.Core.Native/Msi/SummaryInformation.cs | |||
diff --git a/src/WixToolset.Core.Native/Msi/TransformErrorConditions.cs b/src/wix/WixToolset.Core.Native/Msi/TransformErrorConditions.cs index 313dceeb..313dceeb 100644 --- a/src/WixToolset.Core.Native/Msi/TransformErrorConditions.cs +++ b/src/wix/WixToolset.Core.Native/Msi/TransformErrorConditions.cs | |||
diff --git a/src/WixToolset.Core.Native/Msi/TransformValidations.cs b/src/wix/WixToolset.Core.Native/Msi/TransformValidations.cs index 52bddeaf..52bddeaf 100644 --- a/src/WixToolset.Core.Native/Msi/TransformValidations.cs +++ b/src/wix/WixToolset.Core.Native/Msi/TransformValidations.cs | |||
diff --git a/src/WixToolset.Core.Native/Msi/View.cs b/src/wix/WixToolset.Core.Native/Msi/View.cs index 6305a9de..6305a9de 100644 --- a/src/WixToolset.Core.Native/Msi/View.cs +++ b/src/wix/WixToolset.Core.Native/Msi/View.cs | |||
diff --git a/src/WixToolset.Core.Native/Msi/WixInvalidIdtException.cs b/src/wix/WixToolset.Core.Native/Msi/WixInvalidIdtException.cs index 268ddc11..268ddc11 100644 --- a/src/WixToolset.Core.Native/Msi/WixInvalidIdtException.cs +++ b/src/wix/WixToolset.Core.Native/Msi/WixInvalidIdtException.cs | |||
diff --git a/src/WixToolset.Core.Native/Msm/ConfigurationCallback.cs b/src/wix/WixToolset.Core.Native/Msm/ConfigurationCallback.cs index 31b06d02..31b06d02 100644 --- a/src/WixToolset.Core.Native/Msm/ConfigurationCallback.cs +++ b/src/wix/WixToolset.Core.Native/Msm/ConfigurationCallback.cs | |||
diff --git a/src/WixToolset.Core.Native/Msm/IMsmConfigureModule.cs b/src/wix/WixToolset.Core.Native/Msm/IMsmConfigureModule.cs index 468fb1fc..468fb1fc 100644 --- a/src/WixToolset.Core.Native/Msm/IMsmConfigureModule.cs +++ b/src/wix/WixToolset.Core.Native/Msm/IMsmConfigureModule.cs | |||
diff --git a/src/WixToolset.Core.Native/Msm/IMsmError.cs b/src/wix/WixToolset.Core.Native/Msm/IMsmError.cs index 4f1325a6..4f1325a6 100644 --- a/src/WixToolset.Core.Native/Msm/IMsmError.cs +++ b/src/wix/WixToolset.Core.Native/Msm/IMsmError.cs | |||
diff --git a/src/WixToolset.Core.Native/Msm/IMsmErrors.cs b/src/wix/WixToolset.Core.Native/Msm/IMsmErrors.cs index e1472376..e1472376 100644 --- a/src/WixToolset.Core.Native/Msm/IMsmErrors.cs +++ b/src/wix/WixToolset.Core.Native/Msm/IMsmErrors.cs | |||
diff --git a/src/WixToolset.Core.Native/Msm/IMsmMerge2.cs b/src/wix/WixToolset.Core.Native/Msm/IMsmMerge2.cs index 400249e7..400249e7 100644 --- a/src/WixToolset.Core.Native/Msm/IMsmMerge2.cs +++ b/src/wix/WixToolset.Core.Native/Msm/IMsmMerge2.cs | |||
diff --git a/src/WixToolset.Core.Native/Msm/IMsmStrings.cs b/src/wix/WixToolset.Core.Native/Msm/IMsmStrings.cs index 41063bfa..41063bfa 100644 --- a/src/WixToolset.Core.Native/Msm/IMsmStrings.cs +++ b/src/wix/WixToolset.Core.Native/Msm/IMsmStrings.cs | |||
diff --git a/src/WixToolset.Core.Native/Msm/MsmErrorType.cs b/src/wix/WixToolset.Core.Native/Msm/MsmErrorType.cs index c67d37b4..c67d37b4 100644 --- a/src/WixToolset.Core.Native/Msm/MsmErrorType.cs +++ b/src/wix/WixToolset.Core.Native/Msm/MsmErrorType.cs | |||
diff --git a/src/WixToolset.Core.Native/Msm/MsmInterop.cs b/src/wix/WixToolset.Core.Native/Msm/MsmInterop.cs index d2627904..d2627904 100644 --- a/src/WixToolset.Core.Native/Msm/MsmInterop.cs +++ b/src/wix/WixToolset.Core.Native/Msm/MsmInterop.cs | |||
diff --git a/src/WixToolset.Core.Native/Ole32/Storage.cs b/src/wix/WixToolset.Core.Native/Ole32/Storage.cs index 3e4c6af2..3e4c6af2 100644 --- a/src/WixToolset.Core.Native/Ole32/Storage.cs +++ b/src/wix/WixToolset.Core.Native/Ole32/Storage.cs | |||
diff --git a/src/WixToolset.Core.Native/Ole32/StorageMode.cs b/src/wix/WixToolset.Core.Native/Ole32/StorageMode.cs index 24b60e4d..24b60e4d 100644 --- a/src/WixToolset.Core.Native/Ole32/StorageMode.cs +++ b/src/wix/WixToolset.Core.Native/Ole32/StorageMode.cs | |||
diff --git a/src/WixToolset.Core.Native/PatchAPI/PatchInterop.cs b/src/wix/WixToolset.Core.Native/PatchAPI/PatchInterop.cs index 04f5a553..04f5a553 100644 --- a/src/WixToolset.Core.Native/PatchAPI/PatchInterop.cs +++ b/src/wix/WixToolset.Core.Native/PatchAPI/PatchInterop.cs | |||
diff --git a/src/WixToolset.Core.Native/ValidationMessage.cs b/src/wix/WixToolset.Core.Native/ValidationMessage.cs index d7137326..d7137326 100644 --- a/src/WixToolset.Core.Native/ValidationMessage.cs +++ b/src/wix/WixToolset.Core.Native/ValidationMessage.cs | |||
diff --git a/src/WixToolset.Core.Native/ValidationMessageType.cs b/src/wix/WixToolset.Core.Native/ValidationMessageType.cs index 98635294..98635294 100644 --- a/src/WixToolset.Core.Native/ValidationMessageType.cs +++ b/src/wix/WixToolset.Core.Native/ValidationMessageType.cs | |||
diff --git a/src/WixToolset.Core.Native/WindowsInstallerValidator.cs b/src/wix/WixToolset.Core.Native/WindowsInstallerValidator.cs index 9f4b26a3..9f4b26a3 100644 --- a/src/WixToolset.Core.Native/WindowsInstallerValidator.cs +++ b/src/wix/WixToolset.Core.Native/WindowsInstallerValidator.cs | |||
diff --git a/src/WixToolset.Core.Native/WixNativeExe.cs b/src/wix/WixToolset.Core.Native/WixNativeExe.cs index fb41b2f2..fb41b2f2 100644 --- a/src/WixToolset.Core.Native/WixNativeExe.cs +++ b/src/wix/WixToolset.Core.Native/WixNativeExe.cs | |||
diff --git a/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj b/src/wix/WixToolset.Core.Native/WixToolset.Core.Native.csproj index fea15922..fea15922 100644 --- a/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj +++ b/src/wix/WixToolset.Core.Native/WixToolset.Core.Native.csproj | |||
diff --git a/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec b/src/wix/WixToolset.Core.Native/WixToolset.Core.Native.nuspec index 3091ccd5..3091ccd5 100644 --- a/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec +++ b/src/wix/WixToolset.Core.Native/WixToolset.Core.Native.nuspec | |||
diff --git a/src/WixToolset.Core.Native/cubes/darice.cub b/src/wix/WixToolset.Core.Native/cubes/darice.cub index 4292fede..4292fede 100644 --- a/src/WixToolset.Core.Native/cubes/darice.cub +++ b/src/wix/WixToolset.Core.Native/cubes/darice.cub | |||
Binary files differ | |||
diff --git a/src/WixToolset.Core.Native/cubes/mergemod.cub b/src/wix/WixToolset.Core.Native/cubes/mergemod.cub index def6dd1a..def6dd1a 100644 --- a/src/WixToolset.Core.Native/cubes/mergemod.cub +++ b/src/wix/WixToolset.Core.Native/cubes/mergemod.cub | |||
Binary files differ | |||
diff --git a/src/WixToolset.Core.Native/targets/WixToolset.Core.Native.targets b/src/wix/WixToolset.Core.Native/targets/WixToolset.Core.Native.targets index aafbd405..aafbd405 100644 --- a/src/WixToolset.Core.Native/targets/WixToolset.Core.Native.targets +++ b/src/wix/WixToolset.Core.Native/targets/WixToolset.Core.Native.targets | |||
diff --git a/src/wix/appveyor-CoreNative.cmd b/src/wix/appveyor-CoreNative.cmd new file mode 100644 index 00000000..d9691a42 --- /dev/null +++ b/src/wix/appveyor-CoreNative.cmd | |||
@@ -0,0 +1,19 @@ | |||
1 | @setlocal | ||
2 | @pushd %~dp0 | ||
3 | @set _C=Release | ||
4 | @if /i "%1"=="debug" set _C=Debug | ||
5 | |||
6 | :: Restore | ||
7 | msbuild -p:Configuration=%_C% -t:Restore || exit /b | ||
8 | |||
9 | :: Build | ||
10 | msbuild -p:Configuration=%_C% src\test\WixToolsetTest.Core.Native\WixToolsetTest.Core.Native.csproj || exit /b | ||
11 | |||
12 | :: Test | ||
13 | dotnet test -c %_C% --no-build src\test\WixToolsetTest.Core.Native\WixToolsetTest.Core.Native.csproj || exit /b | ||
14 | |||
15 | :: Pack | ||
16 | msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\WixToolset.Core.Native\WixToolset.Core.Native.csproj || exit /b | ||
17 | |||
18 | @popd | ||
19 | @endlocal | ||
diff --git a/src/wix/appveyor-CoreNative.yml b/src/wix/appveyor-CoreNative.yml new file mode 100644 index 00000000..364569cf --- /dev/null +++ b/src/wix/appveyor-CoreNative.yml | |||
@@ -0,0 +1,44 @@ | |||
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 | # Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml | ||
4 | # then update all of the repos. | ||
5 | |||
6 | branches: | ||
7 | only: | ||
8 | - master | ||
9 | - develop | ||
10 | |||
11 | image: Visual Studio 2019 | ||
12 | |||
13 | version: 0.0.0.{build} | ||
14 | configuration: Release | ||
15 | |||
16 | environment: | ||
17 | DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true | ||
18 | DOTNET_CLI_TELEMETRY_OPTOUT: 1 | ||
19 | NUGET_XMLDOC_MODE: skip | ||
20 | |||
21 | build_script: | ||
22 | - appveyor.cmd | ||
23 | |||
24 | test: off | ||
25 | |||
26 | pull_requests: | ||
27 | do_not_increment_build_number: true | ||
28 | |||
29 | nuget: | ||
30 | disable_publish_on_pr: true | ||
31 | |||
32 | skip_branch_with_pr: true | ||
33 | skip_tags: true | ||
34 | |||
35 | artifacts: | ||
36 | - path: build\Release\**\*.nupkg | ||
37 | name: nuget | ||
38 | - path: build\Release\**\*.snupkg | ||
39 | name: snupkg | ||
40 | |||
41 | notifications: | ||
42 | - provider: Slack | ||
43 | incoming_webhook: | ||
44 | secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= | ||
diff --git a/src/wix/nuget-CoreNative.config b/src/wix/nuget-CoreNative.config new file mode 100644 index 00000000..18404582 --- /dev/null +++ b/src/wix/nuget-CoreNative.config | |||
@@ -0,0 +1,9 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
2 | <configuration> | ||
3 | <packageSources> | ||
4 | <clear /> | ||
5 | <add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" /> | ||
6 | <add key="wixtoolset-dutil" value="https://ci.appveyor.com/nuget/wixtoolset-dutil" /> | ||
7 | <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
8 | </packageSources> | ||
9 | </configuration> \ No newline at end of file | ||
diff --git a/src/test/WixToolsetTest.Core.Native/CabinetFixture.cs b/src/wix/test/WixToolsetTest.Core.Native/CabinetFixture.cs index 2e43dce4..2e43dce4 100644 --- a/src/test/WixToolsetTest.Core.Native/CabinetFixture.cs +++ b/src/wix/test/WixToolsetTest.Core.Native/CabinetFixture.cs | |||
diff --git a/src/test/WixToolsetTest.Core.Native/MsmFixture.cs b/src/wix/test/WixToolsetTest.Core.Native/MsmFixture.cs index 709d4b93..709d4b93 100644 --- a/src/test/WixToolsetTest.Core.Native/MsmFixture.cs +++ b/src/wix/test/WixToolsetTest.Core.Native/MsmFixture.cs | |||
diff --git a/src/test/WixToolsetTest.Core.Native/TestData/test.cab b/src/wix/test/WixToolsetTest.Core.Native/TestData/test.cab index ca78f632..ca78f632 100644 --- a/src/test/WixToolsetTest.Core.Native/TestData/test.cab +++ b/src/wix/test/WixToolsetTest.Core.Native/TestData/test.cab | |||
Binary files differ | |||
diff --git a/src/test/WixToolsetTest.Core.Native/TestData/test.txt b/src/wix/test/WixToolsetTest.Core.Native/TestData/test.txt index cd0db0e1..cd0db0e1 100644 --- a/src/test/WixToolsetTest.Core.Native/TestData/test.txt +++ b/src/wix/test/WixToolsetTest.Core.Native/TestData/test.txt | |||
diff --git a/src/test/WixToolsetTest.Core.Native/Utility/DisposableFileSystem.cs b/src/wix/test/WixToolsetTest.Core.Native/Utility/DisposableFileSystem.cs index c9957247..c9957247 100644 --- a/src/test/WixToolsetTest.Core.Native/Utility/DisposableFileSystem.cs +++ b/src/wix/test/WixToolsetTest.Core.Native/Utility/DisposableFileSystem.cs | |||
diff --git a/src/test/WixToolsetTest.Core.Native/Utility/Pushd.cs b/src/wix/test/WixToolsetTest.Core.Native/Utility/Pushd.cs index 91700c2f..91700c2f 100644 --- a/src/test/WixToolsetTest.Core.Native/Utility/Pushd.cs +++ b/src/wix/test/WixToolsetTest.Core.Native/Utility/Pushd.cs | |||
diff --git a/src/test/WixToolsetTest.Core.Native/Utility/TestData.cs b/src/wix/test/WixToolsetTest.Core.Native/Utility/TestData.cs index cd9c6318..cd9c6318 100644 --- a/src/test/WixToolsetTest.Core.Native/Utility/TestData.cs +++ b/src/wix/test/WixToolsetTest.Core.Native/Utility/TestData.cs | |||
diff --git a/src/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj b/src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj index 6068dbea..6068dbea 100644 --- a/src/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj +++ b/src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj | |||
diff --git a/src/test/version.txt b/src/wix/test/version.txt index cf138743..cf138743 100644 --- a/src/test/version.txt +++ b/src/wix/test/version.txt | |||
diff --git a/src/wixnative/ARM/mergemod.dll b/src/wix/wixnative/ARM/mergemod.dll index 739af831..739af831 100644 --- a/src/wixnative/ARM/mergemod.dll +++ b/src/wix/wixnative/ARM/mergemod.dll | |||
Binary files differ | |||
diff --git a/src/wixnative/ARM64/mergemod.dll b/src/wix/wixnative/ARM64/mergemod.dll index 564a75fc..564a75fc 100644 --- a/src/wixnative/ARM64/mergemod.dll +++ b/src/wix/wixnative/ARM64/mergemod.dll | |||
Binary files differ | |||
diff --git a/src/wixnative/Win32/mergemod.dll b/src/wix/wixnative/Win32/mergemod.dll index 4286df4d..4286df4d 100644 --- a/src/wixnative/Win32/mergemod.dll +++ b/src/wix/wixnative/Win32/mergemod.dll | |||
Binary files differ | |||
diff --git a/src/wixnative/enumcab.cpp b/src/wix/wixnative/enumcab.cpp index e7717bac..e7717bac 100644 --- a/src/wixnative/enumcab.cpp +++ b/src/wix/wixnative/enumcab.cpp | |||
diff --git a/src/wixnative/extractcab.cpp b/src/wix/wixnative/extractcab.cpp index 53f53266..53f53266 100644 --- a/src/wixnative/extractcab.cpp +++ b/src/wix/wixnative/extractcab.cpp | |||
diff --git a/src/wixnative/packages.config b/src/wix/wixnative/packages.config index a98c0c8e..a98c0c8e 100644 --- a/src/wixnative/packages.config +++ b/src/wix/wixnative/packages.config | |||
diff --git a/src/wixnative/precomp.cpp b/src/wix/wixnative/precomp.cpp index 37664a1c..37664a1c 100644 --- a/src/wixnative/precomp.cpp +++ b/src/wix/wixnative/precomp.cpp | |||
diff --git a/src/wixnative/precomp.h b/src/wix/wixnative/precomp.h index 5bd617e5..5bd617e5 100644 --- a/src/wixnative/precomp.h +++ b/src/wix/wixnative/precomp.h | |||
diff --git a/src/wixnative/resetacls.cpp b/src/wix/wixnative/resetacls.cpp index 8c5bdc56..8c5bdc56 100644 --- a/src/wixnative/resetacls.cpp +++ b/src/wix/wixnative/resetacls.cpp | |||
diff --git a/src/wixnative/smartcab.cpp b/src/wix/wixnative/smartcab.cpp index 0dff6c94..0dff6c94 100644 --- a/src/wixnative/smartcab.cpp +++ b/src/wix/wixnative/smartcab.cpp | |||
diff --git a/src/wixnative/wixnative.cpp b/src/wix/wixnative/wixnative.cpp index 7bd8dbca..7bd8dbca 100644 --- a/src/wixnative/wixnative.cpp +++ b/src/wix/wixnative/wixnative.cpp | |||
diff --git a/src/wixnative/wixnative.v3.ncrunchproject b/src/wix/wixnative/wixnative.v3.ncrunchproject index 319cd523..319cd523 100644 --- a/src/wixnative/wixnative.v3.ncrunchproject +++ b/src/wix/wixnative/wixnative.v3.ncrunchproject | |||
diff --git a/src/wixnative/wixnative.vcxproj b/src/wix/wixnative/wixnative.vcxproj index 20959827..20959827 100644 --- a/src/wixnative/wixnative.vcxproj +++ b/src/wix/wixnative/wixnative.vcxproj | |||
diff --git a/src/wixnative/x64/mergemod.dll b/src/wix/wixnative/x64/mergemod.dll index b6422174..b6422174 100644 --- a/src/wixnative/x64/mergemod.dll +++ b/src/wix/wixnative/x64/mergemod.dll | |||
Binary files differ | |||