Skip to content
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Before building the WiX Toolset, ensure you have Visual Studio 2022 (17.8.2 or h

| Individual components |
| :-------------------- |
| .NET 6.0 Runtime (Long Term Support) |
| .NET 8.0 Runtime (Long Term Support) |
| .NET Framework 4.7.2 SDK |
| .NET Framework 4.7.2 targeting pack |
| .NET Framework 4.6.2 targeting pack |
Expand Down
2 changes: 1 addition & 1 deletion src/Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<PropertyGroup>
<SigningToolExe>$(ToolsFolder)\sign.exe</SigningToolExe>
<SigningCommand>code azure-key-vault</SigningCommand>
<SigningConfiguration>--description "WiX Toolset" --description-url "https://wixtoolset.org/" --file-list "$(MSBuildThisFileDirectory)signing-empty-file-list.txt" --azure-key-vault-url $(SigningKeyVaultUri) --azure-key-vault-tenant-id $(SigningTenantId) --azure-key-vault-client-id $(SigningClientId) --azure-key-vault-client-secret $(SigningClientSecret) --azure-key-vault-certificate $(SigningCertName) --timestamp-url "http://timestamp.digicert.com"</SigningConfiguration>
<SigningConfiguration>--description "WiX Toolset" --description-url "https://wixtoolset.org/" --recurse-containers=false --azure-key-vault-url $(SigningKeyVaultUri) --azure-key-vault-tenant-id $(SigningTenantId) --azure-key-vault-client-id $(SigningClientId) --azure-key-vault-client-secret $(SigningClientSecret) --azure-key-vault-certificate $(SigningCertName) --timestamp-url "http://timestamp.digicert.com"</SigningConfiguration>
</PropertyGroup>

<PropertyGroup Condition=" '$(IsWixTestSupportProject)'=='true' ">
Expand Down
1 change: 0 additions & 1 deletion src/Directory.csproj.targets
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
</ItemGroup>


<ItemGroup Condition=" '$(IsWixTestProject)'!='true' ">
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/api/api.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ msbuild api_t.proj -p:Configuration=%_C% -tl -nologo -warnaserror -bl:%_L%\api_b

:: Test
dotnet test ^
%_B%\net6.0\WixToolsetTest.Data.dll ^
%_B%\net6.0\win-x86\WixToolsetTest.BootstrapperApplicationApi.dll ^
%_B%\net8.0\WixToolsetTest.Data.dll ^
%_B%\net8.0\win-x86\WixToolsetTest.BootstrapperApplicationApi.dll ^
%_B%\x86\BalUtilUnitTest.dll ^
%_B%\x86\BextUtilUnitTest.dll ^
--nologo -l "trx;LogFileName=%_L%\TestResults\api.trx" || exit /b
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RuntimeIdentifier>win-x86</RuntimeIdentifier>
<SelfContained>false</SelfContained>
<IsWixTestProject>true</IsWixTestProject>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsWixTestProject>true</IsWixTestProject>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<Project Sdk="MSTest.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsWixMSTestProject>true</IsWixMSTestProject>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
<OutputType>WinExe</OutputType>
<DebugType>embedded</DebugType>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
<OutputType>WinExe</OutputType>
<DebugType>embedded</DebugType>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
<Description>WPF .NET Core MBA</Description>
<UseWPF>true</UseWPF>
Expand Down
56 changes: 56 additions & 0 deletions src/ext/Bal/wixext-backward-compatible/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
# WixToolset.Bal.wixext - Bootstrapper Applications WiX Toolset Extension

This WiX Extension was renamed. Use `WixToolset.BootstrapperApplications.wixext` instead.

- [WixStandardBootstrapperApplication](https://www.nuget.org/packages/WixToolset.BootstrapperApplications.wixext)

[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]

## Open Source Maintenance Fee

To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].

To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).


## Getting started

Add the WiX Extension as a PackageReference to your .wixproj:

```
<Project Sdk="WixToolset.Sdk/6.0.2">
<ItemGroup>
<PackageReference Include="WixToolset.BootstrapperApplications.wixext" Version="6.0.2" />
</ItemGroup>
</Project>
```

Then add the namespace and bootstrapper application of choice:

