aboutsummaryrefslogtreecommitdiff
path: root/src/ext
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2023-12-18 19:44:47 -0800
committerRob Mensching <rob@firegiant.com>2023-12-19 11:46:11 -0800
commitf02ef4acf9649badaa3ab78d2499ca5014fa2234 (patch)
tree78e9cbccc6f11a7a354d73cb6d5df95718799828 /src/ext
parent7b63b092cbc393739d64c371dd89f91891d15102 (diff)
downloadwix-f02ef4acf9649badaa3ab78d2499ca5014fa2234.tar.gz
wix-f02ef4acf9649badaa3ab78d2499ca5014fa2234.tar.bz2
wix-f02ef4acf9649badaa3ab78d2499ca5014fa2234.zip
Make the minimum supported .NET Framework v4.6.2
Diffstat (limited to 'src/ext')
-rw-r--r--src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.config1
-rw-r--r--src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj2
-rw-r--r--src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec6
-rw-r--r--src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs8
-rw-r--r--src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj2
-rw-r--r--src/ext/Bal/test/examples/FullFramework2MBA/WixToolset.Mba.Host.config4
-rw-r--r--src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs8
-rw-r--r--src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj2
-rw-r--r--src/ext/Bal/test/examples/FullFramework4MBA/WixToolset.Mba.Host.config2
-rw-r--r--src/ext/Bal/wixlib/bal.wixproj2
10 files changed, 18 insertions, 19 deletions
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>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-17 00:06:35 +0000