update to newest oneware

one-ware · Feb 29, 2024 · 669f411 · 669f411
1 parent 734bf3b
commit 669f411
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/src/OneWare.NetlistSvg/NetlistSvgModule.cs b/src/OneWare.NetlistSvg/NetlistSvgModule.cs
@@ -1,7 +1,8 @@
 using CommunityToolkit.Mvvm.Input;
 using OneWare.NetlistSvg.Services;
-using OneWare.SDK.Models;
-using OneWare.SDK.Services;
+using OneWare.Essentials.Models;
+using OneWare.Essentials.Services;
+using OneWare.Essentials.ViewModels;
 using Prism.Ioc;
 using Prism.Modularity;
 
@@ -24,7 +25,7 @@ public void OnInitialized(IContainerProvider containerProvider)
             {
                 return new[]
                 {
-                    new MenuItemModel("NetlistSvg")
+                    new MenuItemViewModel("NetlistSvg")
                     {
                         Header = "Convert to SVG",
                         Command = new AsyncRelayCommand(() => netListSvgService.ShowSchemeAsync(json))

diff --git a/src/OneWare.NetlistSvg/OneWare.NetlistSvg.csproj b/src/OneWare.NetlistSvg/OneWare.NetlistSvg.csproj
@@ -16,7 +16,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="OneWare.SDK" Version="0.12.1.0" Private="false" ExcludeAssets="runtime;Native"/>
+        <PackageReference Include="OneWare.Essentials" Version="0.1" Private="false" ExcludeAssets="runtime;Native"/>
     </ItemGroup>
 
 </Project>
diff --git a/src/OneWare.NetlistSvg/Services/NetlistSvgService.cs b/src/OneWare.NetlistSvg/Services/NetlistSvgService.cs
@@ -5,26 +5,26 @@
 using Esprima;
 using Esprima.Ast;
 using Jint;
-using OneWare.SDK.Enums;
-using OneWare.SDK.Models;
-using OneWare.SDK.Services;
+using OneWare.Essentials.Enums;
+using OneWare.Essentials.Models;
+using OneWare.Essentials.Services;
 using Color = Avalonia.Media.Color;
 
 namespace OneWare.NetlistSvg.Services;
 
 public class NetlistSvgService
 {
     private readonly ILogger _logger;
-    private readonly IActive _active;
+    private readonly IApplicationStateService _applicationStateService;
     private readonly IDockService _dockService;
 
     private Script? _script1;
     private Script? _script2;
 
-    public NetlistSvgService(ILogger logger, IActive active, IDockService dockService)
+    public NetlistSvgService(ILogger logger, IApplicationStateService active, IDockService dockService)
     {
         _logger = logger;
-        _active = active;
+        _applicationStateService = active;
         _dockService = dockService;
 
         _ = LoadScriptsAsync();
@@ -74,7 +74,7 @@ public async Task ShowSchemeAsync(IProjectFile jsonFile)
         _output = string.Empty;
 
         var cancel = new CancellationTokenSource();
-        var state = _active.AddState("Rendering Scheme...", AppState.Loading,  () => cancel.Cancel());
+        var state = _applicationStateService.AddState("Rendering Scheme...", AppState.Loading,  () => cancel.Cancel());
 
         var theme = Application.Current!.ActualThemeVariant;
         var skin = LoadSkin(theme);
@@ -149,7 +149,7 @@ await Task.Run(() =>
             return null;
         }
 
-        _active.RemoveState(state);
+        _applicationStateService.RemoveState(state);
         return cancel.IsCancellationRequested ? null : _output;
     }
 

diff --git a/src/OneWare.NetlistSvg/oneware.json b/src/OneWare.NetlistSvg/oneware.json
@@ -1,9 +1,9 @@
 {
   "Dependencies": [
     {
-      "Name": "OneWare.SDK",
-      "MinVersion": "0.12.1.0",
-      "MaxVersion": "0.12.1.0"
+      "Name": "OneWare.Essentials",
+      "MinVersion": "0.1.0.0",
+      "MaxVersion": "0.1.0.0"
     }
   ]
 }