Close #108

Up version
Adam-Software · Nov 8, 2024 · d63097e · d63097e
1 parent ff170d7
commit d63097e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git 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
@@ -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
@@ -9,7 +9,7 @@
     <PackageReference Include="FFmpeg.zgabi.FFME.Windows.6.0.2" Version="1.0.13" />
     <PackageReference Include="MahApps.Metro" Version="2.4.10" />
     <PackageReference Include="MahApps.Metro.IconPacks" Version="5.1.0" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2592.51" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2849.39" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
     <PackageReference Include="NetCoreServer" Version="8.0.7" />
     <PackageReference Include="PortableSettingsProvider" Version="0.2.5" />

diff --git a/AdamStudio/AdamStudio.csproj b/AdamStudio/AdamStudio.csproj
@@ -3,8 +3,8 @@
     <WebView2LoaderPreference>Dynamic</WebView2LoaderPreference>
     <WebView2UseWinRT>False</WebView2UseWinRT>
     <PackageLicenseExpression>MIT-Modern-Variant</PackageLicenseExpression>
-    <AssemblyVersion>2.0.1.2</AssemblyVersion>
-    <FileVersion>2.0.1.2</FileVersion>
+    <AssemblyVersion>2.0.1.3</AssemblyVersion>
+    <FileVersion>2.0.1.3</FileVersion>
   </PropertyGroup>
   <PropertyGroup>
     <TargetFramework>net8.0-windows7.0</TargetFramework>