Skip to content

Commit

Permalink
net8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
nirbar committed Dec 1, 2024
1 parent efd648c commit f422c57
Show file tree
Hide file tree
Showing 82 changed files with 111 additions and 111 deletions.
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
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
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
2 changes: 1 addition & 1 deletion src/internal/SetBuildNumber/SetBuildNumber.proj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<Project Sdk="Microsoft.Build.NoTargets/3.5.6">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<!-- Disable central package version management since this project will write the central package version management file -->
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>

Expand Down
2 changes: 1 addition & 1 deletion src/libs/libs.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
msbuild -Restore libs_t.proj -p:Configuration=%_C% -tl -nologo -m -warnaserror -bl:%_L%\libs_build.binlog || exit /b

dotnet test ^
%_B%\net6.0\WixToolsetTest.Versioning.dll ^
%_B%\net8.0\WixToolsetTest.Versioning.dll ^
%_B%\x86\DUtilUnitTest.dll ^
%_B%\x64\DUtilUnitTest.dll ^
--nologo -l "trx;LogFileName=%_L%\TestResults\libs.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>
<IsWixTestProject>true</IsWixTestProject>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/test/burn/Directory.wixproj.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<TestGroupName Condition=" '$(TestGroupName)'=='' ">$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName($(MSBuildProjectDirectory)))))</TestGroupName>
<BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(TestGroupName)\$(ProjectName)\</BaseIntermediateOutputPath>
<OutputPath>$(OutputPath)net6.0-windows\TestData\$(TestGroupName)\</OutputPath>
<OutputPath>$(OutputPath)net8.0-windows\TestData\$(TestGroupName)\</OutputPath>
<DefaultCompressionLevel>None</DefaultCompressionLevel>
<CompilerAdditionalOptions>-wx</CompilerAdditionalOptions>
<SuppressSpecificWarnings>1154;$(SuppressSpecificWarnings)</SuppressSpecificWarnings>
Expand Down
4 changes: 2 additions & 2 deletions src/test/burn/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ They modify machine state so it's strongly recommended *not* to run these tests
They should be run on a VM instead, where you can easily roll back.

1. Run build.cmd to build everything (the tests will not automatically run).
1. Copy the build\IntegrationBurn\Debug\net6.0-windows folder to your VM.
1. Open an elevated command prompt and navigate to the net6.0-windows folder.
1. Copy the build\IntegrationBurn\Debug\net8.0-windows folder to your VM.
1. Open an elevated command prompt and navigate to the net8.0-windows folder.
1. Run the runtests.cmd file to run the tests.

You can modify the runtests.cmd to run specific tests.
Expand Down
2 changes: 1 addition & 1 deletion src/test/burn/TestBA/TestBA.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net462;net6.0-windows</TargetFrameworks>
<TargetFrameworks>net462;net8.0-windows</TargetFrameworks>
<OutputType>WinExe</OutputType>
<AssemblyName>TestBA</AssemblyName>
<RootNamespace>WixToolset.Test.BA</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion src/test/burn/TestBA/TestBA_x64.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net462;net6.0-windows</TargetFrameworks>
<TargetFrameworks>net462;net8.0-windows</TargetFrameworks>
<OutputType>WinExe</OutputType>
<AssemblyName>TestBA</AssemblyName>
<RootNamespace>WixToolset.Test.BA</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion src/test/burn/TestData/CacheTests/BundleC/BundleC.wixproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</ItemGroup>
<!-- We do this dynamically to avoid committing such a large file to source control. -->
<Target Name="CreateLargeFile" AfterTargets="BeforeBuild" Inputs="$(MSBuildProjectFullPath)" Outputs="$(MSBuildProjectDirectory)\fivegb.file">
<Exec Command='"$(BaseOutputPath)$(Configuration)\net6.0\win-x86\testexe.exe" /lf "fivegb.file|5368709120' WorkingDirectory="$(MSBuildProjectDirectory)" />
<Exec Command='"$(BaseOutputPath)$(Configuration)\net8.0\win-x86\testexe.exe" /lf "fivegb.file|5368709120' WorkingDirectory="$(MSBuildProjectDirectory)" />
</Target>
<!-- We do this to avoid copying such a large file to the VM to run the tests. -->
<Target Name="DeleteLargeFile" AfterTargets="AfterBuild">
Expand Down
4 changes: 2 additions & 2 deletions src/test/burn/TestData/Manual/BundleB/BundleB.wixproj
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@

