From c4c37a053b20eb61d36afde02ef7a82198711e56 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Tue, 6 Dec 2022 14:08:59 -0800
Subject: Always reference net472 when it is to be referenced

---
 .../WixInternal.Core.TestPackage/WixInternal.Core.TestPackage.csproj   | 1 -
 .../WixToolset.Converters.Symbolizer.csproj                            | 3 +--
 src/wix/WixToolset.Converters/WixToolset.Converters.csproj             | 3 +--
 src/wix/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj               | 3 +--
 .../WixToolset.Core.ExtensionCache.csproj                              | 3 +--
 .../WixToolset.Core.WindowsInstaller.csproj                            | 3 +--
 src/wix/WixToolset.Core/WixToolset.Core.csproj                         | 3 +--
 .../WixToolsetTest.Converters.Symbolizer.csproj                        | 2 +-
 8 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/wix/WixInternal.Core.TestPackage/WixInternal.Core.TestPackage.csproj b/src/wix/WixInternal.Core.TestPackage/WixInternal.Core.TestPackage.csproj
index 3c56ee86..9d242b6c 100644
--- a/src/wix/WixInternal.Core.TestPackage/WixInternal.Core.TestPackage.csproj
+++ b/src/wix/WixInternal.Core.TestPackage/WixInternal.Core.TestPackage.csproj
@@ -4,7 +4,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net472</TargetFrameworks>
     <Description>Internal WiX Toolset Test Package</Description>
     <DebugType>embedded</DebugType>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
diff --git a/src/wix/WixToolset.Converters.Symbolizer/WixToolset.Converters.Symbolizer.csproj b/src/wix/WixToolset.Converters.Symbolizer/WixToolset.Converters.Symbolizer.csproj
index 51463f2a..91221cc7 100644
--- a/src/wix/WixToolset.Converters.Symbolizer/WixToolset.Converters.Symbolizer.csproj
+++ b/src/wix/WixToolset.Converters.Symbolizer/WixToolset.Converters.Symbolizer.csproj
@@ -4,8 +4,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net472</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
     <Description>Symbolizer</Description>
     <Title>WiX Toolset Converters Tuplizer</Title>
     <DebugType>embedded</DebugType>
diff --git a/src/wix/WixToolset.Converters/WixToolset.Converters.csproj b/src/wix/WixToolset.Converters/WixToolset.Converters.csproj
index 2372b481..95f0e603 100644
--- a/src/wix/WixToolset.Converters/WixToolset.Converters.csproj
+++ b/src/wix/WixToolset.Converters/WixToolset.Converters.csproj
@@ -4,8 +4,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net472</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
     <Description>Converter</Description>
     <Title>WiX Toolset Converters</Title>
     <DebugType>embedded</DebugType>
diff --git a/src/wix/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj b/src/wix/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj
index 03f6343f..42390b6d 100644
--- a/src/wix/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj
+++ b/src/wix/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj
@@ -3,8 +3,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net472</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
     <Description>Core Burn</Description>
     <Title>WiX Toolset Core Burn</Title>
     <DebugType>embedded</DebugType>
diff --git a/src/wix/WixToolset.Core.ExtensionCache/WixToolset.Core.ExtensionCache.csproj b/src/wix/WixToolset.Core.ExtensionCache/WixToolset.Core.ExtensionCache.csproj
index 50eab19e..c0da4573 100644
--- a/src/wix/WixToolset.Core.ExtensionCache/WixToolset.Core.ExtensionCache.csproj
+++ b/src/wix/WixToolset.Core.ExtensionCache/WixToolset.Core.ExtensionCache.csproj
@@ -3,8 +3,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net472</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
     <Description>Extension Cache</Description>
     <Title>WiX Toolset Extension Cache</Title>
     <DebugType>embedded</DebugType>
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/WixToolset.Core.WindowsInstaller.csproj b/src/wix/WixToolset.Core.WindowsInstaller/WixToolset.Core.WindowsInstaller.csproj
index 1f01fff9..e5f53903 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/WixToolset.Core.WindowsInstaller.csproj
+++ b/src/wix/WixToolset.Core.WindowsInstaller/WixToolset.Core.WindowsInstaller.csproj
@@ -3,8 +3,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net472</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
     <Description>Core Windows Installer</Description>
     <Title>WiX Toolset Core Windows Installer</Title>
     <DebugType>embedded</DebugType>
diff --git a/src/wix/WixToolset.Core/WixToolset.Core.csproj b/src/wix/WixToolset.Core/WixToolset.Core.csproj
index c94c0b8e..33e151bc 100644
--- a/src/wix/WixToolset.Core/WixToolset.Core.csproj
+++ b/src/wix/WixToolset.Core/WixToolset.Core.csproj
@@ -3,8 +3,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net472</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
     <Description>Core</Description>
     <Title>WiX Toolset Core</Title>
     <DebugType>embedded</DebugType>
diff --git a/src/wix/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj b/src/wix/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj
index 7eea6516..8bb32786 100644
--- a/src/wix/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj
+++ b/src/wix/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- 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. -->
 
 <Project Sdk="Microsoft.NET.Sdk">
-- 
cgit v1.2.3-55-g6feb