@joebigelow / wix-1 / commits / 47582b16

Provide managed CA and Embedded UI DTF libraries via NuGet

Lots of refactoring to bring the SFX tooling back into the 'dtf' layer since they are (in the end) tightly coupled to some DTF assemblies. Also refactored the DTF tests into their own folder and added a couple integration tests to build using the new CA/UI NuGet package. Closes wixtoolset/issues#6080

Rob Mensching committed Mar 31, 2022 at 11:56 UTC 47582b162368e8edf7a3b11c13b8e9dabc5f0a26
72 files changed +326 -455
src/clean.cmd
+1
@@ -29,6 +29,7 @@ if exist "%_NUGET_CACHE%\wixtoolset.data" rd /s/q "%_NUGET_CACHE%\wixtoolset.dat
29 if exist "%_NUGET_CACHE%\wixtoolset.dependency.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.dependency.wixext"
30 if exist "%_NUGET_CACHE%\wixtoolset.dtf.compression" rd /s/q "%_NUGET_CACHE%\wixtoolset.dtf.compression"
31 if exist "%_NUGET_CACHE%\wixtoolset.dtf.compression.cab" rd /s/q "%_NUGET_CACHE%\wixtoolset.dtf.compression.cab"
32 +if exist "%_NUGET_CACHE%\wixtoolset.dtf.customaction" rd /s/q "%_NUGET_CACHE%\wixtoolset.dtf.customaction"
33 if exist "%_NUGET_CACHE%\wixtoolset.dtf.resources" rd /s/q "%_NUGET_CACHE%\wixtoolset.dtf.resources"
34 if exist "%_NUGET_CACHE%\wixtoolset.dtf.windowsinstaller" rd /s/q "%_NUGET_CACHE%\wixtoolset.dtf.windowsinstaller"
35 if exist "%_NUGET_CACHE%\wixtoolset.dutil" rd /s/q "%_NUGET_CACHE%\wixtoolset.dutil"
src/dtf/SfxCA/ClrHost.cpp renamed
src/dtf/SfxCA/EmbeddedUI.cpp renamed
src/dtf/SfxCA/EntryPoints.def renamed
src/dtf/SfxCA/EntryPoints.h renamed
src/dtf/SfxCA/Extract.cpp renamed
src/dtf/SfxCA/RemoteMsi.cpp renamed
src/dtf/SfxCA/RemoteMsiSession.h renamed
src/dtf/SfxCA/SfxCA.cpp renamed
src/dtf/SfxCA/SfxCA.rc renamed
src/dtf/SfxCA/SfxCA.vcxproj renamed
+26 -14
@@ -1,19 +1,28 @@
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 DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5 <ItemGroup Label="ProjectConfigurations">
5 - <ProjectConfiguration Include="Debug|Win32">
6 + <ProjectConfiguration Include="Debug|ARM64">
7 <Configuration>Debug</Configuration>
7 - <Platform>Win32</Platform>
8 + <Platform>ARM64</Platform>
9 </ProjectConfiguration>
9 - <ProjectConfiguration Include="Release|Win32">
10 - <Configuration>Release</Configuration>
10 + <ProjectConfiguration Include="Debug|Win32">
11 + <Configuration>Debug</Configuration>
12 <Platform>Win32</Platform>
13 </ProjectConfiguration>
14 <ProjectConfiguration Include="Debug|x64">
15 <Configuration>Debug</Configuration>
16 <Platform>x64</Platform>
17 </ProjectConfiguration>
18 + <ProjectConfiguration Include="Release|ARM64">
19 + <Configuration>Release</Configuration>
20 + <Platform>ARM64</Platform>
21 + </ProjectConfiguration>
22 + <ProjectConfiguration Include="Release|Win32">
23 + <Configuration>Release</Configuration>
24 + <Platform>Win32</Platform>
25 + </ProjectConfiguration>
26 <ProjectConfiguration Include="Release|x64">
27 <Configuration>Release</Configuration>
28 <Platform>x64</Platform>
@@ -23,15 +32,18 @@
32 <PropertyGroup Label="Globals">
33 <ProjectGuid>{55D5BA28-D427-4F53-80C2-FE9EF23C1553}</ProjectGuid>
34 <ConfigurationType>DynamicLibrary</ConfigurationType>
26 - <TargetName>SfxCA</TargetName>
35 <CharacterSet>Unicode</CharacterSet>
36 + <SignOutput>false</SignOutput>
37 <ProjectModuleDefinitionFile>EntryPoints.def</ProjectModuleDefinitionFile>
38 </PropertyGroup>
39 +
40 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
41 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
42 +
43 <PropertyGroup>
44 <ProjectAdditionalLinkLibraries>msi.lib;cabinet.lib;shlwapi.lib</ProjectAdditionalLinkLibraries>
45 </PropertyGroup>
46 +
47 <ItemGroup>
48 <ClCompile Include="ClrHost.cpp" />
49 <ClCompile Include="Extract.cpp" />
@@ -49,19 +61,19 @@
61 <ClInclude Include="RemoteMsiSession.h" />
62 <ClInclude Include="SfxUtil.h" />
63 </ItemGroup>
64 +
65 <ItemGroup>
66 <None Include="EntryPoints.def" />
54 - <None Include="packages.config" />
67 </ItemGroup>
68 +
69 <ItemGroup>
70 <ResourceCompile Include="SfxCA.rc" />
71 </ItemGroup>
72 +
73 + <ItemGroup>
74 + <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
75 + <PackageReference Include="GitInfo" PrivateAssets="All" />
76 + </ItemGroup>
77 +
78 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
60 - <Import Project="..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" />
61 - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
62 - <PropertyGroup>
63 - <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>
64 - </PropertyGroup>
65 - <Error Condition="!Exists('..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />
66 - </Target>
67 -</Project>
\ No newline at end of file
79 +</Project>
src/dtf/SfxCA/SfxCA.vcxproj.filters renamed
src/dtf/SfxCA/SfxUtil.cpp renamed
src/dtf/SfxCA/SfxUtil.h renamed
src/dtf/SfxCA/precomp.cpp renamed
src/dtf/SfxCA/precomp.h renamed
src/dtf/SfxCA/sfxca_t.proj new
+7
@@ -0,0 +1,7 @@
1 +<Project Sdk="Microsoft.Build.Traversal">
2 + <ItemGroup>
3 + <ProjectReference Include="SfxCA.vcxproj" Properties="Platform=x86" />
4 + <ProjectReference Include="SfxCA.vcxproj" Properties="Platform=x64" />
5 + <ProjectReference Include="SfxCA.vcxproj" Properties="Platform=ARM64" />
6 + </ItemGroup>
7 +</Project>
src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.csproj new
+17
@@ -0,0 +1,17 @@
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 Sdk="Microsoft.NET.Sdk">
5 + <PropertyGroup>
6 + <TargetFramework>net472</TargetFramework>
7 + <IncludeBuildOutput>false</IncludeBuildOutput>
8 + <Title>The WiX Toolset Managed CustomAction Framework.</Title>
9 + <Description>The WiX Toolset lets developers create managed custom actions for the Windows Installer. This package contains the tools necessary to convert your project into a managed custom action.</Description>
10 +
11 + <NuspecBasePath>$(OutputPath)</NuspecBasePath>
12 + </PropertyGroup>
13 +
14 + <ItemGroup>
15 + <ProjectReference Include="..\WixToolset.Dtf.MakeSfxCA\WixToolset.Dtf.MakeSfxCA.csproj" />
16 + </ItemGroup>
17 +</Project>
src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.nuspec new
+32
@@ -0,0 +1,32 @@
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3 + <metadata>
4 + <id>$id$</id>
5 + <version>$version$</version>
6 + <title>$title$</title>
7 + <description>$description$</description>
8 + <authors>$authors$</authors>
9 + <icon>wix-white-bg.png</icon>
10 + <license type="expression">MS-RL</license>
11 + <requireLicenseAcceptance>false</requireLicenseAcceptance>
12 + <copyright>$copyright$</copyright>
13 + <projectUrl>$projectUrl$</projectUrl>
14 + <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
15 + <dependencies>
16 + <dependency id="WixToolset.Dtf.WindowsInstaller" version="$version$" />
17 + </dependencies>
18 + </metadata>
19 +
20 + <files>
21 + <file src="$projectFolder$\$id$.targets" target="build" />
22 + <file src="$projectFolder$\..\..\internal\images\wix-white-bg.png" />
23 + <file src="net472\WixToolset.Dtf.MakeSfxCA.exe" target="tools" />
24 + <file src="net472\WixToolset.Dtf.MakeSfxCA.exe.config" target="tools" />
25 + <file src="net472\WixToolset.Dtf.Compression.dll" target="tools" />
26 + <file src="net472\WixToolset.Dtf.Compression.Cab.dll" target="tools" />
27 + <file src="net472\WixToolset.Dtf.Resources.dll" target="tools" />
28 + <file src="x64\SfxCA.dll" target="tools\x64" />
29 + <file src="x86\SfxCA.dll" target="tools\x86" />
30 + <file src="ARM64\SfxCA.dll" target="tools\arm64" />
31 + </files>
32 +</package>
src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.targets renamed
+8 -10
@@ -1,8 +1,7 @@
1 -<?xml version="1.0" encoding="utf-8" ?>
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 -
5 -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
4 +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5
6 <Import Project="$(CustomBeforeWixCATargets)" Condition=" '$(CustomBeforeWixCATargets)' != '' and Exists('$(CustomBeforeWixCATargets)')" />
7
@@ -11,13 +10,12 @@
10
11 <TargetCAFileName Condition=" '$(TargetCAFileName)' == '' ">$(TargetName).CA$(TargetExt)</TargetCAFileName>
12
14 - <WixSdkPath Condition=" '$(WixSdkPath)' == '' ">$(MSBuildThisFileDirectory)</WixSdkPath>
15 - <WixSdkX86Path Condition=" '$(WixSdkX86Path)' == '' ">$(WixSdkPath)x86\</WixSdkX86Path>
16 - <WixSdkX64Path Condition=" '$(WixSdkX64Path)' == '' ">$(WixSdkPath)x64\</WixSdkX64Path>
13 + <MakeSfxCAPath Condition=" '$(MakeSfxCAPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\</MakeSfxCAPath>
14
18 - <MakeSfxCA Condition=" '$(MakeSfxCA)' == '' ">$(WixSdkPath)MakeSfxCA.exe</MakeSfxCA>
19 - <SfxCADll Condition=" '$(SfxCADll)' == '' and '$(Platform)' == 'x64' ">$(WixSdkX64Path)SfxCA.dll</SfxCADll>
20 - <SfxCADll Condition=" '$(SfxCADll)' == '' ">$(WixSdkX86Path)SfxCA.dll</SfxCADll>
15 + <MakeSfxCA Condition=" '$(MakeSfxCA)' == '' ">$(MakeSfxCAPath)WixToolset.Dtf.MakeSfxCA.exe</MakeSfxCA>
16 + <SfxCADll Condition=" '$(SfxCADll)' == '' and '$(Platform)' == 'ARM64' ">$(MakeSfxCAPath)arm64\SfxCA.dll</SfxCADll>
17 + <SfxCADll Condition=" '$(SfxCADll)' == '' and '$(Platform)' == 'x64' ">$(MakeSfxCAPath)x64\SfxCA.dll</SfxCADll>
18 + <SfxCADll Condition=" '$(SfxCADll)' == '' ">$(MakeSfxCAPath)x86\SfxCA.dll</SfxCADll>
19 </PropertyGroup>
20
21 <!--
@@ -74,7 +72,7 @@
72 <!-- Run the MakeSfxCA.exe CA packaging tool. -->
73 <Exec Command='"$(MakeSfxCA)" "@(IntermediateCAPackage)" "$(SfxCADll)" "@(IntermediateCAAssembly)" "$(CustomActionContents)"'
74 WorkingDirectory="$(ProjectDir)" />
77 -
75 +
76 <!-- Add modules to be copied to output dir. -->
77 <ItemGroup>
78 <AddModules Include="@(IntermediateCAPackage)" />
src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.v3.ncrunchproject new
+5
@@ -0,0 +1,5 @@
1 +<ProjectConfiguration>
2 + <Settings>
3 + <HiddenComponentWarnings />
4 + </Settings>
5 +</ProjectConfiguration>
\ No newline at end of file
src/dtf/WixToolset.Dtf.MSBuild/WixToolset.Dtf.MSBuild.csproj deleted
-40
@@ -1,40 +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 Sdk="Microsoft.NET.Sdk">
5 -
6 - <PropertyGroup>
7 - <TargetFramework>netcoreapp3.1</TargetFramework>
8 - <IncludeBuildOutput>false</IncludeBuildOutput>
9 - <Description>WiX Toolset Dtf MSBuild integration</Description>
10 - <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
11 - <NuspecBasePath>$(OutputPath)publish\WixToolset.Dtf.MSBuild\</NuspecBasePath>
12 - <NuspecProperties>Id=$(MSBuildThisFileName);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description)</NuspecProperties>
13 - </PropertyGroup>
14 -
15 - <ItemGroup>
16 - <None Remove="build\WixToolset.Dtf.MSBuild.props" />
17 - <None Remove="tools\wix.ca.targets" />
18 - </ItemGroup>
19 -
20 - <ItemGroup>
21 - <Content Include="build\WixToolset.Dtf.MSBuild.props">
22 - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
23 - </Content>
24 - <Content Include="tools\wix.ca.targets">
25 - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
26 - </Content>
27 - </ItemGroup>
28 -
29 - <PropertyGroup>
30 - <GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);SetNuspecVersion</GenerateNuspecDependsOn>
31 - </PropertyGroup>
32 -
33 - <Target Name="SetNuspecVersion">
34 - <Error Text="Cannot pack $(MSBuildThisFileName) until all projects are published to: '$(NuspecBasePath)'. Run appveyor.cmd to publish projects properly." Condition=" !Exists('$(NuspecBasePath)') " />
35 -
36 - <PropertyGroup>
37 - <NuspecProperties>$(NuspecProperties);Version=$(Version);ProjectFolder=$(MSBuildThisFileDirectory)</NuspecProperties>
38 - </PropertyGroup>
39 - </Target>
40 -</Project>
src/dtf/WixToolset.Dtf.MSBuild/WixToolset.Dtf.MSBuild.nuspec deleted
-18
@@ -1,18 +0,0 @@
1 -<?xml version="1.0" encoding="utf-8"?>
2 -<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3 - <metadata>
4 - <id>$id$</id>
5 - <version>$version$</version>
6 - <authors>$authors$</authors>
7 - <owners>$authors$</owners>
8 - <license type="expression">MS-RL</license>
9 - <requireLicenseAcceptance>false</requireLicenseAcceptance>
10 - <description>$description$</description>
11 - <copyright>$copyright$</copyright>
12 - </metadata>
13 -
14 - <files>
15 - <file src="build\**\*" target="build" />
16 - <file src="tools\**\*" target="tools" />
17 - </files>
18 -</package>
src/dtf/WixToolset.Dtf.MSBuild/tools/wix.ca.targets deleted
-123
@@ -1,123 +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 -
5 -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
6 -
7 - <Import Project="$(CustomBeforeWixCATargets)" Condition=" '$(CustomBeforeWixCATargets)' != '' and Exists('$(CustomBeforeWixCATargets)')" />
8 -
9 - <PropertyGroup>
10 - <WixCATargetsImported>true</WixCATargetsImported>
11 -
12 - <TargetCAFileName Condition=" '$(TargetCAFileName)' == '' ">$(TargetName).CA$(TargetExt)</TargetCAFileName>
13 -
14 - <WixSdkPath Condition=" '$(WixSdkPath)' == '' ">$(MSBuildThisFileDirectory)</WixSdkPath>
15 - <WixSdkX86Path Condition=" '$(WixSdkX86Path)' == '' ">$(WixSdkPath)x86\</WixSdkX86Path>
16 - <WixSdkX64Path Condition=" '$(WixSdkX64Path)' == '' ">$(WixSdkPath)x64\</WixSdkX64Path>
17 -
18 - <MakeSfxCA Condition=" '$(MakeSfxCA)' == '' ">$(WixSdkPath)MakeSfxCA.exe</MakeSfxCA>
19 - <SfxCADll Condition=" '$(SfxCADll)' == '' and '$(Platform)' == 'x64' ">$(WixSdkX64Path)SfxCA.dll</SfxCADll>
20 - <SfxCADll Condition=" '$(SfxCADll)' == '' ">$(WixSdkX86Path)SfxCA.dll</SfxCADll>
21 - </PropertyGroup>
22 -
23 - <!--
24 - ==================================================================================================
25 - PackCustomAction
26 -
27 - Creates an MSI managed custom action package that includes the custom action assembly,
28 - local assembly dependencies, and project content files.
29 -
30 - [IN]
31 - @(IntermediateAssembly) - Managed custom action assembly.
32 - @(Content) - Project items of type Content will be included in the package.
33 - $(CustomActionContents) - Optional space-delimited list of additional files to include.
34 -
35 - [OUT]
36 - $(IntermediateOutputPath)$(TargetCAFileName) - Managed custom action package with unmanaged stub.
37 - ==================================================================================================
38 - -->
39 - <Target Name="PackCustomAction"
40 - Inputs="@(IntermediateAssembly);@(Content);$(CustomActionContents)"
41 - Outputs="$(IntermediateOutputPath)$(TargetCAFileName)">
42 -
43 - <!-- Find all referenced items marked CopyLocal, but exclude non-binary files. -->
44 - <ItemGroup>
45 - <CustomActionReferenceContents Include="@(ReferenceCopyLocalPaths)"
46 - Condition=" '%(Extension)' == '.dll' or '%(Extension)' == '.exe' " />
47 - <CustomActionReferenceContents Include="@(ReferenceComWrappersToCopyLocal)"
48 - Condition=" '%(Extension)' == '.dll' or '%(Extension)' == '.exe' " />
49 -
50 - <!-- include PDBs for Debug only -->
51 - <CustomActionReferenceContents Include="@(IntermediateAssembly->'%(RootDir)%(Directory)%(Filename).pdb')"
52 - Condition=" Exists('%(RootDir)%(Directory)%(Filename).pdb') and '$(Configuration)' == 'Debug' " />
53 - <CustomActionReferenceContents Include="@(ReferenceCopyLocalPaths)"
54 - Condition=" '%(Extension)' == '.pdb' and '$(Configuration)' == 'Debug' " />
55 - <CustomActionReferenceContents Include="@(ReferenceComWrappersToCopyLocal)"
56 - Condition=" '%(Extension)' == '.pdb' and '$(Configuration)' == 'Debug' " />
57 - </ItemGroup>
58 -
59 - <!--
60 - Items to include in the CA package:
61 - - Reference assemblies marked CopyLocal
62 - - Project items of type Content
63 - - Additional items in the CustomActionContents property
64 - -->
65 - <PropertyGroup>
66 - <CustomActionContents>@(CustomActionReferenceContents);@(Content->'%(FullPath)');$(CustomActionContents)</CustomActionContents>
67 - </PropertyGroup>
68 -
69 - <ItemGroup>
70 - <IntermediateCAAssembly Include="@(IntermediateAssembly->'%(FullPath)')" />
71 - <IntermediateCAPackage Include="@(IntermediateAssembly->'%(RootDir)%(Directory)$(TargetCAFileName)')" />
72 - </ItemGroup>
73 -
74 - <!-- Run the MakeSfxCA.exe CA packaging tool. -->
75 - <Exec Command='"$(MakeSfxCA)" "@(IntermediateCAPackage)" "$(SfxCADll)" "@(IntermediateCAAssembly)" "$(CustomActionContents)"'
76 - WorkingDirectory="$(ProjectDir)" />
77 -
78 - <!-- Add modules to be copied to output dir. -->
79 - <ItemGroup>
80 - <AddModules Include="@(IntermediateCAPackage)" />
81 - </ItemGroup>
82 - </Target>
83 -
84 - <!--
85 - ==================================================================================================
86 - CleanCustomAction
87 -
88 - Cleans the .CA.dll binary created by the PackCustomAction target.
89 -
90 - ==================================================================================================
91 - -->
92 - <Target Name="CleanCustomAction">
93 - <Delete Files="$(IntermediateOutputPath)$(TargetCAFileName)"
94 - TreatErrorsAsWarnings="true" />
95 - </Target>
96 -
97 - <!--
98 - ==================================================================================================
99 - AfterCompile (redefinition)
100 -
101 - Calls the PackCustomAction target after compiling.
102 - Overrides the empty AfterCompile target from Microsoft.Common.targets.
103 -
104 - ==================================================================================================
105 - -->
106 - <Target Name="AfterCompile"
107 - DependsOnTargets="PackCustomAction" />
108 -
109 - <!--
110 - ==================================================================================================
111 - BeforeClean (redefinition)
112 -
113 - Calls the CleanCustomAction target before cleaning.
114 - Overrides the empty AfterCompile target from Microsoft.Common.targets.
115 -
116 - ==================================================================================================
117 - -->
118 - <Target Name="BeforeClean"
119 - DependsOnTargets="CleanCustomAction" />
120 -
121 - <Import Project="$(CustomAfterWixCATargets)" Condition=" '$(CustomAfterWixCATargets)' != '' and Exists('$(CustomAfterWixCATargets)')" />
122 -
123 -</Project>
src/dtf/WixToolset.Dtf.MakeSfxCA/MakeSfxCA.cs renamed
+25 -26
@@ -1,6 +1,6 @@
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.Dtf.Tools.MakeSfxCA
3 +namespace WixToolset.Dtf.MakeSfxCA
4 {
5 using System;
6 using System.IO;
@@ -8,10 +8,10 @@ namespace WixToolset.Dtf.Tools.MakeSfxCA
8 using System.Security;
9 using System.Text;
10 using System.Reflection;
11 - using Compression;
12 - using Compression.Cab;
13 - using Resources;
14 - using ResourceCollection = Resources.ResourceCollection;
11 + using WixToolset.Dtf.Compression;
12 + using WixToolset.Dtf.Compression.Cab;
13 + using WixToolset.Dtf.Resources;
14 + using ResourceCollection = WixToolset.Dtf.Resources.ResourceCollection;
15
16 /// <summary>
17 /// Command-line tool for building self-extracting custom action packages.
@@ -30,11 +30,10 @@ namespace WixToolset.Dtf.Tools.MakeSfxCA
30 /// <param name="w">Console text writer.</param>
31 public static void Usage(TextWriter w)
32 {
33 - w.WriteLine("Deployment Tools Foundation custom action packager version {0}",
34 - Assembly.GetExecutingAssembly().GetName().Version);
33 + w.WriteLine("WiX Toolset custom action packager version {0}", Assembly.GetExecutingAssembly().GetName().Version);
34 w.WriteLine("Copyright (C) .NET Foundation and contributors. All rights reserved.");
35 w.WriteLine();
37 - w.WriteLine("Usage: MakeSfxCA <outputca.dll> SfxCA.dll <inputca.dll> [support files ...]");
36 + w.WriteLine("Usage: WixToolset.Dtf.MakeSfxCA <outputca.dll> SfxCA.dll <inputca.dll> [support files ...]");
37 w.WriteLine();
38 w.WriteLine("Makes a self-extracting managed MSI CA or UI DLL package.");
39 w.WriteLine("Support files must include " + MakeSfxCA.REQUIRED_WI_ASSEMBLY);
@@ -90,12 +89,12 @@ namespace WixToolset.Dtf.Tools.MakeSfxCA
89 {
90 MakeSfxCA.log = log;
91
93 - if (string.IsNullOrEmpty(output))
92 + if (String.IsNullOrEmpty(output))
93 {
94 throw new ArgumentNullException("output");
95 }
96
98 - if (string.IsNullOrEmpty(sfxDll))
97 + if (String.IsNullOrEmpty(sfxDll))
98 {
99 throw new ArgumentNullException("sfxDll");
100 }
@@ -123,7 +122,7 @@ namespace WixToolset.Dtf.Tools.MakeSfxCA
122 var foundWIAssembly = false;
123 foreach (var input in inputsMap.Keys)
124 {
126 - if (string.Compare(input, MakeSfxCA.REQUIRED_WI_ASSEMBLY,
125 + if (String.Compare(input, MakeSfxCA.REQUIRED_WI_ASSEMBLY,
126 StringComparison.OrdinalIgnoreCase) == 0)
127 {
128 foundWIAssembly = true;
@@ -183,7 +182,7 @@ namespace WixToolset.Dtf.Tools.MakeSfxCA
182
183 foreach (var item in list)
184 {
186 - if (!string.IsNullOrEmpty(item))
185 + if (!String.IsNullOrEmpty(item))
186 {
187 foreach (var splitItem in item.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
188 {
@@ -216,9 +215,9 @@ namespace WixToolset.Dtf.Tools.MakeSfxCA
215 {
216 var inputName = Path.GetFileNameWithoutExtension(inputFile);
217 var inputExtension = Path.GetExtension(inputFile);
219 - if (string.Equals(inputName, resolveName.Name, StringComparison.OrdinalIgnoreCase) &&
220 - (string.Equals(inputExtension, ".dll", StringComparison.OrdinalIgnoreCase) ||
221 - string.Equals(inputExtension, ".exe", StringComparison.OrdinalIgnoreCase)))
218 + if (String.Equals(inputName, resolveName.Name, StringComparison.OrdinalIgnoreCase) &&
219 + (String.Equals(inputExtension, ".dll", StringComparison.OrdinalIgnoreCase) ||
220 + String.Equals(inputExtension, ".exe", StringComparison.OrdinalIgnoreCase)))
221 {
222 assembly = MakeSfxCA.TryLoadDependentAssembly(inputFile);
223
@@ -268,7 +267,7 @@ namespace WixToolset.Dtf.Tools.MakeSfxCA
267
268 if (assembly != null)
269 {
271 - if (string.Equals(assembly.GetName().ToString(), resolveName.ToString()))
270 + if (String.Equals(assembly.GetName().ToString(), resolveName.ToString()))
271 {
272 log.WriteLine(" Loaded dependent assembly: " + assembly.Location);
273 return assembly;
@@ -373,7 +372,7 @@ namespace WixToolset.Dtf.Tools.MakeSfxCA
372 var entryPointName = MakeSfxCA.GetEntryPoint(method);
373 if (entryPointName != null)
374 {
376 - var entryPointPath = string.Format(
375 + var entryPointPath = String.Format(
376 "{0}!{1}.{2}",
377 Path.GetFileNameWithoutExtension(module),
378 type.FullName,
@@ -421,7 +420,7 @@ namespace WixToolset.Dtf.Tools.MakeSfxCA
420 break;
421 }
422
424 - if (string.IsNullOrEmpty(entryPointName))
423 + if (String.IsNullOrEmpty(entryPointName))
424 {
425 entryPointName = method.Name;
426 }
@@ -444,7 +443,7 @@ namespace WixToolset.Dtf.Tools.MakeSfxCA
443 {
444 for (var count = 0; ; count++)
445 {
447 - var templateName = string.Format(entryPointFormat, count);
446 + var templateName = String.Format(entryPointFormat, count);
447 var templateAsciiBytes = Encoding.ASCII.GetBytes(templateName);
448
449 var nameOffset = FindBytes(fileBytes, templateAsciiBytes);
@@ -491,7 +490,7 @@ namespace WixToolset.Dtf.Tools.MakeSfxCA
490
491 if (entryPoints.Count > slotCount)
492 {
494 - throw new ArgumentException(string.Format(
493 + throw new ArgumentException(String.Format(
494 "The custom action assembly has {0} entrypoints, which is more than the maximum ({1}). " +
495 "Refactor the custom actions or add more entrypoint slots in SfxCA\\EntryPoints.h.",
496 entryPoints.Count, slotCount));
@@ -500,7 +499,7 @@ namespace WixToolset.Dtf.Tools.MakeSfxCA
499 var slotSort = new string[slotCount];
500 for (var i = 0; i < slotCount - entryPoints.Count; i++)
501 {
503 - slotSort[i] = string.Empty;
502 + slotSort[i] = String.Empty;
503 }
504
505 entryPoints.Keys.CopyTo(slotSort, slotCount - entryPoints.Count);
@@ -508,7 +507,7 @@ namespace WixToolset.Dtf.Tools.MakeSfxCA
507
508 for (var i = 0; ; i++)
509 {
511 - var templateName = string.Format(ENTRYPOINT_FORMAT, i);
510 + var templateName = String.Format(ENTRYPOINT_FORMAT, i);
511 var templateAsciiBytes = Encoding.ASCII.GetBytes(templateName);
512 var templateUniBytes = Encoding.Unicode.GetBytes(templateName);
513
@@ -526,11 +525,11 @@ namespace WixToolset.Dtf.Tools.MakeSfxCA
525
526 var entryPointName = slotSort[i];
527 var entryPointPath = entryPointName.Length > 0 ?
529 - entryPoints[entryPointName] : string.Empty;
528 + entryPoints[entryPointName] : String.Empty;
529
530 if (entryPointName.Length > MAX_ENTRYPOINT_NAME)
531 {
533 - throw new ArgumentException(string.Format(
532 + throw new ArgumentException(String.Format(
533 "Entry point name exceeds limit of {0} characters: {1}",
534 MAX_ENTRYPOINT_NAME,
535 entryPointName));
@@ -538,7 +537,7 @@ namespace WixToolset.Dtf.Tools.MakeSfxCA
537
538 if (entryPointPath.Length > MAX_ENTRYPOINT_PATH)
539 {
541 - throw new ArgumentException(string.Format(
540 + throw new ArgumentException(String.Format(
541 "Entry point path exceeds limit of {0} characters: {1}",
542 MAX_ENTRYPOINT_PATH,
543 entryPointPath));
@@ -570,7 +569,7 @@ namespace WixToolset.Dtf.Tools.MakeSfxCA
569
570 if (uiClass.Length > MAX_ENTRYPOINT_PATH)
571 {
573 - throw new ArgumentException(string.Format(
572 + throw new ArgumentException(String.Format(
573 "UI class full name exceeds limit of {0} characters: {1}",
574 MAX_ENTRYPOINT_PATH,
575 uiClass));
src/dtf/WixToolset.Dtf.MakeSfxCA/MakeSfxCA.exe.manifest new
+11
@@ -0,0 +1,11 @@
1 +<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2 +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
3 + <assemblyIdentity name="WixToolset.Dtf.MakeSfxCA" version="4.0.0.0" processorArchitecture="x86" type="win32"/>
4 + <description>WiX Toolset Compiler</description>
5 + <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
6 + <security><requestedPrivileges><requestedExecutionLevel level="asInvoker" uiAccess="false"/></requestedPrivileges></security>
7 + </trustInfo>
8 + <application xmlns="urn:schemas-microsoft-com:asm.v3">
9 + <windowsSettings xmlns:ws2="http://schemas.microsoft.com/SMI/2016/WindowsSettings"><ws2:longPathAware>true</ws2:longPathAware></windowsSettings>
10 + </application>
11 +</assembly>
src/dtf/WixToolset.Dtf.MakeSfxCA/WixToolset.Dtf.MakeSfxCA.csproj new
+19
@@ -0,0 +1,19 @@
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 Sdk="Microsoft.NET.Sdk">
5 + <PropertyGroup>
6 + <OutputType>Exe</OutputType>
7 + <TargetFrameworks>net472</TargetFrameworks>
8 + <IsPackable>false</IsPackable>
9 + <DebugType>embedded</DebugType>
10 + <AppConfig>app.config</AppConfig>
11 + <ApplicationManifest>MakeSfxCA.exe.manifest</ApplicationManifest>
12 + </PropertyGroup>
13 +
14 + <ItemGroup>
15 + <ProjectReference Include="..\WixToolset.Dtf.Compression.Cab\WixToolset.Dtf.Compression.Cab.csproj" />
16 + <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" />
17 + <ProjectReference Include="..\WixToolset.Dtf.Resources\WixToolset.Dtf.Resources.csproj" />
18 + </ItemGroup>
19 +</Project>
src/dtf/WixToolset.Dtf.MakeSfxCA/app.config new
+7
@@ -0,0 +1,7 @@
1 +<?xml version="1.0" encoding="utf-8" ?>
2 +<configuration>
3 + <runtime>
4 + <loadFromRemoteSources enabled="true"/>
5 + <AppContextSwitchOverrides value="Switch.System.IO.UseLegacyPathHandling=false;Switch.System.IO.BlockLongPaths=false" />
6 + </runtime>
7 +</configuration>
src/dtf/WixToolset.Dtf.Resources/ResourceCollection.cs
+18 -18
@@ -18,7 +18,7 @@ namespace WixToolset.Dtf.Resources
18 /// <remarks>
19 /// To use this class:<list type="number">
20 /// <item>Create a new ResourceCollection</item>
21 - /// <item>Locate resources for the collection by calling one of the <see cref="ResourceCollection.Find(string)"/> methods</item>
21 + /// <item>Locate resources for the collection by calling one of the <see cref="ResourceCollection.Find(String)"/> methods</item>
22 /// <item>Load data of one or more <see cref="Resource"/>s from a file by calling the <see cref="Load"/> method of the
23 /// Resource class, or load them all at once (more efficient) with the <see cref="Load"/> method of the ResourceCollection.</item>
24 /// <item>Read and/or edit data of the individual Resource objects using the methods on that class.</item>
@@ -28,7 +28,7 @@ namespace WixToolset.Dtf.Resources
28 /// </remarks>
29 public class ResourceCollection : ICollection<Resource>
30 {
31 - private List<Resource> resources;
31 + private readonly List<Resource> resources;
32
33 /// <summary>
34 /// Creates a new, empty ResourceCollection.
@@ -48,17 +48,17 @@ namespace WixToolset.Dtf.Resources
48 {
49 this.Clear();
50
51 - IntPtr module = NativeMethods.LoadLibraryEx(resFile, IntPtr.Zero, NativeMethods.LOAD_LIBRARY_AS_DATAFILE);
51 + var module = NativeMethods.LoadLibraryEx(resFile, IntPtr.Zero, NativeMethods.LOAD_LIBRARY_AS_DATAFILE);
52 if (module == IntPtr.Zero)
53 {
54 - int err = Marshal.GetLastWin32Error();
54 + var err = Marshal.GetLastWin32Error();
55 throw new IOException(String.Format(CultureInfo.InvariantCulture, "Failed to load resource file. Error code: {0}", err));
56 }
57 try
58 {
59 if (!NativeMethods.EnumResourceTypes(module, new NativeMethods.EnumResTypesProc(this.EnumResTypes), IntPtr.Zero))
60 {
61 - int err = Marshal.GetLastWin32Error();
61 + var err = Marshal.GetLastWin32Error();
62 throw new IOException(String.Format(CultureInfo.InvariantCulture, "Failed to enumerate resources. Error code: {0}", err));
63 }
64 }
@@ -79,12 +79,12 @@ namespace WixToolset.Dtf.Resources
79 {
80 this.Clear();
81
82 - IntPtr module = NativeMethods.LoadLibraryEx(resFile, IntPtr.Zero, NativeMethods.LOAD_LIBRARY_AS_DATAFILE);
82 + var module = NativeMethods.LoadLibraryEx(resFile, IntPtr.Zero, NativeMethods.LOAD_LIBRARY_AS_DATAFILE);
83 try
84 {
85 if (!NativeMethods.EnumResourceNames(module, (string) type, new NativeMethods.EnumResNamesProc(this.EnumResNames), IntPtr.Zero))
86 {
87 - int err = Marshal.GetLastWin32Error();
87 + var err = Marshal.GetLastWin32Error();
88 throw new IOException(String.Format(CultureInfo.InvariantCulture, "EnumResourceNames error. Error code: {0}", err));
89 }
90 }
@@ -106,12 +106,12 @@ namespace WixToolset.Dtf.Resources
106 {
107 this.Clear();
108
109 - IntPtr module = NativeMethods.LoadLibraryEx(resFile, IntPtr.Zero, NativeMethods.LOAD_LIBRARY_AS_DATAFILE);
109 + var module = NativeMethods.LoadLibraryEx(resFile, IntPtr.Zero, NativeMethods.LOAD_LIBRARY_AS_DATAFILE);
110 try
111 {
112 if (!NativeMethods.EnumResourceLanguages(module, (string) type, name, new NativeMethods.EnumResLangsProc(this.EnumResLangs), IntPtr.Zero))
113 {
114 - int err = Marshal.GetLastWin32Error();
114 + var err = Marshal.GetLastWin32Error();
115 throw new IOException(String.Format(CultureInfo.InvariantCulture, "EnumResourceLanguages error. Error code: {0}", err));
116 }
117 }
@@ -123,9 +123,9 @@ namespace WixToolset.Dtf.Resources
123
124 private bool EnumResTypes(IntPtr module, IntPtr type, IntPtr param)
125 {
126 - if (!NativeMethods.EnumResourceNames(module, type, new NativeMethods.EnumResNamesProc(EnumResNames), IntPtr.Zero))
126 + if (!NativeMethods.EnumResourceNames(module, type, new NativeMethods.EnumResNamesProc(this.EnumResNames), IntPtr.Zero))
127 {
128 - int err = Marshal.GetLastWin32Error();
128 + var err = Marshal.GetLastWin32Error();
129 throw new IOException(String.Format(CultureInfo.InvariantCulture, "EnumResourceNames error! Error code: {0}", err));
130 }
131 return true;
@@ -133,9 +133,9 @@ namespace WixToolset.Dtf.Resources
133
134 private bool EnumResNames(IntPtr module, IntPtr type, IntPtr name, IntPtr param)
135 {
136 - if (!NativeMethods.EnumResourceLanguages(module, type, name, new NativeMethods.EnumResLangsProc(EnumResLangs), IntPtr.Zero))
136 + if (!NativeMethods.EnumResourceLanguages(module, type, name, new NativeMethods.EnumResLangsProc(this.EnumResLangs), IntPtr.Zero))
137 {
138 - int err = Marshal.GetLastWin32Error();
138 + var err = Marshal.GetLastWin32Error();
139 throw new IOException(String.Format(CultureInfo.InvariantCulture, "EnumResourceLanguages error. Error code: {0}", err));
140 }
141 return true;
@@ -179,10 +179,10 @@ namespace WixToolset.Dtf.Resources
179 /// <param name="file">The file from which resources are loaded.</param>
180 public void Load(string file)
181 {
182 - IntPtr module = NativeMethods.LoadLibraryEx(file, IntPtr.Zero, NativeMethods.LOAD_LIBRARY_AS_DATAFILE);
182 + var module = NativeMethods.LoadLibraryEx(file, IntPtr.Zero, NativeMethods.LOAD_LIBRARY_AS_DATAFILE);
183 try
184 {
185 - foreach (Resource res in this)
185 + foreach (var res in this)
186 {
187 res.Load(module);
188 }
@@ -199,17 +199,17 @@ namespace WixToolset.Dtf.Resources
199 /// <param name="file">The file to which resources are saved.</param>
200 public void Save(string file)
201 {
202 - IntPtr updateHandle = IntPtr.Zero;
202 + var updateHandle = IntPtr.Zero;
203 try
204 {
205 updateHandle = NativeMethods.BeginUpdateResource(file, false);
206 - foreach (Resource res in this)
206 + foreach (var res in this)
207 {
208 res.Save(updateHandle);
209 }
210 if (!NativeMethods.EndUpdateResource(updateHandle, false))
211 {
212 - int err = Marshal.GetLastWin32Error();
212 + var err = Marshal.GetLastWin32Error();
213 throw new IOException(String.Format(CultureInfo.InvariantCulture, "Failed to save resource. Error {0}", err));
214 }
215 updateHandle = IntPtr.Zero;
src/dtf/dtf.cmd
+2
@@ -8,6 +8,8 @@
8
9 @echo Building dtf %_C%
10
11 +msbuild -Restore SfxCA\sfxca_t.proj -p:Configuration=%_C% -nologo -m -warnaserror -bl:..\..\build\logs\dtf_sfxca.binlog || exit /b
12 +
13 msbuild -Restore -t:Pack dtf.sln -p:Configuration=%_C% -nologo -m -warnaserror -bl:..\..\build\logs\dtf_build.binlog || exit /b
14
15 @popd
src/dtf/dtf.sln
+63 -39
@@ -1,33 +1,39 @@
1 
2 Microsoft Visual Studio Solution File, Format Version 12.00
3 -# Visual Studio 15
4 -VisualStudioVersion = 15.0.26730.8
3 +# Visual Studio Version 17
4 +VisualStudioVersion = 17.1.32228.430
5 MinimumVisualStudioVersion = 15.0.26124.0
6 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dtf.Compression", "WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj", "{2D62850C-9F81-4BE9-BDF3-9379389C8F7B}"
6 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Dtf.Compression", "WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj", "{2D62850C-9F81-4BE9-BDF3-9379389C8F7B}"
7 EndProject
8 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dtf.Compression.Cab", "WixToolset.Dtf.Compression.Cab\WixToolset.Dtf.Compression.Cab.csproj", "{15895FD1-DD68-407B-8717-08F6DD14F02C}"
8 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Dtf.Compression.Cab", "WixToolset.Dtf.Compression.Cab\WixToolset.Dtf.Compression.Cab.csproj", "{15895FD1-DD68-407B-8717-08F6DD14F02C}"
9 EndProject
10 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dtf.Compression.Zip", "WixToolset.Dtf.Compression.Zip\WixToolset.Dtf.Compression.Zip.csproj", "{261F2857-B521-42A4-A3E0-B5165F225E50}"
10 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Dtf.Compression.Zip", "WixToolset.Dtf.Compression.Zip\WixToolset.Dtf.Compression.Zip.csproj", "{261F2857-B521-42A4-A3E0-B5165F225E50}"
11 EndProject
12 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dtf.Resources", "WixToolset.Dtf.Resources\WixToolset.Dtf.Resources.csproj", "{44931ECB-8D6F-4C12-A872-64E261B6A98E}"
12 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Dtf.Resources", "WixToolset.Dtf.Resources\WixToolset.Dtf.Resources.csproj", "{44931ECB-8D6F-4C12-A872-64E261B6A98E}"
13 EndProject
14 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dtf.WindowsInstaller", "WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj", "{24121677-0ED0-41B5-833F-1B9A18E87BF4}"
14 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Dtf.WindowsInstaller", "WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj", "{24121677-0ED0-41B5-833F-1B9A18E87BF4}"
15 EndProject
16 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dtf.WindowsInstaller.Linq", "WixToolset.Dtf.WindowsInstaller.Linq\WixToolset.Dtf.WindowsInstaller.Linq.csproj", "{CD7A37D8-9D8C-41BD-B78F-DB5E0C299D2E}"
16 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Dtf.WindowsInstaller.Linq", "WixToolset.Dtf.WindowsInstaller.Linq\WixToolset.Dtf.WindowsInstaller.Linq.csproj", "{CD7A37D8-9D8C-41BD-B78F-DB5E0C299D2E}"
17 EndProject
18 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dtf.WindowsInstaller.Package", "WixToolset.Dtf.WindowsInstaller.Package\WixToolset.Dtf.WindowsInstaller.Package.csproj", "{1A9940A7-3E29-4428-B753-C4CC66058F1A}"
18 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Dtf.WindowsInstaller.Package", "WixToolset.Dtf.WindowsInstaller.Package\WixToolset.Dtf.WindowsInstaller.Package.csproj", "{1A9940A7-3E29-4428-B753-C4CC66058F1A}"
19 EndProject
20 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.Compression", "WixToolsetTests.Dtf.Compression\WixToolsetTests.Dtf.Compression.csproj", "{F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}"
20 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.Compression", "test\WixToolsetTests.Dtf.Compression\WixToolsetTests.Dtf.Compression.csproj", "{F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}"
21 EndProject
22 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.Compression.Cab", "WixToolsetTests.Dtf.Compression.Cab\WixToolsetTests.Dtf.Compression.Cab.csproj", "{4544158C-2D63-4146-85FF-62169280144E}"
22 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.Compression.Cab", "test\WixToolsetTests.Dtf.Compression.Cab\WixToolsetTests.Dtf.Compression.Cab.csproj", "{4544158C-2D63-4146-85FF-62169280144E}"
23 EndProject
24 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.Compression.Zip", "WixToolsetTests.Dtf.Compression.Zip\WixToolsetTests.Dtf.Compression.Zip.csproj", "{328799BB-7B03-4B28-8180-4132211FD07D}"
24 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.Compression.Zip", "test\WixToolsetTests.Dtf.Compression.Zip\WixToolsetTests.Dtf.Compression.Zip.csproj", "{328799BB-7B03-4B28-8180-4132211FD07D}"
25 EndProject
26 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.WindowsInstaller", "WixToolsetTests.Dtf.WindowsInstaller\WixToolsetTests.Dtf.WindowsInstaller.csproj", "{16F5202F-9276-4166-975C-C9654BAF8012}"
26 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.WindowsInstaller", "test\WixToolsetTests.Dtf.WindowsInstaller\WixToolsetTests.Dtf.WindowsInstaller.csproj", "{16F5202F-9276-4166-975C-C9654BAF8012}"
27 EndProject
28 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.WindowsInstaller.CustomActions", "WixToolsetTests.Dtf.WindowsInstaller.CustomActions\WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj", "{137D376B-989F-4FEA-9A67-01D8D38CA0DE}"
28 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.WindowsInstaller.CustomActions", "test\WixToolsetTests.Dtf.WindowsInstaller.CustomActions\WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj", "{137D376B-989F-4FEA-9A67-01D8D38CA0DE}"
29 EndProject
30 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.WindowsInstaller.Linq", "WixToolsetTests.Dtf.WindowsInstaller.Linq\WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj", "{4F55F9B8-D8B6-41EB-8796-221B4CD98324}"
30 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.WindowsInstaller.Linq", "test\WixToolsetTests.Dtf.WindowsInstaller.Linq\WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj", "{4F55F9B8-D8B6-41EB-8796-221B4CD98324}"
31 +EndProject
32 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{222DA0A6-5E28-4D7A-A227-B818B0C55BAB}"
33 +EndProject
34 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Dtf.MakeSfxCA", "WixToolset.Dtf.MakeSfxCA\WixToolset.Dtf.MakeSfxCA.csproj", "{F8CA8E72-08BF-4A8A-AD32-C638616B72E2}"
35 +EndProject
36 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Dtf.CustomAction", "WixToolset.Dtf.CustomAction\WixToolset.Dtf.CustomAction.csproj", "{D6C0D94C-80A5-495C-B573-C7440A8594F5}"
37 EndProject
38 Global
39 GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -129,8 +135,8 @@ Global
135 {F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}.Debug|x64.Build.0 = Debug|Any CPU
136 {F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}.Debug|x86.ActiveCfg = Debug|Any CPU
137 {F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}.Debug|x86.Build.0 = Debug|Any CPU
132 - {F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
133 - {F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}.Release|Any CPU.Build.0 = Release|Any CPU
138 + {F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}.Release|Any CPU.ActiveCfg = Debug|Any CPU
139 + {F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}.Release|Any CPU.Build.0 = Debug|Any CPU
140 {F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}.Release|x64.ActiveCfg = Release|Any CPU
141 {F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}.Release|x64.Build.0 = Release|Any CPU
142 {F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}.Release|x86.ActiveCfg = Release|Any CPU
@@ -141,8 +147,8 @@ Global
147 {4544158C-2D63-4146-85FF-62169280144E}.Debug|x64.Build.0 = Debug|Any CPU
148 {4544158C-2D63-4146-85FF-62169280144E}.Debug|x86.ActiveCfg = Debug|Any CPU
149 {4544158C-2D63-4146-85FF-62169280144E}.Debug|x86.Build.0 = Debug|Any CPU
144 - {4544158C-2D63-4146-85FF-62169280144E}.Release|Any CPU.ActiveCfg = Release|Any CPU
145 - {4544158C-2D63-4146-85FF-62169280144E}.Release|Any CPU.Build.0 = Release|Any CPU
150 + {4544158C-2D63-4146-85FF-62169280144E}.Release|Any CPU.ActiveCfg = Debug|Any CPU
151 + {4544158C-2D63-4146-85FF-62169280144E}.Release|Any CPU.Build.0 = Debug|Any CPU
152 {4544158C-2D63-4146-85FF-62169280144E}.Release|x64.ActiveCfg = Release|Any CPU
153 {4544158C-2D63-4146-85FF-62169280144E}.Release|x64.Build.0 = Release|Any CPU
154 {4544158C-2D63-4146-85FF-62169280144E}.Release|x86.ActiveCfg = Release|Any CPU
@@ -153,8 +159,8 @@ Global
159 {328799BB-7B03-4B28-8180-4132211FD07D}.Debug|x64.Build.0 = Debug|Any CPU
160 {328799BB-7B03-4B28-8180-4132211FD07D}.Debug|x86.ActiveCfg = Debug|Any CPU
161 {328799BB-7B03-4B28-8180-4132211FD07D}.Debug|x86.Build.0 = Debug|Any CPU
156 - {328799BB-7B03-4B28-8180-4132211FD07D}.Release|Any CPU.ActiveCfg = Release|Any CPU
157 - {328799BB-7B03-4B28-8180-4132211FD07D}.Release|Any CPU.Build.0 = Release|Any CPU
162 + {328799BB-7B03-4B28-8180-4132211FD07D}.Release|Any CPU.ActiveCfg = Debug|Any CPU
163 + {328799BB-7B03-4B28-8180-4132211FD07D}.Release|Any CPU.Build.0 = Debug|Any CPU
164 {328799BB-7B03-4B28-8180-4132211FD07D}.Release|x64.ActiveCfg = Release|Any CPU
165 {328799BB-7B03-4B28-8180-4132211FD07D}.Release|x64.Build.0 = Release|Any CPU
166 {328799BB-7B03-4B28-8180-4132211FD07D}.Release|x86.ActiveCfg = Release|Any CPU
@@ -165,8 +171,8 @@ Global
171 {16F5202F-9276-4166-975C-C9654BAF8012}.Debug|x64.Build.0 = Debug|Any CPU
172 {16F5202F-9276-4166-975C-C9654BAF8012}.Debug|x86.ActiveCfg = Debug|Any CPU
173 {16F5202F-9276-4166-975C-C9654BAF8012}.Debug|x86.Build.0 = Debug|Any CPU
168 - {16F5202F-9276-4166-975C-C9654BAF8012}.Release|Any CPU.ActiveCfg = Release|Any CPU
169 - {16F5202F-9276-4166-975C-C9654BAF8012}.Release|Any CPU.Build.0 = Release|Any CPU
174 + {16F5202F-9276-4166-975C-C9654BAF8012}.Release|Any CPU.ActiveCfg = Debug|Any CPU
175 + {16F5202F-9276-4166-975C-C9654BAF8012}.Release|Any CPU.Build.0 = Debug|Any CPU
176 {16F5202F-9276-4166-975C-C9654BAF8012}.Release|x64.ActiveCfg = Release|Any CPU
177 {16F5202F-9276-4166-975C-C9654BAF8012}.Release|x64.Build.0 = Release|Any CPU
178 {16F5202F-9276-4166-975C-C9654BAF8012}.Release|x86.ActiveCfg = Release|Any CPU
@@ -177,8 +183,8 @@ Global
183 {137D376B-989F-4FEA-9A67-01D8D38CA0DE}.Debug|x64.Build.0 = Debug|Any CPU
184 {137D376B-989F-4FEA-9A67-01D8D38CA0DE}.Debug|x86.ActiveCfg = Debug|Any CPU
185 {137D376B-989F-4FEA-9A67-01D8D38CA0DE}.Debug|x86.Build.0 = Debug|Any CPU
180 - {137D376B-989F-4FEA-9A67-01D8D38CA0DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
181 - {137D376B-989F-4FEA-9A67-01D8D38CA0DE}.Release|Any CPU.Build.0 = Release|Any CPU
186 + {137D376B-989F-4FEA-9A67-01D8D38CA0DE}.Release|Any CPU.ActiveCfg = Debug|Any CPU
187 + {137D376B-989F-4FEA-9A67-01D8D38CA0DE}.Release|Any CPU.Build.0 = Debug|Any CPU
188 {137D376B-989F-4FEA-9A67-01D8D38CA0DE}.Release|x64.ActiveCfg = Release|Any CPU
189 {137D376B-989F-4FEA-9A67-01D8D38CA0DE}.Release|x64.Build.0 = Release|Any CPU
190 {137D376B-989F-4FEA-9A67-01D8D38CA0DE}.Release|x86.ActiveCfg = Release|Any CPU
@@ -189,29 +195,47 @@ Global
195 {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Debug|x64.Build.0 = Debug|Any CPU
196 {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Debug|x86.ActiveCfg = Debug|Any CPU
197 {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Debug|x86.Build.0 = Debug|Any CPU
192 - {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Release|Any CPU.ActiveCfg = Release|Any CPU
193 - {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Release|Any CPU.Build.0 = Release|Any CPU
198 + {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Release|Any CPU.ActiveCfg = Debug|Any CPU
199 + {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Release|Any CPU.Build.0 = Debug|Any CPU
200 {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Release|x64.ActiveCfg = Release|Any CPU
201 {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Release|x64.Build.0 = Release|Any CPU
202 {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Release|x86.ActiveCfg = Release|Any CPU
203 {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Release|x86.Build.0 = Release|Any CPU
198 - {E7A00377-A0B5-400F-8337-C0814AAC7153}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
199 - {E7A00377-A0B5-400F-8337-C0814AAC7153}.Debug|Any CPU.Build.0 = Debug|Any CPU
200 - {E7A00377-A0B5-400F-8337-C0814AAC7153}.Debug|x64.ActiveCfg = Debug|Any CPU
201 - {E7A00377-A0B5-400F-8337-C0814AAC7153}.Debug|x64.Build.0 = Debug|Any CPU
202 - {E7A00377-A0B5-400F-8337-C0814AAC7153}.Debug|x86.ActiveCfg = Debug|Any CPU
203 - {E7A00377-A0B5-400F-8337-C0814AAC7153}.Debug|x86.Build.0 = Debug|Any CPU
204 - {E7A00377-A0B5-400F-8337-C0814AAC7153}.Release|Any CPU.ActiveCfg = Release|Any CPU
205 - {E7A00377-A0B5-400F-8337-C0814AAC7153}.Release|Any CPU.Build.0 = Release|Any CPU
206 - {E7A00377-A0B5-400F-8337-C0814AAC7153}.Release|x64.ActiveCfg = Release|Any CPU
207 - {E7A00377-A0B5-400F-8337-C0814AAC7153}.Release|x64.Build.0 = Release|Any CPU
208 - {E7A00377-A0B5-400F-8337-C0814AAC7153}.Release|x86.ActiveCfg = Release|Any CPU
209 - {E7A00377-A0B5-400F-8337-C0814AAC7153}.Release|x86.Build.0 = Release|Any CPU
204 + {F8CA8E72-08BF-4A8A-AD32-C638616B72E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
205 + {F8CA8E72-08BF-4A8A-AD32-C638616B72E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
206 + {F8CA8E72-08BF-4A8A-AD32-C638616B72E2}.Debug|x64.ActiveCfg = Debug|Any CPU
207 + {F8CA8E72-08BF-4A8A-AD32-C638616B72E2}.Debug|x64.Build.0 = Debug|Any CPU
208 + {F8CA8E72-08BF-4A8A-AD32-C638616B72E2}.Debug|x86.ActiveCfg = Debug|Any CPU
209 + {F8CA8E72-08BF-4A8A-AD32-C638616B72E2}.Debug|x86.Build.0 = Debug|Any CPU
210 + {F8CA8E72-08BF-4A8A-AD32-C638616B72E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
211 + {F8CA8E72-08BF-4A8A-AD32-C638616B72E2}.Release|Any CPU.Build.0 = Release|Any CPU
212 + {F8CA8E72-08BF-4A8A-AD32-C638616B72E2}.Release|x64.ActiveCfg = Release|Any CPU
213 + {F8CA8E72-08BF-4A8A-AD32-C638616B72E2}.Release|x64.Build.0 = Release|Any CPU
214 + {F8CA8E72-08BF-4A8A-AD32-C638616B72E2}.Release|x86.ActiveCfg = Release|Any CPU
215 + {F8CA8E72-08BF-4A8A-AD32-C638616B72E2}.Release|x86.Build.0 = Release|Any CPU
216 + {D6C0D94C-80A5-495C-B573-C7440A8594F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
217 + {D6C0D94C-80A5-495C-B573-C7440A8594F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
218 + {D6C0D94C-80A5-495C-B573-C7440A8594F5}.Debug|x64.ActiveCfg = Debug|Any CPU
219 + {D6C0D94C-80A5-495C-B573-C7440A8594F5}.Debug|x64.Build.0 = Debug|Any CPU
220 + {D6C0D94C-80A5-495C-B573-C7440A8594F5}.Debug|x86.ActiveCfg = Debug|Any CPU
221 + {D6C0D94C-80A5-495C-B573-C7440A8594F5}.Debug|x86.Build.0 = Debug|Any CPU
222 + {D6C0D94C-80A5-495C-B573-C7440A8594F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
223 + {D6C0D94C-80A5-495C-B573-C7440A8594F5}.Release|Any CPU.Build.0 = Release|Any CPU
224 + {D6C0D94C-80A5-495C-B573-C7440A8594F5}.Release|x64.ActiveCfg = Release|Any CPU
225 + {D6C0D94C-80A5-495C-B573-C7440A8594F5}.Release|x64.Build.0 = Release|Any CPU
226 + {D6C0D94C-80A5-495C-B573-C7440A8594F5}.Release|x86.ActiveCfg = Release|Any CPU
227 + {D6C0D94C-80A5-495C-B573-C7440A8594F5}.Release|x86.Build.0 = Release|Any CPU
228 EndGlobalSection
229 GlobalSection(SolutionProperties) = preSolution
230 HideSolutionNode = FALSE
231 EndGlobalSection
232 GlobalSection(NestedProjects) = preSolution
233 + {F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9} = {222DA0A6-5E28-4D7A-A227-B818B0C55BAB}
234 + {4544158C-2D63-4146-85FF-62169280144E} = {222DA0A6-5E28-4D7A-A227-B818B0C55BAB}
235 + {328799BB-7B03-4B28-8180-4132211FD07D} = {222DA0A6-5E28-4D7A-A227-B818B0C55BAB}
236 + {16F5202F-9276-4166-975C-C9654BAF8012} = {222DA0A6-5E28-4D7A-A227-B818B0C55BAB}
237 + {137D376B-989F-4FEA-9A67-01D8D38CA0DE} = {222DA0A6-5E28-4D7A-A227-B818B0C55BAB}
238 + {4F55F9B8-D8B6-41EB-8796-221B4CD98324} = {222DA0A6-5E28-4D7A-A227-B818B0C55BAB}
239 EndGlobalSection
240 GlobalSection(ExtensibilityGlobals) = postSolution
241 SolutionGuid = {BB57C98D-C0C2-4805-AED3-C19B47759DBD}
src/dtf/test/WixToolsetTests.Dtf.Compression.Cab/CabTest.cs renamed
src/dtf/test/WixToolsetTests.Dtf.Compression.Cab/WixToolsetTests.Dtf.Compression.Cab.csproj renamed
+3 -3
@@ -1,6 +1,6 @@
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" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="Current">
4 <PropertyGroup>
5 <ProjectGuid>{4544158C-2D63-4146-85FF-62169280144E}</ProjectGuid>
6 <OutputType>Library</OutputType>
@@ -24,11 +24,11 @@
24 </ItemGroup>
25
26 <ItemGroup>
27 - <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj">
27 + <ProjectReference Include="..\..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj">
28 <Project>{45D81DAB-0559-4836-8106-CE9987FD4AB5}</Project>
29 <Name>WixToolset.Dtf.Compression</Name>
30 </ProjectReference>
31 - <ProjectReference Include="..\WixToolset.Dtf.Compression.Cab\WixToolset.Dtf.Compression.Cab.csproj">
31 + <ProjectReference Include="..\..\WixToolset.Dtf.Compression.Cab\WixToolset.Dtf.Compression.Cab.csproj">
32 <Project>{E56C0ED3-FA2F-4CA9-A1C0-2E796BB0BF80}</Project>
33 <Name>WixToolset.Dtf.Compression.Cab</Name>
34 </ProjectReference>
src/dtf/test/WixToolsetTests.Dtf.Compression.Zip/WixToolsetTests.Dtf.Compression.Zip.csproj renamed
+3 -3
@@ -1,6 +1,6 @@
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" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="Current">
4 <PropertyGroup>
5 <ProjectGuid>{328799BB-7B03-4B28-8180-4132211FD07D}</ProjectGuid>
6 <OutputType>Library</OutputType>
@@ -22,11 +22,11 @@
22 </ItemGroup>
23
24 <ItemGroup>
25 - <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj">
25 + <ProjectReference Include="..\..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj">
26 <Project>{45D81DAB-0559-4836-8106-CE9987FD4AB5}</Project>
27 <Name>WixToolset.Dtf.Compression</Name>
28 </ProjectReference>
29 - <ProjectReference Include="..\WixToolset.Dtf.Compression.Zip\WixToolset.Dtf.Compression.Zip.csproj">
29 + <ProjectReference Include="..\..\WixToolset.Dtf.Compression.Zip\WixToolset.Dtf.Compression.Zip.csproj">
30 <Project>{E4C60A57-8AFE-4FF3-9058-ACAC6A069533}</Project>
31 <Name>WixToolset.Dtf.Compression.Zip</Name>
32 </ProjectReference>
src/dtf/test/WixToolsetTests.Dtf.Compression.Zip/ZipTest.cs renamed
src/dtf/test/WixToolsetTests.Dtf.Compression/CompressionTestUtil.cs renamed
src/dtf/test/WixToolsetTests.Dtf.Compression/MisbehavingStreamContext.cs renamed
src/dtf/test/WixToolsetTests.Dtf.Compression/OptionStreamContext.cs renamed
src/dtf/test/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj renamed
+2 -2
@@ -1,6 +1,6 @@
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" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="Current">
4 <PropertyGroup>
5 <ProjectGuid>{F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}</ProjectGuid>
6 <OutputType>Library</OutputType>
@@ -25,7 +25,7 @@
25 </ItemGroup>
26
27 <ItemGroup>
28 - <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj">
28 + <ProjectReference Include="..\..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj">
29 <Project>{45D81DAB-0559-4836-8106-CE9987FD4AB5}</Project>
30 <Name>WixToolset.Dtf.Compression</Name>
31 </ProjectReference>
src/dtf/test/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/CustomActionTest.cs renamed
src/dtf/test/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj renamed
+1 -1
@@ -1,6 +1,6 @@
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" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="Current">
4 <PropertyGroup>
5 <ProjectGuid>{137D376B-989F-4FEA-9A67-01D8D38CA0DE}</ProjectGuid>
6 <OutputType>Library</OutputType>
src/dtf/test/WixToolsetTests.Dtf.WindowsInstaller.Linq/LinqTest.cs renamed
src/dtf/test/WixToolsetTests.Dtf.WindowsInstaller.Linq/WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj renamed
+4 -4
@@ -1,6 +1,6 @@
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" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="Current">
4 <PropertyGroup>
5 <ProjectGuid>{4F55F9B8-D8B6-41EB-8796-221B4CD98324}</ProjectGuid>
6 <OutputType>Library</OutputType>
@@ -23,11 +23,11 @@
23 </ItemGroup>
24
25 <ItemGroup>
26 - <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj">
26 + <ProjectReference Include="..\..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj">
27 <Project>{85225597-5121-4361-8332-4E3246D5BBF5}</Project>
28 <Name>WixToolset.Dtf.WindowsInstaller</Name>
29 </ProjectReference>
30 - <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller.Linq\WixToolset.Dtf.WindowsInstaller.Linq.csproj">
30 + <ProjectReference Include="..\..\WixToolset.Dtf.WindowsInstaller.Linq\WixToolset.Dtf.WindowsInstaller.Linq.csproj">
31 <Project>{7E66313B-C6D4-4729-8422-4D1474E0E6F7}</Project>
32 <Name>WixToolset.Dtf.WindowsInstaller.Linq</Name>
33 </ProjectReference>
@@ -39,4 +39,4 @@
39
40 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
41 <Target Name="Pack" DependsOnTargets="Build" />
42 -</Project>
42 +</Project>
\ No newline at end of file
src/dtf/test/WixToolsetTests.Dtf.WindowsInstaller/EmbeddedExternalUI.cs renamed
src/dtf/test/WixToolsetTests.Dtf.WindowsInstaller/Schema.cs renamed
src/dtf/test/WixToolsetTests.Dtf.WindowsInstaller/WindowsInstallerTest.cs renamed
src/dtf/test/WixToolsetTests.Dtf.WindowsInstaller/WindowsInstallerTransactions.cs renamed
src/dtf/test/WixToolsetTests.Dtf.WindowsInstaller/WindowsInstallerUtils.cs renamed
src/dtf/test/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj renamed
+2 -2
@@ -1,6 +1,6 @@
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" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="Current">
4 <PropertyGroup>
5 <ProjectGuid>{16F5202F-9276-4166-975C-C9654BAF8012}</ProjectGuid>
6 <OutputType>Library</OutputType>
@@ -28,7 +28,7 @@
28 </ItemGroup>
29
30 <ItemGroup>
31 - <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj">
31 + <ProjectReference Include="..\..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj">
32 <Project>{85225597-5121-4361-8332-4E3246D5BBF5}</Project>
33 <Name>WixToolset.Dtf.WindowsInstaller</Name>
34 </ProjectReference>
src/internal/SetBuildNumber/Directory.Packages.props.pp
+1
@@ -2,6 +2,7 @@
2 <ItemGroup>
3 <PackageVersion Include="WixToolset.Dtf.Compression" Version="{packageversion}" />
4 <PackageVersion Include="WixToolset.Dtf.Compression.Cab" Version="{packageversion}" />
5 + <PackageVersion Include="WixToolset.Dtf.CustomAction" Version="{packageversion}" />
6 <PackageVersion Include="WixToolset.Dtf.Resources" Version="{packageversion}" />
7 <PackageVersion Include="WixToolset.Dtf.WindowsInstaller" Version="{packageversion}" />
8
src/internal/WixBuildFinalize/WixBuildFinalize.proj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.Build.NoTargets">
5 <PropertyGroup>
6 - <TargetFramework>net46</TargetFramework>
6 + <TargetFramework>net472</TargetFramework>
7 </PropertyGroup>
8
9 <ItemGroup>
src/samples/Dtf/EmbeddedUI/AssemblyInfo.cs deleted
-5
@@ -1,5 +0,0 @@
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 -using System.Reflection;
4 -
5 -[assembly: AssemblyDescription("Sample managed embedded external UI")]
src/samples/Dtf/ManagedCA/AssemblyInfo.cs deleted
-5
@@ -1,5 +0,0 @@
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 -using System.Reflection;
4 -
5 -[assembly: AssemblyDescription("Sample managed custom actions")]
src/samples/Dtf/ManagedCA/ManagedCA.csproj deleted
-33
@@ -1,33 +0,0 @@
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 -<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 - <PropertyGroup>
4 - <ProjectGuid>{DB9E5F02-8241-440A-9B60-980EB5B42B13}</ProjectGuid>
5 - <OutputType>Library</OutputType>
6 - <RootNamespace>WixToolset.Dtf.Samples.ManagedCA</RootNamespace>
7 - <AssemblyName>WixToolset.Dtf.Samples.ManagedCA</AssemblyName>
8 - <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
9 - <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
10 - </PropertyGroup>
11 - <ItemGroup>
12 - <Compile Include="AssemblyInfo.cs" />
13 - <Compile Include="SampleCAs.cs" />
14 - </ItemGroup>
15 - <ItemGroup>
16 - <Reference Include="System" />
17 - </ItemGroup>
18 - <ItemGroup>
19 - <ProjectReference Include="..\..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj">
20 - <Project>{24121677-0ed0-41b5-833f-1b9a18e87bf4}</Project>
21 - <Name>WixToolset.Dtf.WindowsInstaller</Name>
22 - </ProjectReference>
23 - </ItemGroup>
24 -
25 - <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
26 -
27 -<!--
28 - <PropertyGroup>
29 - <PostBuildEvent>"$(TargetDir)..\x86\MakeSfxCA.exe" "$(TargetPath)" "$(TargetDir)SfxCA.dll" "$(IntermediateOutputPath)$(TargetFileName)" WixToolset.Dtf.WindowsInstaller.dll="$(TargetDir)WixToolset.Dtf.WindowsInstaller.dll" testsub\SampleCAs.cs="$(ProjectDir)\SampleCAs.cs"</PostBuildEvent>
30 - </PropertyGroup>
31 --->
32 -
33 -</Project>
src/samples/Dtf/Tools/MakeSfxCA/MakeSfxCA.csproj deleted
-27
@@ -1,27 +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 Sdk="Microsoft.NET.Sdk">
5 - <PropertyGroup>
6 - <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
7 - <OutputType>Exe</OutputType>
8 - <RootNamespace>WixToolset.Dtf.Tools.MakeSfxCA</RootNamespace>
9 - <AssemblyName>MakeSfxCA</AssemblyName>
10 - <DebugType>embedded</DebugType>
11 - <AppConfig>app.config</AppConfig>
12 - <ApplicationManifest>MakeSfxCA.exe.manifest</ApplicationManifest>
13 - <RollForward>Major</RollForward>
14 - <RuntimeIdentifier>win-x86</RuntimeIdentifier>
15 - </PropertyGroup>
16 -
17 - <ItemGroup>
18 - <ProjectReference Include="..\..\WixToolset.Dtf.Compression.Cab\WixToolset.Dtf.Compression.Cab.csproj" />
19 - <ProjectReference Include="..\..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" />
20 - <ProjectReference Include="..\..\WixToolset.Dtf.Resources\WixToolset.Dtf.Resources.csproj" />
21 - </ItemGroup>
22 -
23 - <ItemGroup>
24 - <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
25 - <PackageReference Include="GitInfo" Version="2.1.2" PrivateAssets="All" />
26 - </ItemGroup>
27 -</Project>
src/samples/Dtf/Tools/MakeSfxCA/MakeSfxCA.exe.manifest deleted
-20
@@ -1,20 +0,0 @@
1 -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
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 -
5 -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
6 - <assemblyIdentity name="WixToolset.Dtf.Tools.MakeSfxCA" version="4.0.0.0" processorArchitecture="x86" type="win32"/>
7 - <description>WiX Toolset Compiler</description>
8 - <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
9 - <security>
10 - <requestedPrivileges>
11 - <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
12 - </requestedPrivileges>
13 - </security>
14 - </trustInfo>
15 - <application xmlns="urn:schemas-microsoft-com:asm.v3">
16 - <windowsSettings xmlns:ws2="http://schemas.microsoft.com/SMI/2016/WindowsSettings">
17 - <ws2:longPathAware>true</ws2:longPathAware>
18 - </windowsSettings>
19 - </application>
20 -</assembly>
src/samples/Dtf/Tools/MakeSfxCA/app.config 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 -
5 -<configuration>
6 - <runtime>
7 - <loadFromRemoteSources enabled="true"/>
8 - <AppContextSwitchOverrides value="Switch.System.IO.UseLegacyPathHandling=false;Switch.System.IO.BlockLongPaths=false" />
9 - </runtime>
10 -</configuration>
src/samples/Dtf/Tools/SfxCA/packages.config deleted
-4
@@ -1,4 +0,0 @@
1 -<?xml version="1.0" encoding="utf-8"?>
2 -<packages>
3 - <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />
4 -</packages>
\ No newline at end of file
src/samples/Dtf/Tools/Tools.proj deleted
-15
@@ -1,15 +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 -
5 -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
6 - <ItemGroup>
7 - <ProjectReference Include="MakeSfxCA\MakeSfxCA.csproj" />
8 - <ProjectReference Include="SfxCA\SfxCA.vcxproj" />
9 - <ProjectReference Include="SfxCA\SfxCA.vcxproj">
10 - <Properties>Platform=x64</Properties>
11 - </ProjectReference>
12 - </ItemGroup>
13 -
14 - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\Traversal.targets" />
15 -</Project>
src/test/dtf/Directory.Build.props renamed
+6 -3
@@ -1,8 +1,11 @@
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" ToolsVersion="4.0">
3 +<Project>
4 <PropertyGroup>
6 - <WixCATargetsPath Condition=" '$(WixCATargetsPath)' == '' ">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\wix.ca.targets'))</WixCATargetsPath>
5 + <SegmentName>IntegrationDtf</SegmentName>
6 + <SignOutput>false</SignOutput>
7 </PropertyGroup>
8 +
9 + <Import Project="..\..\Directory.Build.props" />
10 + <Import Project="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " />
11 </Project>
src/test/dtf/Directory.Build.targets new
+6
@@ -0,0 +1,6 @@
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>
4 + <Import Project="..\..\Directory.Build.targets" />
5 + <Import Project="Directory$(MSBuildProjectExtension).targets" Condition=" Exists('Directory$(MSBuildProjectExtension).targets') " />
6 +</Project>
src/test/dtf/DtfE2ETests.sln new
+28
@@ -0,0 +1,28 @@
1 +
2 +Microsoft Visual Studio Solution File, Format Version 12.00
3 +# Visual Studio Version 16
4 +VisualStudioVersion = 16.0.30114.105
5 +MinimumVisualStudioVersion = 10.0.40219.1
6 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EmbeddedUI", "EmbeddedUI\EmbeddedUI.csproj", "{864B8C50-7895-4485-AC89-900D86FD8C0D}"
7 +EndProject
8 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleCA", "SampleCA\SampleCA.csproj", "{8F53B9CC-6FBE-493D-9C9A-09B2AD578CE7}"
9 +EndProject
10 +Global
11 + GlobalSection(SolutionConfigurationPlatforms) = preSolution
12 + Debug|Any CPU = Debug|Any CPU
13 + Release|Any CPU = Release|Any CPU
14 + EndGlobalSection
15 + GlobalSection(SolutionProperties) = preSolution
16 + HideSolutionNode = FALSE
17 + EndGlobalSection
18 + GlobalSection(ProjectConfigurationPlatforms) = postSolution
19 + {864B8C50-7895-4485-AC89-900D86FD8C0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
20 + {864B8C50-7895-4485-AC89-900D86FD8C0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
21 + {864B8C50-7895-4485-AC89-900D86FD8C0D}.Release|Any CPU.ActiveCfg = Debug|Any CPU
22 + {864B8C50-7895-4485-AC89-900D86FD8C0D}.Release|Any CPU.Build.0 = Debug|Any CPU
23 + {8F53B9CC-6FBE-493D-9C9A-09B2AD578CE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
24 + {8F53B9CC-6FBE-493D-9C9A-09B2AD578CE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
25 + {8F53B9CC-6FBE-493D-9C9A-09B2AD578CE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
26 + {8F53B9CC-6FBE-493D-9C9A-09B2AD578CE7}.Release|Any CPU.Build.0 = Release|Any CPU
27 + EndGlobalSection
28 +EndGlobal
src/test/dtf/EmbeddedUI/AssemblyInfo.cs new
+3
@@ -0,0 +1,3 @@
1 +using System.Reflection;
2 +
3 +[assembly: AssemblyDescription("Sample managed embedded external UI")]
src/test/dtf/EmbeddedUI/EmbeddedUI.csproj renamed
+7 -14
@@ -1,14 +1,13 @@
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. -->
1 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <ProjectGuid>{864B8C50-7895-4485-AC89-900D86FD8C0D}</ProjectGuid>
4 <OutputType>Library</OutputType>
7 - <RootNamespace>WixToolset.Dtf.Samples.EmbeddedUI</RootNamespace>
8 - <AssemblyName>WixToolset.Dtf.Samples.EmbeddedUI</AssemblyName>
5 + <RootNamespace>WixToolset.Samples.EmbeddedUI</RootNamespace>
6 + <AssemblyName>WixToolset.Samples.EmbeddedUI</AssemblyName>
7 <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
8 <FileAlignment>512</FileAlignment>
9 </PropertyGroup>
10 +
11 <ItemGroup>
12 <Compile Include="AssemblyInfo.cs" />
13 <Compile Include="InstallProgressCounter.cs" />
@@ -17,12 +16,14 @@
16 <DependentUpon>SetupWizard.xaml</DependentUpon>
17 </Compile>
18 </ItemGroup>
19 +
20 <ItemGroup>
21 <Page Include="SetupWizard.xaml">
22 <Generator>MSBuild:Compile</Generator>
23 <SubType>Designer</SubType>
24 </Page>
25 </ItemGroup>
26 +
27 <ItemGroup>
28 <Reference Include="PresentationCore">
29 <RequiredTargetFramework>3.0</RequiredTargetFramework>
@@ -39,18 +40,10 @@
40 <RequiredTargetFramework>3.0</RequiredTargetFramework>
41 </Reference>
42 </ItemGroup>
43 +
44 <ItemGroup>
43 - <ProjectReference Include="..\..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj">
44 - <Project>{24121677-0ed0-41b5-833f-1b9a18e87bf4}</Project>
45 - <Name>WixToolset.Dtf.WindowsInstaller</Name>
46 - </ProjectReference>
45 + <PackageReference Include="WixToolset.Dtf.CustomAction" />
46 </ItemGroup>
47
48 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
50 -<!--
51 - <PropertyGroup>
52 - <PostBuildEvent>"$(TargetDir)..\x86\MakeSfxCA.exe" "$(TargetPath)" "$(TargetDir)SfxCA.dll" "$(IntermediateOutputPath)$(TargetFileName)" "$(TargetDir)WixToolset.Dtf.WindowsInstaller.dll"</PostBuildEvent>
53 - </PropertyGroup>
54 --->
55 -
49 </Project>
src/test/dtf/EmbeddedUI/InstallProgressCounter.cs renamed
+1 -3
@@ -1,6 +1,4 @@
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.Dtf.Samples.EmbeddedUI
1 +namespace WixToolset.Samples.EmbeddedUI
2 {
3 using System;
4 using WixToolset.Dtf.WindowsInstaller;
src/test/dtf/EmbeddedUI/SampleEmbeddedUI.cs renamed
+1 -3
@@ -1,6 +1,4 @@
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.Dtf.Samples.EmbeddedUI
1 +namespace WixToolset.Samples.EmbeddedUI
2 {
3 using System;
4 using System.Collections.Generic;
src/test/dtf/EmbeddedUI/SetupWizard.xaml renamed
+1 -1
@@ -2,7 +2,7 @@
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
5 -<Window x:Class="WixToolset.Dtf.Samples.EmbeddedUI.SetupWizard"
5 +<Window x:Class="WixToolset.Samples.EmbeddedUI.SetupWizard"
6 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
7 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
8 Title="Sample Embedded UI" Height="400" Width="540" Visibility="Visible">
src/test/dtf/EmbeddedUI/SetupWizard.xaml.cs renamed
+1 -3
@@ -1,6 +1,4 @@
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.Dtf.Samples.EmbeddedUI
1 +namespace WixToolset.Samples.EmbeddedUI
2 {
3 using System;
4 using System.Collections.Generic;
src/test/dtf/SampleCA/SampleCA.cs renamed
+2 -4
@@ -1,13 +1,11 @@
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.Dtf.Samples.ManagedCA
1 +namespace WixToolset.Samples
2 {
3 using System;
4 using System.Collections.Generic;
5 using System.IO;
6 using WixToolset.Dtf.WindowsInstaller;
7
10 - public class SampleCAs
8 + public class SampleCA
9 {
10 [CustomAction]
11 public static ActionResult SampleCA1(Session session)
src/test/dtf/SampleCA/SampleCA.csproj new
+10
@@ -0,0 +1,10 @@
1 +<Project Sdk="Microsoft.NET.Sdk">
2 + <PropertyGroup>
3 + <TargetFramework>net472</TargetFramework>
4 + <Description>Sample managed custom actions</Description>
5 + </PropertyGroup>
6 +
7 + <ItemGroup>
8 + <PackageReference Include="WixToolset.Dtf.CustomAction" />
9 + </ItemGroup>
10 +</Project>
src/test/test.cmd
+2
@@ -13,6 +13,8 @@
13
14 @call burn\test_burn.cmd %_C% %_T% || exit /b
15
16 +msbuild -t:Restore dtf\DtfE2ETests.sln -p:Configuration=%_C% -nologo -m -warnaserror -bl:%_L%\dtfe2etests.binlog || exit /b
17 +
18 dotnet test wix -c %_C% --nologo -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.WixE2ETests.trx" || exit /b
19
20 @popd
src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj
-1
@@ -15,7 +15,6 @@
15 <ItemGroup>
16 <Content Include="build\$(MSBuildThisFileName).props" CopyToOutputDirectory="PreserveNewest" />
17 <Content Include="build\$(MSBuildThisFileName).targets" CopyToOutputDirectory="PreserveNewest" />
18 - <Content Include="tools\wix.ca.targets" CopyToOutputDirectory="PreserveNewest" />
18 <Content Include="tools\wix.harvest.targets" CopyToOutputDirectory="PreserveNewest" />
19 <Content Include="tools\WixToolset.Signing.targets" CopyToOutputDirectory="PreserveNewest" />
20 <Content Include="tools\wix.props" CopyToOutputDirectory="PreserveNewest" />