diff options
author | Rob Mensching <rob@firegiant.com> | 2023-12-18 19:44:47 -0800 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2023-12-19 11:46:11 -0800 |
commit | f02ef4acf9649badaa3ab78d2499ca5014fa2234 (patch) | |
tree | 78e9cbccc6f11a7a354d73cb6d5df95718799828 /src | |
parent | 7b63b092cbc393739d64c371dd89f91891d15102 (diff) | |
download | wix-f02ef4acf9649badaa3ab78d2499ca5014fa2234.tar.gz wix-f02ef4acf9649badaa3ab78d2499ca5014fa2234.tar.bz2 wix-f02ef4acf9649badaa3ab78d2499ca5014fa2234.zip |
Make the minimum supported .NET Framework v4.6.2
Diffstat (limited to 'src')
38 files changed, 56 insertions, 57 deletions
diff --git a/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj b/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj index 95108cb5..9d2e4077 100644 --- a/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj +++ b/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.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>netstandard2.0;net20</TargetFrameworks> | 6 | <TargetFrameworks>netstandard2.0;net462</TargetFrameworks> |
7 | <AssemblyName>WixToolset.Mba.Core</AssemblyName> | 7 | <AssemblyName>WixToolset.Mba.Core</AssemblyName> |
8 | <RootNamespace>WixToolset.Mba.Core</RootNamespace> | 8 | <RootNamespace>WixToolset.Mba.Core</RootNamespace> |
9 | <DebugType>embedded</DebugType> | 9 | <DebugType>embedded</DebugType> |
diff --git a/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec b/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec index 6eda95db..0a9bcb5d 100644 --- a/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec +++ b/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec | |||
@@ -13,15 +13,15 @@ | |||
13 | <projectUrl>$projectUrl$</projectUrl> | 13 | <projectUrl>$projectUrl$</projectUrl> |
14 | <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" /> | 14 | <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" /> |
15 | <dependencies> | 15 | <dependencies> |
16 | <group targetFramework=".NETFramework2.0" /> | 16 | <group targetFramework=".NETFramework4.6.2" /> |
17 | <group targetFramework=".NETStandard2.0" /> | 17 | <group targetFramework=".NETStandard2.0" /> |
18 | </dependencies> | 18 | </dependencies> |
19 | </metadata> | 19 | </metadata> |
20 | 20 | ||
21 | <files> | 21 | <files> |
22 | <file src="$projectFolder$\..\..\..\internal\images\wix.png" /> | 22 | <file src="$projectFolder$\..\..\..\internal\images\wix.png" /> |
23 | <file src="net20\$id$.dll" target="lib\net20" /> | 23 | <file src="net462\$id$.dll" target="lib\net462" /> |
24 | <file src="net20\$id$.xml" target="lib\net20" /> | 24 | <file src="net462\$id$.xml" target="lib\net462" /> |
25 | <file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" /> | 25 | <file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" /> |
26 | <file src="netstandard2.0\$id$.xml" target="lib\netstandard2.0" /> | 26 | <file src="netstandard2.0\$id$.xml" target="lib\netstandard2.0" /> |
27 | 27 | ||
diff --git a/src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj b/src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj index 08a88b30..f2e940cd 100644 --- a/src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj +++ b/src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj | |||
@@ -5,7 +5,7 @@ | |||
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <RootNamespace>WixToolset.Dtf.Compression.Cab</RootNamespace> | 6 | <RootNamespace>WixToolset.Dtf.Compression.Cab</RootNamespace> |
7 | <AssemblyName>WixToolset.Dtf.Compression.Cab</AssemblyName> | 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> | 9 | <Description>Managed libraries for cabinet archive packing and unpacking</Description> |
10 | <CreateDocumentationFile>true</CreateDocumentationFile> | 10 | <CreateDocumentationFile>true</CreateDocumentationFile> |
11 | </PropertyGroup> | 11 | </PropertyGroup> |
diff --git a/src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj b/src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj index aa97019d..8dcc48e4 100644 --- a/src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj +++ b/src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj | |||
@@ -5,7 +5,7 @@ | |||
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <RootNamespace>WixToolset.Dtf.Compression.Zip</RootNamespace> | 6 | <RootNamespace>WixToolset.Dtf.Compression.Zip</RootNamespace> |
7 | <AssemblyName>WixToolset.Dtf.Compression.Zip</AssemblyName> | 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> | 9 | <Description>Managed libraries for zip archive packing and unpacking</Description> |
10 | <CreateDocumentationFile>true</CreateDocumentationFile> | 10 | <CreateDocumentationFile>true</CreateDocumentationFile> |
11 | </PropertyGroup> | 11 | </PropertyGroup> |
diff --git a/src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj b/src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj index 907e7a04..de3f076a 100644 --- a/src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj +++ b/src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj | |||
@@ -5,7 +5,7 @@ | |||
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <RootNamespace>WixToolset.Dtf.Compression</RootNamespace> | 6 | <RootNamespace>WixToolset.Dtf.Compression</RootNamespace> |
7 | <AssemblyName>WixToolset.Dtf.Compression</AssemblyName> | 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> | 9 | <Description>Abstract base libraries for archive packing and unpacking</Description> |
10 | <CreateDocumentationFile>true</CreateDocumentationFile> | 10 | <CreateDocumentationFile>true</CreateDocumentationFile> |
11 | </PropertyGroup> | 11 | </PropertyGroup> |
diff --git a/src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj b/src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj index 89bff841..e0635ae9 100644 --- a/src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj +++ b/src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj | |||
@@ -5,7 +5,7 @@ | |||
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <RootNamespace>WixToolset.Dtf.Resources</RootNamespace> | 6 | <RootNamespace>WixToolset.Dtf.Resources</RootNamespace> |
7 | <AssemblyName>WixToolset.Dtf.Resources</AssemblyName> | 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> | 9 | <Description>Classes for reading and writing resource data in executable files</Description> |
10 | <CreateDocumentationFile>true</CreateDocumentationFile> | 10 | <CreateDocumentationFile>true</CreateDocumentationFile> |
11 | </PropertyGroup> | 11 | </PropertyGroup> |
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj b/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj index fbc85880..e4b9d2ac 100644 --- a/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj +++ b/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj | |||
@@ -5,7 +5,7 @@ | |||
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <RootNamespace>WixToolset.Dtf.WindowsInstaller.Linq</RootNamespace> | 6 | <RootNamespace>WixToolset.Dtf.WindowsInstaller.Linq</RootNamespace> |
7 | <AssemblyName>WixToolset.Dtf.WindowsInstaller.Linq</AssemblyName> | 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> | 9 | <Description>LINQ extensions for Windows Installer classes</Description> |
10 | <CreateDocumentationFile>true</CreateDocumentationFile> | 10 | <CreateDocumentationFile>true</CreateDocumentationFile> |
11 | </PropertyGroup> | 11 | </PropertyGroup> |
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj b/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj index b3952177..c9c6ac95 100644 --- a/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj +++ b/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj | |||
@@ -5,7 +5,7 @@ | |||
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <RootNamespace>WixToolset.Dtf.WindowsInstaller</RootNamespace> | 6 | <RootNamespace>WixToolset.Dtf.WindowsInstaller</RootNamespace> |
7 | <AssemblyName>WixToolset.Dtf.WindowsInstaller.Package</AssemblyName> | 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> | 9 | <Description>Extended managed libraries for Windows Installer</Description> |
10 | <CreateDocumentationFile>true</CreateDocumentationFile> | 10 | <CreateDocumentationFile>true</CreateDocumentationFile> |
11 | </PropertyGroup> | 11 | </PropertyGroup> |
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/CustomActionProxy.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/CustomActionProxy.cs index d3fd7d1b..f58ff07d 100644 --- a/src/dtf/WixToolset.Dtf.WindowsInstaller/CustomActionProxy.cs +++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/CustomActionProxy.cs | |||
@@ -201,7 +201,7 @@ namespace WixToolset.Dtf.WindowsInstaller | |||
201 | } | 201 | } |
202 | else | 202 | else |
203 | { | 203 | { |
204 | #if NET20 | 204 | #if NETFRAMEWORK |
205 | IDictionary config; | 205 | IDictionary config; |
206 | try | 206 | try |
207 | { | 207 | { |
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj b/src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj index 117a4114..648c11f6 100644 --- a/src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj +++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj | |||
@@ -5,7 +5,7 @@ | |||
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <RootNamespace>WixToolset.Dtf.WindowsInstaller</RootNamespace> | 6 | <RootNamespace>WixToolset.Dtf.WindowsInstaller</RootNamespace> |
7 | <AssemblyName>WixToolset.Dtf.WindowsInstaller</AssemblyName> | 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> | 9 | <Description>Managed libraries for Windows Installer</Description> |
10 | <CreateDocumentationFile>true</CreateDocumentationFile> | 10 | <CreateDocumentationFile>true</CreateDocumentationFile> |
11 | </PropertyGroup> | 11 | </PropertyGroup> |
@@ -19,7 +19,7 @@ | |||
19 | <None Include="WindowsInstaller.cd" /> | 19 | <None Include="WindowsInstaller.cd" /> |
20 | </ItemGroup> | 20 | </ItemGroup> |
21 | 21 | ||
22 | <ItemGroup Condition=" '$(TargetFramework)'=='net20' "> | 22 | <ItemGroup Condition=" '$(TargetFramework)'=='net462' "> |
23 | <Reference Include="System.Configuration" /> | 23 | <Reference Include="System.Configuration" /> |
24 | </ItemGroup> | 24 | </ItemGroup> |
25 | </Project> | 25 | </Project> |
diff --git a/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.config b/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.config index a19b66f1..91280739 100644 --- a/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.config +++ b/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.config | |||
@@ -10,7 +10,6 @@ | |||
10 | </configSections> | 10 | </configSections> |
11 | <startup useLegacyV2RuntimeActivationPolicy="true"> | 11 | <startup useLegacyV2RuntimeActivationPolicy="true"> |
12 | <supportedRuntime version="v4.0" /> | 12 | <supportedRuntime version="v4.0" /> |
13 | <supportedRuntime version="v2.0.50727" /> | ||
14 | </startup> | 13 | </startup> |
15 | <wix.bootstrapper> | 14 | <wix.bootstrapper> |
16 | <!-- Example only. Use only if the startup/supportedRuntime above cannot discern supported frameworks. --> | 15 | <!-- Example only. Use only if the startup/supportedRuntime above cannot discern supported frameworks. --> |
diff --git a/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj index 0bcd523c..242c4d14 100644 --- a/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj +++ b/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj | |||
@@ -5,7 +5,7 @@ | |||
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <AssemblyName>WixToolset.Mba.Host</AssemblyName> | 6 | <AssemblyName>WixToolset.Mba.Host</AssemblyName> |
7 | <RootNamespace>WixToolset.Mba.Host</RootNamespace> | 7 | <RootNamespace>WixToolset.Mba.Host</RootNamespace> |
8 | <TargetFrameworks>net20</TargetFrameworks> | 8 | <TargetFrameworks>net462</TargetFrameworks> |
9 | <Description>Managed Bootstrapper Application entry point</Description> | 9 | <Description>Managed Bootstrapper Application entry point</Description> |
10 | <DebugType>embedded</DebugType> | 10 | <DebugType>embedded</DebugType> |
11 | <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile> | 11 | <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile> |
diff --git a/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec b/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec index bcd7b89a..b1f00ebd 100644 --- a/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec +++ b/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec | |||
@@ -13,13 +13,13 @@ | |||
13 | <projectUrl>$projectUrl$</projectUrl> | 13 | <projectUrl>$projectUrl$</projectUrl> |
14 | <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" /> | 14 | <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" /> |
15 | <dependencies> | 15 | <dependencies> |
16 | <group targetFramework=".NETFramework2.0" /> | 16 | <group targetFramework=".NETFramework4.6.2" /> |
17 | </dependencies> | 17 | </dependencies> |
18 | </metadata> | 18 | </metadata> |
19 | 19 | ||
20 | <files> | 20 | <files> |
21 | <file src="$projectFolder$\..\..\..\internal\images\wix.png" /> | 21 | <file src="$projectFolder$\..\..\..\internal\images\wix.png" /> |
22 | <file src="net20\$id$.config" target="samples" /> | 22 | <file src="net462\$id$.config" target="samples" /> |
23 | <file src="net20\$id$.dll" target="lib\net20" /> | 23 | <file src="net462\$id$.dll" target="lib\net462" /> |
24 | </files> | 24 | </files> |
25 | </package> | 25 | </package> |
diff --git a/src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs b/src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs index 6d6133b6..ba4f02b6 100644 --- a/src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs +++ b/src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs | |||
@@ -1,10 +1,10 @@ | |||
1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> | 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"> | 2 | <Bundle Name="FullFramework2MBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533"> |
3 | <BootstrapperApplication> | 3 | <BootstrapperApplication> |
4 | <Payload SourceFile="Example.FullFramework2MBA\net20\win-x64\Example.FullFramework2MBA.dll" /> | 4 | <Payload SourceFile="Example.FullFramework2MBA\net462\win-x64\Example.FullFramework2MBA.dll" /> |
5 | <Payload SourceFile="Example.FullFramework2MBA\net20\win-x64\mbanative.dll" /> | 5 | <Payload SourceFile="Example.FullFramework2MBA\net462\win-x64\mbanative.dll" /> |
6 | <Payload SourceFile="Example.FullFramework2MBA\net20\win-x64\WixToolset.Mba.Core.dll" /> | 6 | <Payload SourceFile="Example.FullFramework2MBA\net462\win-x64\WixToolset.Mba.Core.dll" /> |
7 | <Payload SourceFile="Example.FullFramework2MBA\net20\win-x64\WixToolset.Mba.Host.config" /> | 7 | <Payload SourceFile="Example.FullFramework2MBA\net462\win-x64\WixToolset.Mba.Host.config" /> |
8 | <bal:WixManagedBootstrapperApplicationHost /> | 8 | <bal:WixManagedBootstrapperApplicationHost /> |
9 | </BootstrapperApplication> | 9 | </BootstrapperApplication> |
10 | <Chain> | 10 | <Chain> |
diff --git a/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj b/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj index 2076f0b4..f6280a9e 100644 --- a/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj +++ b/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.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>net20</TargetFramework> | 6 | <TargetFramework>net462</TargetFramework> |
7 | <AssemblyName>Example.FullFramework2MBA</AssemblyName> | 7 | <AssemblyName>Example.FullFramework2MBA</AssemblyName> |
8 | <RootNamespace>Example.FullFramework2MBA</RootNamespace> | 8 | <RootNamespace>Example.FullFramework2MBA</RootNamespace> |
9 | <DebugType>embedded</DebugType> | 9 | <DebugType>embedded</DebugType> |
diff --git a/src/ext/Bal/test/examples/FullFramework2MBA/WixToolset.Mba.Host.config b/src/ext/Bal/test/examples/FullFramework2MBA/WixToolset.Mba.Host.config index be450a4f..41cacce5 100644 --- a/src/ext/Bal/test/examples/FullFramework2MBA/WixToolset.Mba.Host.config +++ b/src/ext/Bal/test/examples/FullFramework2MBA/WixToolset.Mba.Host.config | |||
@@ -9,12 +9,12 @@ | |||
9 | </sectionGroup> | 9 | </sectionGroup> |
10 | </configSections> | 10 | </configSections> |
11 | <startup> | 11 | <startup> |
12 | <supportedRuntime version="v2.0.50727" /> | 12 | <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /> |
13 | </startup> | 13 | </startup> |
14 | <wix.bootstrapper> | 14 | <wix.bootstrapper> |
15 | 15 | ||
16 | <host assemblyName="Example.FullFramework2MBA"> | 16 | <host assemblyName="Example.FullFramework2MBA"> |
17 | <supportedFramework version="v3.5" /> | 17 | <supportedFramework version="v4\Client" /> |
18 | </host> | 18 | </host> |
19 | </wix.bootstrapper> | 19 | </wix.bootstrapper> |
20 | </configuration> | 20 | </configuration> |
diff --git a/src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs b/src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs index a21318aa..802b8b1e 100644 --- a/src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs +++ b/src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs | |||
@@ -1,10 +1,10 @@ | |||
1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> | 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"> | 2 | <Bundle Name="FullFramework4MBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="E08068E0-4FBA-439D-A1C8-4CD1FE27093F"> |
3 | <BootstrapperApplication> | 3 | <BootstrapperApplication> |
4 | <Payload SourceFile="Example.FullFramework4MBA\net48\win-x64\Example.FullFramework4MBA.dll" /> | 4 | <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\Example.FullFramework4MBA.dll" /> |
5 | <Payload SourceFile="Example.FullFramework4MBA\net48\win-x64\mbanative.dll" /> | 5 | <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\mbanative.dll" /> |
6 | <Payload SourceFile="Example.FullFramework4MBA\net48\win-x64\WixToolset.Mba.Core.dll" /> | 6 | <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\WixToolset.Mba.Core.dll" /> |
7 | <Payload SourceFile="Example.FullFramework4MBA\net48\win-x64\WixToolset.Mba.Host.config" /> | 7 | <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\WixToolset.Mba.Host.config" /> |
8 | <bal:WixManagedBootstrapperApplicationHost /> | 8 | <bal:WixManagedBootstrapperApplicationHost /> |
9 | </BootstrapperApplication> | 9 | </BootstrapperApplication> |
10 | <Chain> | 10 | <Chain> |
diff --git a/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj b/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj index 90b2763c..247c8173 100644 --- a/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj +++ b/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.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>net48</TargetFramework> | 6 | <TargetFramework>net472</TargetFramework> |
7 | <Description>Full Framework v4 MBA</Description> | 7 | <Description>Full Framework v4 MBA</Description> |
8 | <RuntimeIdentifier>win-x64</RuntimeIdentifier> | 8 | <RuntimeIdentifier>win-x64</RuntimeIdentifier> |
9 | </PropertyGroup> | 9 | </PropertyGroup> |
diff --git a/src/ext/Bal/test/examples/FullFramework4MBA/WixToolset.Mba.Host.config b/src/ext/Bal/test/examples/FullFramework4MBA/WixToolset.Mba.Host.config index 96678cda..ac4770df 100644 --- a/src/ext/Bal/test/examples/FullFramework4MBA/WixToolset.Mba.Host.config +++ b/src/ext/Bal/test/examples/FullFramework4MBA/WixToolset.Mba.Host.config | |||
@@ -9,7 +9,7 @@ | |||
9 | </sectionGroup> | 9 | </sectionGroup> |
10 | </configSections> | 10 | </configSections> |
11 | <startup> | 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> | 13 | </startup> |
14 | <wix.bootstrapper> | 14 | <wix.bootstrapper> |
15 | <host assemblyName="Example.FullFramework4MBA" /> | 15 | <host assemblyName="Example.FullFramework4MBA" /> |
diff --git a/src/ext/Bal/wixlib/bal.wixproj b/src/ext/Bal/wixlib/bal.wixproj index e703a0a8..9e1b111a 100644 --- a/src/ext/Bal/wixlib/bal.wixproj +++ b/src/ext/Bal/wixlib/bal.wixproj | |||
@@ -8,7 +8,7 @@ | |||
8 | 8 | ||
9 | <ItemGroup> | 9 | <ItemGroup> |
10 | <BindPath Include="..\wixstdba\Resources\" /> | 10 | <BindPath Include="..\wixstdba\Resources\" /> |
11 | <BindPath Include="$(OutputPath)net20" /> | 11 | <BindPath Include="$(OutputPath)net462" /> |
12 | </ItemGroup> | 12 | </ItemGroup> |
13 | 13 | ||
14 | <ItemGroup> | 14 | <ItemGroup> |
diff --git a/src/test/burn/TestBA/TestBA.csproj b/src/test/burn/TestBA/TestBA.csproj index ab3c21cb..77f90ede 100644 --- a/src/test/burn/TestBA/TestBA.csproj +++ b/src/test/burn/TestBA/TestBA.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>net35;net6.0-windows</TargetFrameworks> | 6 | <TargetFrameworks>net462;net6.0-windows</TargetFrameworks> |
7 | <AssemblyName>TestBA</AssemblyName> | 7 | <AssemblyName>TestBA</AssemblyName> |
8 | <RootNamespace>WixToolset.Test.BA</RootNamespace> | 8 | <RootNamespace>WixToolset.Test.BA</RootNamespace> |
9 | <DebugType>embedded</DebugType> | 9 | <DebugType>embedded</DebugType> |
@@ -13,7 +13,7 @@ | |||
13 | <RollForward>Major</RollForward> | 13 | <RollForward>Major</RollForward> |
14 | </PropertyGroup> | 14 | </PropertyGroup> |
15 | 15 | ||
16 | <ItemGroup Condition=" '$(TargetFramework)'=='net35' "> | 16 | <ItemGroup Condition=" '$(TargetFramework)'=='net462' "> |
17 | <Content Include="TestBA.BootstrapperCore.config" CopyToOutputDirectory="PreserveNewest" /> | 17 | <Content Include="TestBA.BootstrapperCore.config" CopyToOutputDirectory="PreserveNewest" /> |
18 | <Reference Include="System.Windows.Forms" /> | 18 | <Reference Include="System.Windows.Forms" /> |
19 | </ItemGroup> | 19 | </ItemGroup> |
diff --git a/src/test/burn/TestBA/TestBA_x64.csproj b/src/test/burn/TestBA/TestBA_x64.csproj index 748d78ab..0669eee1 100644 --- a/src/test/burn/TestBA/TestBA_x64.csproj +++ b/src/test/burn/TestBA/TestBA_x64.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>net35;net6.0-windows</TargetFrameworks> | 6 | <TargetFrameworks>net462;net6.0-windows</TargetFrameworks> |
7 | <AssemblyName>TestBA</AssemblyName> | 7 | <AssemblyName>TestBA</AssemblyName> |
8 | <RootNamespace>WixToolset.Test.BA</RootNamespace> | 8 | <RootNamespace>WixToolset.Test.BA</RootNamespace> |
9 | <DebugType>embedded</DebugType> | 9 | <DebugType>embedded</DebugType> |
@@ -13,7 +13,7 @@ | |||
13 | <RollForward>Major</RollForward> | 13 | <RollForward>Major</RollForward> |
14 | </PropertyGroup> | 14 | </PropertyGroup> |
15 | 15 | ||
16 | <ItemGroup Condition=" '$(TargetFramework)'=='net35' "> | 16 | <ItemGroup Condition=" '$(TargetFramework)'=='net462' "> |
17 | <Content Include="TestBA.BootstrapperCore.config" CopyToOutputDirectory="PreserveNewest" /> | 17 | <Content Include="TestBA.BootstrapperCore.config" CopyToOutputDirectory="PreserveNewest" /> |
18 | <Reference Include="System.Windows.Forms" /> | 18 | <Reference Include="System.Windows.Forms" /> |
19 | </ItemGroup> | 19 | </ItemGroup> |
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wixproj b/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wixproj index 843b382a..ade73a52 100644 --- a/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wixproj +++ b/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wixproj | |||
@@ -9,7 +9,7 @@ | |||
9 | <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" /> | 9 | <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" /> |
10 | </ItemGroup> | 10 | </ItemGroup> |
11 | <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> | 13 | </ItemGroup> |
14 | <ItemGroup> | 14 | <ItemGroup> |
15 | <ProjectReference Include="..\PackageB\PackageB.wixproj" /> | 15 | <ProjectReference Include="..\PackageB\PackageB.wixproj" /> |
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleD/BundleD.wixproj b/src/test/burn/TestData/PrereqBaTests/BundleD/BundleD.wixproj index 314fe2e2..b3ba4987 100644 --- a/src/test/burn/TestData/PrereqBaTests/BundleD/BundleD.wixproj +++ b/src/test/burn/TestData/PrereqBaTests/BundleD/BundleD.wixproj | |||
@@ -9,7 +9,7 @@ | |||
9 | <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" /> | 9 | <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" /> |
10 | </ItemGroup> | 10 | </ItemGroup> |
11 | <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> | 13 | </ItemGroup> |
14 | <ItemGroup> | 14 | <ItemGroup> |
15 | <ProjectReference Include="..\PackageB\PackageB.wixproj" /> | 15 | <ProjectReference Include="..\PackageB\PackageB.wixproj" /> |
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj b/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj index 6ef417d0..788353d6 100644 --- a/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj +++ b/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj | |||
@@ -6,7 +6,7 @@ | |||
6 | <Cultures>en-us</Cultures> | 6 | <Cultures>en-us</Cultures> |
7 | </PropertyGroup> | 7 | </PropertyGroup> |
8 | <ItemGroup> | 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" /> | 10 | <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net472\win-x86" BindName="net4x86" /> |
11 | <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net6.0-windows\win-x86" BindName="dncx86" /> | 11 | <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net6.0-windows\win-x86" BindName="dncx86" /> |
12 | </ItemGroup> | 12 | </ItemGroup> |
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj index 13f66a86..154367e3 100644 --- a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj +++ b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj | |||
@@ -7,7 +7,7 @@ | |||
7 | <InstallerPlatform>x64</InstallerPlatform> | 7 | <InstallerPlatform>x64</InstallerPlatform> |
8 | </PropertyGroup> | 8 | </PropertyGroup> |
9 | <ItemGroup> | 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" /> | 11 | <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net472\win-x64" BindName="net4x64" /> |
12 | <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net6.0-windows\win-x64" BindName="dncx64" /> | 12 | <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net6.0-windows\win-x64" BindName="dncx64" /> |
13 | </ItemGroup> | 13 | </ItemGroup> |
@@ -17,7 +17,7 @@ | |||
17 | the required target framework. Since we want all target frameworks built, | 17 | the required target framework. Since we want all target frameworks built, |
18 | the above line is shorter. | 18 | the above line is shorter. |
19 | <ProjectReference Include="..\..\..\TestBA\TestBA_x64.csproj"> | 19 | <ProjectReference Include="..\..\..\TestBA\TestBA_x64.csproj"> |
20 | <SetTargetFramework>TargetFramework=net35</SetTargetFramework> | 20 | <SetTargetFramework>TargetFramework=net462</SetTargetFramework> |
21 | </ProjectReference> | 21 | </ProjectReference> |
22 | <ProjectReference Include="..\..\..\TestBA\TestBA_x64.csproj"> | 22 | <ProjectReference Include="..\..\..\TestBA\TestBA_x64.csproj"> |
23 | <SetTargetFramework>TargetFramework=net5.0-windows</SetTargetFramework> | 23 | <SetTargetFramework>TargetFramework=net5.0-windows</SetTargetFramework> |
diff --git a/src/test/burn/TestData/WixIuiBaTests/EmbeddedUI/EmbeddedUI.csproj b/src/test/burn/TestData/WixIuiBaTests/EmbeddedUI/EmbeddedUI.csproj index a6339220..b183b842 100644 --- a/src/test/burn/TestData/WixIuiBaTests/EmbeddedUI/EmbeddedUI.csproj +++ b/src/test/burn/TestData/WixIuiBaTests/EmbeddedUI/EmbeddedUI.csproj | |||
@@ -1,6 +1,6 @@ | |||
1 | <Project Sdk="Microsoft.NET.Sdk"> | 1 | <Project Sdk="Microsoft.NET.Sdk"> |
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <TargetFramework>net35</TargetFramework> | 3 | <TargetFramework>net462</TargetFramework> |
4 | <Description>Sample managed embedded external UI</Description> | 4 | <Description>Sample managed embedded external UI</Description> |
5 | <UseWPF>true</UseWPF> | 5 | <UseWPF>true</UseWPF> |
6 | </PropertyGroup> | 6 | </PropertyGroup> |
diff --git a/src/test/burn/TestData/WixIuiBaTests/ManagedCA/ManagedCA.csproj b/src/test/burn/TestData/WixIuiBaTests/ManagedCA/ManagedCA.csproj index 866b7575..fd3862d9 100644 --- a/src/test/burn/TestData/WixIuiBaTests/ManagedCA/ManagedCA.csproj +++ b/src/test/burn/TestData/WixIuiBaTests/ManagedCA/ManagedCA.csproj | |||
@@ -1,6 +1,6 @@ | |||
1 | <Project Sdk="Microsoft.NET.Sdk"> | 1 | <Project Sdk="Microsoft.NET.Sdk"> |
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <TargetFramework>net20</TargetFramework> | 3 | <TargetFramework>net462</TargetFramework> |
4 | <Description>Sample managed custom actions</Description> | 4 | <Description>Sample managed custom actions</Description> |
5 | </PropertyGroup> | 5 | </PropertyGroup> |
6 | 6 | ||
diff --git a/src/test/burn/TestExe/NetfxTask.cs b/src/test/burn/TestExe/NetfxTask.cs index 35b1ea95..149df421 100644 --- a/src/test/burn/TestExe/NetfxTask.cs +++ b/src/test/burn/TestExe/NetfxTask.cs | |||
@@ -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. | 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 | 2 | ||
3 | #if NET35 | 3 | #if NETFRAMEWORK |
4 | using System; | 4 | using System; |
5 | using System.Collections.Generic; | 5 | using System.Collections.Generic; |
6 | using System.Diagnostics; | 6 | using System.Diagnostics; |
diff --git a/src/test/burn/TestExe/Task.cs b/src/test/burn/TestExe/Task.cs index 0d283c6c..e6f52b5a 100644 --- a/src/test/burn/TestExe/Task.cs +++ b/src/test/burn/TestExe/Task.cs | |||
@@ -264,7 +264,7 @@ namespace TestExe | |||
264 | t = new DeleteManifestsTask(args[i + 1]); | 264 | t = new DeleteManifestsTask(args[i + 1]); |
265 | tasks.Add(t); | 265 | tasks.Add(t); |
266 | break; | 266 | break; |
267 | #if NET35 | 267 | #if NETFRAMEWORK |
268 | case "/pinfo": | 268 | case "/pinfo": |
269 | t = new ProcessInfoTask(args[i + 1]); | 269 | t = new ProcessInfoTask(args[i + 1]); |
270 | tasks.Add(t); | 270 | tasks.Add(t); |
diff --git a/src/test/burn/TestExe/TestExe.csproj b/src/test/burn/TestExe/TestExe.csproj index 446d0ee3..9209dfd7 100644 --- a/src/test/burn/TestExe/TestExe.csproj +++ b/src/test/burn/TestExe/TestExe.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>net35;net6.0</TargetFrameworks> | 6 | <TargetFrameworks>net462;net6.0</TargetFrameworks> |
7 | <AssemblyName>TestExe</AssemblyName> | 7 | <AssemblyName>TestExe</AssemblyName> |
8 | <RootNamespace>TestExe</RootNamespace> | 8 | <RootNamespace>TestExe</RootNamespace> |
9 | <OutputType>Exe</OutputType> | 9 | <OutputType>Exe</OutputType> |
@@ -14,7 +14,7 @@ | |||
14 | <RollForward>Major</RollForward> | 14 | <RollForward>Major</RollForward> |
15 | </PropertyGroup> | 15 | </PropertyGroup> |
16 | 16 | ||
17 | <ItemGroup Condition="'$(TargetFramework)'=='net35'"> | 17 | <ItemGroup Condition="'$(TargetFramework)'=='net462'"> |
18 | <Reference Include="System.Management" /> | 18 | <Reference Include="System.Management" /> |
19 | </ItemGroup> | 19 | </ItemGroup> |
20 | </Project> | 20 | </Project> |
diff --git a/src/test/burn/TestExe/TestExe_x64.csproj b/src/test/burn/TestExe/TestExe_x64.csproj index ef981d73..2344ad0b 100644 --- a/src/test/burn/TestExe/TestExe_x64.csproj +++ b/src/test/burn/TestExe/TestExe_x64.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>net35</TargetFrameworks> | 6 | <TargetFrameworks>net462</TargetFrameworks> |
7 | <AssemblyName>TestExe</AssemblyName> | 7 | <AssemblyName>TestExe</AssemblyName> |
8 | <RootNamespace>TestExe</RootNamespace> | 8 | <RootNamespace>TestExe</RootNamespace> |
9 | <OutputType>Exe</OutputType> | 9 | <OutputType>Exe</OutputType> |
diff --git a/src/test/burn/test_burn.cmd b/src/test/burn/test_burn.cmd index 7303f736..178ac7e2 100644 --- a/src/test/burn/test_burn.cmd +++ b/src/test/burn/test_burn.cmd | |||
@@ -16,7 +16,7 @@ | |||
16 | msbuild -Restore -p:Configuration=%_C% -tl -nologo -m -warnaserror -bl:%_L%\test_burn_build.binlog || exit /b | 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 | 17 | msbuild -Restore TestData\TestData.proj -p:Configuration=%_C% -tl -nologo -m -warnaserror -bl:%_L%\test_burn_data_build.binlog || exit /b |
18 | 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" | 20 | mt.exe -manifest "WixToolsetTest.BurnE2E\testhost.longpathaware.manifest" -updateresource:"%_B%\net6.0-windows\testhost.exe" |
21 | 21 | ||
22 | @if not "%RuntimeTestsEnabled%"=="true" goto :LExit | 22 | @if not "%RuntimeTestsEnabled%"=="true" goto :LExit |
diff --git a/src/test/wix/TestData/CsprojClassLibraryMultiFramework/CsprojClassLibraryMultiFramework.csproj b/src/test/wix/TestData/CsprojClassLibraryMultiFramework/CsprojClassLibraryMultiFramework.csproj index ffc34573..bc30bf4b 100644 --- a/src/test/wix/TestData/CsprojClassLibraryMultiFramework/CsprojClassLibraryMultiFramework.csproj +++ b/src/test/wix/TestData/CsprojClassLibraryMultiFramework/CsprojClassLibraryMultiFramework.csproj | |||
@@ -1,7 +1,7 @@ | |||
1 | <Project Sdk="Microsoft.NET.Sdk"> | 1 | <Project Sdk="Microsoft.NET.Sdk"> |
2 | 2 | ||
3 | <PropertyGroup> | 3 | <PropertyGroup> |
4 | <TargetFrameworks>net6.0;net48</TargetFrameworks> | 4 | <TargetFrameworks>net6.0;net472</TargetFrameworks> |
5 | <DebugType>embedded</DebugType> | 5 | <DebugType>embedded</DebugType> |
6 | </PropertyGroup> | 6 | </PropertyGroup> |
7 | 7 | ||
diff --git a/src/test/wix/TestData/CsprojClassLibraryMultiTarget/CsprojClassLibraryMultiTarget.csproj b/src/test/wix/TestData/CsprojClassLibraryMultiTarget/CsprojClassLibraryMultiTarget.csproj index 9920b616..e2fa94f5 100644 --- a/src/test/wix/TestData/CsprojClassLibraryMultiTarget/CsprojClassLibraryMultiTarget.csproj +++ b/src/test/wix/TestData/CsprojClassLibraryMultiTarget/CsprojClassLibraryMultiTarget.csproj | |||
@@ -1,7 +1,7 @@ | |||
1 | <Project Sdk="Microsoft.NET.Sdk"> | 1 | <Project Sdk="Microsoft.NET.Sdk"> |
2 | 2 | ||
3 | <PropertyGroup> | 3 | <PropertyGroup> |
4 | <TargetFrameworks>net48;net5.0</TargetFrameworks> | 4 | <TargetFrameworks>net472;net6.0</TargetFrameworks> |
5 | </PropertyGroup> | 5 | </PropertyGroup> |
6 | 6 | ||
7 | <ItemGroup> | 7 | <ItemGroup> |
diff --git a/src/test/wix/TestData/CsprojConsoleMultiFramework/CsprojConsoleMultiFramework.csproj b/src/test/wix/TestData/CsprojConsoleMultiFramework/CsprojConsoleMultiFramework.csproj index 8b4fac23..bb8a8b3e 100644 --- a/src/test/wix/TestData/CsprojConsoleMultiFramework/CsprojConsoleMultiFramework.csproj +++ b/src/test/wix/TestData/CsprojConsoleMultiFramework/CsprojConsoleMultiFramework.csproj | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | <PropertyGroup> | 3 | <PropertyGroup> |
4 | <OutputType>Exe</OutputType> | 4 | <OutputType>Exe</OutputType> |
5 | <TargetFrameworks>net6.0;net48</TargetFrameworks> | 5 | <TargetFrameworks>net6.0;net472</TargetFrameworks> |
6 | <RuntimeIdentifiers>win-x86</RuntimeIdentifiers> | 6 | <RuntimeIdentifiers>win-x86</RuntimeIdentifiers> |
7 | </PropertyGroup> | 7 | </PropertyGroup> |
8 | 8 | ||
diff --git a/src/test/wix/TestData/WixprojLibraryMultiFramework/Library.wxs b/src/test/wix/TestData/WixprojLibraryMultiFramework/Library.wxs index 00a2e558..cf3d2d35 100644 --- a/src/test/wix/TestData/WixprojLibraryMultiFramework/Library.wxs +++ b/src/test/wix/TestData/WixprojLibraryMultiFramework/Library.wxs | |||
@@ -13,13 +13,13 @@ | |||
13 | </Fragment> | 13 | </Fragment> |
14 | 14 | ||
15 | <Fragment> | 15 | <Fragment> |
16 | <ComponentGroup Id='CsprojClassLibraryMultiFrameworkNet48' Directory='ApplicationFolder' Subdirectory="net48"> | 16 | <ComponentGroup Id='CsprojClassLibraryMultiFrameworkNet472' Directory='ApplicationFolder' Subdirectory="net472"> |
17 | <Component> | 17 | <Component> |
18 | <File Id="Net48" Source='!(bindpath.CsprojConsoleMultiFramework.net48)CsprojConsoleMultiFramework.exe' /> | 18 | <File Id="Net472" Source='!(bindpath.CsprojConsoleMultiFramework.net472)CsprojConsoleMultiFramework.exe' /> |
19 | <File Source='!(bindpath.CsprojConsoleMultiFramework.net48)CsprojConsoleMultiFramework.exe.config' /> | 19 | <File Source='!(bindpath.CsprojConsoleMultiFramework.net472)CsprojConsoleMultiFramework.exe.config' /> |
20 | </Component> | 20 | </Component> |
21 | <Component> | 21 | <Component> |
22 | <File Source='!(bindpath.CsprojConsoleMultiFramework.net48)CsprojClassLibraryMultiFramework.dll' /> | 22 | <File Source='!(bindpath.CsprojConsoleMultiFramework.net472)CsprojClassLibraryMultiFramework.dll' /> |
23 | </Component> | 23 | </Component> |
24 | </ComponentGroup> | 24 | </ComponentGroup> |
25 | </Fragment> | 25 | </Fragment> |
diff --git a/src/test/wix/TestData/WixprojLibraryMultiFramework/WixprojLibraryMultiFramework.wixproj b/src/test/wix/TestData/WixprojLibraryMultiFramework/WixprojLibraryMultiFramework.wixproj index 6b4dd129..66812ea2 100644 --- a/src/test/wix/TestData/WixprojLibraryMultiFramework/WixprojLibraryMultiFramework.wixproj +++ b/src/test/wix/TestData/WixprojLibraryMultiFramework/WixprojLibraryMultiFramework.wixproj | |||
@@ -7,6 +7,6 @@ | |||
7 | 7 | ||
8 | <ItemGroup> | 8 | <ItemGroup> |
9 | <ProjectReference Include="..\CsprojConsoleMultiFramework\CsprojConsoleMultiFramework.csproj" | 9 | <ProjectReference Include="..\CsprojConsoleMultiFramework\CsprojConsoleMultiFramework.csproj" |
10 | TargetFrameworks="net48;net6.0" Publish="true" /> | 10 | TargetFrameworks="net472;net6.0" Publish="true" /> |
11 | </ItemGroup> | 11 | </ItemGroup> |
12 | </Project> | 12 | </Project> |