Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Net8, and a bunch of other dependency updates #554

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all 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 @@ -23,7 +23,7 @@ This repository contains the WiX Toolset codebase.

| 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
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
2 changes: 1 addition & 1 deletion src/ext/Bal/bal.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ msbuild bal_t.proj -p:Configuration=%_C% -tl -nologo -warnaserror -bl:%_L%\bal_b
:: Test
dotnet test ^
%_B%\x86\WixStdFnUnitTest.dll ^
%_B%\net6.0\WixToolsetTest.BootstrapperApplications.dll ^
%_B%\net8.0\WixToolsetTest.BootstrapperApplications.dll ^
--nologo -l "trx;LogFileName=%_L%\TestResults\bal.wixext.trx" || exit /b

@goto :end
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
@@ -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
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 @@ -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="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="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="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="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="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="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsWixTestProject>true</IsWixTestProject>
</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.7\runtimes\win-$(NetHostPlatform)\native\</NetHostPath>
<HostfxrPath>..\..\..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetHostResolver.8.0.7\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.7" targetFramework="native" />
<package id="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" version="8.0.7" targetFramework="native" />
<package id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="8.0.7" targetFramework="native" />
<package id="runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" version="8.0.7" targetFramework="native" />
<package id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" version="8.0.7" targetFramework="native" />
<package id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" version="8.0.7" targetFramework="native" />
</packages>
2 changes: 1 addition & 1 deletion src/ext/NetFx/netfx.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ msbuild -Restore -p:Configuration=%_C% -tl -nologo -warnaserror -bl:%_L%\ext_net

:: Test
dotnet test ^
%_B%\net6.0\WixToolsetTest.NetFx.dll ^
%_B%\net8.0\WixToolsetTest.NetFx.dll ^
--nologo -l "trx;LogFileName=%_L%\TestResults\netfx.wixext.trx" || exit /b

:: Pack
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="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="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsWixTestProject>true</IsWixTestProject>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public void CanBuildUsingWixUIFeatureTree()
var results = build.BuildAndQuery(BuildX64, "Binary", "Dialog", "CustomAction", "ControlEvent", "InstallUISequence");
Assert.Single(results, result => result.StartsWith("Dialog:WelcomeDlg\t"));
Assert.Single(results, result => result.StartsWith("Dialog:CustomizeDlg\t"));
Assert.Empty(results.Where(result => result.StartsWith("Dialog:SetupTypeDlg\t")));
Assert.DoesNotContain(results, result => result.StartsWith("Dialog:SetupTypeDlg\t"));
WixAssert.CompareLineByLine(new[]
{
"Binary:WixUI_Bmp_Banner\t[Binary data]",
Expand Down Expand Up @@ -358,7 +358,7 @@ public void CanBuildWithInstallDirAndRemovedDialog()
"ControlEvent:InstallDirDlg\tNext\tDoAction\tWixUIValidatePath_X86\tNOT WIXUI_DONTVALIDATEPATH\t2",
}, results.Where(result => result.StartsWith("ControlEvent:") && result.Contains("DoAction")).OrderBy(s => s).ToArray());

Assert.Empty(results.Where(result => result.Contains("LicenseAgreementDlg")).ToArray());
Assert.DoesNotContain(results, result => result.Contains("LicenseAgreementDlg"));

