From 102b7ccf44559ef7acd15d54a52b2a6206de0b8a Mon Sep 17 00:00:00 2001 From: Alexey Nesterov Date: Mon, 13 May 2024 11:40:41 +1000 Subject: [PATCH 1/5] Fix #61 --- .../AdamController.Modules.ContentRegion.csproj | 1 + .../ViewModels/ScratchControlViewModel.cs | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/AdamController.Modules.ContentRegion/AdamController.Modules.ContentRegion.csproj b/Modules/AdamController.Modules.ContentRegion/AdamController.Modules.ContentRegion.csproj index ecb20a5..6da134c 100644 --- a/Modules/AdamController.Modules.ContentRegion/AdamController.Modules.ContentRegion.csproj +++ b/Modules/AdamController.Modules.ContentRegion/AdamController.Modules.ContentRegion.csproj @@ -2,6 +2,7 @@ net7.0-windows7.0 true + true diff --git a/Modules/AdamController.Modules.ContentRegion/ViewModels/ScratchControlViewModel.cs b/Modules/AdamController.Modules.ContentRegion/ViewModels/ScratchControlViewModel.cs index d8c04c7..1484a14 100644 --- a/Modules/AdamController.Modules.ContentRegion/ViewModels/ScratchControlViewModel.cs +++ b/Modules/AdamController.Modules.ContentRegion/ViewModels/ScratchControlViewModel.cs @@ -4,7 +4,6 @@ using AdamBlocklyLibrary.Toolbox; using AdamBlocklyLibrary.ToolboxSets; using AdamController.Controls.CustomControls.Services; -using AdamController.Controls.Enums; using AdamController.Core; using AdamController.Core.Extensions; using AdamController.Core.Mvvm; From 37927fdfe699a4532eb495495c872f5effdd98d9 Mon Sep 17 00:00:00 2001 From: Alexey Nesterov Date: Mon, 13 May 2024 11:45:19 +1000 Subject: [PATCH 2/5] Update build script --- AdamSetup.devel.iss | 6 +++--- AdamSetup.release.iss | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/AdamSetup.devel.iss b/AdamSetup.devel.iss index 92742be..67648d8 100644 --- a/AdamSetup.devel.iss +++ b/AdamSetup.devel.iss @@ -2,11 +2,11 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "AdamStudio" -#define MyAppPublisher "AdamStudioProduction" +#define MyAppPublisher "AdamSoftware" #define MyAppURL "https://robotco.ru/" -#define MySupportURL = "https://github.com/vertigra/Adam-IDE" +#define MySupportURL = "https://github.com/Adam-Software/Adam-IDE" #define MyAppExeName "AdamController.exe" -#define InstallerIconPath "AdamController\Images\Icons\AdamIconAndRGBPageIcon.ico" +#define InstallerIconPath "AdamController.Core\Properties\Icons\main_app_icon.ico" #define AppReleaseFolderPath "AdamController\bin\Debug\net7.0-windows\" #define MyAppVersion GetVersionNumbersString(AppReleaseFolderPath + MyAppExeName) diff --git a/AdamSetup.release.iss b/AdamSetup.release.iss index 847cbc0..82f0fc2 100644 --- a/AdamSetup.release.iss +++ b/AdamSetup.release.iss @@ -2,11 +2,11 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "AdamStudio" -#define MyAppPublisher "AdamStudioProduction" +#define MyAppPublisher "AdamSoftware" #define MyAppURL "https://robotco.ru/" -#define MySupportURL = "https://github.com/vertigra/Adam-IDE" +#define MySupportURL = "https://github.com/Adam-Software/Adam-IDE" #define MyAppExeName "AdamController.exe" -#define InstallerIconPath "AdamController\Images\Icons\AdamIconAndRGBPageIcon.ico" +#define InstallerIconPath "AdamController.Core\Properties\Icons\main_app_icon.ico" #define AppReleaseFolderPath "AdamController\bin\Release\net7.0-windows\" #define MyAppVersion GetVersionNumbersString(AppReleaseFolderPath + MyAppExeName) From afd15395bb0bcd253c216a96e76978ed9e095869 Mon Sep 17 00:00:00 2001 From: Alexey Nesterov Date: Mon, 13 May 2024 11:55:45 +1000 Subject: [PATCH 3/5] Close #61 Up version 2.0.0.0=>2.0.0.1 --- AdamController/AdamController.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AdamController/AdamController.csproj b/AdamController/AdamController.csproj index 8d6999a..ac2d374 100644 --- a/AdamController/AdamController.csproj +++ b/AdamController/AdamController.csproj @@ -3,8 +3,8 @@ Dynamic False MIT-Modern-Variant - 2.0.0.0 - 2.0.0.0 + 2.0.0.1 + 2.0.0.1 net7.0-windows From 2ad0691dba5ec401ceabe048331f359b9d27ed3d Mon Sep 17 00:00:00 2001 From: Alexey Nesterov Date: Mon, 13 May 2024 13:08:19 +1000 Subject: [PATCH 4/5] Re-close #61. Up version 2.0.0.1 => 2.0.0.2 --- AdamController/AdamController.csproj | 4 ++-- .../AdamController.Modules.ContentRegion.csproj | 1 - .../Views/ScratchControlView.xaml.cs | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/AdamController/AdamController.csproj b/AdamController/AdamController.csproj index ac2d374..4d7e7e6 100644 --- a/AdamController/AdamController.csproj +++ b/AdamController/AdamController.csproj @@ -3,8 +3,8 @@ Dynamic False MIT-Modern-Variant - 2.0.0.1 - 2.0.0.1 + 2.0.0.2 + 2.0.0.2 net7.0-windows diff --git a/Modules/AdamController.Modules.ContentRegion/AdamController.Modules.ContentRegion.csproj b/Modules/AdamController.Modules.ContentRegion/AdamController.Modules.ContentRegion.csproj index 6da134c..ecb20a5 100644 --- a/Modules/AdamController.Modules.ContentRegion/AdamController.Modules.ContentRegion.csproj +++ b/Modules/AdamController.Modules.ContentRegion/AdamController.Modules.ContentRegion.csproj @@ -2,7 +2,6 @@ net7.0-windows7.0 true - true diff --git a/Modules/AdamController.Modules.ContentRegion/Views/ScratchControlView.xaml.cs b/Modules/AdamController.Modules.ContentRegion/Views/ScratchControlView.xaml.cs index 38efa24..0abaee8 100644 --- a/Modules/AdamController.Modules.ContentRegion/Views/ScratchControlView.xaml.cs +++ b/Modules/AdamController.Modules.ContentRegion/Views/ScratchControlView.xaml.cs @@ -107,14 +107,14 @@ private void TextResulEditorTextChanged(object sender, EventArgs e) private async void InitializeWebViewCore() { CoreWebView2Environment env = await CoreWebView2Environment.CreateAsync(userDataFolder: mPath); - await WebView.EnsureCoreWebView2Async(env); + await WebView?.EnsureCoreWebView2Async(env); } private void WebViewCoreWebView2InitializationCompleted(object sender, CoreWebView2InitializationCompletedEventArgs e) { WebView.CoreWebView2.Settings.AreDefaultContextMenusEnabled = !Settings.Default.DontShowBrowserMenuInBlockly; - WebView.CoreWebView2.SetVirtualHostNameToFolderMapping("localhost", mPathToSource, CoreWebView2HostResourceAccessKind.Allow); - WebView.CoreWebView2.Navigate("https://localhost/index.html"); + WebView?.CoreWebView2?.SetVirtualHostNameToFolderMapping("localhost", mPathToSource, CoreWebView2HostResourceAccessKind.Allow); + WebView?.CoreWebView2?.Navigate("https://localhost/index.html"); } private void WebViewWebMessageReceived(object sender, CoreWebView2WebMessageReceivedEventArgs e) From 12d7958f49949d6b26c712f7f806fb727fb83c9d Mon Sep 17 00:00:00 2001 From: Alexey Nesterov Date: Mon, 13 May 2024 13:47:46 +1000 Subject: [PATCH 5/5] Fix temp path Up version 1.0.0.2 => 1.0.0.3 --- AdamController/AdamController.csproj | 4 ++-- .../Views/ScratchControlView.xaml.cs | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/AdamController/AdamController.csproj b/AdamController/AdamController.csproj index 4d7e7e6..afeb6a8 100644 --- a/AdamController/AdamController.csproj +++ b/AdamController/AdamController.csproj @@ -3,8 +3,8 @@ Dynamic False MIT-Modern-Variant - 2.0.0.2 - 2.0.0.2 + 2.0.0.3 + 2.0.0.3 net7.0-windows diff --git a/Modules/AdamController.Modules.ContentRegion/Views/ScratchControlView.xaml.cs b/Modules/AdamController.Modules.ContentRegion/Views/ScratchControlView.xaml.cs index 0abaee8..057c1fb 100644 --- a/Modules/AdamController.Modules.ContentRegion/Views/ScratchControlView.xaml.cs +++ b/Modules/AdamController.Modules.ContentRegion/Views/ScratchControlView.xaml.cs @@ -27,7 +27,6 @@ public partial class ScratchControlView : UserControl #region Var private readonly string mPathToSource; - private readonly string mPath; #endregion @@ -41,7 +40,6 @@ public ScratchControlView(IWebViewProvider webViewProvider, IStatusBarNotificati mControlHelper = controlHelper; mPathToSource = Path.Combine(folderManagment.CommonDirAppData, "BlocklySource"); - mPath = Path.Combine(Path.GetTempPath(), "AdamBrowser"); WebView.CoreWebView2InitializationCompleted += WebViewCoreWebView2InitializationCompleted; WebView.NavigationCompleted += WebViewNavigationCompleted; @@ -106,7 +104,8 @@ private void TextResulEditorTextChanged(object sender, EventArgs e) private async void InitializeWebViewCore() { - CoreWebView2Environment env = await CoreWebView2Environment.CreateAsync(userDataFolder: mPath); + var tempPath = Path.Combine(Path.GetTempPath(), "AdamBrowser"); + CoreWebView2Environment env = await CoreWebView2Environment.CreateAsync(userDataFolder: tempPath); await WebView?.EnsureCoreWebView2Async(env); }