diff options
Diffstat (limited to 'src/test')
29 files changed, 123 insertions, 590 deletions
diff --git a/src/test/burn/BurnE2ETests.sln b/src/test/burn/BurnE2ETests.sln deleted file mode 100644 index 98cd3575..00000000 --- a/src/test/burn/BurnE2ETests.sln +++ /dev/null | |||
| @@ -1,107 +0,0 @@ | |||
| 1 | | ||
| 2 | Microsoft Visual Studio Solution File, Format Version 12.00 | ||
| 3 | # Visual Studio Version 17 | ||
| 4 | VisualStudioVersion = 17.0.31919.166 | ||
| 5 | MinimumVisualStudioVersion = 10.0.40219.1 | ||
| 6 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestBA", "TestBA\TestBA.csproj", "{04022D35-6D75-49D0-91D2-4208E09DBA6D}" | ||
| 7 | EndProject | ||
| 8 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestExe", "TestExe\TestExe.csproj", "{B038B342-BE42-4951-82A9-7789412CF37F}" | ||
| 9 | EndProject | ||
| 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixTestTools", "WixTestTools\WixTestTools.csproj", "{3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}" | ||
| 11 | EndProject | ||
| 12 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.WixBA", "WixToolset.WixBA\WixToolset.WixBA.csproj", "{7C27518B-84AD-4679-8EF4-29DF552CF1AC}" | ||
| 13 | EndProject | ||
| 14 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.BurnE2E", "WixToolsetTest.BurnE2E\WixToolsetTest.BurnE2E.csproj", "{FED9D707-E5C3-4867-87B0-FABDB5EB0823}" | ||
| 15 | EndProject | ||
| 16 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ForTestingUseOnly.wixext", "ForTestingUseOnlyExtension\ForTestingUseOnly.wixext.csproj", "{0037E6A3-45C6-4AB6-BC8C-1CB0C145E992}" | ||
| 17 | EndProject | ||
| 18 | Global | ||
| 19 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| 20 | Debug|Any CPU = Debug|Any CPU | ||
| 21 | Debug|x64 = Debug|x64 | ||
| 22 | Debug|x86 = Debug|x86 | ||
| 23 | Release|Any CPU = Release|Any CPU | ||
| 24 | Release|x64 = Release|x64 | ||
| 25 | Release|x86 = Release|x86 | ||
| 26 | EndGlobalSection | ||
| 27 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| 28 | {04022D35-6D75-49D0-91D2-4208E09DBA6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 29 | {04022D35-6D75-49D0-91D2-4208E09DBA6D}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 30 | {04022D35-6D75-49D0-91D2-4208E09DBA6D}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 31 | {04022D35-6D75-49D0-91D2-4208E09DBA6D}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 32 | {04022D35-6D75-49D0-91D2-4208E09DBA6D}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 33 | {04022D35-6D75-49D0-91D2-4208E09DBA6D}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 34 | {04022D35-6D75-49D0-91D2-4208E09DBA6D}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 35 | {04022D35-6D75-49D0-91D2-4208E09DBA6D}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 36 | {04022D35-6D75-49D0-91D2-4208E09DBA6D}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 37 | {04022D35-6D75-49D0-91D2-4208E09DBA6D}.Release|x64.Build.0 = Release|Any CPU | ||
| 38 | {04022D35-6D75-49D0-91D2-4208E09DBA6D}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 39 | {04022D35-6D75-49D0-91D2-4208E09DBA6D}.Release|x86.Build.0 = Release|Any CPU | ||
| 40 | {B038B342-BE42-4951-82A9-7789412CF37F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 41 | {B038B342-BE42-4951-82A9-7789412CF37F}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 42 | {B038B342-BE42-4951-82A9-7789412CF37F}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 43 | {B038B342-BE42-4951-82A9-7789412CF37F}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 44 | {B038B342-BE42-4951-82A9-7789412CF37F}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 45 | {B038B342-BE42-4951-82A9-7789412CF37F}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 46 | {B038B342-BE42-4951-82A9-7789412CF37F}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 47 | {B038B342-BE42-4951-82A9-7789412CF37F}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 48 | {B038B342-BE42-4951-82A9-7789412CF37F}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 49 | {B038B342-BE42-4951-82A9-7789412CF37F}.Release|x64.Build.0 = Release|Any CPU | ||
| 50 | {B038B342-BE42-4951-82A9-7789412CF37F}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 51 | {B038B342-BE42-4951-82A9-7789412CF37F}.Release|x86.Build.0 = Release|Any CPU | ||
| 52 | {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 53 | {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 54 | {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 55 | {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 56 | {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 57 | {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 58 | {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 59 | {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 60 | {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 61 | {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Release|x64.Build.0 = Release|Any CPU | ||
| 62 | {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 63 | {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Release|x86.Build.0 = Release|Any CPU | ||
| 64 | {7C27518B-84AD-4679-8EF4-29DF552CF1AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 65 | {7C27518B-84AD-4679-8EF4-29DF552CF1AC}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 66 | {7C27518B-84AD-4679-8EF4-29DF552CF1AC}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 67 | {7C27518B-84AD-4679-8EF4-29DF552CF1AC}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 68 | {7C27518B-84AD-4679-8EF4-29DF552CF1AC}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 69 | {7C27518B-84AD-4679-8EF4-29DF552CF1AC}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 70 | {7C27518B-84AD-4679-8EF4-29DF552CF1AC}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 71 | {7C27518B-84AD-4679-8EF4-29DF552CF1AC}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 72 | {7C27518B-84AD-4679-8EF4-29DF552CF1AC}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 73 | {7C27518B-84AD-4679-8EF4-29DF552CF1AC}.Release|x64.Build.0 = Release|Any CPU | ||
| 74 | {7C27518B-84AD-4679-8EF4-29DF552CF1AC}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 75 | {7C27518B-84AD-4679-8EF4-29DF552CF1AC}.Release|x86.Build.0 = Release|Any CPU | ||
| 76 | {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 77 | {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 78 | {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 79 | {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 80 | {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 81 | {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 82 | {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 83 | {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 84 | {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 85 | {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|x64.Build.0 = Release|Any CPU | ||
| 86 | {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 87 | {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|x86.Build.0 = Release|Any CPU | ||
| 88 | {0037E6A3-45C6-4AB6-BC8C-1CB0C145E992}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 89 | {0037E6A3-45C6-4AB6-BC8C-1CB0C145E992}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 90 | {0037E6A3-45C6-4AB6-BC8C-1CB0C145E992}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 91 | {0037E6A3-45C6-4AB6-BC8C-1CB0C145E992}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 92 | {0037E6A3-45C6-4AB6-BC8C-1CB0C145E992}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 93 | {0037E6A3-45C6-4AB6-BC8C-1CB0C145E992}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 94 | {0037E6A3-45C6-4AB6-BC8C-1CB0C145E992}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 95 | {0037E6A3-45C6-4AB6-BC8C-1CB0C145E992}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 96 | {0037E6A3-45C6-4AB6-BC8C-1CB0C145E992}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 97 | {0037E6A3-45C6-4AB6-BC8C-1CB0C145E992}.Release|x64.Build.0 = Release|Any CPU | ||
| 98 | {0037E6A3-45C6-4AB6-BC8C-1CB0C145E992}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 99 | {0037E6A3-45C6-4AB6-BC8C-1CB0C145E992}.Release|x86.Build.0 = Release|Any CPU | ||
| 100 | EndGlobalSection | ||
| 101 | GlobalSection(SolutionProperties) = preSolution | ||
| 102 | HideSolutionNode = FALSE | ||
| 103 | EndGlobalSection | ||
| 104 | GlobalSection(ExtensibilityGlobals) = postSolution | ||
| 105 | SolutionGuid = {74DE2EED-ECAA-4FDD-9792-9D3B0C0C1321} | ||
| 106 | EndGlobalSection | ||
| 107 | EndGlobal | ||
diff --git a/src/test/burn/BurnE2ETests.slnx b/src/test/burn/BurnE2ETests.slnx new file mode 100644 index 00000000..4bd44779 --- /dev/null +++ b/src/test/burn/BurnE2ETests.slnx | |||
| @@ -0,0 +1,13 @@ | |||
| 1 | <Solution> | ||
| 2 | <Configurations> | ||
| 3 | <Platform Name="Any CPU" /> | ||
| 4 | <Platform Name="x64" /> | ||
| 5 | <Platform Name="x86" /> | ||
| 6 | </Configurations> | ||
| 7 | <Project Path="ForTestingUseOnlyExtension/ForTestingUseOnly.wixext.csproj" /> | ||
| 8 | <Project Path="TestBA/TestBA.csproj" /> | ||
| 9 | <Project Path="TestExe/TestExe.csproj" /> | ||
| 10 | <Project Path="WixTestTools/WixTestTools.csproj" /> | ||
| 11 | <Project Path="WixToolset.WixBA/WixToolset.WixBA.csproj" /> | ||
| 12 | <Project Path="WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj" /> | ||
| 13 | </Solution> | ||
diff --git a/src/test/burn/TestData/WixIuiBaTests/DtfSamples.sln b/src/test/burn/TestData/WixIuiBaTests/DtfSamples.sln deleted file mode 100644 index 1e6c2082..00000000 --- a/src/test/burn/TestData/WixIuiBaTests/DtfSamples.sln +++ /dev/null | |||
| @@ -1,28 +0,0 @@ | |||
| 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}") = "ManagedCA", "ManagedCA\ManagedCA.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 | ||
diff --git a/src/test/burn/TestData/WixIuiBaTests/DtfSamples.slnx b/src/test/burn/TestData/WixIuiBaTests/DtfSamples.slnx new file mode 100644 index 00000000..be21997d --- /dev/null +++ b/src/test/burn/TestData/WixIuiBaTests/DtfSamples.slnx | |||
| @@ -0,0 +1,6 @@ | |||
| 1 | <Solution> | ||
| 2 | <Project Path="EmbeddedUI/EmbeddedUI.csproj"> | ||
| 3 | <BuildType Project="Debug" /> | ||
| 4 | </Project> | ||
| 5 | <Project Path="ManagedCA/ManagedCA.csproj" /> | ||
| 6 | </Solution> | ||
diff --git a/src/test/msi/MsiE2ETests.sln b/src/test/msi/MsiE2ETests.sln deleted file mode 100644 index c8ba93ec..00000000 --- a/src/test/msi/MsiE2ETests.sln +++ /dev/null | |||
| @@ -1,51 +0,0 @@ | |||
| 1 | | ||
| 2 | Microsoft Visual Studio Solution File, Format Version 12.00 | ||
| 3 | # Visual Studio Version 17 | ||
| 4 | VisualStudioVersion = 17.0.31919.166 | ||
| 5 | MinimumVisualStudioVersion = 10.0.40219.1 | ||
| 6 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixTestTools", "..\burn\WixTestTools\WixTestTools.csproj", "{3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}" | ||
| 7 | EndProject | ||
| 8 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.MsiE2E", "WixToolsetTest.MsiE2E\WixToolsetTest.MsiE2E.csproj", "{68E1A5F8-0F44-4B38-8876-C101A2A019F2}" | ||
| 9 | EndProject | ||
| 10 | Global | ||
| 11 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| 12 | Debug|Any CPU = Debug|Any CPU | ||
| 13 | Debug|x64 = Debug|x64 | ||
| 14 | Debug|x86 = Debug|x86 | ||
| 15 | Release|Any CPU = Release|Any CPU | ||
| 16 | Release|x64 = Release|x64 | ||
| 17 | Release|x86 = Release|x86 | ||
| 18 | EndGlobalSection | ||
| 19 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| 20 | {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 21 | {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 22 | {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 23 | {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 24 | {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 25 | {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 26 | {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 27 | {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 28 | {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 29 | {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Release|x64.Build.0 = Release|Any CPU | ||
| 30 | {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 31 | {3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}.Release|x86.Build.0 = Release|Any CPU | ||
| 32 | {68E1A5F8-0F44-4B38-8876-C101A2A019F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 33 | {68E1A5F8-0F44-4B38-8876-C101A2A019F2}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 34 | {68E1A5F8-0F44-4B38-8876-C101A2A019F2}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 35 | {68E1A5F8-0F44-4B38-8876-C101A2A019F2}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 36 | {68E1A5F8-0F44-4B38-8876-C101A2A019F2}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 37 | {68E1A5F8-0F44-4B38-8876-C101A2A019F2}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 38 | {68E1A5F8-0F44-4B38-8876-C101A2A019F2}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 39 | {68E1A5F8-0F44-4B38-8876-C101A2A019F2}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 40 | {68E1A5F8-0F44-4B38-8876-C101A2A019F2}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 41 | {68E1A5F8-0F44-4B38-8876-C101A2A019F2}.Release|x64.Build.0 = Release|Any CPU | ||
| 42 | {68E1A5F8-0F44-4B38-8876-C101A2A019F2}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 43 | {68E1A5F8-0F44-4B38-8876-C101A2A019F2}.Release|x86.Build.0 = Release|Any CPU | ||
| 44 | EndGlobalSection | ||
| 45 | GlobalSection(SolutionProperties) = preSolution | ||
| 46 | HideSolutionNode = FALSE | ||
| 47 | EndGlobalSection | ||
| 48 | GlobalSection(ExtensibilityGlobals) = postSolution | ||
| 49 | SolutionGuid = {4C9978E3-8548-451E-8BF5-03AD1D0280C2} | ||
| 50 | EndGlobalSection | ||
| 51 | EndGlobal | ||
diff --git a/src/test/msi/MsiE2ETests.slnx b/src/test/msi/MsiE2ETests.slnx new file mode 100644 index 00000000..c2cff885 --- /dev/null +++ b/src/test/msi/MsiE2ETests.slnx | |||
| @@ -0,0 +1,9 @@ | |||
| 1 | <Solution> | ||
| 2 | <Configurations> | ||
| 3 | <Platform Name="Any CPU" /> | ||
| 4 | <Platform Name="x64" /> | ||
| 5 | <Platform Name="x86" /> | ||
| 6 | </Configurations> | ||
| 7 | <Project Path="../burn/WixTestTools/WixTestTools.csproj" /> | ||
| 8 | <Project Path="WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj" /> | ||
| 9 | </Solution> | ||
diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/ComPlusComponents.sln b/src/test/msi/TestData/ComPlusExtensionTests/Components/ComPlusComponents.sln deleted file mode 100644 index d25fea76..00000000 --- a/src/test/msi/TestData/ComPlusExtensionTests/Components/ComPlusComponents.sln +++ /dev/null | |||
| @@ -1,79 +0,0 @@ | |||
| 1 | | ||
| 2 | Microsoft Visual Studio Solution File, Format Version 12.00 | ||
| 3 | # Visual Studio Version 17 | ||
| 4 | VisualStudioVersion = 17.11.35111.106 | ||
| 5 | MinimumVisualStudioVersion = 10.0.40219.1 | ||
| 6 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestComponentNET3", "TestComponentNET3\TestComponentNET3.csproj", "{B4CD7ECE-7245-445B-9F04-D2952631554D}" | ||
| 7 | EndProject | ||
| 8 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestComponentNET4", "TestComponentNET4\TestComponentNET4.csproj", "{EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}" | ||
| 9 | EndProject | ||
| 10 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestComponentNative", "TestComponentNative\TestComponentNative.vcxproj", "{EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}" | ||
| 11 | EndProject | ||
| 12 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestComponentNET8", "TestComponentNET8\TestComponentNET8.csproj", "{EC2F6BAE-9840-4CA0-8B83-F38F635CF246}" | ||
| 13 | EndProject | ||
| 14 | Global | ||
| 15 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| 16 | Debug|Any CPU = Debug|Any CPU | ||
| 17 | Debug|x64 = Debug|x64 | ||
| 18 | Debug|x86 = Debug|x86 | ||
| 19 | Release|Any CPU = Release|Any CPU | ||
| 20 | Release|x64 = Release|x64 | ||
| 21 | Release|x86 = Release|x86 | ||
| 22 | EndGlobalSection | ||
| 23 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| 24 | {B4CD7ECE-7245-445B-9F04-D2952631554D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 25 | {B4CD7ECE-7245-445B-9F04-D2952631554D}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 26 | {B4CD7ECE-7245-445B-9F04-D2952631554D}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 27 | {B4CD7ECE-7245-445B-9F04-D2952631554D}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 28 | {B4CD7ECE-7245-445B-9F04-D2952631554D}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 29 | {B4CD7ECE-7245-445B-9F04-D2952631554D}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 30 | {B4CD7ECE-7245-445B-9F04-D2952631554D}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 31 | {B4CD7ECE-7245-445B-9F04-D2952631554D}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 32 | {B4CD7ECE-7245-445B-9F04-D2952631554D}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 33 | {B4CD7ECE-7245-445B-9F04-D2952631554D}.Release|x64.Build.0 = Release|Any CPU | ||
| 34 | {B4CD7ECE-7245-445B-9F04-D2952631554D}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 35 | {B4CD7ECE-7245-445B-9F04-D2952631554D}.Release|x86.Build.0 = Release|Any CPU | ||
| 36 | {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 37 | {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 38 | {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 39 | {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 40 | {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 41 | {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 42 | {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 43 | {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 44 | {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 45 | {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Release|x64.Build.0 = Release|Any CPU | ||
| 46 | {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 47 | {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Release|x86.Build.0 = Release|Any CPU | ||
| 48 | {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Debug|Any CPU.ActiveCfg = Debug|x64 | ||
| 49 | {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Debug|Any CPU.Build.0 = Debug|x64 | ||
| 50 | {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Debug|x64.ActiveCfg = Debug|x64 | ||
| 51 | {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Debug|x64.Build.0 = Debug|x64 | ||
| 52 | {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Debug|x86.ActiveCfg = Debug|Win32 | ||
| 53 | {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Debug|x86.Build.0 = Debug|Win32 | ||
| 54 | {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Release|Any CPU.ActiveCfg = Release|x64 | ||
| 55 | {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Release|Any CPU.Build.0 = Release|x64 | ||
| 56 | {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Release|x64.ActiveCfg = Release|x64 | ||
| 57 | {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Release|x64.Build.0 = Release|x64 | ||
| 58 | {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Release|x86.ActiveCfg = Release|Win32 | ||
| 59 | {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Release|x86.Build.0 = Release|Win32 | ||
| 60 | {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 61 | {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 62 | {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 63 | {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 64 | {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 65 | {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 66 | {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 67 | {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 68 | {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 69 | {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Release|x64.Build.0 = Release|Any CPU | ||
| 70 | {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 71 | {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Release|x86.Build.0 = Release|Any CPU | ||
| 72 | EndGlobalSection | ||
| 73 | GlobalSection(SolutionProperties) = preSolution | ||
| 74 | HideSolutionNode = FALSE | ||
| 75 | EndGlobalSection | ||
| 76 | GlobalSection(ExtensibilityGlobals) = postSolution | ||
| 77 | SolutionGuid = {4C27BD28-1E2C-4414-8290-3C5C042DF148} | ||
| 78 | EndGlobalSection | ||
| 79 | EndGlobal | ||
diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/ComPlusComponents.slnx b/src/test/msi/TestData/ComPlusExtensionTests/Components/ComPlusComponents.slnx new file mode 100644 index 00000000..f29f1aa2 --- /dev/null +++ b/src/test/msi/TestData/ComPlusExtensionTests/Components/ComPlusComponents.slnx | |||
| @@ -0,0 +1,11 @@ | |||
| 1 | <Solution> | ||
| 2 | <Configurations> | ||
| 3 | <Platform Name="Any CPU" /> | ||
| 4 | <Platform Name="x64" /> | ||
| 5 | <Platform Name="x86" /> | ||
| 6 | </Configurations> | ||
| 7 | <Project Path="TestComponentNative/TestComponentNative.vcxproj" Id="eb199fa2-f9f7-4a2f-a4d3-6689f8a18952" /> | ||
| 8 | <Project Path="TestComponentNET3/TestComponentNET3.csproj" Id="b4cd7ece-7245-445b-9f04-d2952631554d" /> | ||
| 9 | <Project Path="TestComponentNET4/TestComponentNET4.csproj" Id="ea2afcce-677d-433e-8517-4cfbbd3ebfaa" /> | ||
| 10 | <Project Path="TestComponentNET8/TestComponentNET8.csproj" /> | ||
| 11 | </Solution> | ||
diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET3/TestComponentNET3.csproj b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET3/TestComponentNET3.csproj index b0c4aff9..a71fb079 100644 --- a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET3/TestComponentNET3.csproj +++ b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET3/TestComponentNET3.csproj | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> | 2 | <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> |
| 3 | <PropertyGroup> | 3 | <PropertyGroup> |
| 4 | <ProjectType>Local</ProjectType> | 4 | <ProjectType>Local</ProjectType> |
| 5 | <ProductVersion>7.0.9466</ProductVersion> | 5 | <ProductVersion>7.0.9466</ProductVersion> |
| @@ -94,4 +94,4 @@ | |||
| 94 | <PostBuildEvent>call "$(DevEnvDir)..\Tools\VsDevCmd.bat" | 94 | <PostBuildEvent>call "$(DevEnvDir)..\Tools\VsDevCmd.bat" |
| 95 | tlbexp.exe $(TargetDir)$(TargetFileName)</PostBuildEvent> | 95 | tlbexp.exe $(TargetDir)$(TargetFileName)</PostBuildEvent> |
| 96 | </PropertyGroup> | 96 | </PropertyGroup> |
| 97 | </Project> \ No newline at end of file | 97 | </Project> |
diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET4/TestComponentNET4.csproj b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET4/TestComponentNET4.csproj index c1398c24..5e5e2d75 100644 --- a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET4/TestComponentNET4.csproj +++ b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET4/TestComponentNET4.csproj | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> | 2 | <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> |
| 3 | <PropertyGroup> | 3 | <PropertyGroup> |
| 4 | <ProjectType>Local</ProjectType> | 4 | <ProjectType>Local</ProjectType> |
| 5 | <ProductVersion>7.0.9466</ProductVersion> | 5 | <ProductVersion>7.0.9466</ProductVersion> |
| @@ -94,4 +94,4 @@ | |||
| 94 | <PostBuildEvent>call "$(DevEnvDir)..\Tools\VsDevCmd.bat" | 94 | <PostBuildEvent>call "$(DevEnvDir)..\Tools\VsDevCmd.bat" |
| 95 | tlbexp.exe $(TargetDir)$(TargetFileName)</PostBuildEvent> | 95 | tlbexp.exe $(TargetDir)$(TargetFileName)</PostBuildEvent> |
| 96 | </PropertyGroup> | 96 | </PropertyGroup> |
| 97 | </Project> \ No newline at end of file | 97 | </Project> |
diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.vcxproj.filters b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.vcxproj.filters index a05a6a8f..7d4d96a9 100644 --- a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.vcxproj.filters +++ b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.vcxproj.filters | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 2 | <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 3 | <ItemGroup> | 3 | <ItemGroup> |
| 4 | <Filter Include="Source Files"> | 4 | <Filter Include="Source Files"> |
| 5 | <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> | 5 | <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> |
| @@ -79,4 +79,4 @@ | |||
| 79 | <Filter>Source Files</Filter> | 79 | <Filter>Source Files</Filter> |
| 80 | </Midl> | 80 | </Midl> |
| 81 | </ItemGroup> | 81 | </ItemGroup> |
| 82 | </Project> \ No newline at end of file | 82 | </Project> |
diff --git a/src/test/wix/TestData/CsprojClassLibraryNetFx/CsprojClassLibraryNetFx.csproj b/src/test/wix/TestData/CsprojClassLibraryNetFx/CsprojClassLibraryNetFx.csproj index e776bc4b..8f88a463 100644 --- a/src/test/wix/TestData/CsprojClassLibraryNetFx/CsprojClassLibraryNetFx.csproj +++ b/src/test/wix/TestData/CsprojClassLibraryNetFx/CsprojClassLibraryNetFx.csproj | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 2 | <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 3 | <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> | 3 | <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> |
| 4 | <PropertyGroup> | 4 | <PropertyGroup> |
| 5 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 5 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
| @@ -32,18 +32,18 @@ | |||
| 32 | </PropertyGroup> | 32 | </PropertyGroup> |
| 33 | <ItemGroup> | 33 | <ItemGroup> |
| 34 | <Reference Include="System"/> | 34 | <Reference Include="System"/> |
| 35 | 35 | ||
| 36 | <Reference Include="System.Core"/> | 36 | <Reference Include="System.Core"/> |
| 37 | <Reference Include="System.Xml.Linq"/> | 37 | <Reference Include="System.Xml.Linq"/> |
| 38 | <Reference Include="System.Data.DataSetExtensions"/> | 38 | <Reference Include="System.Data.DataSetExtensions"/> |
| 39 | 39 | ||
| 40 | 40 | ||
| 41 | <Reference Include="Microsoft.CSharp"/> | 41 | <Reference Include="Microsoft.CSharp"/> |
| 42 | 42 | ||
| 43 | <Reference Include="System.Data"/> | 43 | <Reference Include="System.Data"/> |
| 44 | 44 | ||
| 45 | <Reference Include="System.Net.Http"/> | 45 | <Reference Include="System.Net.Http"/> |
| 46 | 46 | ||
| 47 | <Reference Include="System.Xml"/> | 47 | <Reference Include="System.Xml"/> |
| 48 | </ItemGroup> | 48 | </ItemGroup> |
| 49 | <ItemGroup> | 49 | <ItemGroup> |
diff --git a/src/test/wix/TestData/CsprojConsoleMultiFramework/CsprojConsoleMultiFramework.sln b/src/test/wix/TestData/CsprojConsoleMultiFramework/CsprojConsoleMultiFramework.sln deleted file mode 100644 index ec9c83db..00000000 --- a/src/test/wix/TestData/CsprojConsoleMultiFramework/CsprojConsoleMultiFramework.sln +++ /dev/null | |||
| @@ -1,25 +0,0 @@ | |||
| 1 | | ||
| 2 | Microsoft Visual Studio Solution File, Format Version 12.00 | ||
| 3 | # Visual Studio Version 16 | ||
| 4 | VisualStudioVersion = 16.0.31911.196 | ||
| 5 | MinimumVisualStudioVersion = 10.0.40219.1 | ||
| 6 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsprojConsoleMultiFramework", "CsprojConsoleMultiFramework.csproj", "{A87A6E98-EE6A-4688-8716-E2378AC7BB75}" | ||
| 7 | EndProject | ||
| 8 | Global | ||
| 9 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| 10 | Debug|Any CPU = Debug|Any CPU | ||
| 11 | Release|Any CPU = Release|Any CPU | ||
| 12 | EndGlobalSection | ||
| 13 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| 14 | {A87A6E98-EE6A-4688-8716-E2378AC7BB75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 15 | {A87A6E98-EE6A-4688-8716-E2378AC7BB75}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 16 | {A87A6E98-EE6A-4688-8716-E2378AC7BB75}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 17 | {A87A6E98-EE6A-4688-8716-E2378AC7BB75}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 18 | EndGlobalSection | ||
| 19 | GlobalSection(SolutionProperties) = preSolution | ||
| 20 | HideSolutionNode = FALSE | ||
| 21 | EndGlobalSection | ||
| 22 | GlobalSection(ExtensibilityGlobals) = postSolution | ||
| 23 | SolutionGuid = {9D5D5A46-18B1-4B8B-BC4B-DBD4EFC8215D} | ||
| 24 | EndGlobalSection | ||
| 25 | EndGlobal | ||
diff --git a/src/test/wix/TestData/CsprojConsoleMultiFramework/CsprojConsoleMultiFramework.slnx b/src/test/wix/TestData/CsprojConsoleMultiFramework/CsprojConsoleMultiFramework.slnx new file mode 100644 index 00000000..1264db9c --- /dev/null +++ b/src/test/wix/TestData/CsprojConsoleMultiFramework/CsprojConsoleMultiFramework.slnx | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | <Solution> | ||
| 2 | <Project Path="CsprojConsoleMultiFramework.csproj" /> | ||
| 3 | </Solution> | ||
diff --git a/src/test/wix/TestData/CsprojConsoleNetCore/CsprojConsoleNetCore.sln b/src/test/wix/TestData/CsprojConsoleNetCore/CsprojConsoleNetCore.sln deleted file mode 100644 index 47005cdc..00000000 --- a/src/test/wix/TestData/CsprojConsoleNetCore/CsprojConsoleNetCore.sln +++ /dev/null | |||
| @@ -1,25 +0,0 @@ | |||
| 1 | | ||
| 2 | Microsoft Visual Studio Solution File, Format Version 12.00 | ||
| 3 | # Visual Studio Version 16 | ||
| 4 | VisualStudioVersion = 16.0.31911.196 | ||
| 5 | MinimumVisualStudioVersion = 10.0.40219.1 | ||
| 6 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsprojConsoleNetCore", "CsprojConsoleNetCore.csproj", "{A87A6E98-EE6A-4688-8716-E2378AC7BB75}" | ||
| 7 | EndProject | ||
| 8 | Global | ||
| 9 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| 10 | Debug|Any CPU = Debug|Any CPU | ||
| 11 | Release|Any CPU = Release|Any CPU | ||
| 12 | EndGlobalSection | ||
| 13 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| 14 | {A87A6E98-EE6A-4688-8716-E2378AC7BB75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 15 | {A87A6E98-EE6A-4688-8716-E2378AC7BB75}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 16 | {A87A6E98-EE6A-4688-8716-E2378AC7BB75}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 17 | {A87A6E98-EE6A-4688-8716-E2378AC7BB75}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 18 | EndGlobalSection | ||
| 19 | GlobalSection(SolutionProperties) = preSolution | ||
| 20 | HideSolutionNode = FALSE | ||
| 21 | EndGlobalSection | ||
| 22 | GlobalSection(ExtensibilityGlobals) = postSolution | ||
| 23 | SolutionGuid = {9D5D5A46-18B1-4B8B-BC4B-DBD4EFC8215D} | ||
| 24 | EndGlobalSection | ||
| 25 | EndGlobal | ||
diff --git a/src/test/wix/TestData/CsprojConsoleNetCore/CsprojConsoleNetCore.slnx b/src/test/wix/TestData/CsprojConsoleNetCore/CsprojConsoleNetCore.slnx new file mode 100644 index 00000000..93780d52 --- /dev/null +++ b/src/test/wix/TestData/CsprojConsoleNetCore/CsprojConsoleNetCore.slnx | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | <Solution> | ||
| 2 | <Project Path="CsprojConsoleNetCore.csproj" /> | ||
| 3 | </Solution> | ||
diff --git a/src/test/wix/TestData/CsprojWebApplicationNetFx/CsprojWebApplicationNetFx.csproj b/src/test/wix/TestData/CsprojWebApplicationNetFx/CsprojWebApplicationNetFx.csproj index 28322fe1..79c5fd72 100644 --- a/src/test/wix/TestData/CsprojWebApplicationNetFx/CsprojWebApplicationNetFx.csproj +++ b/src/test/wix/TestData/CsprojWebApplicationNetFx/CsprojWebApplicationNetFx.csproj | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 2 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="Current"> |
| 3 | <Import Project="..\..\..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\..\..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" /> | 3 | <Import Project="..\..\..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\..\..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" /> |
| 4 | <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> | 4 | <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> |
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| @@ -216,4 +216,4 @@ | |||
| 216 | </Target> | 216 | </Target> |
| 217 | <Target Name="AfterBuild"> | 217 | <Target Name="AfterBuild"> |
| 218 | </Target> --> | 218 | </Target> --> |
| 219 | </Project> \ No newline at end of file | 219 | </Project> |
diff --git a/src/test/wix/TestData/CsprojWindowsFormsNetFx/CsprojWindowsFormsNetFx.csproj b/src/test/wix/TestData/CsprojWindowsFormsNetFx/CsprojWindowsFormsNetFx.csproj index 3b044194..82a9e503 100644 --- a/src/test/wix/TestData/CsprojWindowsFormsNetFx/CsprojWindowsFormsNetFx.csproj +++ b/src/test/wix/TestData/CsprojWindowsFormsNetFx/CsprojWindowsFormsNetFx.csproj | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 2 | <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="Current"> |
| 3 | <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> | 3 | <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> |
| 4 | <PropertyGroup> | 4 | <PropertyGroup> |
| 5 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 5 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
| @@ -62,6 +62,7 @@ | |||
| 62 | <Compile Include="Properties\Resources.Designer.cs"> | 62 | <Compile Include="Properties\Resources.Designer.cs"> |
| 63 | <AutoGen>True</AutoGen> | 63 | <AutoGen>True</AutoGen> |
| 64 | <DependentUpon>Resources.resx</DependentUpon> | 64 | <DependentUpon>Resources.resx</DependentUpon> |
| 65 | <DesignTime>True</DesignTime> | ||
| 65 | </Compile> | 66 | </Compile> |
| 66 | <None Include="Properties\Settings.settings"> | 67 | <None Include="Properties\Settings.settings"> |
| 67 | <Generator>SettingsSingleFileGenerator</Generator> | 68 | <Generator>SettingsSingleFileGenerator</Generator> |
| @@ -83,4 +84,4 @@ | |||
| 83 | </ProjectReference> | 84 | </ProjectReference> |
| 84 | </ItemGroup> | 85 | </ItemGroup> |
| 85 | <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> | 86 | <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> |
| 86 | </Project> \ No newline at end of file | 87 | </Project> |
diff --git a/src/test/wix/TestData/CsprojWindowsFormsNetFx/Properties/Resources.Designer.cs b/src/test/wix/TestData/CsprojWindowsFormsNetFx/Properties/Resources.Designer.cs index c450b36d..0ab4f967 100644 --- a/src/test/wix/TestData/CsprojWindowsFormsNetFx/Properties/Resources.Designer.cs +++ b/src/test/wix/TestData/CsprojWindowsFormsNetFx/Properties/Resources.Designer.cs | |||
| @@ -8,9 +8,10 @@ | |||
| 8 | // </auto-generated> | 8 | // </auto-generated> |
| 9 | //------------------------------------------------------------------------------ | 9 | //------------------------------------------------------------------------------ |
| 10 | 10 | ||
| 11 | 11 | namespace CsprojWindowsFormsNetFx.Properties { | |
| 12 | namespace CsprojWindowsFormsNetFx.Properties | 12 | using System; |
| 13 | { | 13 | |
| 14 | |||
| 14 | /// <summary> | 15 | /// <summary> |
| 15 | /// A strongly-typed resource class, for looking up localized strings, etc. | 16 | /// A strongly-typed resource class, for looking up localized strings, etc. |
| 16 | /// </summary> | 17 | /// </summary> |
| @@ -18,51 +19,43 @@ namespace CsprojWindowsFormsNetFx.Properties | |||
| 18 | // class via a tool like ResGen or Visual Studio. | 19 | // class via a tool like ResGen or Visual Studio. |
| 19 | // To add or remove a member, edit your .ResX file then rerun ResGen | 20 | // To add or remove a member, edit your .ResX file then rerun ResGen |
| 20 | // with the /str option, or rebuild your VS project. | 21 | // with the /str option, or rebuild your VS project. |
| 21 | [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] | 22 | [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")] |
| 22 | [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] | 23 | [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] |
| 23 | [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] | 24 | [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] |
| 24 | internal class Resources | 25 | internal class Resources { |
| 25 | { | 26 | |
| 26 | |||
| 27 | private static global::System.Resources.ResourceManager resourceMan; | 27 | private static global::System.Resources.ResourceManager resourceMan; |
| 28 | 28 | ||
| 29 | private static global::System.Globalization.CultureInfo resourceCulture; | 29 | private static global::System.Globalization.CultureInfo resourceCulture; |
| 30 | 30 | ||
| 31 | [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] | 31 | [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] |
| 32 | internal Resources() | 32 | internal Resources() { |
| 33 | { | ||
| 34 | } | 33 | } |
| 35 | 34 | ||
| 36 | /// <summary> | 35 | /// <summary> |
| 37 | /// Returns the cached ResourceManager instance used by this class. | 36 | /// Returns the cached ResourceManager instance used by this class. |
| 38 | /// </summary> | 37 | /// </summary> |
| 39 | [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] | 38 | [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] |
| 40 | internal static global::System.Resources.ResourceManager ResourceManager | 39 | internal static global::System.Resources.ResourceManager ResourceManager { |
| 41 | { | 40 | get { |
| 42 | get | 41 | if (object.ReferenceEquals(resourceMan, null)) { |
| 43 | { | ||
| 44 | if ((resourceMan == null)) | ||
| 45 | { | ||
| 46 | global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CsprojWindowsFormsNetFx.Properties.Resources", typeof(Resources).Assembly); | 42 | global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CsprojWindowsFormsNetFx.Properties.Resources", typeof(Resources).Assembly); |
| 47 | resourceMan = temp; | 43 | resourceMan = temp; |
| 48 | } | 44 | } |
| 49 | return resourceMan; | 45 | return resourceMan; |
| 50 | } | 46 | } |
| 51 | } | 47 | } |
| 52 | 48 | ||
| 53 | /// <summary> | 49 | /// <summary> |
| 54 | /// Overrides the current thread's CurrentUICulture property for all | 50 | /// Overrides the current thread's CurrentUICulture property for all |
| 55 | /// resource lookups using this strongly typed resource class. | 51 | /// resource lookups using this strongly typed resource class. |
| 56 | /// </summary> | 52 | /// </summary> |
| 57 | [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] | 53 | [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] |
| 58 | internal static global::System.Globalization.CultureInfo Culture | 54 | internal static global::System.Globalization.CultureInfo Culture { |
| 59 | { | 55 | get { |
| 60 | get | ||
| 61 | { | ||
| 62 | return resourceCulture; | 56 | return resourceCulture; |
| 63 | } | 57 | } |
| 64 | set | 58 | set { |
| 65 | { | ||
| 66 | resourceCulture = value; | 59 | resourceCulture = value; |
| 67 | } | 60 | } |
| 68 | } | 61 | } |
diff --git a/src/test/wix/TestData/CsprojWindowsFormsNetFx/Properties/Settings.Designer.cs b/src/test/wix/TestData/CsprojWindowsFormsNetFx/Properties/Settings.Designer.cs index 2ad6fcfd..4b0cf401 100644 --- a/src/test/wix/TestData/CsprojWindowsFormsNetFx/Properties/Settings.Designer.cs +++ b/src/test/wix/TestData/CsprojWindowsFormsNetFx/Properties/Settings.Designer.cs | |||
| @@ -8,20 +8,17 @@ | |||
| 8 | // </auto-generated> | 8 | // </auto-generated> |
| 9 | //------------------------------------------------------------------------------ | 9 | //------------------------------------------------------------------------------ |
| 10 | 10 | ||
| 11 | 11 | namespace CsprojWindowsFormsNetFx.Properties { | |
| 12 | namespace CsprojWindowsFormsNetFx.Properties | 12 | |
| 13 | { | 13 | |
| 14 | [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] | 14 | [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] |
| 15 | [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] | 15 | [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0")] |
| 16 | internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase | 16 | internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { |
| 17 | { | 17 | |
| 18 | |||
| 19 | private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); | 18 | private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); |
| 20 | 19 | ||
| 21 | public static Settings Default | 20 | public static Settings Default { |
| 22 | { | 21 | get { |
| 23 | get | ||
| 24 | { | ||
| 25 | return defaultInstance; | 22 | return defaultInstance; |
| 26 | } | 23 | } |
| 27 | } | 24 | } |
diff --git a/src/test/wix/TestData/TestProjects.sln b/src/test/wix/TestData/TestProjects.sln deleted file mode 100644 index 5f2cf2c7..00000000 --- a/src/test/wix/TestData/TestProjects.sln +++ /dev/null | |||
| @@ -1,191 +0,0 @@ | |||
| 1 | | ||
| 2 | Microsoft Visual Studio Solution File, Format Version 12.00 | ||
| 3 | # Visual Studio Version 17 | ||
| 4 | VisualStudioVersion = 17.0.31912.275 | ||
| 5 | MinimumVisualStudioVersion = 10.0.40219.1 | ||
| 6 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CsprojClassLibraryNetCore", "CsprojClassLibraryNetCore\CsprojClassLibraryNetCore.csproj", "{0613F696-7DAD-41AE-ACD5-38949021C534}" | ||
| 7 | EndProject | ||
| 8 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsprojClassLibraryNetFx", "CsprojClassLibraryNetFx\CsprojClassLibraryNetFx.csproj", "{984D615D-ADB1-49B4-AE0B-4496ED963881}" | ||
| 9 | EndProject | ||
| 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CsprojConsoleNetCore", "CsprojConsoleNetCore\CsprojConsoleNetCore.csproj", "{D7555F37-31DA-4678-8E0B-4BD0D392F136}" | ||
| 11 | EndProject | ||
| 12 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CsprojWebApplicationNetCore", "CsprojWebApplicationNetCore\CsprojWebApplicationNetCore.csproj", "{AE8FC882-54CC-45C6-9489-8C98CAE31268}" | ||
| 13 | EndProject | ||
| 14 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsprojWebApplicationNetFx", "CsprojWebApplicationNetFx\CsprojWebApplicationNetFx.csproj", "{3DDD967D-2E14-44A3-AFE1-1ED4C25033BC}" | ||
| 15 | EndProject | ||
| 16 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsprojWindowsFormsNetFx", "CsprojWindowsFormsNetFx\CsprojWindowsFormsNetFx.csproj", "{3B5570AD-4191-4A66-A81D-8CBD14496340}" | ||
| 17 | EndProject | ||
| 18 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VcxprojConsoleApplication", "VcxprojConsoleApplication\VcxprojConsoleApplication.vcxproj", "{7EDF70C5-DEC2-417D-82E3-F354BE59E3A7}" | ||
| 19 | EndProject | ||
| 20 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VcxprojDll", "VcxprojDll\VcxprojDll.vcxproj", "{2B70C248-1090-4D04-BDA0-BF0E48716E5B}" | ||
| 21 | EndProject | ||
| 22 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VcxprojStaticLib", "VcxprojStaticLib\VcxprojStaticLib.vcxproj", "{C4BBEB93-E40F-4F91-9A9D-DB9656DB04F0}" | ||
| 23 | EndProject | ||
| 24 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VcxprojWindowsApp", "VcxprojWindowsApp\VcxprojWindowsApp.vcxproj", "{8F2A12CD-6D3B-4648-81A9-2A852A63EA90}" | ||
| 25 | EndProject | ||
| 26 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CsprojClassLibraryMultiTarget", "CsprojClassLibraryMultiTarget\CsprojClassLibraryMultiTarget.csproj", "{B1F59F27-6AA6-4228-A3DF-B21B32AEEB7B}" | ||
| 27 | EndProject | ||
| 28 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsprojWpfNetCore", "CsprojWpfNetCore\CsprojWpfNetCore.csproj", "{F467E3CF-2107-44B0-B45B-0FCA4A04613B}" | ||
| 29 | EndProject | ||
| 30 | Global | ||
| 31 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| 32 | Debug|Any CPU = Debug|Any CPU | ||
| 33 | Debug|x64 = Debug|x64 | ||
| 34 | Debug|x86 = Debug|x86 | ||
| 35 | Release|Any CPU = Release|Any CPU | ||
| 36 | Release|x64 = Release|x64 | ||
| 37 | Release|x86 = Release|x86 | ||
| 38 | EndGlobalSection | ||
| 39 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| 40 | {0613F696-7DAD-41AE-ACD5-38949021C534}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 41 | {0613F696-7DAD-41AE-ACD5-38949021C534}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 42 | {0613F696-7DAD-41AE-ACD5-38949021C534}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 43 | {0613F696-7DAD-41AE-ACD5-38949021C534}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 44 | {0613F696-7DAD-41AE-ACD5-38949021C534}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 45 | {0613F696-7DAD-41AE-ACD5-38949021C534}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 46 | {0613F696-7DAD-41AE-ACD5-38949021C534}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 47 | {0613F696-7DAD-41AE-ACD5-38949021C534}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 48 | {0613F696-7DAD-41AE-ACD5-38949021C534}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 49 | {0613F696-7DAD-41AE-ACD5-38949021C534}.Release|x64.Build.0 = Release|Any CPU | ||
| 50 | {0613F696-7DAD-41AE-ACD5-38949021C534}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 51 | {0613F696-7DAD-41AE-ACD5-38949021C534}.Release|x86.Build.0 = Release|Any CPU | ||
| 52 | {984D615D-ADB1-49B4-AE0B-4496ED963881}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 53 | {984D615D-ADB1-49B4-AE0B-4496ED963881}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 54 | {984D615D-ADB1-49B4-AE0B-4496ED963881}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 55 | {984D615D-ADB1-49B4-AE0B-4496ED963881}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 56 | {984D615D-ADB1-49B4-AE0B-4496ED963881}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 57 | {984D615D-ADB1-49B4-AE0B-4496ED963881}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 58 | {984D615D-ADB1-49B4-AE0B-4496ED963881}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 59 | {984D615D-ADB1-49B4-AE0B-4496ED963881}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 60 | {984D615D-ADB1-49B4-AE0B-4496ED963881}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 61 | {984D615D-ADB1-49B4-AE0B-4496ED963881}.Release|x64.Build.0 = Release|Any CPU | ||
| 62 | {984D615D-ADB1-49B4-AE0B-4496ED963881}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 63 | {984D615D-ADB1-49B4-AE0B-4496ED963881}.Release|x86.Build.0 = Release|Any CPU | ||
| 64 | {D7555F37-31DA-4678-8E0B-4BD0D392F136}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 65 | {D7555F37-31DA-4678-8E0B-4BD0D392F136}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 66 | {D7555F37-31DA-4678-8E0B-4BD0D392F136}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 67 | {D7555F37-31DA-4678-8E0B-4BD0D392F136}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 68 | {D7555F37-31DA-4678-8E0B-4BD0D392F136}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 69 | {D7555F37-31DA-4678-8E0B-4BD0D392F136}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 70 | {D7555F37-31DA-4678-8E0B-4BD0D392F136}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 71 | {D7555F37-31DA-4678-8E0B-4BD0D392F136}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 72 | {D7555F37-31DA-4678-8E0B-4BD0D392F136}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 73 | {D7555F37-31DA-4678-8E0B-4BD0D392F136}.Release|x64.Build.0 = Release|Any CPU | ||
| 74 | {D7555F37-31DA-4678-8E0B-4BD0D392F136}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 75 | {D7555F37-31DA-4678-8E0B-4BD0D392F136}.Release|x86.Build.0 = Release|Any CPU | ||
| 76 | {AE8FC882-54CC-45C6-9489-8C98CAE31268}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 77 | {AE8FC882-54CC-45C6-9489-8C98CAE31268}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 78 | {AE8FC882-54CC-45C6-9489-8C98CAE31268}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 79 | {AE8FC882-54CC-45C6-9489-8C98CAE31268}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 80 | {AE8FC882-54CC-45C6-9489-8C98CAE31268}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 81 | {AE8FC882-54CC-45C6-9489-8C98CAE31268}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 82 | {AE8FC882-54CC-45C6-9489-8C98CAE31268}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 83 | {AE8FC882-54CC-45C6-9489-8C98CAE31268}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 84 | {AE8FC882-54CC-45C6-9489-8C98CAE31268}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 85 | {AE8FC882-54CC-45C6-9489-8C98CAE31268}.Release|x64.Build.0 = Release|Any CPU | ||
| 86 | {AE8FC882-54CC-45C6-9489-8C98CAE31268}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 87 | {AE8FC882-54CC-45C6-9489-8C98CAE31268}.Release|x86.Build.0 = Release|Any CPU | ||
| 88 | {3DDD967D-2E14-44A3-AFE1-1ED4C25033BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 89 | {3DDD967D-2E14-44A3-AFE1-1ED4C25033BC}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 90 | {3DDD967D-2E14-44A3-AFE1-1ED4C25033BC}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 91 | {3DDD967D-2E14-44A3-AFE1-1ED4C25033BC}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 92 | {3DDD967D-2E14-44A3-AFE1-1ED4C25033BC}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 93 | {3DDD967D-2E14-44A3-AFE1-1ED4C25033BC}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 94 | {3DDD967D-2E14-44A3-AFE1-1ED4C25033BC}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 95 | {3DDD967D-2E14-44A3-AFE1-1ED4C25033BC}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 96 | {3DDD967D-2E14-44A3-AFE1-1ED4C25033BC}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 97 | {3DDD967D-2E14-44A3-AFE1-1ED4C25033BC}.Release|x64.Build.0 = Release|Any CPU | ||
| 98 | {3DDD967D-2E14-44A3-AFE1-1ED4C25033BC}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 99 | {3DDD967D-2E14-44A3-AFE1-1ED4C25033BC}.Release|x86.Build.0 = Release|Any CPU | ||
| 100 | {3B5570AD-4191-4A66-A81D-8CBD14496340}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 101 | {3B5570AD-4191-4A66-A81D-8CBD14496340}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 102 | {3B5570AD-4191-4A66-A81D-8CBD14496340}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 103 | {3B5570AD-4191-4A66-A81D-8CBD14496340}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 104 | {3B5570AD-4191-4A66-A81D-8CBD14496340}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 105 | {3B5570AD-4191-4A66-A81D-8CBD14496340}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 106 | {3B5570AD-4191-4A66-A81D-8CBD14496340}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 107 | {3B5570AD-4191-4A66-A81D-8CBD14496340}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 108 | {3B5570AD-4191-4A66-A81D-8CBD14496340}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 109 | {3B5570AD-4191-4A66-A81D-8CBD14496340}.Release|x64.Build.0 = Release|Any CPU | ||
| 110 | {3B5570AD-4191-4A66-A81D-8CBD14496340}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 111 | {3B5570AD-4191-4A66-A81D-8CBD14496340}.Release|x86.Build.0 = Release|Any CPU | ||
| 112 | {7EDF70C5-DEC2-417D-82E3-F354BE59E3A7}.Debug|Any CPU.ActiveCfg = Debug|x64 | ||
| 113 | {7EDF70C5-DEC2-417D-82E3-F354BE59E3A7}.Debug|Any CPU.Build.0 = Debug|x64 | ||
| 114 | {7EDF70C5-DEC2-417D-82E3-F354BE59E3A7}.Debug|x64.ActiveCfg = Debug|x64 | ||
| 115 | {7EDF70C5-DEC2-417D-82E3-F354BE59E3A7}.Debug|x64.Build.0 = Debug|x64 | ||
| 116 | {7EDF70C5-DEC2-417D-82E3-F354BE59E3A7}.Debug|x86.ActiveCfg = Debug|Win32 | ||
| 117 | {7EDF70C5-DEC2-417D-82E3-F354BE59E3A7}.Debug|x86.Build.0 = Debug|Win32 | ||
| 118 | {7EDF70C5-DEC2-417D-82E3-F354BE59E3A7}.Release|Any CPU.ActiveCfg = Release|x64 | ||
| 119 | {7EDF70C5-DEC2-417D-82E3-F354BE59E3A7}.Release|Any CPU.Build.0 = Release|x64 | ||
| 120 | {7EDF70C5-DEC2-417D-82E3-F354BE59E3A7}.Release|x64.ActiveCfg = Release|x64 | ||
| 121 | {7EDF70C5-DEC2-417D-82E3-F354BE59E3A7}.Release|x64.Build.0 = Release|x64 | ||
| 122 | {7EDF70C5-DEC2-417D-82E3-F354BE59E3A7}.Release|x86.ActiveCfg = Release|Win32 | ||
| 123 | {7EDF70C5-DEC2-417D-82E3-F354BE59E3A7}.Release|x86.Build.0 = Release|Win32 | ||
| 124 | {2B70C248-1090-4D04-BDA0-BF0E48716E5B}.Debug|Any CPU.ActiveCfg = Debug|x64 | ||
| 125 | {2B70C248-1090-4D04-BDA0-BF0E48716E5B}.Debug|Any CPU.Build.0 = Debug|x64 | ||
| 126 | {2B70C248-1090-4D04-BDA0-BF0E48716E5B}.Debug|x64.ActiveCfg = Debug|x64 | ||
| 127 | {2B70C248-1090-4D04-BDA0-BF0E48716E5B}.Debug|x64.Build.0 = Debug|x64 | ||
| 128 | {2B70C248-1090-4D04-BDA0-BF0E48716E5B}.Debug|x86.ActiveCfg = Debug|Win32 | ||
| 129 | {2B70C248-1090-4D04-BDA0-BF0E48716E5B}.Debug|x86.Build.0 = Debug|Win32 | ||
| 130 | {2B70C248-1090-4D04-BDA0-BF0E48716E5B}.Release|Any CPU.ActiveCfg = Release|x64 | ||
| 131 | {2B70C248-1090-4D04-BDA0-BF0E48716E5B}.Release|Any CPU.Build.0 = Release|x64 | ||
| 132 | {2B70C248-1090-4D04-BDA0-BF0E48716E5B}.Release|x64.ActiveCfg = Release|x64 | ||
| 133 | {2B70C248-1090-4D04-BDA0-BF0E48716E5B}.Release|x64.Build.0 = Release|x64 | ||
| 134 | {2B70C248-1090-4D04-BDA0-BF0E48716E5B}.Release|x86.ActiveCfg = Release|Win32 | ||
| 135 | {2B70C248-1090-4D04-BDA0-BF0E48716E5B}.Release|x86.Build.0 = Release|Win32 | ||
| 136 | {C4BBEB93-E40F-4F91-9A9D-DB9656DB04F0}.Debug|Any CPU.ActiveCfg = Debug|x64 | ||
| 137 | {C4BBEB93-E40F-4F91-9A9D-DB9656DB04F0}.Debug|Any CPU.Build.0 = Debug|x64 | ||
| 138 | {C4BBEB93-E40F-4F91-9A9D-DB9656DB04F0}.Debug|x64.ActiveCfg = Debug|x64 | ||
| 139 | {C4BBEB93-E40F-4F91-9A9D-DB9656DB04F0}.Debug|x64.Build.0 = Debug|x64 | ||
| 140 | {C4BBEB93-E40F-4F91-9A9D-DB9656DB04F0}.Debug|x86.ActiveCfg = Debug|Win32 | ||
| 141 | {C4BBEB93-E40F-4F91-9A9D-DB9656DB04F0}.Debug|x86.Build.0 = Debug|Win32 | ||
| 142 | {C4BBEB93-E40F-4F91-9A9D-DB9656DB04F0}.Release|Any CPU.ActiveCfg = Release|x64 | ||
| 143 | {C4BBEB93-E40F-4F91-9A9D-DB9656DB04F0}.Release|Any CPU.Build.0 = Release|x64 | ||
| 144 | {C4BBEB93-E40F-4F91-9A9D-DB9656DB04F0}.Release|x64.ActiveCfg = Release|x64 | ||
| 145 | {C4BBEB93-E40F-4F91-9A9D-DB9656DB04F0}.Release|x64.Build.0 = Release|x64 | ||
| 146 | {C4BBEB93-E40F-4F91-9A9D-DB9656DB04F0}.Release|x86.ActiveCfg = Release|Win32 | ||
| 147 | {C4BBEB93-E40F-4F91-9A9D-DB9656DB04F0}.Release|x86.Build.0 = Release|Win32 | ||
| 148 | {8F2A12CD-6D3B-4648-81A9-2A852A63EA90}.Debug|Any CPU.ActiveCfg = Debug|x64 | ||
| 149 | {8F2A12CD-6D3B-4648-81A9-2A852A63EA90}.Debug|Any CPU.Build.0 = Debug|x64 | ||
| 150 | {8F2A12CD-6D3B-4648-81A9-2A852A63EA90}.Debug|x64.ActiveCfg = Debug|x64 | ||
| 151 | {8F2A12CD-6D3B-4648-81A9-2A852A63EA90}.Debug|x64.Build.0 = Debug|x64 | ||
| 152 | {8F2A12CD-6D3B-4648-81A9-2A852A63EA90}.Debug|x86.ActiveCfg = Debug|Win32 | ||
| 153 | {8F2A12CD-6D3B-4648-81A9-2A852A63EA90}.Debug|x86.Build.0 = Debug|Win32 | ||
| 154 | {8F2A12CD-6D3B-4648-81A9-2A852A63EA90}.Release|Any CPU.ActiveCfg = Release|x64 | ||
| 155 | {8F2A12CD-6D3B-4648-81A9-2A852A63EA90}.Release|Any CPU.Build.0 = Release|x64 | ||
| 156 | {8F2A12CD-6D3B-4648-81A9-2A852A63EA90}.Release|x64.ActiveCfg = Release|x64 | ||
| 157 | {8F2A12CD-6D3B-4648-81A9-2A852A63EA90}.Release|x64.Build.0 = Release|x64 | ||
| 158 | {8F2A12CD-6D3B-4648-81A9-2A852A63EA90}.Release|x86.ActiveCfg = Release|Win32 | ||
| 159 | {8F2A12CD-6D3B-4648-81A9-2A852A63EA90}.Release|x86.Build.0 = Release|Win32 | ||
| 160 | {B1F59F27-6AA6-4228-A3DF-B21B32AEEB7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 161 | {B1F59F27-6AA6-4228-A3DF-B21B32AEEB7B}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 162 | {B1F59F27-6AA6-4228-A3DF-B21B32AEEB7B}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 163 | {B1F59F27-6AA6-4228-A3DF-B21B32AEEB7B}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 164 | {B1F59F27-6AA6-4228-A3DF-B21B32AEEB7B}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 165 | {B1F59F27-6AA6-4228-A3DF-B21B32AEEB7B}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 166 | {B1F59F27-6AA6-4228-A3DF-B21B32AEEB7B}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 167 | {B1F59F27-6AA6-4228-A3DF-B21B32AEEB7B}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 168 | {B1F59F27-6AA6-4228-A3DF-B21B32AEEB7B}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 169 | {B1F59F27-6AA6-4228-A3DF-B21B32AEEB7B}.Release|x64.Build.0 = Release|Any CPU | ||
| 170 | {B1F59F27-6AA6-4228-A3DF-B21B32AEEB7B}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 171 | {B1F59F27-6AA6-4228-A3DF-B21B32AEEB7B}.Release|x86.Build.0 = Release|Any CPU | ||
| 172 | {F467E3CF-2107-44B0-B45B-0FCA4A04613B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 173 | {F467E3CF-2107-44B0-B45B-0FCA4A04613B}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 174 | {F467E3CF-2107-44B0-B45B-0FCA4A04613B}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
| 175 | {F467E3CF-2107-44B0-B45B-0FCA4A04613B}.Debug|x64.Build.0 = Debug|Any CPU | ||
| 176 | {F467E3CF-2107-44B0-B45B-0FCA4A04613B}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
| 177 | {F467E3CF-2107-44B0-B45B-0FCA4A04613B}.Debug|x86.Build.0 = Debug|Any CPU | ||
| 178 | {F467E3CF-2107-44B0-B45B-0FCA4A04613B}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 179 | {F467E3CF-2107-44B0-B45B-0FCA4A04613B}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 180 | {F467E3CF-2107-44B0-B45B-0FCA4A04613B}.Release|x64.ActiveCfg = Release|Any CPU | ||
| 181 | {F467E3CF-2107-44B0-B45B-0FCA4A04613B}.Release|x64.Build.0 = Release|Any CPU | ||
| 182 | {F467E3CF-2107-44B0-B45B-0FCA4A04613B}.Release|x86.ActiveCfg = Release|Any CPU | ||
| 183 | {F467E3CF-2107-44B0-B45B-0FCA4A04613B}.Release|x86.Build.0 = Release|Any CPU | ||
| 184 | EndGlobalSection | ||
| 185 | GlobalSection(SolutionProperties) = preSolution | ||
| 186 | HideSolutionNode = FALSE | ||
| 187 | EndGlobalSection | ||
| 188 | GlobalSection(ExtensibilityGlobals) = postSolution | ||
| 189 | SolutionGuid = {690AEDD5-EBD0-4F2F-98AC-2D2821E1D228} | ||
| 190 | EndGlobalSection | ||
| 191 | EndGlobal | ||
diff --git a/src/test/wix/TestData/TestProjects.slnx b/src/test/wix/TestData/TestProjects.slnx new file mode 100644 index 00000000..712bd148 --- /dev/null +++ b/src/test/wix/TestData/TestProjects.slnx | |||
| @@ -0,0 +1,19 @@ | |||
| 1 | <Solution> | ||
| 2 | <Configurations> | ||
| 3 | <Platform Name="Any CPU" /> | ||
| 4 | <Platform Name="x64" /> | ||
| 5 | <Platform Name="x86" /> | ||
| 6 | </Configurations> | ||
| 7 | <Project Path="CsprojClassLibraryMultiTarget/CsprojClassLibraryMultiTarget.csproj" /> | ||
| 8 | <Project Path="CsprojClassLibraryNetCore/CsprojClassLibraryNetCore.csproj" /> | ||
| 9 | <Project Path="CsprojClassLibraryNetFx/CsprojClassLibraryNetFx.csproj" Id="984d615d-adb1-49b4-ae0b-4496ed963881" /> | ||
| 10 | <Project Path="CsprojConsoleNetCore/CsprojConsoleNetCore.csproj" /> | ||
| 11 | <Project Path="CsprojWebApplicationNetCore/CsprojWebApplicationNetCore.csproj" /> | ||
| 12 | <Project Path="CsprojWebApplicationNetFx/CsprojWebApplicationNetFx.csproj" Id="3ddd967d-2e14-44a3-afe1-1ed4c25033bc" /> | ||
| 13 | <Project Path="CsprojWindowsFormsNetFx/CsprojWindowsFormsNetFx.csproj" Id="3b5570ad-4191-4a66-a81d-8cbd14496340" /> | ||
| 14 | <Project Path="CsprojWpfNetCore/CsprojWpfNetCore.csproj" /> | ||
| 15 | <Project Path="VcxprojConsoleApplication/VcxprojConsoleApplication.vcxproj" Id="7edf70c5-dec2-417d-82e3-f354be59e3a7" /> | ||
| 16 | <Project Path="VcxprojDll/VcxprojDll.vcxproj" Id="2b70c248-1090-4d04-bda0-bf0e48716e5b" /> | ||
| 17 | <Project Path="VcxprojStaticLib/VcxprojStaticLib.vcxproj" Id="c4bbeb93-e40f-4f91-9a9d-db9656db04f0" /> | ||
| 18 | <Project Path="VcxprojWindowsApp/VcxprojWindowsApp.vcxproj" Id="8f2a12cd-6d3b-4648-81a9-2a852a63ea90" /> | ||
| 19 | </Solution> | ||
diff --git a/src/test/wix/TestData/VcxprojConsoleApplication/VcxprojConsoleApplication.vcxproj.filters b/src/test/wix/TestData/VcxprojConsoleApplication/VcxprojConsoleApplication.vcxproj.filters index 6fc74f46..f10a3bd6 100644 --- a/src/test/wix/TestData/VcxprojConsoleApplication/VcxprojConsoleApplication.vcxproj.filters +++ b/src/test/wix/TestData/VcxprojConsoleApplication/VcxprojConsoleApplication.vcxproj.filters | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 2 | <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 3 | <ItemGroup> | 3 | <ItemGroup> |
| 4 | <Filter Include="Source Files"> | 4 | <Filter Include="Source Files"> |
| 5 | <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> | 5 | <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> |
| @@ -19,4 +19,4 @@ | |||
| 19 | <Filter>Source Files</Filter> | 19 | <Filter>Source Files</Filter> |
| 20 | </ClCompile> | 20 | </ClCompile> |
| 21 | </ItemGroup> | 21 | </ItemGroup> |
| 22 | </Project> \ No newline at end of file | 22 | </Project> |
diff --git a/src/test/wix/TestData/VcxprojDll/VcxprojDll.vcxproj.filters b/src/test/wix/TestData/VcxprojDll/VcxprojDll.vcxproj.filters index 1e57c7b1..2266d2b6 100644 --- a/src/test/wix/TestData/VcxprojDll/VcxprojDll.vcxproj.filters +++ b/src/test/wix/TestData/VcxprojDll/VcxprojDll.vcxproj.filters | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 2 | <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 3 | <ItemGroup> | 3 | <ItemGroup> |
| 4 | <Filter Include="Source Files"> | 4 | <Filter Include="Source Files"> |
| 5 | <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> | 5 | <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> |
| @@ -30,4 +30,4 @@ | |||
| 30 | <Filter>Source Files</Filter> | 30 | <Filter>Source Files</Filter> |
| 31 | </ClCompile> | 31 | </ClCompile> |
| 32 | </ItemGroup> | 32 | </ItemGroup> |
| 33 | </Project> \ No newline at end of file | 33 | </Project> |
diff --git a/src/test/wix/TestData/VcxprojStaticLib/VcxprojStaticLib.vcxproj.filters b/src/test/wix/TestData/VcxprojStaticLib/VcxprojStaticLib.vcxproj.filters index dbc69054..8fc32a89 100644 --- a/src/test/wix/TestData/VcxprojStaticLib/VcxprojStaticLib.vcxproj.filters +++ b/src/test/wix/TestData/VcxprojStaticLib/VcxprojStaticLib.vcxproj.filters | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 2 | <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 3 | <ItemGroup> | 3 | <ItemGroup> |
| 4 | <Filter Include="Source Files"> | 4 | <Filter Include="Source Files"> |
| 5 | <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> | 5 | <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> |
| @@ -30,4 +30,4 @@ | |||
| 30 | <Filter>Source Files</Filter> | 30 | <Filter>Source Files</Filter> |
| 31 | </ClCompile> | 31 | </ClCompile> |
| 32 | </ItemGroup> | 32 | </ItemGroup> |
| 33 | </Project> \ No newline at end of file | 33 | </Project> |
diff --git a/src/test/wix/TestData/VcxprojWindowsApp/VcxprojWindowsApp.vcxproj.filters b/src/test/wix/TestData/VcxprojWindowsApp/VcxprojWindowsApp.vcxproj.filters index 6221dbea..187d5ae9 100644 --- a/src/test/wix/TestData/VcxprojWindowsApp/VcxprojWindowsApp.vcxproj.filters +++ b/src/test/wix/TestData/VcxprojWindowsApp/VcxprojWindowsApp.vcxproj.filters | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 2 | <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 3 | <ItemGroup> | 3 | <ItemGroup> |
| 4 | <Filter Include="Source Files"> | 4 | <Filter Include="Source Files"> |
| 5 | <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> | 5 | <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> |
| @@ -46,4 +46,4 @@ | |||
| 46 | <Filter>Resource Files</Filter> | 46 | <Filter>Resource Files</Filter> |
| 47 | </Image> | 47 | </Image> |
| 48 | </ItemGroup> | 48 | </ItemGroup> |
| 49 | </Project> \ No newline at end of file | 49 | </Project> |
diff --git a/src/test/wix/TestData/WixprojPackageCsprojWpfNetCore/abc/Bad.wxs b/src/test/wix/TestData/WixprojPackageCsprojWpfNetCore/abc/Bad.wxs new file mode 100644 index 00000000..06cb241c --- /dev/null +++ b/src/test/wix/TestData/WixprojPackageCsprojWpfNetCore/abc/Bad.wxs | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| 2 | <Bad /> | ||
| 3 | </Wix> | ||
diff --git a/src/test/wix/WixE2ETests.sln b/src/test/wix/WixE2ETests.sln deleted file mode 100644 index 3e5a2d1d..00000000 --- a/src/test/wix/WixE2ETests.sln +++ /dev/null | |||
| @@ -1,22 +0,0 @@ | |||
| 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}") = "WixE2E", "WixE2E\WixE2E.csproj", "{6575BF70-BF0F-4477-8A22-1B2D50FDE2BA}" | ||
| 7 | EndProject | ||
| 8 | Global | ||
| 9 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| 10 | Debug|Any CPU = Debug|Any CPU | ||
| 11 | Release|Any CPU = Release|Any CPU | ||
| 12 | EndGlobalSection | ||
| 13 | GlobalSection(SolutionProperties) = preSolution | ||
| 14 | HideSolutionNode = FALSE | ||
| 15 | EndGlobalSection | ||
| 16 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| 17 | {6575BF70-BF0F-4477-8A22-1B2D50FDE2BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| 18 | {6575BF70-BF0F-4477-8A22-1B2D50FDE2BA}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| 19 | {6575BF70-BF0F-4477-8A22-1B2D50FDE2BA}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| 20 | {6575BF70-BF0F-4477-8A22-1B2D50FDE2BA}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| 21 | EndGlobalSection | ||
| 22 | EndGlobal | ||
diff --git a/src/test/wix/WixE2ETests.slnx b/src/test/wix/WixE2ETests.slnx new file mode 100644 index 00000000..7a1020fc --- /dev/null +++ b/src/test/wix/WixE2ETests.slnx | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | <Solution> | ||
| 2 | <Project Path="WixE2E/WixE2E.csproj" /> | ||
| 3 | </Solution> | ||