```
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
<Bundle BundleId="AcmeCorp.Example" Name="Example Bundle" Version="0.0.0.1" Manufacturer="ACME Corporation">
<BootstrapperApplication>
<bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" Theme="hyperlinkLicense" />
</BootstrapperApplication>
</Bundle>
</Wix>
```

## Additional resources

* [WiX Website][web]
* [WiX Documentation][docs]
* [WiX Issue Tracker][issues]
* [WiX Discussions][discussions]


[web]: https://www.firegiant.com/wixtoolset/
[docs]: https://docs.firegiant.com/wixtoolset/
[issues]: https://github.com/wixtoolset/issues/issues
[discussions]: https://github.com/orgs/wixtoolset/discussions
[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
[osmf]: https://opensourcemaintenancefee.org/
[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Import Project="..\..\WixExt.props" />

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IncludeBuildOutput>false</IncludeBuildOutput>
<Title>WiX Toolset BootstrapperApplications extension</Title>
<Description>WiX Toolset BootstrapperApplications extension</Description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<description>$description$</description>
<authors>$authors$</authors>
<icon>icon.png</icon>
<readme>README.md</readme>
<license type="file">OSMFEULA.txt</license>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<tags>$packageTags$</tags>
Expand All @@ -18,6 +19,7 @@
<files>
<file src="$eulaTxt$" />
<file src="$iconPng$" />
<file src="$projectFolder$\README.md" />
<file src="$projectFolder$\WixToolset.Bal.wixext.targets" target="build" />
<file src="WixToolset.BootstrapperApplications.wixext.dll" target="$wixExtensionPackageFolder$" />
</files>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
// 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.

using Microsoft.VisualStudio.TestTools.UnitTesting;

[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]

namespace WixToolsetTest.ComPlus
{
using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using WixInternal.MSTestSupport;
using WixInternal.Core.MSTestPackage;
using WixToolset.ComPlus;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<Project Sdk="MSTest.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsWixMSTestProject>true</IsWixMSTestProject>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
// 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.

using Microsoft.VisualStudio.TestTools.UnitTesting;

[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]

namespace WixToolsetTest.Dependency
{
using System.Linq;
using System.Text.RegularExpressions;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using WixInternal.MSTestSupport;
using WixInternal.Core.MSTestPackage;
using WixToolset.Dependency;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<Project Sdk="MSTest.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsWixMSTestProject>true</IsWixMSTestProject>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
// 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.

using Microsoft.VisualStudio.TestTools.UnitTesting;

[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]

namespace WixToolsetTest.DirectX
{
using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using WixInternal.MSTestSupport;
using WixInternal.Core.MSTestPackage;
using WixToolset.DirectX;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<Project Sdk="MSTest.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsWixMSTestProject>true</IsWixMSTestProject>
</PropertyGroup>

Expand Down
37 changes: 19 additions & 18 deletions src/ext/Firewall/ca/firewall.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -464,29 +464,30 @@ static HRESULT GetFwRuleInterfaces(
}
}

ExitOnNull(iInterfacesCount, hr, S_OK, "All interfaces are empty values");

vInterfaces.vt = VT_ARRAY | VT_VARIANT;
// this will be cleaned up by ReleaseVariant call of the calling function
vInterfaces.parray = SafeArrayCreateVector(VT_VARIANT, 0, iInterfacesCount);

for (LPCWSTR pwzElement = bstrInterfaces; pwzElement < (bstrInterfaces + iLength); ++pwzElement)
if (iInterfacesCount > 0)
{
if (*pwzElement)
vInterfaces.vt = VT_ARRAY | VT_VARIANT;
// this will be cleaned up by ReleaseVariant call of the calling function
vInterfaces.parray = SafeArrayCreateVector(VT_VARIANT, 0, iInterfacesCount);

for (LPCWSTR pwzElement = bstrInterfaces; pwzElement < (bstrInterfaces + iLength); ++pwzElement)
{
VARIANT vElement;
::VariantInit(&vElement);
if (*pwzElement)
{
VARIANT vElement;
::VariantInit(&vElement);

vElement.vt = VT_BSTR;
// this will be cleaned up by ReleaseVariant call of the calling function
vElement.bstrVal = ::SysAllocString(pwzElement);
ExitOnNull(vElement.bstrVal, hr, E_OUTOFMEMORY, "failed SysAllocString for interface element");
vElement.vt = VT_BSTR;
// this will be cleaned up by ReleaseVariant call of the calling function
vElement.bstrVal = ::SysAllocString(pwzElement);
ExitOnNull(vElement.bstrVal, hr, E_OUTOFMEMORY, "failed SysAllocString for interface element");

hr = SafeArrayPutElement(vInterfaces.parray, &iIndex, &vElement);
ExitOnFailure(hr, "failed to put interface '%ls' into safe array", pwzElement);
hr = SafeArrayPutElement(vInterfaces.parray, &iIndex, &vElement);
ExitOnFailure(hr, "failed to put interface '%ls' into safe array", pwzElement);

pwzElement += ::SysStringLen(vElement.bstrVal);
iIndex++;
pwzElement += ::SysStringLen(vElement.bstrVal);
iIndex++;
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<Project Sdk="MSTest.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsWixMSTestProject>true</IsWixMSTestProject>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<Project Sdk="MSTest.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsWixMSTestProject>true</IsWixMSTestProject>
</PropertyGroup>

Expand Down
4 changes: 4 additions & 0 deletions src/ext/Iis/test/WixToolsetTest.Iis/IisExtensionFixture.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
// 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.

using Microsoft.VisualStudio.TestTools.UnitTesting;

[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]

namespace WixToolsetTest.Iis
{
using System.Linq;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<Project Sdk="MSTest.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsWixMSTestProject>true</IsWixMSTestProject>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
// 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.

using Microsoft.VisualStudio.TestTools.UnitTesting;

[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]

namespace WixToolsetTest.Msmq
{
using System.Data;
using System.IO;
using System.Linq;
using System.Xml.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using WixInternal.MSTestSupport;
using WixInternal.Core.MSTestPackage;
using WixToolset.Msmq;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<Project Sdk="MSTest.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsWixMSTestProject>true</IsWixMSTestProject>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/ext/NetFx/netcoresearch/netcoresearch.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
<PropertyGroup>
<NetHostPlatform>$(Platform)</NetHostPlatform>
<NetHostPlatform Condition=" '$(NetHostPlatform)'=='Win32' ">x86</NetHostPlatform>
<NetHostPath>..\..\..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetAppHost.6.0.4\runtimes\win-$(NetHostPlatform)\native\</NetHostPath>
<HostfxrPath>..\..\..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetHostResolver.6.0.4\runtimes\win-$(NetHostPlatform)\native\</HostfxrPath>
<NetHostPath>..\..\..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetAppHost.8.0.21\runtimes\win-$(NetHostPlatform)\native\</NetHostPath>
<HostfxrPath>..\..\..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetHostResolver.8.0.21\runtimes\win-$(NetHostPlatform)\native\</HostfxrPath>
<ProjectAdditionalIncludeDirectories>$(NetHostPath)</ProjectAdditionalIncludeDirectories>
</PropertyGroup>

Expand Down
14 changes: 7 additions & 7 deletions src/ext/NetFx/netcoresearch/packages.config
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="runtime.win-arm64.Microsoft.NETCore.DotNetAppHost" version="6.0.4" targetFramework="native" />
<package id="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" version="6.0.4" targetFramework="native" />
<package id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="6.0.4" targetFramework="native" />
<package id="runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" version="6.0.4" targetFramework="native" />
<package id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.4" targetFramework="native" />
<package id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" version="6.0.4" targetFramework="native" />
</packages>
<package id="runtime.win-arm64.Microsoft.NETCore.DotNetAppHost" version="8.0.21" targetFramework="native" />
<package id="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" version="8.0.21" targetFramework="native" />
<package id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="8.0.21" targetFramework="native" />
<package id="runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" version="8.0.21" targetFramework="native" />
<package id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" version="8.0.21" targetFramework="native" />
<package id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" version="8.0.21" targetFramework="native" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<Project Sdk="MSTest.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsWixMSTestProject>true</IsWixMSTestProject>
</PropertyGroup>

Expand Down
Loading
Loading