@joebigelow / wix-1 / commits / f02ef4ac

Make the minimum supported .NET Framework v4.6.2

Rob Mensching committed Dec 18, 2023 at 19:44 UTC f02ef4acf9649badaa3ab78d2499ca5014fa2234
39 files changed +57 -58
README.md
+1 -1
@@ -12,7 +12,6 @@ This repository contains the WiX Toolset codebase.
12
13 ## Prerequisites
14
15 -- Microsoft .NET Framework 3.5 SP1
15 - A command line Git client that is in the system path
16 - Visual Studio 2022 (17.8.2 or higher) with the following installed:
17
@@ -27,6 +26,7 @@ This repository contains the WiX Toolset codebase.
26 | .NET 6.0 Runtime (Long Term Support) |
27 | .NET Framework 4.7.2 SDK |
28 | .NET Framework 4.7.2 targeting pack |
29 +| .NET Framework 4.6.2 targeting pack |
30 | MSVC v141 - VS 2017 C++ ARM64 build tools (v14.16) |
31 | MSVC v141 - VS 2017 C++ x64/x86 build tools (v14.16) |
32 | MSVC v143 - VS 2022 C++ ARM64/ARM64EC build tools (Latest) |
src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFrameworks>netstandard2.0;net20</TargetFrameworks>
6 + <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
7 <AssemblyName>WixToolset.Mba.Core</AssemblyName>
8 <RootNamespace>WixToolset.Mba.Core</RootNamespace>
9 <DebugType>embedded</DebugType>
src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec
+3 -3
@@ -13,15 +13,15 @@
13 <projectUrl>$projectUrl$</projectUrl>
14 <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
15 <dependencies>
16 - <group targetFramework=".NETFramework2.0" />
16 + <group targetFramework=".NETFramework4.6.2" />
17 <group targetFramework=".NETStandard2.0" />
18 </dependencies>
19 </metadata>
20
21 <files>
22 <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
23 - <file src="net20\$id$.dll" target="lib\net20" />
24 - <file src="net20\$id$.xml" target="lib\net20" />
23 + <file src="net462\$id$.dll" target="lib\net462" />
24 + <file src="net462\$id$.xml" target="lib\net462" />
25 <file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" />
26 <file src="netstandard2.0\$id$.xml" target="lib\netstandard2.0" />
27
src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj
+1 -1
@@ -5,7 +5,7 @@
5 <PropertyGroup>
6 <RootNamespace>WixToolset.Dtf.Compression.Cab</RootNamespace>
7 <AssemblyName>WixToolset.Dtf.Compression.Cab</AssemblyName>
8 - <TargetFrameworks>netstandard2.0;net20</TargetFrameworks>
8 + <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
9 <Description>Managed libraries for cabinet archive packing and unpacking</Description>
10 <CreateDocumentationFile>true</CreateDocumentationFile>
11 </PropertyGroup>
src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj
+1 -1
@@ -5,7 +5,7 @@
5 <PropertyGroup>
6 <RootNamespace>WixToolset.Dtf.Compression.Zip</RootNamespace>
7 <AssemblyName>WixToolset.Dtf.Compression.Zip</AssemblyName>
8 - <TargetFrameworks>netstandard2.0;net20</TargetFrameworks>
8 + <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
9 <Description>Managed libraries for zip archive packing and unpacking</Description>
10 <CreateDocumentationFile>true</CreateDocumentationFile>
11 </PropertyGroup>
src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj
+1 -1
@@ -5,7 +5,7 @@
5 <PropertyGroup>
6 <RootNamespace>WixToolset.Dtf.Compression</RootNamespace>
7 <AssemblyName>WixToolset.Dtf.Compression</AssemblyName>
8 - <TargetFrameworks>netstandard2.0;net20</TargetFrameworks>
8 + <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
9 <Description>Abstract base libraries for archive packing and unpacking</Description>
10 <CreateDocumentationFile>true</CreateDocumentationFile>
11 </PropertyGroup>
src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj
+1 -1
@@ -5,7 +5,7 @@
5 <PropertyGroup>
6 <RootNamespace>WixToolset.Dtf.Resources</RootNamespace>
7 <AssemblyName>WixToolset.Dtf.Resources</AssemblyName>
8 - <TargetFrameworks>netstandard2.0;net20</TargetFrameworks>
8 + <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
9 <Description>Classes for reading and writing resource data in executable files</Description>
10 <CreateDocumentationFile>true</CreateDocumentationFile>
11 </PropertyGroup>
src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj
+1 -1
@@ -5,7 +5,7 @@
5 <PropertyGroup>
6 <RootNamespace>WixToolset.Dtf.WindowsInstaller.Linq</RootNamespace>
7 <AssemblyName>WixToolset.Dtf.WindowsInstaller.Linq</AssemblyName>
8 - <TargetFrameworks>netstandard2.0;net35</TargetFrameworks>
8 + <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
9 <Description>LINQ extensions for Windows Installer classes</Description>
10 <CreateDocumentationFile>true</CreateDocumentationFile>
11 </PropertyGroup>
src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj
+1 -1
@@ -5,7 +5,7 @@
5 <PropertyGroup>
6 <RootNamespace>WixToolset.Dtf.WindowsInstaller</RootNamespace>
7 <AssemblyName>WixToolset.Dtf.WindowsInstaller.Package</AssemblyName>
8 - <TargetFrameworks>netstandard2.0;net20</TargetFrameworks>
8 + <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
9 <Description>Extended managed libraries for Windows Installer</Description>
10 <CreateDocumentationFile>true</CreateDocumentationFile>
11 </PropertyGroup>
src/dtf/WixToolset.Dtf.WindowsInstaller/CustomActionProxy.cs
+1 -1
@@ -201,7 +201,7 @@ namespace WixToolset.Dtf.WindowsInstaller
201 }
202 else
203 {
204 -#if NET20
204 +#if NETFRAMEWORK
205 IDictionary config;
206 try
207 {
src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj
+2 -2
@@ -5,7 +5,7 @@
5 <PropertyGroup>
6 <RootNamespace>WixToolset.Dtf.WindowsInstaller</RootNamespace>
7 <AssemblyName>WixToolset.Dtf.WindowsInstaller</AssemblyName>
8 - <TargetFrameworks>netstandard2.0;net20</TargetFrameworks>
8 + <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
9 <Description>Managed libraries for Windows Installer</Description>
10 <CreateDocumentationFile>true</CreateDocumentationFile>
11 </PropertyGroup>
@@ -19,7 +19,7 @@
19 <None Include="WindowsInstaller.cd" />
20 </ItemGroup>
21
22 - <ItemGroup Condition=" '$(TargetFramework)'=='net20' ">
22 + <ItemGroup Condition=" '$(TargetFramework)'=='net462' ">
23 <Reference Include="System.Configuration" />
24 </ItemGroup>
25 </Project>
src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.config
-1
@@ -10,7 +10,6 @@
10 </configSections>
11 <startup useLegacyV2RuntimeActivationPolicy="true">
12 <supportedRuntime version="v4.0" />
13 - <supportedRuntime version="v2.0.50727" />
13 </startup>
14 <wix.bootstrapper>
15 <!-- Example only. Use only if the startup/supportedRuntime above cannot discern supported frameworks. -->
src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj
+1 -1
@@ -5,7 +5,7 @@
5 <PropertyGroup>
6 <AssemblyName>WixToolset.Mba.Host</AssemblyName>
7 <RootNamespace>WixToolset.Mba.Host</RootNamespace>
8 - <TargetFrameworks>net20</TargetFrameworks>
8 + <TargetFrameworks>net462</TargetFrameworks>
9 <Description>Managed Bootstrapper Application entry point</Description>
10 <DebugType>embedded</DebugType>
11 <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec
+3 -3
@@ -13,13 +13,13 @@
13 <projectUrl>$projectUrl$</projectUrl>
14 <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
15 <dependencies>
16 - <group targetFramework=".NETFramework2.0" />
16 + <group targetFramework=".NETFramework4.6.2" />
17 </dependencies>
18 </metadata>
19
20 <files>
21 <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
22 - <file src="net20\$id$.config" target="samples" />
23 - <file src="net20\$id$.dll" target="lib\net20" />
22 + <file src="net462\$id$.config" target="samples" />
23 + <file src="net462\$id$.dll" target="lib\net462" />
24 </files>
25 </package>
src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs
+4 -4
@@ -1,10 +1,10 @@
1 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
2 <Bundle Name="FullFramework2MBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533">
3 <BootstrapperApplication>
4 - <Payload SourceFile="Example.FullFramework2MBA\net20\win-x64\Example.FullFramework2MBA.dll" />
5 - <Payload SourceFile="Example.FullFramework2MBA\net20\win-x64\mbanative.dll" />
6 - <Payload SourceFile="Example.FullFramework2MBA\net20\win-x64\WixToolset.Mba.Core.dll" />
7 - <Payload SourceFile="Example.FullFramework2MBA\net20\win-x64\WixToolset.Mba.Host.config" />
4 + <Payload SourceFile="Example.FullFramework2MBA\net462\win-x64\Example.FullFramework2MBA.dll" />
5 + <Payload SourceFile="Example.FullFramework2MBA\net462\win-x64\mbanative.dll" />
6 + <Payload SourceFile="Example.FullFramework2MBA\net462\win-x64\WixToolset.Mba.Core.dll" />
7 + <Payload SourceFile="Example.FullFramework2MBA\net462\win-x64\WixToolset.Mba.Host.config" />
8 <bal:WixManagedBootstrapperApplicationHost />
9 </BootstrapperApplication>
10 <Chain>
src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>net20</TargetFramework>
6 + <TargetFramework>net462</TargetFramework>
7 <AssemblyName>Example.FullFramework2MBA</AssemblyName>
8 <RootNamespace>Example.FullFramework2MBA</RootNamespace>
9 <DebugType>embedded</DebugType>
src/ext/Bal/test/examples/FullFramework2MBA/WixToolset.Mba.Host.config
+2 -2
@@ -9,12 +9,12 @@
9 </sectionGroup>
10 </configSections>
11 <startup>
12 - <supportedRuntime version="v2.0.50727" />
12 + <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
13 </startup>
14 <wix.bootstrapper>
15
16 <host assemblyName="Example.FullFramework2MBA">
17 - <supportedFramework version="v3.5" />
17 + <supportedFramework version="v4\Client" />
18 </host>
19 </wix.bootstrapper>
20 </configuration>
src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs
+4 -4
@@ -1,10 +1,10 @@
1 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
2 <Bundle Name="FullFramework4MBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="E08068E0-4FBA-439D-A1C8-4CD1FE27093F">
3 <BootstrapperApplication>
4 - <Payload SourceFile="Example.FullFramework4MBA\net48\win-x64\Example.FullFramework4MBA.dll" />
5 - <Payload SourceFile="Example.FullFramework4MBA\net48\win-x64\mbanative.dll" />
6 - <Payload SourceFile="Example.FullFramework4MBA\net48\win-x64\WixToolset.Mba.Core.dll" />
7 - <Payload SourceFile="Example.FullFramework4MBA\net48\win-x64\WixToolset.Mba.Host.config" />
4 + <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\Example.FullFramework4MBA.dll" />
5 + <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\mbanative.dll" />
6 + <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\WixToolset.Mba.Core.dll" />
7 + <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\WixToolset.Mba.Host.config" />
8 <bal:WixManagedBootstrapperApplicationHost />
9 </BootstrapperApplication>
10 <Chain>
src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFramework>net48</TargetFramework>
6 + <TargetFramework>net472</TargetFramework>
7 <Description>Full Framework v4 MBA</Description>
8 <RuntimeIdentifier>win-x64</RuntimeIdentifier>
9 </PropertyGroup>
src/ext/Bal/test/examples/FullFramework4MBA/WixToolset.Mba.Host.config
+1 -1
@@ -9,7 +9,7 @@
9 </sectionGroup>
10 </configSections>
11 <startup>
12 - <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
12 + <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
13 </startup>
14 <wix.bootstrapper>
15 <host assemblyName="Example.FullFramework4MBA" />
src/ext/Bal/wixlib/bal.wixproj
+1 -1
@@ -8,7 +8,7 @@
8
9 <ItemGroup>
10 <BindPath Include="..\wixstdba\Resources\" />
11 - <BindPath Include="$(OutputPath)net20" />
11 + <BindPath Include="$(OutputPath)net462" />
12 </ItemGroup>
13
14 <ItemGroup>
src/test/burn/TestBA/TestBA.csproj
+2 -2
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFrameworks>net35;net6.0-windows</TargetFrameworks>
6 + <TargetFrameworks>net462;net6.0-windows</TargetFrameworks>
7 <AssemblyName>TestBA</AssemblyName>
8 <RootNamespace>WixToolset.Test.BA</RootNamespace>
9 <DebugType>embedded</DebugType>
@@ -13,7 +13,7 @@
13 <RollForward>Major</RollForward>
14 </PropertyGroup>
15
16 - <ItemGroup Condition=" '$(TargetFramework)'=='net35' ">
16 + <ItemGroup Condition=" '$(TargetFramework)'=='net462' ">
17 <Content Include="TestBA.BootstrapperCore.config" CopyToOutputDirectory="PreserveNewest" />
18 <Reference Include="System.Windows.Forms" />
19 </ItemGroup>
src/test/burn/TestBA/TestBA_x64.csproj
+2 -2
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFrameworks>net35;net6.0-windows</TargetFrameworks>
6 + <TargetFrameworks>net462;net6.0-windows</TargetFrameworks>
7 <AssemblyName>TestBA</AssemblyName>
8 <RootNamespace>WixToolset.Test.BA</RootNamespace>
9 <DebugType>embedded</DebugType>
@@ -13,7 +13,7 @@
13 <RollForward>Major</RollForward>
14 </PropertyGroup>
15
16 - <ItemGroup Condition=" '$(TargetFramework)'=='net35' ">
16 + <ItemGroup Condition=" '$(TargetFramework)'=='net462' ">
17 <Content Include="TestBA.BootstrapperCore.config" CopyToOutputDirectory="PreserveNewest" />
18 <Reference Include="System.Windows.Forms" />
19 </ItemGroup>
src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wixproj
+1 -1
@@ -9,7 +9,7 @@
9 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
10 </ItemGroup>
11 <ItemGroup>
12 - <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net35\win-x86" BindName="net2x86" />
12 + <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net462\win-x86" BindName="net2x86" />
13 </ItemGroup>
14 <ItemGroup>
15 <ProjectReference Include="..\PackageB\PackageB.wixproj" />
src/test/burn/TestData/PrereqBaTests/BundleD/BundleD.wixproj
+1 -1
@@ -9,7 +9,7 @@
9 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
10 </ItemGroup>
11 <ItemGroup>
12 - <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net35\win-x86" BindName="net2x86" />
12 + <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net462\win-x86" BindName="net2x86" />
13 </ItemGroup>
14 <ItemGroup>
15 <ProjectReference Include="..\PackageB\PackageB.wixproj" />
src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
+1 -1
@@ -6,7 +6,7 @@
6 <Cultures>en-us</Cultures>
7 </PropertyGroup>
8 <ItemGroup>
9 - <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net35\win-x86" BindName="net2x86" />
9 + <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net462\win-x86" BindName="net2x86" />
10 <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net472\win-x86" BindName="net4x86" />
11 <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net6.0-windows\win-x86" BindName="dncx86" />
12 </ItemGroup>
src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj
+2 -2
@@ -7,7 +7,7 @@
7 <InstallerPlatform>x64</InstallerPlatform>
8 </PropertyGroup>
9 <ItemGroup>
10 - <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net35\win-x64" BindName="net2x64" />
10 + <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net462\win-x64" BindName="net2x64" />
11 <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net472\win-x64" BindName="net4x64" />
12 <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net6.0-windows\win-x64" BindName="dncx64" />
13 </ItemGroup>
@@ -17,7 +17,7 @@
17 the required target framework. Since we want all target frameworks built,
18 the above line is shorter.
19 <ProjectReference Include="..\..\..\TestBA\TestBA_x64.csproj">
20 - <SetTargetFramework>TargetFramework=net35</SetTargetFramework>
20 + <SetTargetFramework>TargetFramework=net462</SetTargetFramework>
21 </ProjectReference>
22 <ProjectReference Include="..\..\..\TestBA\TestBA_x64.csproj">
23 <SetTargetFramework>TargetFramework=net5.0-windows</SetTargetFramework>
src/test/burn/TestData/WixIuiBaTests/EmbeddedUI/EmbeddedUI.csproj
+1 -1
@@ -1,6 +1,6 @@
1 <Project Sdk="Microsoft.NET.Sdk">
2 <PropertyGroup>
3 - <TargetFramework>net35</TargetFramework>
3 + <TargetFramework>net462</TargetFramework>
4 <Description>Sample managed embedded external UI</Description>
5 <UseWPF>true</UseWPF>
6 </PropertyGroup>
src/test/burn/TestData/WixIuiBaTests/ManagedCA/ManagedCA.csproj
+1 -1
@@ -1,6 +1,6 @@
1 <Project Sdk="Microsoft.NET.Sdk">
2 <PropertyGroup>
3 - <TargetFramework>net20</TargetFramework>
3 + <TargetFramework>net462</TargetFramework>
4 <Description>Sample managed custom actions</Description>
5 </PropertyGroup>
6
src/test/burn/TestExe/NetfxTask.cs
+1 -1
@@ -1,6 +1,6 @@
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
3 -#if NET35
3 +#if NETFRAMEWORK
4 using System;
5 using System.Collections.Generic;
6 using System.Diagnostics;
src/test/burn/TestExe/Task.cs
+1 -1
@@ -264,7 +264,7 @@ namespace TestExe
264 t = new DeleteManifestsTask(args[i + 1]);
265 tasks.Add(t);
266 break;
267 -#if NET35
267 +#if NETFRAMEWORK
268 case "/pinfo":
269 t = new ProcessInfoTask(args[i + 1]);
270 tasks.Add(t);
src/test/burn/TestExe/TestExe.csproj
+2 -2
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFrameworks>net35;net6.0</TargetFrameworks>
6 + <TargetFrameworks>net462;net6.0</TargetFrameworks>
7 <AssemblyName>TestExe</AssemblyName>
8 <RootNamespace>TestExe</RootNamespace>
9 <OutputType>Exe</OutputType>
@@ -14,7 +14,7 @@
14 <RollForward>Major</RollForward>
15 </PropertyGroup>
16
17 - <ItemGroup Condition="'$(TargetFramework)'=='net35'">
17 + <ItemGroup Condition="'$(TargetFramework)'=='net462'">
18 <Reference Include="System.Management" />
19 </ItemGroup>
20 </Project>
src/test/burn/TestExe/TestExe_x64.csproj
+1 -1
@@ -3,7 +3,7 @@
3
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 - <TargetFrameworks>net35</TargetFrameworks>
6 + <TargetFrameworks>net462</TargetFrameworks>
7 <AssemblyName>TestExe</AssemblyName>
8 <RootNamespace>TestExe</RootNamespace>
9 <OutputType>Exe</OutputType>
src/test/burn/test_burn.cmd
+1 -1
@@ -16,7 +16,7 @@
16 msbuild -Restore -p:Configuration=%_C% -tl -nologo -m -warnaserror -bl:%_L%\test_burn_build.binlog || exit /b
17 msbuild -Restore TestData\TestData.proj -p:Configuration=%_C% -tl -nologo -m -warnaserror -bl:%_L%\test_burn_data_build.binlog || exit /b
18
19 -"%_B%\net35\win-x86\testexe.exe" /dm "%_B%\net6.0-windows\testhost.exe"
19 +"%_B%\net462\win-x86\testexe.exe" /dm "%_B%\net6.0-windows\testhost.exe"
20 mt.exe -manifest "WixToolsetTest.BurnE2E\testhost.longpathaware.manifest" -updateresource:"%_B%\net6.0-windows\testhost.exe"
21
22 @if not "%RuntimeTestsEnabled%"=="true" goto :LExit
src/test/wix/TestData/CsprojClassLibraryMultiFramework/CsprojClassLibraryMultiFramework.csproj
+1 -1
@@ -1,7 +1,7 @@
1 <Project Sdk="Microsoft.NET.Sdk">
2
3 <PropertyGroup>
4 - <TargetFrameworks>net6.0;net48</TargetFrameworks>
4 + <TargetFrameworks>net6.0;net472</TargetFrameworks>
5 <DebugType>embedded</DebugType>
6 </PropertyGroup>
7
src/test/wix/TestData/CsprojClassLibraryMultiTarget/CsprojClassLibraryMultiTarget.csproj
+1 -1
@@ -1,7 +1,7 @@
1 <Project Sdk="Microsoft.NET.Sdk">
2
3 <PropertyGroup>
4 - <TargetFrameworks>net48;net5.0</TargetFrameworks>
4 + <TargetFrameworks>net472;net6.0</TargetFrameworks>
5 </PropertyGroup>
6
7 <ItemGroup>
src/test/wix/TestData/CsprojConsoleMultiFramework/CsprojConsoleMultiFramework.csproj
+1 -1
@@ -2,7 +2,7 @@
2
3 <PropertyGroup>
4 <OutputType>Exe</OutputType>
5 - <TargetFrameworks>net6.0;net48</TargetFrameworks>
5 + <TargetFrameworks>net6.0;net472</TargetFrameworks>
6 <RuntimeIdentifiers>win-x86</RuntimeIdentifiers>
7 </PropertyGroup>
8
src/test/wix/TestData/WixprojLibraryMultiFramework/Library.wxs
+4 -4
@@ -13,13 +13,13 @@
13 </Fragment>
14
15 <Fragment>
16 - <ComponentGroup Id='CsprojClassLibraryMultiFrameworkNet48' Directory='ApplicationFolder' Subdirectory="net48">
16 + <ComponentGroup Id='CsprojClassLibraryMultiFrameworkNet472' Directory='ApplicationFolder' Subdirectory="net472">
17 <Component>
18 - <File Id="Net48" Source='!(bindpath.CsprojConsoleMultiFramework.net48)CsprojConsoleMultiFramework.exe' />
19 - <File Source='!(bindpath.CsprojConsoleMultiFramework.net48)CsprojConsoleMultiFramework.exe.config' />
18 + <File Id="Net472" Source='!(bindpath.CsprojConsoleMultiFramework.net472)CsprojConsoleMultiFramework.exe' />
19 + <File Source='!(bindpath.CsprojConsoleMultiFramework.net472)CsprojConsoleMultiFramework.exe.config' />
20 </Component>
21 <Component>
22 - <File Source='!(bindpath.CsprojConsoleMultiFramework.net48)CsprojClassLibraryMultiFramework.dll' />
22 + <File Source='!(bindpath.CsprojConsoleMultiFramework.net472)CsprojClassLibraryMultiFramework.dll' />
23 </Component>
24 </ComponentGroup>
25 </Fragment>
src/test/wix/TestData/WixprojLibraryMultiFramework/WixprojLibraryMultiFramework.wixproj
+1 -1
@@ -7,6 +7,6 @@
7
8 <ItemGroup>
9 <ProjectReference Include="..\CsprojConsoleMultiFramework\CsprojConsoleMultiFramework.csproj"
10 - TargetFrameworks="net48;net6.0" Publish="true" />
10 + TargetFrameworks="net472;net6.0" Publish="true" />
11 </ItemGroup>
12 </Project>