<!-- We do this dynamically to avoid committing so many files to source control. -->
<Target Name="CreateThousandsOfFiles" AfterTargets="BeforeBuild">
<Exec Command='"$(BaseOutputPath)$(Configuration)\net6.0\win-x86\testexe.exe" /gf "BAPayloads|10000' WorkingDirectory="$(MSBuildProjectDirectory)" />
<Exec Command='"$(BaseOutputPath)$(Configuration)\net6.0\win-x86\testexe.exe" /gf "PackagePayloads|10000' WorkingDirectory="$(MSBuildProjectDirectory)" />
<Exec Command='"$(BaseOutputPath)$(Configuration)\net8.0\win-x86\testexe.exe" /gf "BAPayloads|10000' WorkingDirectory="$(MSBuildProjectDirectory)" />
<Exec Command='"$(BaseOutputPath)$(Configuration)\net8.0\win-x86\testexe.exe" /gf "PackagePayloads|10000' WorkingDirectory="$(MSBuildProjectDirectory)" />
</Target>

<Target Name="DeleteThousandsOfFiles" AfterTargets="AfterBuild">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
</ItemGroup>
<ItemGroup>
<BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net6.0-windows\win-x86" BindName="dncx86" />
<BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net8.0-windows\win-x86" BindName="dncx86" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\PackageA\PackageA.wixproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
</ItemGroup>
<ItemGroup>
<BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net6.0-windows\win-x86" BindName="dncx86" />
<BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net8.0-windows\win-x86" BindName="dncx86" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\PackageA\PackageA.wixproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
</ItemGroup>
<ItemGroup>
<BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net6.0-windows\win-x86" BindName="dncx86" />
<BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net8.0-windows\win-x86" BindName="dncx86" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\PrereqBaf\PrereqBaf.vcxproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<ItemGroup>
<BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net462\win-x86" BindName="net2x86" />
<BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net472\win-x86" BindName="net4x86" />
<BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net6.0-windows\win-x86" BindName="dncx86" />
<BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net8.0-windows\win-x86" BindName="dncx86" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\TestBA\TestBA.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ItemGroup>
<BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net462\win-x64" BindName="net2x64" />
<BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net472\win-x64" BindName="net4x64" />
<BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net6.0-windows\win-x64" BindName="dncx64" />
<BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net8.0-windows\win-x64" BindName="dncx64" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\TestBA\TestBA_x64.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion src/test/burn/TestExe/TestExe.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net462;net6.0</TargetFrameworks>
<TargetFrameworks>net462;net8.0</TargetFrameworks>
<AssemblyName>TestExe</AssemblyName>
<RootNamespace>TestExe</RootNamespace>
<OutputType>Exe</OutputType>
Expand Down
2 changes: 1 addition & 1 deletion src/test/burn/WixTestTools/WixTestTools.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-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<PlatformTarget>x64</PlatformTarget>
<IsWixTestSupportProject>true</IsWixTestSupportProject>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
<TargetFrameworks>net472;net8.0-windows</TargetFrameworks>
<OutputType>WinExe</OutputType>
<AssemblyName>WixToolset.WixBA</AssemblyName>
<RootNamespace>WixToolset.WixBA</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
<TargetFrameworks>net472;net8.0-windows</TargetFrameworks>
<OutputType>WinExe</OutputType>
<AssemblyName>WixToolset.WixBA</AssemblyName>
<RootNamespace>WixToolset.WixBA</RootNamespace>
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-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<PlatformTarget>x64</PlatformTarget>
<IsWixTestProject>true</IsWixTestProject>
</PropertyGroup>
Expand Down
Loading

0 comments on commit f422c57

Please sign in to comment.