diff --git a/AdamSetup.devel.iss b/AdamSetup.devel.iss index 11134cb..3ace501 100644 --- a/AdamSetup.devel.iss +++ b/AdamSetup.devel.iss @@ -8,6 +8,7 @@ #define MyAppExeName "AdamStudio.exe" #define InstallerIconPath "AdamStudio.Core\Properties\Icons\main_app_icon.ico" #define AppReleaseFolderPath "AdamStudio\bin\Debug\net8.0-windows7.0\" +#define EdgeWebView2ExeName "MicrosoftEdgeWebView2RuntimeInstaller.1.3.195.25.X64.exe" #define MyAppVersion GetVersionNumbersString(AppReleaseFolderPath + MyAppExeName) [Setup] @@ -43,10 +44,9 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{ Source: "{#AppReleaseFolderPath}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs Source: "AdamInstallBundle\Utils\7za.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall; Source: "AdamInstallBundle\Source\BlocklySource.zip"; DestDir: "{tmp}"; Flags: deleteafterinstall; -Source: "AdamInstallBundle\Components\MicrosoftEdgeWebView2RuntimeInstaller.125.0.2535.51.X64.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall; +Source: "AdamInstallBundle\Components\{#EdgeWebView2ExeName}"; DestDir: "{tmp}"; Flags: deleteafterinstall; Source: "AdamInstallBundle\Components\VC_redist.14.29.30135.0.x64.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall; Source: "AdamInstallBundle\Components\windowsdesktop-runtime-8.0.5-win-x64.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall; -;Source: "AdamInstallBundle\Components\aspnetcore-runtime-8.0.5-win-x64.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall; [Icons] Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" @@ -55,10 +55,9 @@ Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: de [Run] Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent; Filename: "{tmp}\7za.exe"; Parameters: "x ""{tmp}\BlocklySource.zip"" -o""{commonappdata}\{#MyAppName}\BlocklySource"" * -r -aoa"; Flags: runasoriginaluser runhidden; -Filename: "{tmp}\MicrosoftEdgeWebView2RuntimeInstaller.125.0.2535.51.X64.exe"; Parameters: "/silent /install"; +Filename: "{tmp}\{#EdgeWebView2ExeName}"; Parameters: "/silent /install"; Filename: "{tmp}\VC_redist.14.29.30135.0.x64.exe"; Parameters: "/install /quiet /norestart"; Filename: "{tmp}\windowsdesktop-runtime-8.0.5-win-x64.exe"; Parameters: "/install /quiet /norestart"; -;Filename: "{tmp}\aspnetcore-runtime-8.0.5-win-x64.exe"; Parameters: "/install /quiet /norestart"; [Registry] diff --git a/AdamSetup.release.iss b/AdamSetup.release.iss index 4c983f8..d8f71d7 100644 --- a/AdamSetup.release.iss +++ b/AdamSetup.release.iss @@ -8,6 +8,7 @@ #define MyAppExeName "AdamStudio.exe" #define InstallerIconPath "AdamStudio.Core\Properties\Icons\main_app_icon.ico" #define AppReleaseFolderPath "AdamStudio\bin\Release\net8.0-windows7.0\" +#define EdgeWebView2ExeName "MicrosoftEdgeWebView2RuntimeInstaller.1.3.195.25.X64.exe" #define MyAppVersion GetVersionNumbersString(AppReleaseFolderPath + MyAppExeName) [Setup] @@ -44,11 +45,9 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{ Source: "{#AppReleaseFolderPath}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs Source: "AdamInstallBundle\Utils\7za.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall; Source: "AdamInstallBundle\Source\BlocklySource.zip"; DestDir: "{tmp}"; Flags: deleteafterinstall; -Source: "AdamInstallBundle\Components\MicrosoftEdgeWebView2RuntimeInstaller.125.0.2535.51.X64.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall; +Source: "AdamInstallBundle\Components\{#EdgeWebView2ExeName}"; DestDir: "{tmp}"; Flags: deleteafterinstall; Source: "AdamInstallBundle\Components\VC_redist.14.29.30135.0.x64.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall; Source: "AdamInstallBundle\Components\windowsdesktop-runtime-8.0.5-win-x64.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall; -;Source: "AdamInstallBundle\Components\aspnetcore-runtime-8.0.5-win-x64.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall; - [Icons] Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" @@ -57,10 +56,9 @@ Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: de [Run] Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent; Filename: "{tmp}\7za.exe"; Parameters: "x ""{tmp}\BlocklySource.zip"" -o""{commonappdata}\{#MyAppName}\BlocklySource"" * -r -aoa"; Flags: runasoriginaluser runhidden; -Filename: "{tmp}\MicrosoftEdgeWebView2RuntimeInstaller.125.0.2535.51.X64.exe"; Parameters: "/silent /install"; +Filename: "{tmp}\{#EdgeWebView2ExeName}"; Parameters: "/silent /install"; Filename: "{tmp}\VC_redist.14.29.30135.0.x64.exe"; Parameters: "/install /quiet /norestart"; Filename: "{tmp}\windowsdesktop-runtime-8.0.5-win-x64.exe"; Parameters: "/install /quiet /norestart"; -;Filename: "{tmp}\aspnetcore-runtime-8.0.5-win-x64.exe"; Parameters: "/install /quiet /norestart"; [Registry] Root: HKLM64; Subkey: "SOFTWARE\{#MyAppPublisher}\{#MyAppName}"; ValueType: string; ValueName: "AppVersion"; ValueData: "{#MyAppVersion}"; Permissions: users-modify; Flags: uninsdeletevalue diff --git a/AdamStudio.Services/AdamStudio.Services.csproj b/AdamStudio.Services/AdamStudio.Services.csproj index 2ed8d6a..a0e7eb2 100644 --- a/AdamStudio.Services/AdamStudio.Services.csproj +++ b/AdamStudio.Services/AdamStudio.Services.csproj @@ -9,7 +9,7 @@ - + diff --git a/AdamStudio/AdamStudio.csproj b/AdamStudio/AdamStudio.csproj index 260bd65..d30b593 100644 --- a/AdamStudio/AdamStudio.csproj +++ b/AdamStudio/AdamStudio.csproj @@ -3,8 +3,8 @@ Dynamic False MIT-Modern-Variant - 2.0.1.2 - 2.0.1.2 + 2.0.1.3 + 2.0.1.3 net8.0-windows7.0