aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
Diffstat (limited to 'src/test')
-rw-r--r--src/test/wix/TestData/CsprojWpfNetCore/CsprojWpfNetCore.csproj2
-rw-r--r--src/test/wix/TestData/WixprojPackageCsprojWpfNetCore/Package.wxs6
-rw-r--r--src/test/wix/TestData/WixprojPackageCsprojWpfNetCore/WixprojPackageCsprojWpfNetCore.wixproj (renamed from src/test/wix/TestData/WixprojPackageCsprojWpfNetCore/WixprojPackageCsprojWebApplicationNetCore.wixproj)10
3 files changed, 7 insertions, 11 deletions
diff --git a/src/test/wix/TestData/CsprojWpfNetCore/CsprojWpfNetCore.csproj b/src/test/wix/TestData/CsprojWpfNetCore/CsprojWpfNetCore.csproj
index e7061e74..b1bf8781 100644
--- a/src/test/wix/TestData/CsprojWpfNetCore/CsprojWpfNetCore.csproj
+++ b/src/test/wix/TestData/CsprojWpfNetCore/CsprojWpfNetCore.csproj
@@ -2,7 +2,7 @@
2 2
3 <PropertyGroup> 3 <PropertyGroup>
4 <OutputType>WinExe</OutputType> 4 <OutputType>WinExe</OutputType>
5 <TargetFramework>net5.0-windows7.0</TargetFramework> 5 <TargetFramework>net8.0-windows7.0</TargetFramework>
6 <Nullable>enable</Nullable> 6 <Nullable>enable</Nullable>
7 <UseWPF>true</UseWPF> 7 <UseWPF>true</UseWPF>
8 </PropertyGroup> 8 </PropertyGroup>
diff --git a/src/test/wix/TestData/WixprojPackageCsprojWpfNetCore/Package.wxs b/src/test/wix/TestData/WixprojPackageCsprojWpfNetCore/Package.wxs
index 8bd191d8..3671c0ca 100644
--- a/src/test/wix/TestData/WixprojPackageCsprojWpfNetCore/Package.wxs
+++ b/src/test/wix/TestData/WixprojPackageCsprojWpfNetCore/Package.wxs
@@ -7,9 +7,9 @@
7 </StandardDirectory> 7 </StandardDirectory>
8 8
9 <Feature Id='Main' Title='WpfApp'> 9 <Feature Id='Main' Title='WpfApp'>
10 <Component Directory='ApplicationFolder'> 10 <Files Directory='ApplicationFolder' Include='!(bindpath.CsprojWpfNetCore)\**'>
11 <File Source='CsprojWpfNetCore.exe' /> 11 <Exclude Files="**\*.pdb" />
12 </Component> 12 </Files>
13 </Feature> 13 </Feature>
14 </Package> 14 </Package>
15</Wix> 15</Wix>
diff --git a/src/test/wix/TestData/WixprojPackageCsprojWpfNetCore/WixprojPackageCsprojWebApplicationNetCore.wixproj b/src/test/wix/TestData/WixprojPackageCsprojWpfNetCore/WixprojPackageCsprojWpfNetCore.wixproj
index 686092b6..df333242 100644
--- a/src/test/wix/TestData/WixprojPackageCsprojWpfNetCore/WixprojPackageCsprojWebApplicationNetCore.wixproj
+++ b/src/test/wix/TestData/WixprojPackageCsprojWpfNetCore/WixprojPackageCsprojWpfNetCore.wixproj
@@ -1,17 +1,13 @@
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. --> 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 Sdk='WixToolset.Sdk'> 2<Project Sdk='WixToolset.Sdk'>
3<!-- <Project> -->
4 <!-- <Import Sdk="WixToolset.Sdk" Project='D:\src\wix4\build\wix\Debug\net8.0\Sdk\Sdk.props' /> -->
5 3
6 <PropertyGroup> 4 <ItemGroup>
7 <!-- <WixBinDir>D:\src\wix4\build\wix\Debug\net472\</WixBinDir> --> 5 <Compile Remove="abc\Bad.wxs" />
8 <!-- <WixBinDir64>D:\src\wix4\build\wix\Debug\publish\WixToolset.Sdk\tools\net472\x64\</WixBinDir64> --> 6 </ItemGroup>
9 </PropertyGroup>
10 7
11 <ItemGroup> 8 <ItemGroup>
12 <!-- SkipPublish="true" BindPath="$(MSBuildProjectDirectory)\does\not\exist" BindName="Xxx" Publish="true" --> 9 <!-- SkipPublish="true" BindPath="$(MSBuildProjectDirectory)\does\not\exist" BindName="Xxx" Publish="true" -->
13 <ProjectReference Include="..\CsprojWpfNetCore\CsprojWpfNetCore.csproj" Publish="true" /> 10 <ProjectReference Include="..\CsprojWpfNetCore\CsprojWpfNetCore.csproj" Publish="true" />
14 </ItemGroup> 11 </ItemGroup>
15 12
16 <!-- <Import Sdk="WixToolset.Sdk" Project='D:\src\wix4\build\wix\Debug\net8.0\Sdk\Sdk.targets' /> -->
17</Project> 13</Project>