Add additional AssetTargetFallback
Fixes 7034
Rob Mensching committed
Nov 21, 2022 at 09:25 UTC
aff110bd5c4d1637f5f1698837bfbdab036b435a
4 files changed
+34
-2
src/test/wix/TestData/CsprojWpfNetCore/CsprojWpfNetCore.csproj
+1
-1
@@ -2,7 +2,7 @@
2
3
<PropertyGroup>
4
<OutputType>WinExe</OutputType>
5
- <TargetFramework>net5.0-windows</TargetFramework>
5
+ <TargetFramework>net5.0-windows7.0</TargetFramework>
6
<Nullable>enable</Nullable>
7
<UseWPF>true</UseWPF>
8
</PropertyGroup>
src/test/wix/TestData/WixprojPackageCsprojWpfNetCore/Package.wxs
new
+15
@@ -0,0 +1,15 @@
1
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2
+ <Package Name='~WpfApp' Manufacturer='WiX Toolset' Version='0.0.1' UpgradeCode='41a2c17e-1976-465b-bcde-eae03516ca68'>
3
+
4
+ <StandardDirectory Id='ProgramFiles6432Folder'>
5
+ <Directory Id='ApplicationFolder' Name='~Wpf App'>
6
+ </Directory>
7
+ </StandardDirectory>
8
+
9
+ <Feature Id='Main' Title='WpfApp'>
10
+ <Component Directory='ApplicationFolder'>
11
+ <File Source='CsprojWpfNetCore.exe' />
12
+ </Component>
13
+ </Feature>
14
+ </Package>
15
+</Wix>
src/test/wix/TestData/WixprojPackageCsprojWpfNetCore/WixprojPackageCsprojWebApplicationNetCore.wixproj
new
+17
@@ -0,0 +1,17 @@
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'>
3
+<!-- <Project> -->
4
+ <!-- <Import Sdk="WixToolset.Sdk" Project='D:\src\wix4\build\wix\Debug\net6.0\Sdk\Sdk.props' /> -->
5
+
6
+ <PropertyGroup>
7
+ <!-- <WixBinDir>D:\src\wix4\build\wix\Debug\net472\</WixBinDir> -->
8
+ <!-- <WixBinDir64>D:\src\wix4\build\wix\Debug\publish\WixToolset.Sdk\tools\net472\x64\</WixBinDir64> -->
9
+ </PropertyGroup>
10
+
11
+ <ItemGroup>
12
+ <!-- SkipPublish="true" BindPath="$(MSBuildProjectDirectory)\does\not\exist" BindName="Xxx" Publish="true" -->
13
+ <ProjectReference Include="..\CsprojWpfNetCore\CsprojWpfNetCore.csproj" Publish="true" />
14
+ </ItemGroup>
15
+
16
+ <!-- <Import Sdk="WixToolset.Sdk" Project='D:\src\wix4\build\wix\Debug\net6.0\Sdk\Sdk.targets' /> -->
17
+</Project>
src/wix/WixToolset.Sdk/tools/wix.props
+1
-1
@@ -51,7 +51,7 @@
51
</PropertyGroup>
52
53
<PropertyGroup>
54
- <AssetTargetFallback>$(AssetTargetFallback);net6.0-windows;net6.0;net5.0-windows;net5.0;netcoreapp3.1;netcoreapp3.0;netcoreapp2.0;net462;net47;net471;net472;net48;native</AssetTargetFallback>
54
+ <AssetTargetFallback>$(AssetTargetFallback);net7.0-windows;net7.0;net6.0-windows7.0;net6.0-windows;net6.0;net5.0-windows7.0;net5.0-windows;net5.0;netcoreapp3.1;netcoreapp3.0;netcoreapp2.0;net462;net47;net471;net472;net48;native</AssetTargetFallback>
55
</PropertyGroup>
56
57
<PropertyGroup>