diff options
Diffstat (limited to '')
-rw-r--r-- | WixToolset.Core.sln | 14 | ||||
-rw-r--r-- | src/test/WixToolsetTest.LightIntegration/WixToolsetTest.LightIntegration.csproj | 11 |
2 files changed, 18 insertions, 7 deletions
diff --git a/WixToolset.Core.sln b/WixToolset.Core.sln index f6dfc653..79cd7057 100644 --- a/WixToolset.Core.sln +++ b/WixToolset.Core.sln | |||
@@ -18,6 +18,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.CoreIntegrat | |||
18 | EndProject | 18 | EndProject |
19 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "light", "src\light\light.csproj", "{821DCF25-4E4F-48B1-9DD6-80B01EBF9B16}" | 19 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "light", "src\light\light.csproj", "{821DCF25-4E4F-48B1-9DD6-80B01EBF9B16}" |
20 | EndProject | 20 | EndProject |
21 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.LightIntegration", "src\test\WixToolsetTest.LightIntegration\WixToolsetTest.LightIntegration.csproj", "{87ED6392-D624-4C7E-80ED-6BE6047A4922}" | ||
22 | EndProject | ||
21 | Global | 23 | Global |
22 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 24 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
23 | Debug|Any CPU = Debug|Any CPU | 25 | Debug|Any CPU = Debug|Any CPU |
@@ -124,6 +126,18 @@ Global | |||
124 | {821DCF25-4E4F-48B1-9DD6-80B01EBF9B16}.Release|x64.Build.0 = Release|Any CPU | 126 | {821DCF25-4E4F-48B1-9DD6-80B01EBF9B16}.Release|x64.Build.0 = Release|Any CPU |
125 | {821DCF25-4E4F-48B1-9DD6-80B01EBF9B16}.Release|x86.ActiveCfg = Release|Any CPU | 127 | {821DCF25-4E4F-48B1-9DD6-80B01EBF9B16}.Release|x86.ActiveCfg = Release|Any CPU |
126 | {821DCF25-4E4F-48B1-9DD6-80B01EBF9B16}.Release|x86.Build.0 = Release|Any CPU | 128 | {821DCF25-4E4F-48B1-9DD6-80B01EBF9B16}.Release|x86.Build.0 = Release|Any CPU |
129 | {87ED6392-D624-4C7E-80ED-6BE6047A4922}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
130 | {87ED6392-D624-4C7E-80ED-6BE6047A4922}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
131 | {87ED6392-D624-4C7E-80ED-6BE6047A4922}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
132 | {87ED6392-D624-4C7E-80ED-6BE6047A4922}.Debug|x64.Build.0 = Debug|Any CPU | ||
133 | {87ED6392-D624-4C7E-80ED-6BE6047A4922}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
134 | {87ED6392-D624-4C7E-80ED-6BE6047A4922}.Debug|x86.Build.0 = Debug|Any CPU | ||
135 | {87ED6392-D624-4C7E-80ED-6BE6047A4922}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
136 | {87ED6392-D624-4C7E-80ED-6BE6047A4922}.Release|Any CPU.Build.0 = Release|Any CPU | ||
137 | {87ED6392-D624-4C7E-80ED-6BE6047A4922}.Release|x64.ActiveCfg = Release|Any CPU | ||
138 | {87ED6392-D624-4C7E-80ED-6BE6047A4922}.Release|x64.Build.0 = Release|Any CPU | ||
139 | {87ED6392-D624-4C7E-80ED-6BE6047A4922}.Release|x86.ActiveCfg = Release|Any CPU | ||
140 | {87ED6392-D624-4C7E-80ED-6BE6047A4922}.Release|x86.Build.0 = Release|Any CPU | ||
127 | EndGlobalSection | 141 | EndGlobalSection |
128 | GlobalSection(SolutionProperties) = preSolution | 142 | GlobalSection(SolutionProperties) = preSolution |
129 | HideSolutionNode = FALSE | 143 | HideSolutionNode = FALSE |
diff --git a/src/test/WixToolsetTest.LightIntegration/WixToolsetTest.LightIntegration.csproj b/src/test/WixToolsetTest.LightIntegration/WixToolsetTest.LightIntegration.csproj index ef303868..59068682 100644 --- a/src/test/WixToolsetTest.LightIntegration/WixToolsetTest.LightIntegration.csproj +++ b/src/test/WixToolsetTest.LightIntegration/WixToolsetTest.LightIntegration.csproj | |||
@@ -5,11 +5,8 @@ | |||
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>net461</TargetFramework> | 6 | <TargetFramework>net461</TargetFramework> |
7 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
8 | <DebugType>embedded</DebugType> | ||
8 | </PropertyGroup> | 9 | </PropertyGroup> |
9 | <ItemGroup> | ||
10 | <None Remove="TestData\Wixout\Package.en-us.wxl" /> | ||
11 | <None Remove="TestData\Wixout\test.wixout" /> | ||
12 | </ItemGroup> | ||
13 | 10 | ||
14 | <ItemGroup> | 11 | <ItemGroup> |
15 | <Content Include="TestData\Wixout\data\test.txt" CopyToOutputDirectory="PreserveNewest" /> | 12 | <Content Include="TestData\Wixout\data\test.txt" CopyToOutputDirectory="PreserveNewest" /> |
@@ -26,8 +23,8 @@ | |||
26 | </ItemGroup> | 23 | </ItemGroup> |
27 | 24 | ||
28 | <ItemGroup> | 25 | <ItemGroup> |
29 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170628-02" /> | 26 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" /> |
30 | <PackageReference Include="xunit" Version="2.2.0" /> | 27 | <PackageReference Include="xunit" Version="2.3.1" /> |
31 | <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" /> | 28 | <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" /> |
32 | </ItemGroup> | 29 | </ItemGroup> |
33 | </Project> | 30 | </Project> |