diff --git a/Divvun.Installer.OneClick/Divvun.Installer.OneClick.csproj b/Divvun.Installer.OneClick/Divvun.Installer.OneClick.csproj index b92e399..757bc07 100644 --- a/Divvun.Installer.OneClick/Divvun.Installer.OneClick.csproj +++ b/Divvun.Installer.OneClick/Divvun.Installer.OneClick.csproj @@ -1,82 +1,81 @@  - - - WinExe - publish\ - false - true - win-x86 - Properties - ../Divvun.Installer/divvun-logo-512.ico - x86 - Divvun.Installer.OneClick - Divvun.Installer.OneClick - net5.0-windows - enable - 8.0 - CS8600;CS8602;CS8603 - true - - - app.manifest - - - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - - - - - - - - - - - - - 6.1.0 - - - 3.0.2 - - - 0.2.0 - - - 13.0.3 - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - True - True - Strings.resx - - - - - PublicResXFileCodeGenerator - Strings.Designer.cs - - - - + + + WinExe + publish\ + false + true + win-x86 + Properties + ../Divvun.Installer/divvun-logo-512.ico + x86 + Divvun.Installer.OneClick + Divvun.Installer.OneClick + net8.0-windows + enable + 8.0 + CS8600;CS8602;CS8603 + true + + + app.manifest + + + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + + + + + + + + + + + + 6.1.0 + + + 3.0.2 + + + 0.2.0 + + + 13.0.3 + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + True + True + Strings.resx + + + + + PublicResXFileCodeGenerator + Strings.Designer.cs + + + \ No newline at end of file diff --git a/Divvun.Installer/Divvun.Installer.csproj b/Divvun.Installer/Divvun.Installer.csproj index 383d484..39999b9 100644 --- a/Divvun.Installer/Divvun.Installer.csproj +++ b/Divvun.Installer/Divvun.Installer.csproj @@ -1,118 +1,116 @@  - - - Exe - Properties - x86 - win-x86 - x86 - Divvun.Installer - DivvunManager - net5.0-windows10.0.18362.0 - enable - 8.0 - CS8600;CS8602;CS8603 - true - AnyCPU;x86 - - - app.manifest - - - divvun-logo-512.ico - - - - - Designer - - - - - - True - True - Strings.resx - - - PublicResXFileCodeGenerator - Strings.Designer.cs - - - - - - - - - - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - true - - - - - True - True - Strings.resx - - - - - PublicResXFileCodeGenerator - Strings.Designer.cs - - - - + + true + + + true + + + true + + + + + True + True + Strings.resx + + + + + PublicResXFileCodeGenerator + Strings.Designer.cs + + + \ No newline at end of file diff --git a/DivvunUITests/DivvunUITests.csproj b/DivvunUITests/DivvunUITests.csproj index 2433057..52704f7 100644 --- a/DivvunUITests/DivvunUITests.csproj +++ b/DivvunUITests/DivvunUITests.csproj @@ -1,21 +1,17 @@ - - - net5.0 - - false - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + net8.0 + false + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + \ No newline at end of file diff --git a/setup.iss b/setup.iss index 5364fe3..9d97121 100644 --- a/setup.iss +++ b/setup.iss @@ -173,7 +173,7 @@ begin // Run embedded dotnet installer WizardForm.PreparingLabel.Caption := CustomMessage('InstallingDotNetMsg'); ExtractTemporaryFile('dotnet5-webinst.exe'); - Exec(ExpandConstant('{tmp}\dotnet5-webinst.exe'), '-r windowsdesktop -v 5 -a x86', '', SW_HIDE, ewWaitUntilTerminated, ResultCode); + Exec(ExpandConstant('{tmp}\dotnet5-webinst.exe'), '-r windowsdesktop -v 8 -a x86', '', SW_HIDE, ewWaitUntilTerminated, ResultCode); finally // restore the original visibility state WizardForm.PreparingLabel.Visible := WasVisible;