aboutsummaryrefslogtreecommitdiff
path: root/src/libs
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2025-10-15 23:06:59 -0700
committerRob Mensching <rob@firegiant.com>2025-10-15 23:12:35 -0700
commit90157a3799acc06ba094b9c445e50f459f3fd194 (patch)
tree6967e73759f32738750bfadc35158187896edbb5 /src/libs
parent064d58584d57ed8fa45d8f3f570a253a0490561b (diff)
downloadwix-90157a3799acc06ba094b9c445e50f459f3fd194.tar.gz
wix-90157a3799acc06ba094b9c445e50f459f3fd194.tar.bz2
wix-90157a3799acc06ba094b9c445e50f459f3fd194.zip
Update to .NET 8 to fix build
.NET 6 was deprecated so move to .NET 8 and possibly .NET 10 after it releases.
Diffstat (limited to 'src/libs')
-rw-r--r--src/libs/libs.cmd5
-rw-r--r--src/libs/test/WixToolsetTest.Versioning/WixToolsetTest.Versioning.csproj2
2 files changed, 4 insertions, 3 deletions
diff --git a/src/libs/libs.cmd b/src/libs/libs.cmd
index acf5ff55..97d2490b 100644
--- a/src/libs/libs.cmd
+++ b/src/libs/libs.cmd
@@ -21,9 +21,10 @@
21 21
22msbuild -Restore libs_t.proj -p:Configuration=%_C% -tl -nologo -m -warnaserror -bl:%_L%\libs_build.binlog || exit /b 22msbuild -Restore libs_t.proj -p:Configuration=%_C% -tl -nologo -m -warnaserror -bl:%_L%\libs_build.binlog || exit /b
23 23
24@rem Optional blame switches for tracking down hangs: --blame-hang-timeout 1min --blame-hang-dump-type mini
24dotnet test ^ 25dotnet test ^
25 --results-directory %_L%\TestResults --blame-hang-timeout 1min --blame-hang-dump-type mini -l:"console;verbosity=detailed" ^ 26 --results-directory %_L%\TestResults -l:"console;verbosity=detailed" ^
26 %_B%\net6.0\WixToolsetTest.Versioning.dll ^ 27 %_B%\net8.0\WixToolsetTest.Versioning.dll ^
27 %_B%\x86\DUtilUnitTest.dll ^ 28 %_B%\x86\DUtilUnitTest.dll ^
28 %_B%\x64\DUtilUnitTest.dll ^ 29 %_B%\x64\DUtilUnitTest.dll ^
29 --nologo -l "trx;LogFileName=%_L%\TestResults\libs.trx" || exit /b 30 --nologo -l "trx;LogFileName=%_L%\TestResults\libs.trx" || exit /b
diff --git a/src/libs/test/WixToolsetTest.Versioning/WixToolsetTest.Versioning.csproj b/src/libs/test/WixToolsetTest.Versioning/WixToolsetTest.Versioning.csproj
index 79d4ef35..52fbf0de 100644
--- a/src/libs/test/WixToolsetTest.Versioning/WixToolsetTest.Versioning.csproj
+++ b/src/libs/test/WixToolsetTest.Versioning/WixToolsetTest.Versioning.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>net6.0</TargetFramework> 6 <TargetFramework>net8.0</TargetFramework>
7 <IsWixTestProject>true</IsWixTestProject> 7 <IsWixTestProject>true</IsWixTestProject>
8 </PropertyGroup> 8 </PropertyGroup>
9 9