aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2021-12-11 22:56:54 -0500
committerBob Arnson <github@bobs.org>2021-12-12 15:13:53 -0500
commitebe9e91768d9514e8dbd617aaa05366365a05cf7 (patch)
treed9f0075df47e1caa89437d194655c24992b04314 /src
parentdc3c94f9c313d8509e304d6085af527a576cf623 (diff)
downloadwix-ebe9e91768d9514e8dbd617aaa05366365a05cf7.tar.gz
wix-ebe9e91768d9514e8dbd617aaa05366365a05cf7.tar.bz2
wix-ebe9e91768d9514e8dbd617aaa05366365a05cf7.zip
Switch to `net472` as Framework baseline.
Diffstat (limited to 'src')
-rw-r--r--src/api/burn/burn.proj1
-rw-r--r--src/api/wix/WixToolset.Data/WixToolset.Data.csproj2
-rw-r--r--src/api/wix/WixToolset.Extensibility/WixToolset.Extensibility.csproj2
-rw-r--r--src/api/wix/wix.proj1
-rw-r--r--src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj2
-rw-r--r--src/internal/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj2
-rw-r--r--src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj6
-rw-r--r--src/samples/Dtf/Tools/MakeSfxCA/MakeSfxCA.csproj2
-rw-r--r--src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj6
-rw-r--r--src/wix/WixToolset.Converters.Symbolizer/WixToolset.Converters.Symbolizer.csproj3
-rw-r--r--src/wix/WixToolset.Converters/WixToolset.Converters.csproj2
-rw-r--r--src/wix/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj2
-rw-r--r--src/wix/WixToolset.Core.ExtensionCache/WixToolset.Core.ExtensionCache.csproj2
-rw-r--r--src/wix/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj2
-rw-r--r--src/wix/WixToolset.Core.WindowsInstaller/WixToolset.Core.WindowsInstaller.csproj2
-rw-r--r--src/wix/WixToolset.Core/WixToolset.Core.csproj2
-rw-r--r--src/wix/WixToolset.Sdk/tools/wix.targets4
-rw-r--r--src/wix/heat/heat.csproj4
-rw-r--r--src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj2
-rw-r--r--src/wix/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj2
-rw-r--r--src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj2
-rw-r--r--src/wix/wix.cmd28
-rw-r--r--src/wix/wix/wix.csproj4
23 files changed, 43 insertions, 42 deletions
diff --git a/src/api/burn/burn.proj b/src/api/burn/burn.proj
index 535f70e7..0aa838bf 100644
--- a/src/api/burn/burn.proj
+++ b/src/api/burn/burn.proj
@@ -27,6 +27,7 @@
27 <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=ARM64" /> 27 <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=ARM64" />
28 28
29 <ProjectReference Include="WixToolset.Mba.Core\WixToolset.Mba.Core.csproj" Properties="Platform=AnyCPU" /> 29 <ProjectReference Include="WixToolset.Mba.Core\WixToolset.Mba.Core.csproj" Properties="Platform=AnyCPU" />
30 <ProjectReference Include="test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj" Properties="Platform=AnyCPU" />
30 31
31 <!-- Test --> 32 <!-- Test -->
32 <ProjectReference Include="test\BalUtilUnitTest\BalUtilUnitTest.vcxproj" Targets="Test" /> 33 <ProjectReference Include="test\BalUtilUnitTest\BalUtilUnitTest.vcxproj" Targets="Test" />
diff --git a/src/api/wix/WixToolset.Data/WixToolset.Data.csproj b/src/api/wix/WixToolset.Data/WixToolset.Data.csproj
index 11c3fd98..d139bc73 100644
--- a/src/api/wix/WixToolset.Data/WixToolset.Data.csproj
+++ b/src/api/wix/WixToolset.Data/WixToolset.Data.csproj
@@ -4,7 +4,7 @@
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);net461;net472</TargetFrameworks> 7 <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net472</TargetFrameworks>
8 <LangVersion>7.3</LangVersion> 8 <LangVersion>7.3</LangVersion>
9 <Description>WiX Toolset Data</Description> 9 <Description>WiX Toolset Data</Description>
10 <DebugType>embedded</DebugType> 10 <DebugType>embedded</DebugType>
diff --git a/src/api/wix/WixToolset.Extensibility/WixToolset.Extensibility.csproj b/src/api/wix/WixToolset.Extensibility/WixToolset.Extensibility.csproj
index 38bec1b0..86ee754d 100644
--- a/src/api/wix/WixToolset.Extensibility/WixToolset.Extensibility.csproj
+++ b/src/api/wix/WixToolset.Extensibility/WixToolset.Extensibility.csproj
@@ -4,7 +4,7 @@
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);net461;net472</TargetFrameworks> 7 <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net472</TargetFrameworks>
8 <Title>WiX Toolset Extensibility</Title> 8 <Title>WiX Toolset Extensibility</Title>
9 <Description></Description> 9 <Description></Description>
10 <DebugType>embedded</DebugType> 10 <DebugType>embedded</DebugType>
diff --git a/src/api/wix/wix.proj b/src/api/wix/wix.proj
index 3db83283..ea07e810 100644
--- a/src/api/wix/wix.proj
+++ b/src/api/wix/wix.proj
@@ -3,6 +3,7 @@
3 <!-- Build --> 3 <!-- Build -->
4 <ProjectReference Include="WixToolset.Data\WixToolset.Data.csproj" /> 4 <ProjectReference Include="WixToolset.Data\WixToolset.Data.csproj" />
5 <ProjectReference Include="WixToolset.Extensibility\WixToolset.Extensibility.csproj" /> 5 <ProjectReference Include="WixToolset.Extensibility\WixToolset.Extensibility.csproj" />
6 <ProjectReference Include="test\WixToolsetTest.Data\WixToolsetTest.Data.csproj" />
6 7
7 <!-- Pack --> 8 <!-- Pack -->
8 <ProjectReference Include="WixToolset.Data\WixToolset.Data.csproj" Targets="Pack" /> 9 <ProjectReference Include="WixToolset.Data\WixToolset.Data.csproj" Targets="Pack" />
diff --git a/src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj b/src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj
index 421f0713..0be55c43 100644
--- a/src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj
+++ b/src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj
@@ -2,7 +2,7 @@
2 2
3 <PropertyGroup> 3 <PropertyGroup>
4 <OutputType>Exe</OutputType> 4 <OutputType>Exe</OutputType>
5 <TargetFramework>net461</TargetFramework> 5 <TargetFramework>net472</TargetFramework>
6 <IsTool>true</IsTool> 6 <IsTool>true</IsTool>
7 <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking> 7 <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
8 <DebugType>embedded</DebugType> 8 <DebugType>embedded</DebugType>
diff --git a/src/internal/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj b/src/internal/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj
index 01166782..3006e784 100644
--- a/src/internal/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj
+++ b/src/internal/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj
@@ -4,7 +4,7 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 5
6 <PropertyGroup> 6 <PropertyGroup>
7 <TargetFrameworks>netstandard2.0;net461;net472</TargetFrameworks> 7 <TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
8 <IsPackable>true</IsPackable> 8 <IsPackable>true</IsPackable>
9 <DebugType>embedded</DebugType> 9 <DebugType>embedded</DebugType>
10 <PublishRepositoryUrl>true</PublishRepositoryUrl> 10 <PublishRepositoryUrl>true</PublishRepositoryUrl>
diff --git a/src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj b/src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj
index 65a65bd0..dd5a8272 100644
--- a/src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj
+++ b/src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj
@@ -2,8 +2,8 @@
2 2
3 <PropertyGroup> 3 <PropertyGroup>
4 <OutputType>Exe</OutputType> 4 <OutputType>Exe</OutputType>
5 <!-- <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks> --> 5 <!-- <TargetFrameworks>netcoreapp2.0;net472</TargetFrameworks> -->
6 <TargetFrameworks>net461</TargetFrameworks> 6 <TargetFrameworks>net472</TargetFrameworks>
7 <IsTool>true</IsTool> 7 <IsTool>true</IsTool>
8 <IncludeBuildOutput>false</IncludeBuildOutput> 8 <IncludeBuildOutput>false</IncludeBuildOutput>
9 <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking> 9 <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
@@ -17,7 +17,7 @@
17 <Content Include="build\WixBuildTools.XsdGen.targets" PackagePath="build\" /> 17 <Content Include="build\WixBuildTools.XsdGen.targets" PackagePath="build\" />
18 <Content Include="buildCrossTargeting\WixBuildTools.XsdGen.targets" PackagePath="buildCrossTargeting\" /> 18 <Content Include="buildCrossTargeting\WixBuildTools.XsdGen.targets" PackagePath="buildCrossTargeting\" />
19 19
20 <Content Include="$(OutputPath)net461\$(TargetFileName)" PackagePath="tools\full" /> 20 <Content Include="$(OutputPath)net472\$(TargetFileName)" PackagePath="tools\full" />
21 <!-- <Content Include="$(OutputPath)netcoreapp2.0\$(TargetFileName)" PackagePath="tools\core" /> --> 21 <!-- <Content Include="$(OutputPath)netcoreapp2.0\$(TargetFileName)" PackagePath="tools\core" /> -->
22 </ItemGroup> 22 </ItemGroup>
23 23
diff --git a/src/samples/Dtf/Tools/MakeSfxCA/MakeSfxCA.csproj b/src/samples/Dtf/Tools/MakeSfxCA/MakeSfxCA.csproj
index 858db59c..25b2cdb8 100644
--- a/src/samples/Dtf/Tools/MakeSfxCA/MakeSfxCA.csproj
+++ b/src/samples/Dtf/Tools/MakeSfxCA/MakeSfxCA.csproj
@@ -3,7 +3,7 @@
3 3
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks> 6 <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
7 <OutputType>Exe</OutputType> 7 <OutputType>Exe</OutputType>
8 <RootNamespace>WixToolset.Dtf.Tools.MakeSfxCA</RootNamespace> 8 <RootNamespace>WixToolset.Dtf.Tools.MakeSfxCA</RootNamespace>
9 <AssemblyName>MakeSfxCA</AssemblyName> 9 <AssemblyName>MakeSfxCA</AssemblyName>
diff --git a/src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj b/src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
index 64a82e98..c8fc64c3 100644
--- a/src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
+++ b/src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
@@ -3,7 +3,7 @@
3 3
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks> 6 <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
7 <Description></Description> 7 <Description></Description>
8 <Title>WiX Toolset MSBuild Tasks</Title> 8 <Title>WiX Toolset MSBuild Tasks</Title>
9 <DebugType>embedded</DebugType> 9 <DebugType>embedded</DebugType>
@@ -17,14 +17,14 @@
17 <PackageReference Include="WixToolset.Dtf.WindowsInstaller" /> 17 <PackageReference Include="WixToolset.Dtf.WindowsInstaller" />
18 </ItemGroup> 18 </ItemGroup>
19 19
20 <ItemGroup Condition="'$(TargetFramework)'=='net461'"> 20 <ItemGroup Condition="'$(TargetFramework)'=='net472'">
21 <ProjectReference Include="..\WixToolset.Core\WixToolset.Core.csproj" /> 21 <ProjectReference Include="..\WixToolset.Core\WixToolset.Core.csproj" />
22 <ProjectReference Include="..\WixToolset.Core.Burn\WixToolset.Core.Burn.csproj" /> 22 <ProjectReference Include="..\WixToolset.Core.Burn\WixToolset.Core.Burn.csproj" />
23 <ProjectReference Include="..\WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj" /> 23 <ProjectReference Include="..\WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj" />
24 <PackageReference Include="Microsoft.Build.Tasks.Core" /> 24 <PackageReference Include="Microsoft.Build.Tasks.Core" />
25 </ItemGroup> 25 </ItemGroup>
26 26
27 <ItemGroup Condition="'$(TargetFramework)'=='net461' and '$(OS)' != 'Windows_NT'"> 27 <ItemGroup Condition="'$(TargetFramework)'=='net472' and '$(OS)' != 'Windows_NT'">
28 <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" /> 28 <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
29 </ItemGroup> 29 </ItemGroup>
30 30
diff --git a/src/wix/WixToolset.Converters.Symbolizer/WixToolset.Converters.Symbolizer.csproj b/src/wix/WixToolset.Converters.Symbolizer/WixToolset.Converters.Symbolizer.csproj
index 42e60ebb..0c3ba4f0 100644
--- a/src/wix/WixToolset.Converters.Symbolizer/WixToolset.Converters.Symbolizer.csproj
+++ b/src/wix/WixToolset.Converters.Symbolizer/WixToolset.Converters.Symbolizer.csproj
@@ -5,7 +5,7 @@
5 5
6 <PropertyGroup> 6 <PropertyGroup>
7 <TargetFrameworks>netstandard2.0</TargetFrameworks> 7 <TargetFrameworks>netstandard2.0</TargetFrameworks>
8 <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net461;net472</TargetFrameworks> 8 <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net472</TargetFrameworks>
9 <Description>Symbolizer</Description> 9 <Description>Symbolizer</Description>
10 <Title>WiX Toolset Converters Tuplizer</Title> 10 <Title>WiX Toolset Converters Tuplizer</Title>
11 <DebugType>embedded</DebugType> 11 <DebugType>embedded</DebugType>
@@ -15,7 +15,6 @@
15 15
16 <ItemGroup> 16 <ItemGroup>
17 <Reference Include="wix" HintPath="..\deps\wix.dll" /> 17 <Reference Include="wix" HintPath="..\deps\wix.dll" />
18 <None Include="..\deps\wix.dll" Pack="true" PackagePath="lib\net461" />
19 <None Include="..\deps\wix.dll" Pack="true" PackagePath="lib\net472" /> 18 <None Include="..\deps\wix.dll" Pack="true" PackagePath="lib\net472" />
20 <None Include="..\deps\wix.dll" Pack="true" PackagePath="lib\netstandard2.0" /> 19 <None Include="..\deps\wix.dll" Pack="true" PackagePath="lib\netstandard2.0" />
21 </ItemGroup> 20 </ItemGroup>
diff --git a/src/wix/WixToolset.Converters/WixToolset.Converters.csproj b/src/wix/WixToolset.Converters/WixToolset.Converters.csproj
index 65c0134a..2372b481 100644
--- a/src/wix/WixToolset.Converters/WixToolset.Converters.csproj
+++ b/src/wix/WixToolset.Converters/WixToolset.Converters.csproj
@@ -5,7 +5,7 @@
5 5
6 <PropertyGroup> 6 <PropertyGroup>
7 <TargetFrameworks>netstandard2.0</TargetFrameworks> 7 <TargetFrameworks>netstandard2.0</TargetFrameworks>
8 <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net461;net472</TargetFrameworks> 8 <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net472</TargetFrameworks>
9 <Description>Converter</Description> 9 <Description>Converter</Description>
10 <Title>WiX Toolset Converters</Title> 10 <Title>WiX Toolset Converters</Title>
11 <DebugType>embedded</DebugType> 11 <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 3527b85a..46f2583d 100644
--- a/src/wix/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj
+++ b/src/wix/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj
@@ -4,7 +4,7 @@
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);net461;net472</TargetFrameworks> 7 <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net472</TargetFrameworks>
8 <Description>Core Burn</Description> 8 <Description>Core Burn</Description>
9 <Title>WiX Toolset Core Burn</Title> 9 <Title>WiX Toolset Core Burn</Title>
10 <DebugType>embedded</DebugType> 10 <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 61dce8b0..50eab19e 100644
--- a/src/wix/WixToolset.Core.ExtensionCache/WixToolset.Core.ExtensionCache.csproj
+++ b/src/wix/WixToolset.Core.ExtensionCache/WixToolset.Core.ExtensionCache.csproj
@@ -4,7 +4,7 @@
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);net461;net472</TargetFrameworks> 7 <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net472</TargetFrameworks>
8 <Description>Extension Cache</Description> 8 <Description>Extension Cache</Description>
9 <Title>WiX Toolset Extension Cache</Title> 9 <Title>WiX Toolset Extension Cache</Title>
10 <DebugType>embedded</DebugType> 10 <DebugType>embedded</DebugType>
diff --git a/src/wix/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj b/src/wix/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj
index 82c60120..bda54cd1 100644
--- a/src/wix/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj
+++ b/src/wix/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj
@@ -4,7 +4,7 @@
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);net461;net472</TargetFrameworks> 7 <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net472</TargetFrameworks>
8 <Description>Internal WiX Toolset Test Package</Description> 8 <Description>Internal WiX Toolset Test Package</Description>
9 <DebugType>embedded</DebugType> 9 <DebugType>embedded</DebugType>
10 <PublishRepositoryUrl>true</PublishRepositoryUrl> 10 <PublishRepositoryUrl>true</PublishRepositoryUrl>
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/WixToolset.Core.WindowsInstaller.csproj b/src/wix/WixToolset.Core.WindowsInstaller/WixToolset.Core.WindowsInstaller.csproj
index 65f4e4ca..fa4ae68c 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/WixToolset.Core.WindowsInstaller.csproj
+++ b/src/wix/WixToolset.Core.WindowsInstaller/WixToolset.Core.WindowsInstaller.csproj
@@ -4,7 +4,7 @@
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);net461;net472</TargetFrameworks> 7 <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net472</TargetFrameworks>
8 <Description>Core Windows Installer</Description> 8 <Description>Core Windows Installer</Description>
9 <Title>WiX Toolset Core Windows Installer</Title> 9 <Title>WiX Toolset Core Windows Installer</Title>
10 <DebugType>embedded</DebugType> 10 <DebugType>embedded</DebugType>
diff --git a/src/wix/WixToolset.Core/WixToolset.Core.csproj b/src/wix/WixToolset.Core/WixToolset.Core.csproj
index 8f47eda3..71742b66 100644
--- a/src/wix/WixToolset.Core/WixToolset.Core.csproj
+++ b/src/wix/WixToolset.Core/WixToolset.Core.csproj
@@ -4,7 +4,7 @@
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);net461;net472</TargetFrameworks> 7 <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net472</TargetFrameworks>
8 <Description>Core</Description> 8 <Description>Core</Description>
9 <Title>WiX Toolset Core</Title> 9 <Title>WiX Toolset Core</Title>
10 <DebugType>embedded</DebugType> 10 <DebugType>embedded</DebugType>
diff --git a/src/wix/WixToolset.Sdk/tools/wix.targets b/src/wix/WixToolset.Sdk/tools/wix.targets
index 5044bf5e..fde969e6 100644
--- a/src/wix/WixToolset.Sdk/tools/wix.targets
+++ b/src/wix/WixToolset.Sdk/tools/wix.targets
@@ -20,8 +20,8 @@
20 <!-- These properties can be overridden to support non-default installations. --> 20 <!-- These properties can be overridden to support non-default installations. -->
21 <PropertyGroup> 21 <PropertyGroup>
22 <WixBinDir Condition=" '$(WixBinDir)' == '' and '$(MSBuildRuntimeType)' == 'Core' ">$(MSBuildThisFileDirectory)netcoreapp3.1\</WixBinDir> 22 <WixBinDir Condition=" '$(WixBinDir)' == '' and '$(MSBuildRuntimeType)' == 'Core' ">$(MSBuildThisFileDirectory)netcoreapp3.1\</WixBinDir>
23 <WixBinDir Condition=" '$(WixBinDir)' == '' ">$(MSBuildThisFileDirectory)net461\x86\</WixBinDir> 23 <WixBinDir Condition=" '$(WixBinDir)' == '' ">$(MSBuildThisFileDirectory)net472\x86\</WixBinDir>
24 <WixBinDir64 Condition=" '$(WixBinDir64)' == '' and '$(MSBuildRuntimeType)' != 'Core' ">$(MSBuildThisFileDirectory)net461\x64\</WixBinDir64> 24 <WixBinDir64 Condition=" '$(WixBinDir64)' == '' and '$(MSBuildRuntimeType)' != 'Core' ">$(MSBuildThisFileDirectory)net472\x64\</WixBinDir64>
25 <WixTasksPath Condition=" '$(WixTasksPath)' == '' ">$(WixBinDir)WixToolset.BuildTasks.dll</WixTasksPath> 25 <WixTasksPath Condition=" '$(WixTasksPath)' == '' ">$(WixBinDir)WixToolset.BuildTasks.dll</WixTasksPath>
26 <WixTasksPath64 Condition=" '$(WixTasksPath64)' == '' and '$(WixBinDir64)' != '' ">$(WixBinDir64)WixToolset.BuildTasks.dll</WixTasksPath64> 26 <WixTasksPath64 Condition=" '$(WixTasksPath64)' == '' and '$(WixBinDir64)' != '' ">$(WixBinDir64)WixToolset.BuildTasks.dll</WixTasksPath64>
27 </PropertyGroup> 27 </PropertyGroup>
diff --git a/src/wix/heat/heat.csproj b/src/wix/heat/heat.csproj
index 2aa0c278..341a2083 100644
--- a/src/wix/heat/heat.csproj
+++ b/src/wix/heat/heat.csproj
@@ -3,7 +3,7 @@
3 3
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks> 6 <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
7 <OutputType>Exe</OutputType> 7 <OutputType>Exe</OutputType>
8 <Description>Harvester</Description> 8 <Description>Harvester</Description>
9 <Title>WiX Harvester</Title> 9 <Title>WiX Harvester</Title>
@@ -46,7 +46,7 @@
46 <PackageReference Include="System.DirectoryServices" /> 46 <PackageReference Include="System.DirectoryServices" />
47 </ItemGroup> 47 </ItemGroup>
48 48
49 <ItemGroup Condition="'$(TargetFramework)'=='net461' and '$(OS)' != 'Windows_NT'"> 49 <ItemGroup Condition="'$(TargetFramework)'=='net472' and '$(OS)' != 'Windows_NT'">
50 <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" /> 50 <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
51 </ItemGroup> 51 </ItemGroup>
52</Project> 52</Project>
diff --git a/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj b/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
index dc442e6f..b166ba64 100644
--- a/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
+++ b/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
@@ -3,7 +3,7 @@
3 3
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>net461</TargetFramework> 6 <TargetFramework>net472</TargetFramework>
7 <IsPackable>false</IsPackable> 7 <IsPackable>false</IsPackable>
8 <DebugType>embedded</DebugType> 8 <DebugType>embedded</DebugType>
9 <RuntimeIdentifier>win-x86</RuntimeIdentifier> 9 <RuntimeIdentifier>win-x86</RuntimeIdentifier>
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 0fa05242..5a35aeeb 100644
--- a/src/wix/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj
+++ b/src/wix/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj
@@ -3,7 +3,7 @@
3 3
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>net461</TargetFramework> 6 <TargetFramework>net472</TargetFramework>
7 <IsPackable>false</IsPackable> 7 <IsPackable>false</IsPackable>
8 <SignOutput>false</SignOutput> 8 <SignOutput>false</SignOutput>
9 </PropertyGroup> 9 </PropertyGroup>
diff --git a/src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj b/src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj
index 4716f6d7..8f40efee 100644
--- a/src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj
+++ b/src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj
@@ -3,7 +3,7 @@
3 3
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>net461</TargetFramework> 6 <TargetFramework>net472</TargetFramework>
7 <IsPackable>false</IsPackable> 7 <IsPackable>false</IsPackable>
8 <DebugType>embedded</DebugType> 8 <DebugType>embedded</DebugType>
9 <DefaultItemExcludes>TestData\**;$(DefaultItemExcludes)</DefaultItemExcludes> 9 <DefaultItemExcludes>TestData\**;$(DefaultItemExcludes)</DefaultItemExcludes>
diff --git a/src/wix/wix.cmd b/src/wix/wix.cmd
index 8bf60e85..11b5582f 100644
--- a/src/wix/wix.cmd
+++ b/src/wix/wix.cmd
@@ -37,19 +37,19 @@ dotnet test -c %_C% --no-build test\WixToolsetTest.Heat || exit /b
37:: Publish 37:: Publish
38msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=netcoreapp3.1 -p:PublishDir=%_P%wix\ wix\wix.csproj || exit /b 38msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=netcoreapp3.1 -p:PublishDir=%_P%wix\ wix\wix.csproj || exit /b
39 39
40msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net461 -p:RuntimeIdentifier=win-x86 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net461\x86\buildtasks\ WixToolset.BuildTasks\WixToolset.BuildTasks.csproj || exit /b 40msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net472 -p:RuntimeIdentifier=win-x86 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net472\x86\buildtasks\ WixToolset.BuildTasks\WixToolset.BuildTasks.csproj || exit /b
41msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net461 -p:RuntimeIdentifier=win-x86 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net461\x86\heat\ heat\heat.csproj || exit /b 41msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net472 -p:RuntimeIdentifier=win-x86 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net472\x86\heat\ heat\heat.csproj || exit /b
42msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net461 -p:RuntimeIdentifier=win-x86 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net461\x86\wix\ wix\wix.csproj || exit /b 42msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net472 -p:RuntimeIdentifier=win-x86 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net472\x86\wix\ wix\wix.csproj || exit /b
43robocopy %_P_OBJ%\WixToolset.Sdk\separate\net461\x86\buildtasks %_P%\WixToolset.Sdk\tools\net461\x86 %_RCO% /XF Microsoft.Build.*.dll 43robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x86\buildtasks %_P%\WixToolset.Sdk\tools\net472\x86 %_RCO% /XF Microsoft.Build.*.dll
44robocopy %_P_OBJ%\WixToolset.Sdk\separate\net461\x86\heat %_P%\WixToolset.Sdk\tools\net461\x86 %_RCO% 44robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x86\heat %_P%\WixToolset.Sdk\tools\net472\x86 %_RCO%
45robocopy %_P_OBJ%\WixToolset.Sdk\separate\net461\x86\wix %_P%\WixToolset.Sdk\tools\net461\x86 %_RCO% 45robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x86\wix %_P%\WixToolset.Sdk\tools\net472\x86 %_RCO%
46 46
47msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net461 -p:RuntimeIdentifier=win-x64 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net461\x64\buildtasks\ WixToolset.BuildTasks\WixToolset.BuildTasks.csproj || exit /b 47msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net472 -p:RuntimeIdentifier=win-x64 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net472\x64\buildtasks\ WixToolset.BuildTasks\WixToolset.BuildTasks.csproj || exit /b
48msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net461 -p:RuntimeIdentifier=win-x64 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net461\x64\heat\ heat\heat.csproj || exit /b 48msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net472 -p:RuntimeIdentifier=win-x64 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net472\x64\heat\ heat\heat.csproj || exit /b
49msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net461 -p:RuntimeIdentifier=win-x64 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net461\x64\wix\ wix\wix.csproj || exit /b 49msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=net472 -p:RuntimeIdentifier=win-x64 -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\net472\x64\wix\ wix\wix.csproj || exit /b
50robocopy %_P_OBJ%\WixToolset.Sdk\separate\net461\x64\buildtasks %_P%\WixToolset.Sdk\tools\net461\x64 %_RCO% /XF Microsoft.Build.*.dll 50robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x64\buildtasks %_P%\WixToolset.Sdk\tools\net472\x64 %_RCO% /XF Microsoft.Build.*.dll
51robocopy %_P_OBJ%\WixToolset.Sdk\separate\net461\x64\heat %_P%\WixToolset.Sdk\tools\net461\x64 %_RCO% 51robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x64\heat %_P%\WixToolset.Sdk\tools\net472\x64 %_RCO%
52robocopy %_P_OBJ%\WixToolset.Sdk\separate\net461\x64\wix %_P%\WixToolset.Sdk\tools\net461\x64 %_RCO% 52robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x64\wix %_P%\WixToolset.Sdk\tools\net472\x64 %_RCO%
53 53
54msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=netcoreapp3.1 -p:UseAppHost=false -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\netcoreapp3.1\buildtasks\ WixToolset.BuildTasks\WixToolset.BuildTasks.csproj || exit /b 54msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=netcoreapp3.1 -p:UseAppHost=false -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\netcoreapp3.1\buildtasks\ WixToolset.BuildTasks\WixToolset.BuildTasks.csproj || exit /b
55msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=netcoreapp3.1 -p:UseAppHost=false -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\netcoreapp3.1\heat\ heat\heat.csproj || exit /b 55msbuild -t:Publish -p:Configuration=%_C% -p:TargetFramework=netcoreapp3.1 -p:UseAppHost=false -p:PublishDir=%_P_OBJ%WixToolset.Sdk\separate\netcoreapp3.1\heat\ heat\heat.csproj || exit /b
@@ -61,7 +61,7 @@ robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\wix %_P%\WixToolset.Sdk\
61msbuild -t:Publish -p:Configuration=%_C% -p:PublishDir=%_P%WixToolset.Sdk\ WixToolset.Sdk\WixToolset.Sdk.csproj || exit /b 61msbuild -t:Publish -p:Configuration=%_C% -p:PublishDir=%_P%WixToolset.Sdk\ WixToolset.Sdk\WixToolset.Sdk.csproj || exit /b
62 62
63:: TODO - used by MsbuildFixture.ReportsInnerExceptionForUnexpectedExceptions test 63:: TODO - used by MsbuildFixture.ReportsInnerExceptionForUnexpectedExceptions test
64:: msbuild -t:Publish -Restore -p:Configuration=%_C% -p:TargetFramework=net461 -p:RuntimeIdentifier=linux-x86 -p:PublishDir=%_P%WixToolset.Sdk\broken\net461\ wix\wix.csproj || exit /b 64:: msbuild -t:Publish -Restore -p:Configuration=%_C% -p:TargetFramework=net472 -p:RuntimeIdentifier=linux-x86 -p:PublishDir=%_P%WixToolset.Sdk\broken\net472\ wix\wix.csproj || exit /b
65 65
66 66
67:: Test 67:: Test
diff --git a/src/wix/wix/wix.csproj b/src/wix/wix/wix.csproj
index 34185a06..cdf4fbe7 100644
--- a/src/wix/wix/wix.csproj
+++ b/src/wix/wix/wix.csproj
@@ -3,7 +3,7 @@
3 3
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks> 6 <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
7 <OutputType>Exe</OutputType> 7 <OutputType>Exe</OutputType>
8 <Description>WiX Toolset creates installation packages.</Description> 8 <Description>WiX Toolset creates installation packages.</Description>
9 <DebugType>embedded</DebugType> 9 <DebugType>embedded</DebugType>
@@ -20,7 +20,7 @@
20 <NoWarn>NU1701</NoWarn> 20 <NoWarn>NU1701</NoWarn>
21 </PropertyGroup> 21 </PropertyGroup>
22 22
23 <ItemGroup Condition="'$(TargetFramework)'=='net461' and '$(OS)' != 'Windows_NT'"> 23 <ItemGroup Condition="'$(TargetFramework)'=='net472' and '$(OS)' != 'Windows_NT'">
24 <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" /> 24 <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
25 </ItemGroup> 25 </ItemGroup>
26 26
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-19 23:07:46 +0000