diff options
author | Rob Mensching <rob@firegiant.com> | 2022-12-06 14:08:59 -0800 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2022-12-06 17:29:07 -0800 |
commit | c4c37a053b20eb61d36afde02ef7a82198711e56 (patch) | |
tree | 2c3fdfd051a97df004a66b2c2891514035e2b66b | |
parent | c4ffb9967e4e4f7d67f5925208e3e0a885e903c5 (diff) | |
download | wix-c4c37a053b20eb61d36afde02ef7a82198711e56.tar.gz wix-c4c37a053b20eb61d36afde02ef7a82198711e56.tar.bz2 wix-c4c37a053b20eb61d36afde02ef7a82198711e56.zip |
Always reference net472 when it is to be referenced
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 @@ | |||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFrameworks>netstandard2.0</TargetFrameworks> | 6 | <TargetFrameworks>netstandard2.0</TargetFrameworks> |
7 | <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net472</TargetFrameworks> | ||
8 | <Description>Internal WiX Toolset Test Package</Description> | 7 | <Description>Internal WiX Toolset Test Package</Description> |
9 | <DebugType>embedded</DebugType> | 8 | <DebugType>embedded</DebugType> |
10 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | 9 | <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 @@ | |||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | 5 | ||
6 | <PropertyGroup> | 6 | <PropertyGroup> |
7 | <TargetFrameworks>netstandard2.0</TargetFrameworks> | 7 | <TargetFrameworks>netstandard2.0;net472</TargetFrameworks> |
8 | <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net472</TargetFrameworks> | ||
9 | <Description>Symbolizer</Description> | 8 | <Description>Symbolizer</Description> |
10 | <Title>WiX Toolset Converters Tuplizer</Title> | 9 | <Title>WiX Toolset Converters Tuplizer</Title> |
11 | <DebugType>embedded</DebugType> | 10 | <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 @@ | |||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | 5 | ||
6 | <PropertyGroup> | 6 | <PropertyGroup> |
7 | <TargetFrameworks>netstandard2.0</TargetFrameworks> | 7 | <TargetFrameworks>netstandard2.0;net472</TargetFrameworks> |
8 | <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net472</TargetFrameworks> | ||
9 | <Description>Converter</Description> | 8 | <Description>Converter</Description> |
10 | <Title>WiX Toolset Converters</Title> | 9 | <Title>WiX Toolset Converters</Title> |
11 | <DebugType>embedded</DebugType> | 10 | <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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFrameworks>netstandard2.0</TargetFrameworks> | 6 | <TargetFrameworks>netstandard2.0;net472</TargetFrameworks> |
7 | <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net472</TargetFrameworks> | ||
8 | <Description>Core Burn</Description> | 7 | <Description>Core Burn</Description> |
9 | <Title>WiX Toolset Core Burn</Title> | 8 | <Title>WiX Toolset Core Burn</Title> |
10 | <DebugType>embedded</DebugType> | 9 | <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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFrameworks>netstandard2.0</TargetFrameworks> | 6 | <TargetFrameworks>netstandard2.0;net472</TargetFrameworks> |
7 | <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net472</TargetFrameworks> | ||
8 | <Description>Extension Cache</Description> | 7 | <Description>Extension Cache</Description> |
9 | <Title>WiX Toolset Extension Cache</Title> | 8 | <Title>WiX Toolset Extension Cache</Title> |
10 | <DebugType>embedded</DebugType> | 9 | <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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFrameworks>netstandard2.0</TargetFrameworks> | 6 | <TargetFrameworks>netstandard2.0;net472</TargetFrameworks> |
7 | <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net472</TargetFrameworks> | ||
8 | <Description>Core Windows Installer</Description> | 7 | <Description>Core Windows Installer</Description> |
9 | <Title>WiX Toolset Core Windows Installer</Title> | 8 | <Title>WiX Toolset Core Windows Installer</Title> |
10 | <DebugType>embedded</DebugType> | 9 | <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 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFrameworks>netstandard2.0</TargetFrameworks> | 6 | <TargetFrameworks>netstandard2.0;net472</TargetFrameworks> |
7 | <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net472</TargetFrameworks> | ||
8 | <Description>Core</Description> | 7 | <Description>Core</Description> |
9 | <Title>WiX Toolset Core</Title> | 8 | <Title>WiX Toolset Core</Title> |
10 | <DebugType>embedded</DebugType> | 9 | <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 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <!-- 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 | <!-- 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. --> |
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |