Skip to content

Commit 756be0e

Browse files
MattEqualsCoderMattEqualsCoder
committed
Update to .net 9
1 parent f704cad commit 756be0e

File tree

7 files changed

+110
-56
lines changed

7 files changed

+110
-56
lines changed

‎.github/workflows/dotnet.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Setup .NET
2323
uses: actions/setup-dotnet@v4
2424
with:
25-
dotnet-version: 8.0.x
25+
dotnet-version: 9.0.x
2626
- name: Restore dependencies
2727
run: dotnet restore
2828
- name: Build
@@ -50,7 +50,7 @@ jobs:
5050
if: ${{ github.event_name != 'pull_request' }}
5151
id: version
5252
run: |
53-
$version = (Get-Item "MSURandomizer\bin\Release\net8.0\win-x86\publish\MSURandomizer.exe").VersionInfo.ProductVersion
53+
$version = (Get-Item "MSURandomizer\bin\Release\net9.0\win-x86\publish\MSURandomizer.exe").VersionInfo.ProductVersion
5454
$version = $version -replace "\+.*", ""
5555
Write-Output "number=$version" >> $env:GITHUB_OUTPUT
5656
shell: pwsh

‎MSURandomizer/MSURandomizer.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
4-
<TargetFramework>net8.0</TargetFramework>
54
<Nullable>enable</Nullable>
65
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
76
<ApplicationManifest>app.manifest</ApplicationManifest>
@@ -10,6 +9,7 @@
109
<ApplicationIcon>MSURandomizerIcon.ico</ApplicationIcon>
1110
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1211
<PackageId>MattEqualsCoder.MSURandomizer.Avalonia</PackageId>
12+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
1313
</PropertyGroup>
1414

1515
<ItemGroup>
@@ -31,11 +31,11 @@
3131

3232
<ItemGroup>
3333
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
34-
<PackageReference Include="MattEqualsCoder.AvaloniaControls" Version="1.4.3" />
34+
<PackageReference Include="MattEqualsCoder.AvaloniaControls" Version="1.5.0" />
3535
<PackageReference Include="MattEqualsCoder.GitHubReleaseChecker" Version="1.1.2" />
36-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
36+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
3737
<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
38-
<PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" />
38+
<PackageReference Include="Serilog.Extensions.Hosting" Version="9.0.0" />
3939
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
4040
<PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
4141
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />

‎MSURandomizerLibrary/MSURandomizerLibrary.csproj‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,9 @@
1717
<Version>3.0.1</Version>
1818
<PackageId>MattEqualsCoder.MSURandomizer.Library</PackageId>
1919
<GenerateDocumentationFile>True</GenerateDocumentationFile>
20-
<TargetFramework>net8.0</TargetFramework>
20+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
2121
</PropertyGroup>
2222

23-
<ItemGroup>
24-
<None Update="LICENSE">
25-
<Pack>True</Pack>
26-
<PackagePath>\</PackagePath>
27-
</None>
28-
</ItemGroup>
29-
3023
<ItemGroup>
3124
<EmbeddedResource Include="settings.yaml" />
3225
<None Remove="README.md" />
@@ -47,17 +40,25 @@
4740
</ItemGroup>
4841

4942
<ItemGroup>
50-
<PackageReference Include="Google.Protobuf" Version="3.28.3" />
51-
<PackageReference Include="Grpc.AspNetCore" Version="2.66.0" />
52-
<PackageReference Include="Grpc.Net.Client" Version="2.66.0" />
53-
<PackageReference Include="Grpc.Tools" Version="2.67.0">
43+
<PackageReference Include="Google.Protobuf" Version="3.29.2" />
44+
<PackageReference Include="Grpc.AspNetCore" Version="2.67.0" />
45+
<PackageReference Include="Grpc.Net.Client" Version="2.67.0" />
46+
<PackageReference Include="Grpc.Tools" Version="2.68.1">
5447
<PrivateAssets>all</PrivateAssets>
5548
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5649
</PackageReference>
5750
<PackageReference Include="MattEqualsCoder.SnesConnectorLibrary" Version="0.9.9" />
58-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
59-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
60-
<PackageReference Include="YamlDotNet" Version="16.1.3" />
51+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
52+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
53+
<PackageReference Include="YamlDotNet" Version="16.3.0" />
54+
</ItemGroup>
55+
56+
<ItemGroup>
57+
<None Remove="LICENSE" />
58+
<Content Include="LICENSE">
59+
<Pack>True</Pack>
60+
<PackagePath>\</PackagePath>
61+
</Content>
6162
</ItemGroup>
6263