WixAssert.CompareLineByLine(new[]
{
Expand Down
2 changes: 1 addition & 1 deletion src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj
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="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsWixTestProject>true</IsWixTestProject>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/ext/Util/util.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ msbuild -Restore -p:Configuration=%_C% -tl -nologo -warnaserror -bl:%_L%\ext_uti

:: Test
dotnet test ^
%_B%\net6.0\WixToolsetTest.Util.dll ^
%_B%\net8.0\WixToolsetTest.Util.dll ^
--nologo -l "trx;LogFileName=%_L%\TestResults\util.wixext.trx" || exit /b

:: Pack
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
56 changes: 25 additions & 31 deletions src/internal/SetBuildNumber/Directory.Packages.props.pp
Original file line number Diff line number Diff line change
Expand Up @@ -42,53 +42,47 @@
</ItemGroup>

<ItemGroup>
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
<PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="4.7.0" />
<PackageVersion Include="System.DirectoryServices" Version="4.7.0" />
<PackageVersion Include="System.DirectoryServices.AccountManagement" Version="4.7.0" />
<PackageVersion Include="System.Management" Version="4.7.0" />
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
<PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="8.0.0" />
<PackageVersion Include="System.DirectoryServices" Version="8.0.0" />
<PackageVersion Include="System.DirectoryServices.AccountManagement" Version="8.0.0" />
<PackageVersion Include="System.Management" Version="8.0.0" />
<PackageVersion Include="System.IO.Compression" Version="4.3.0" />
<PackageVersion Include="System.IO.FileSystem.AccessControl" Version="4.7.0" />
<PackageVersion Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
<PackageVersion Include="System.Net.NetworkInformation" Version="4.3.0" />
<PackageVersion Include="System.Reflection.Metadata" Version="1.8.1" />
<PackageVersion Include="System.Security.Principal.Windows" Version="4.7.0" />
<PackageVersion Include="System.Text.Encoding.CodePages" Version="4.7.1" />
<PackageVersion Include="System.Text.Json" Version="6.0.9" />
<PackageVersion Include="System.Reflection.Metadata" Version="8.0.0" />
<PackageVersion Include="System.Security.Principal.Windows" Version="5.0.0" />
<PackageVersion Include="System.Text.Encoding.CodePages" Version="8.0.0" />
<PackageVersion Include="System.Text.Json" Version="8.0.4" />

<PackageVersion Include="Microsoft.AspNetCore.Owin" Version="3.1.13" />
<PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Native" Version="3.10.2154" />
<PackageVersion Include="Microsoft.Win32.Registry" Version="4.7.0" />
<PackageVersion Include="Microsoft.AspNetCore.Owin" Version="8.0.8" />
<PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Native" Version="3.11.2177" />
<PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
</ItemGroup>

<ItemGroup>
<PackageVersion Include="NuGet.Credentials" Version="6.10.1" />
<PackageVersion Include="NuGet.Protocol" Version="6.10.1" />
<PackageVersion Include="NuGet.Versioning" Version="6.10.1" />
<PackageVersion Include="NuGet.Credentials" Version="6.11.0" />
<PackageVersion Include="NuGet.Protocol" Version="6.11.0" />
<PackageVersion Include="NuGet.Versioning" Version="6.11.0" />
</ItemGroup>

<!--
These MSBuild versions are trapped in antiquity for heat.exe.
-->
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="14.3" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'">
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="15.7.179" />
<ItemGroup>
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.11.4" />
</ItemGroup>

<!-- Keep the following versions in sync with internal\WixInternal.TestSupport.Native\packages.config -->
<ItemGroup>
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />

<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageVersion Include="xunit" Version="2.8.1" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.1" />
<PackageVersion Include="xunit.assert" Version="2.8.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageVersion Include="xunit" Version="2.9.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
<PackageVersion Include="xunit.assert" Version="2.9.0" />
</ItemGroup>

<ItemGroup>
<PackageVersion Include="Microsoft.NET.Tools.NETCoreCheck.x86" Version="6.0.0" />
<PackageVersion Include="Microsoft.NET.Tools.NETCoreCheck.x64" Version="6.0.0" />
<PackageVersion Include="Microsoft.NET.Tools.NETCoreCheck.arm64" Version="6.0.0" />
<PackageVersion Include="Microsoft.NET.Tools.NETCoreCheck.x86" Version="7.0.0" />
<PackageVersion Include="Microsoft.NET.Tools.NETCoreCheck.x64" Version="7.0.0" />
<PackageVersion Include="Microsoft.NET.Tools.NETCoreCheck.arm64" Version="7.0.0" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<PropertyGroup>
<RepoRootDir Condition=" '$(RepoRootDir)' == '' ">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), .gitignore))</RepoRootDir>
</PropertyGroup>
<Import Project="$(RepoRootDir)\packages\xunit.core.2.8.1\build\xunit.core.props" Condition="Exists('$(RepoRootDir)\packages\xunit.core.2.8.1\build\xunit.core.props')" />
<Import Project="$(RepoRootDir)\packages\xunit.runner.visualstudio.2.8.1\build\net462\xunit.runner.visualstudio.props" Condition="Exists('$(RepoRootDir)\packages\xunit.runner.visualstudio.2.8.1\build\net462\xunit.runner.visualstudio.props')" />
<Import Project="$(RepoRootDir)\packages\xunit.core.2.9.0\build\xunit.core.props" Condition="Exists('$(RepoRootDir)\packages\xunit.core.2.9.0\build\xunit.core.props')" />
<Import Project="$(RepoRootDir)\packages\xunit.runner.visualstudio.2.8.2\build\net462\xunit.runner.visualstudio.props" Condition="Exists('$(RepoRootDir)\packages\xunit.runner.visualstudio.2.8.2\build\net462\xunit.runner.visualstudio.props')" />
<PropertyGroup>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
</PropertyGroup>
Expand Down
Loading
Loading