diff options
Diffstat (limited to 'src/test')
3 files changed, 8 insertions, 1 deletions
diff --git a/src/test/msi/TestData/CustomActionTests/TestCA/TestCA.csproj b/src/test/msi/TestData/CustomActionTests/TestCA/TestCA.csproj index 80602295..00fb5a41 100644 --- a/src/test/msi/TestData/CustomActionTests/TestCA/TestCA.csproj +++ b/src/test/msi/TestData/CustomActionTests/TestCA/TestCA.csproj | |||
| @@ -3,6 +3,9 @@ | |||
| 3 | <Project Sdk="Microsoft.NET.Sdk"> | 3 | <Project Sdk="Microsoft.NET.Sdk"> |
| 4 | <PropertyGroup> | 4 | <PropertyGroup> |
| 5 | <TargetFramework>net472</TargetFramework> | 5 | <TargetFramework>net472</TargetFramework> |
| 6 | |||
| 7 | <!-- Add some random EULA Ids for testing purposes. --> | ||
| 8 | <AcceptEula>foo;wix7;bar</AcceptEula> | ||
| 6 | </PropertyGroup> | 9 | </PropertyGroup> |
| 7 | 10 | ||
| 8 | <ItemGroup> | 11 | <ItemGroup> |
diff --git a/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/WixprojPackageVcxprojWindowsApp.wixproj b/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/WixprojPackageVcxprojWindowsApp.wixproj index 27affb11..1e137761 100644 --- a/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/WixprojPackageVcxprojWindowsApp.wixproj +++ b/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/WixprojPackageVcxprojWindowsApp.wixproj | |||
| @@ -4,6 +4,9 @@ | |||
| 4 | <PropertyGroup> | 4 | <PropertyGroup> |
| 5 | <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally> | 5 | <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally> |
| 6 | <SignOutput>true</SignOutput> | 6 | <SignOutput>true</SignOutput> |
| 7 | |||
| 8 | <!-- Add some random EULA Ids for testing purposes. --> | ||
| 9 | <AcceptEula>abc;xyz;123;wix7</AcceptEula> | ||
| 7 | </PropertyGroup> | 10 | </PropertyGroup> |
| 8 | 11 | ||
| 9 | <ItemGroup> | 12 | <ItemGroup> |
| @@ -12,6 +15,7 @@ | |||
| 12 | <ProjectReference Include="..\WixprojModuleCsprojWinFormsNetFx\WixprojModuleCsprojWinFormsNetFx.wixproj" /> | 15 | <ProjectReference Include="..\WixprojModuleCsprojWinFormsNetFx\WixprojModuleCsprojWinFormsNetFx.wixproj" /> |
| 13 | 16 | ||
| 14 | <PackageReference Include="Wixtoolset.UI.wixext" /> | 17 | <PackageReference Include="Wixtoolset.UI.wixext" /> |
| 18 | <PackageReference Include="Wixtoolset.Util.wixext" /> | ||
| 15 | </ItemGroup> | 19 | </ItemGroup> |
| 16 | 20 | ||
| 17 | <Target Name="SignMsi"> | 21 | <Target Name="SignMsi"> |
diff --git a/src/test/wix/WixE2E/WixE2EFixture.cs b/src/test/wix/WixE2E/WixE2EFixture.cs index f15571e4..512e80f5 100644 --- a/src/test/wix/WixE2E/WixE2EFixture.cs +++ b/src/test/wix/WixE2E/WixE2EFixture.cs | |||
| @@ -71,7 +71,7 @@ namespace WixE2E | |||
| 71 | .ToArray(); | 71 | .ToArray(); |
| 72 | WixAssert.CompareLineByLine(new[] | 72 | WixAssert.CompareLineByLine(new[] |
| 73 | { | 73 | { |
| 74 | @"<projectFolder>\WixprojPackageVcxprojWindowsApp.wixproj(18,5): warning : SignMsi = obj\<configuration>\en-US\WixprojPackageVcxprojWindowsApp.msi;obj\<configuration>\ja-JP\WixprojPackageVcxprojWindowsApp.msi" | 74 | @"<projectFolder>\WixprojPackageVcxprojWindowsApp.wixproj(22,5): warning : SignMsi = obj\<configuration>\en-US\WixprojPackageVcxprojWindowsApp.msi;obj\<configuration>\ja-JP\WixprojPackageVcxprojWindowsApp.msi" |
| 75 | }, signingStatement); | 75 | }, signingStatement); |
| 76 | } | 76 | } |
| 77 | 77 | ||