6364
</Project>

‎MSURandomizerLibraryTests/MSURandomizerLibraryTests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
1414
<PackageReference Include="Moq" Version="4.18.4" />
15-
<PackageReference Include="NUnit" Version="4.2.2" />
15+
<PackageReference Include="NUnit" Version="4.3.1" />
1616
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
17-
<PackageReference Include="NUnit.Analyzers" Version="4.3.0">
17+
<PackageReference Include="NUnit.Analyzers" Version="4.5.0">
1818
<PrivateAssets>all</PrivateAssets>
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
</PackageReference>

‎Setup/CodeDependencies.iss‎

Lines changed: 76 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
; https://github.com/DomGries/InnoDependencyInstaller
1+
[Code]
2+
// https://github.com/DomGries/InnoDependencyInstaller
23
3-
4-
[Code]
54
// types and variables
65
type
76
TDependency_Entry = record
@@ -17,7 +16,7 @@ type
1716
var
1817
Dependency_Memo: String;
1918
Dependency_List: array of TDependency_Entry;
20-
Dependency_NeedRestart, Dependency_ForceX86: Boolean;
19+
Dependency_NeedToRestart, Dependency_ForceX86: Boolean;
2120
Dependency_DownloadPage: TDownloadWizardPage;
2221
2322
procedure Dependency_Add(const Filename, Parameters, Title, URL, Checksum: String; const ForceSuccess, RestartAfter: Boolean);
@@ -47,13 +46,13 @@ begin
4746
end;
4847
4948
<event('InitializeWizard')>
50-
procedure Dependency_Internal1;
49+
procedure Dependency_InitializeWizard;
5150
begin
5251
Dependency_DownloadPage := CreateDownloadPage(SetupMessage(msgWizardPreparing), SetupMessage(msgPreparingDesc), nil);
5352
end;
5453
5554
<event('PrepareToInstall')>
56-
function Dependency_Internal2(var NeedsRestart: Boolean): String;
55+
function Dependency_PrepareToInstall(var NeedsRestart: Boolean): String;
5756
var
5857
DependencyCount, DependencyIndex, ResultCode: Integer;
5958
Retry: Boolean;
@@ -102,10 +101,14 @@ begin
102101
103102
while True do begin
104103
ResultCode := 0;
104+
#ifdef Dependency_CustomExecute
105+
if {#Dependency_CustomExecute}(ExpandConstant('{tmp}{\}') + Dependency_List[DependencyIndex].Filename, Dependency_List[DependencyIndex].Parameters, ResultCode) then begin
106+
#else
105107
if ShellExec('', ExpandConstant('{tmp}{\}') + Dependency_List[DependencyIndex].Filename, Dependency_List[DependencyIndex].Parameters, '', SW_SHOWNORMAL, ewWaitUntilTerminated, ResultCode) then begin
108+
#endif
106109
if Dependency_List[DependencyIndex].RestartAfter then begin
107110
if DependencyIndex = DependencyCount - 1 then begin
108-
Dependency_NeedRestart := True;
111+
Dependency_NeedToRestart := True;
109112
end else begin
110113
NeedsRestart := True;
111114
Result := Dependency_List[DependencyIndex].Title;
@@ -118,7 +121,7 @@ begin
118121
Result := Dependency_List[DependencyIndex].Title;
119122
break;
120123
end else if ResultCode = 3010 then begin // ERROR_SUCCESS_REBOOT_REQUIRED (3010)
121-
Dependency_NeedRestart := True;
124+
Dependency_NeedToRestart := True;
122125
break;
123126
end;
124127
end;
@@ -152,8 +155,10 @@ begin
152155
end;
153156
end;
154157
158+
#ifndef Dependency_NoUpdateReadyMemo
155159
<event('UpdateReadyMemo')>
156-
function Dependency_Internal3(const Space, NewLine, MemoUserInfoInfo, MemoDirInfo, MemoTypeInfo, MemoComponentsInfo, MemoGroupInfo, MemoTasksInfo: String): String;
160+
#endif
161+
function Dependency_UpdateReadyMemo(const Space, NewLine, MemoUserInfoInfo, MemoDirInfo, MemoTypeInfo, MemoComponentsInfo, MemoGroupInfo, MemoTasksInfo: String): String;
157162
begin
158163
Result := '';
159164
if MemoUserInfoInfo <> '' then begin
@@ -184,9 +189,9 @@ begin
184189
end;
185190
186191
<event('NeedRestart')>
187-
function Dependency_Internal4: Boolean;
192+
function Dependency_NeedRestart: Boolean;
188193
begin
189-
Result := Dependency_NeedRestart;
194+
Result := Dependency_NeedToRestart;
190195
end;
191196
192197
function Dependency_IsX64: Boolean;
@@ -285,12 +290,24 @@ begin
285290
end;
286291
287292
procedure Dependency_AddDotNet48;
293+
begin
294+
// https://dotnet.microsoft.com/download/dotnet-framework/net48
295+
if not IsDotNetInstalled(net48, 0) then begin
296+
Dependency_Add('dotnetfx48.exe',
297+
'/lcid ' + IntToStr(GetUILanguage) + ' /passive /norestart',
298+
'.NET Framework 4.8',
299+
'https://go.microsoft.com/fwlink/?LinkId=2085155',
300+
'', False, False);
301+
end;
302+
end;
303+
304+
procedure Dependency_AddDotNet481;
288305
var
289306
Version: Cardinal;
290307
begin
291308
// https://dotnet.microsoft.com/download/dotnet-framework/net481
292309
if not RegQueryDWordValue(HKLM, 'SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full', 'Release', Version) or (Version < 533320) then begin
293-
Dependency_Add('dotnetfx48.exe',
310+
Dependency_Add('dotnetfx481.exe',
294311
'/lcid ' + IntToStr(GetUILanguage) + ' /passive /norestart',
295312
'.NET Framework 4.8.1',
296313
'https://go.microsoft.com/fwlink/?LinkId=2203304',
@@ -446,35 +463,71 @@ end;
446463
procedure Dependency_AddDotNet80;
447464
begin
448465
// https://dotnet.microsoft.com/download/dotnet/8.0
449-
if not Dependency_IsNetCoreInstalled('-n Microsoft.NETCore.App -v 8.0.0') then begin
466+
if not Dependency_IsNetCoreInstalled('-n Microsoft.NETCore.App -v 8.0.10') then begin
450467
Dependency_Add('dotnet80' + Dependency_ArchSuffix + '.exe',
451468
'/lcid ' + IntToStr(GetUILanguage) + ' /passive /norestart',
452-
'.NET Runtime 8.0.0' + Dependency_ArchTitle,
453-
Dependency_String('https://download.visualstudio.microsoft.com/download/pr/593685c9-7e98-455a-8e34-4b8ad1be9489/6ccf85c6fc244428d61f74ca3aee0645/dotnet-runtime-8.0.0-win-x86.exe', 'https://download.visualstudio.microsoft.com/download/pr/7f4d5cbc-4449-4ea5-9578-c467821f251f/b9b19f89d0642bf78f4b612c6a741637/dotnet-runtime-8.0.0-win-x64.exe'),
469+
'.NET Runtime 8.0.10' + Dependency_ArchTitle,
470+
Dependency_String('https://download.visualstudio.microsoft.com/download/pr/3f9cf5a6-d4d6-4fe0-a02b-cd700df1899b/75c95e00aab7258aed5f4ffe80526803/dotnet-runtime-8.0.10-win-x86.exe', 'https://download.visualstudio.microsoft.com/download/pr/f55ed80e-ba58-4ac8-a2b3-f2227cd628de/6fabf1c613cf9386d14ddbaaca1a5eb8/dotnet-runtime-8.0.10-win-x64.exe'),
454471
'', False, False);
455472
end;
456473
end;
457474
458475
procedure Dependency_AddDotNet80Asp;
459476
begin
460477
// https://dotnet.microsoft.com/download/dotnet/8.0
461-
if not Dependency_IsNetCoreInstalled('-n Microsoft.AspNetCore.App -v 8.0.0') then begin
478+
if not Dependency_IsNetCoreInstalled('-n Microsoft.AspNetCore.App -v 8.0.10') then begin
462479
Dependency_Add('dotnet80asp' + Dependency_ArchSuffix + '.exe',
463480
'/lcid ' + IntToStr(GetUILanguage) + ' /passive /norestart',
464-
'ASP.NET Core Runtime 8.0.0' + Dependency_ArchTitle,
465-
Dependency_String('https://download.visualstudio.microsoft.com/download/pr/66ae7d00-596a-4e36-be73-2ebc0c332329/e2f6e37933e204fef5687e338a95b749/aspnetcore-runtime-8.0.0-win-x86.exe', 'https://download.visualstudio.microsoft.com/download/pr/89d3660b-d344-47c5-a1cd-d8343a3f3779/9f55af82923dab7e3dce912f5c5b9d60/aspnetcore-runtime-8.0.0-win-x64.exe'),
481+
'ASP.NET Core Runtime 8.0.10' + Dependency_ArchTitle,
482+
Dependency_String('https://download.visualstudio.microsoft.com/download/pr/175256c9-8d8d-4f9a-a873-ff7b36161506/1b91f2b288e6077e30714485ebe8acb5/aspnetcore-runtime-8.0.10-win-x86.exe', 'https://download.visualstudio.microsoft.com/download/pr/a17b907f-8457-45a8-90db-53f2665ee49e/49bccd33593ebceb2847674fe5fd768e/aspnetcore-runtime-8.0.10-win-x64.exe'),
466483
'', False, False);
467484
end;
468485
end;
469486
470487
procedure Dependency_AddDotNet80Desktop;
471488
begin
472489
// https://dotnet.microsoft.com/download/dotnet/8.0
473-
if not Dependency_IsNetCoreInstalled('-n Microsoft.WindowsDesktop.App -v 8.0.0') then begin
490+
if not Dependency_IsNetCoreInstalled('-n Microsoft.WindowsDesktop.App -v 8.0.10') then begin
474491
Dependency_Add('dotnet80desktop' + Dependency_ArchSuffix + '.exe',
475492
'/lcid ' + IntToStr(GetUILanguage) + ' /passive /norestart',
476-
'.NET Desktop Runtime 8.0.0' + Dependency_ArchTitle,
477-
Dependency_String('https://download.visualstudio.microsoft.com/download/pr/f9e3b581-059d-429f-9f0d-1d1167ff7e32/bd7661030cd5d66cd3eee0fd20b24540/windowsdesktop-runtime-8.0.0-win-x86.exe', 'https://download.visualstudio.microsoft.com/download/pr/b280d97f-25a9-4ab7-8a12-8291aa3af117/a37ed0e68f51fcd973e9f6cb4f40b1a7/windowsdesktop-runtime-8.0.0-win-x64.exe'),
493+
'.NET Desktop Runtime 8.0.10' + Dependency_ArchTitle,
494+
Dependency_String('https://download.visualstudio.microsoft.com/download/pr/9836a475-66af-47eb-a726-8046c47ce6d5/ccb7d60db407a6d022a856852ef9e763/windowsdesktop-runtime-8.0.10-win-x86.exe', 'https://download.visualstudio.microsoft.com/download/pr/f398d462-9d4e-4b9c-abd3-86c54262869a/4a8e3a10ca0a9903a989578140ef0499/windowsdesktop-runtime-8.0.10-win-x64.exe'),
495+
'', False, False);
496+
end;
497+
end;
498+
499+
procedure Dependency_AddDotNet90;
500+
begin
501+
// https://dotnet.microsoft.com/download/dotnet/9.0
502+
if not Dependency_IsNetCoreInstalled('-n Microsoft.NETCore.App -v 9.0.0') then begin
503+
Dependency_Add('dotnet90' + Dependency_ArchSuffix + '.exe',
504+
'/lcid ' + IntToStr(GetUILanguage) + ' /passive /norestart',
505+
'.NET Runtime 9.0.0' + Dependency_ArchTitle,
506+
Dependency_String('https://download.visualstudio.microsoft.com/download/pr/0e89cce9-dc02-423c-a657-0c2b421edf21/af2e916785775fe7e023b953af404db5/dotnet-runtime-9.0.0-win-x86.exe', 'https://download.visualstudio.microsoft.com/download/pr/99bd07c2-c95c-44dc-9d47-36d3b18df240/bdf26c62f69c1b783687c1dce83ccf7a/dotnet-runtime-9.0.0-win-x64.exe'),
507+
'', False, False);
508+
end;
509+
end;
510+
511+
procedure Dependency_AddDotNet90Asp;
512+
begin
513+
// https://dotnet.microsoft.com/download/dotnet/9.0
514+
if not Dependency_IsNetCoreInstalled('-n Microsoft.AspNetCore.App -v 9.0.0') then begin
515+
Dependency_Add('dotnet90asp' + Dependency_ArchSuffix + '.exe',
516+
'/lcid ' + IntToStr(GetUILanguage) + ' /passive /norestart',
517+
'ASP.NET Core Runtime 9.0.0' + Dependency_ArchTitle,
518+
Dependency_String('https://download.visualstudio.microsoft.com/download/pr/70c1a68c-e5e4-45ef-9f2c-df1d3f195a2e/6b8e20fe1e45f886e464908cf18efd96/aspnetcore-runtime-9.0.0-win-x86.exe', 'https://download.visualstudio.microsoft.com/download/pr/815e6104-b92c-4cd5-8971-cba2f685002a/37befaa217f3269a152016da80a922c1/aspnetcore-runtime-9.0.0-win-x64.exe'),
519+
'', False, False);
520+
end;
521+
end;
522+
523+
procedure Dependency_AddDotNet90Desktop;
524+
begin
525+
// https://dotnet.microsoft.com/download/dotnet/9.0
526+
if not Dependency_IsNetCoreInstalled('-n Microsoft.WindowsDesktop.App -v 9.0.0') then begin
527+
Dependency_Add('dotnet90desktop' + Dependency_ArchSuffix + '.exe',
528+
'/lcid ' + IntToStr(GetUILanguage) + ' /passive /norestart',
529+
'.NET Desktop Runtime 9.0.0' + Dependency_ArchTitle,
530+
Dependency_String('https://download.visualstudio.microsoft.com/download/pr/8dfbde7b-c316-418d-934a-d3246253f342/69c6a35b77a4f01b95588e1df2bddf9a/windowsdesktop-runtime-9.0.0-win-x86.exe', 'https://download.visualstudio.microsoft.com/download/pr/685792b6-4827-4dca-a971-bce5d7905170/1bf61b02151bc56e763dc711e45f0e1e/windowsdesktop-runtime-9.0.0-win-x64.exe'),
478531
'', False, False);
479532
end;
480533
end;
@@ -542,7 +595,7 @@ end;
542595
procedure Dependency_AddVC2015To2022;
543596
begin
544597
// https://docs.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist
545-
if not IsMsiProductInstalled(Dependency_String('{65E5BD06-6392-3027-8C26-853107D3CF1A}', '{36F68A90-239C-34DF-B58C-64B30153CE35}'), PackVersionComponents(14, 30, 30704, 0)) then begin
598+
if not IsMsiProductInstalled(Dependency_String('{65E5BD06-6392-3027-8C26-853107D3CF1A}', '{36F68A90-239C-34DF-B58C-64B30153CE35}'), PackVersionComponents(14, 30, 33810, 0)) then begin
546599
Dependency_Add('vcredist2022' + Dependency_ArchSuffix + '.exe',
547600
'/passive /norestart',
548601
'Visual C++ 2015-2022 Redistributable' + Dependency_ArchTitle,
@@ -715,4 +768,4 @@ Source: "{#Dependency_Path_NetCoreCheck}netcorecheck_x64.exe"; Flags: dontcopy n
715768

716769
#ifdef Dependency_Path_DirectX
717770
Source: "{#Dependency_Path_DirectX}dxwebsetup.exe"; Flags: dontcopy noencryption
718-
#endif
771+
#endif

‎Setup/LinuxBuildZipper.ps1‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
$parentFolder = Split-Path -parent $PSScriptRoot
22

33
# Get publish folder
4-
$folder = "$parentFolder\MSURandomizer\bin\Release\net8.0\linux-x64\publish"
5-
$winFolder = "$parentFolder\MSURandomizer\bin\Release\net8.0-windows\win-x86\publish"
4+
$folder = "$parentFolder\MSURandomizer\bin\Release\net9.0\linux-x64\publish"
5+
$winFolder = "$parentFolder\MSURandomizer\bin\Release\net9.0-windows\win-x86\publish"
66
if (-not (Test-Path $folder))
77
{
8-
$folder = "$parentFolder\MSURandomizer\bin\Release\net8.0\publish\linux-x64"
9-
$winFolder = "$parentFolder\MSURandomizer\bin\Release\net8.0-windows\publish\win-x86"
8+
$folder = "$parentFolder\MSURandomizer\bin\Release\net9.0\publish\linux-x64"
9+
$winFolder = "$parentFolder\MSURandomizer\bin\Release\net9.0-windows\publish\win-x86"
1010
}
1111

1212
# Get version number from Randomizer.App

‎Setup/MSURandomizer.iss‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define MyAppPublisher "MattEqualsCoder"
88
#define MyAppURL "https://github.com/MattEqualsCoder"
99
#define MyAppExeName "MSURandomizer.exe"
10-
#define MyAppVersion GetStringFileInfo("..\MSURandomizer\bin\Release\net8.0\win-x64\publish\" + MyAppExeName, "ProductVersion")
10+
#define MyAppVersion GetStringFileInfo("..\MSURandomizer\bin\Release\net9.0\win-x64\publish\" + MyAppExeName, "ProductVersion")
1111
#define MyAppVersion Copy(MyAppVersion, 0, Pos('+', MyAppVersion)-1)
1212

1313
[Setup]
@@ -34,8 +34,8 @@ WizardStyle=modern
3434
[Code]
3535
function InitializeSetup: Boolean;
3636
begin
37-
Dependency_AddDotNet80Desktop;
38-
Dependency_AddDotNet80Asp;
37+
Dependency_AddDotNet90Desktop;
38+
Dependency_AddDotNet90Asp;
3939
Result := True;
4040
end;
4141
@@ -48,8 +48,8 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
4848
[Files]
4949
Source: "netcorecheck.exe"; Flags: dontcopy noencryption
5050
Source: "netcorecheck_x64.exe"; Flags: dontcopy noencryption
51-
Source: "..\MSURandomizer\bin\Release\net8.0\win-x64\publish\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; Check: Is64BitInstallMode;
52-
Source: "..\MSURandomizer\bin\Release\net8.0\win-x86\publish\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; Check: "not Is64BitInstallMode";
51+
Source: "..\MSURandomizer\bin\Release\net9.0\win-x64\publish\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; Check: Is64BitInstallMode;
52+
Source: "..\MSURandomizer\bin\Release\net9.0\win-x86\publish\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; Check: "not Is64BitInstallMode";
5353
; Source: "..\ConfigRepo\resources\snes\*"; Excludes: "*.txt,*.bps"; DestDir: "{localappdata}\MSURandomizer\Configs\snes"; Flags: ignoreversion recursesubdirs createallsubdirs
5454
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
5555

0 commit comments

Comments
 (0)