Merge pull request #99 from strem-app/chore/update-dependencies

Chore/update dependencies
strem-app · Dec 30, 2024 · 20a5f93 · 20a5f93
2 parents 22f1e45 + 07bfa9d
commit 20a5f93
Show file tree

Hide file tree

Showing 27 changed files with 109 additions and 77 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -5,14 +5,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Setup .NET 8.0
+      - name: Setup .NET 9.0
         uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 9.0.x
       - name: Run Build Script
         shell: pwsh
         run: |
-          ./build.ps1 --buildNo='0.9.${{github.run_number}}' --target='build-and-test'
+          ./build.ps1 --buildNo='0.10.${{github.run_number}}' --target='build-and-test'
       - name: Publish Test Results
         uses: EnricoMi/publish-unit-test-result-action@v2
         with:
@@ -35,7 +35,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: Package App Script
         shell: pwsh
-        run: ./build.ps1 --buildNo='0.9.${{github.run_number}}' --target='publish'
+        run: ./build.ps1 --buildNo='0.10.${{github.run_number}}' --target='publish'
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1

diff --git a/src/Strem.Build/Strem.Build.csproj b/src/Strem.Build/Strem.Build.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <IsPackable>false</IsPackable>
@@ -13,6 +13,7 @@
       <PackageReference Include="Cake.Coverlet" Version="2.5.4" />
       <PackageReference Include="Cake.Frosting" Version="2.2.0" />
       <PackageReference Include="Glob" Version="1.1.9" />
+      <PackageReference Include="System.Reactive" Version="6.0.1" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Strem.Core/Events/Broker/MessageBroker.cs b/src/Strem.Core/Events/Broker/MessageBroker.cs
@@ -9,7 +9,7 @@ public class MessageBroker : IMessageBroker, IDisposable
 
     public void Publish<T>(T message)
     {
-        object notifier;
+        object? notifier;
         lock (_notifiers)
         {
             if (_isDisposed) { return; }

diff --git a/src/Strem.Core/Services/Browsers/File/IFileBrowser.cs b/src/Strem.Core/Services/Browsers/File/IFileBrowser.cs
@@ -2,6 +2,6 @@
 
 public interface IFileBrowser
 {
-    string BrowseToOpenFile(string startingDirectory = null, string filterList = null);
-    string BrowseToSaveFile(string startingDirectory = null, string filterList = null);
+    string BrowseToOpenFile(string? startingDirectory = null, string? filterList = null);
+    string BrowseToSaveFile(string? startingDirectory = null, string? filterList = null);
 }
diff --git a/src/Strem.Core/Services/Validation/Attributes/IsFloatAttribute.cs b/src/Strem.Core/Services/Validation/Attributes/IsFloatAttribute.cs
@@ -4,7 +4,7 @@ namespace Strem.Core.Services.Validation.Attributes;
 
 public class IsFloatAttribute : ValidationAttribute
 {
-    protected override ValidationResult IsValid(object value, ValidationContext validationContext)
+    protected override ValidationResult IsValid(object? value, ValidationContext validationContext)
     {
         if (value == null) { return ValidationResult.Success;}
 

diff --git a/src/Strem.Core/Strem.Core.csproj b/src/Strem.Core/Strem.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <OutputType>Library</OutputType>
@@ -11,11 +11,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
-      <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+      <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-      <PackageReference Include="SharpHook.Reactive" Version="5.3.1" />
-      <PackageReference Include="System.Reactive" Version="6.0.0" />
+      <PackageReference Include="SharpHook.Reactive" Version="5.3.8" />
+      <PackageReference Include="System.Reactive" Version="6.0.1" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Strem.Core/Variables/Variables.cs b/src/Strem.Core/Variables/Variables.cs
@@ -14,7 +14,7 @@ public class Variables : IVariables
     [JsonIgnore]
     public IObservable<KeyValuePair<VariableEntry, string>> OnVariableChanged => OnChangedSubject;
 
-    public Variables(Dictionary<VariableEntry, string> state = null)
+    public Variables(Dictionary<VariableEntry, string>? state = null)
     { Data = state ?? new Dictionary<VariableEntry, string>(); }
 
     public VariableEntry FindFullyQualifiedEntry(string variableName)

diff --git a/src/Strem.Data/Strem.Data.csproj b/src/Strem.Data/Strem.Data.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <IsPackable>true</IsPackable>
@@ -10,7 +10,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="LiteDB" Version="5.0.19" />
+      <PackageReference Include="LiteDB" Version="5.0.21" />
+      <PackageReference Include="System.Reactive" Version="6.0.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Strem.Flows.Default/Strem.Flows.Default.csproj b/src/Strem.Flows.Default/Strem.Flows.Default.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <OutputType>Library</OutputType>
@@ -16,13 +16,14 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="BlazorMonaco" Version="3.1.0" />
-        <PackageReference Include="IronPython" Version="3.4.1" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0" />
-        <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.4.1" />
-        <PackageReference Include="RestSharp" Version="108.0.1" />
-        <PackageReference Include="SharpHook.Reactive" Version="5.3.1" />
-        <PackageReference Include="Westwind.Scripting" Version="1.4.1" />
+        <PackageReference Include="BlazorMonaco" Version="3.3.0" />
+        <PackageReference Include="IronPython" Version="3.4.2" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
+        <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.4.6" />
+        <PackageReference Include="RestSharp" Version="112.1.0" />
+        <PackageReference Include="SharpHook.Reactive" Version="5.3.8" />
+        <PackageReference Include="System.Reactive" Version="6.0.1" />
+        <PackageReference Include="Westwind.Scripting" Version="1.5.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Strem.Flows/Strem.Flows.csproj b/src/Strem.Flows/Strem.Flows.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <OutputType>Library</OutputType>
@@ -11,10 +11,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
-      <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+      <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-      <PackageReference Include="System.Reactive" Version="6.0.0" />
+      <PackageReference Include="System.Reactive" Version="6.0.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Strem.Infrastructure/Strem.Infrastructure.csproj b/src/Strem.Infrastructure/Strem.Infrastructure.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <OutputType>Library</OutputType>
@@ -18,12 +18,13 @@
 
     <ItemGroup>
       <PackageReference Include="Glob" Version="1.1.9" />
-      <PackageReference Include="LiteDB" Version="5.0.19" />
+      <PackageReference Include="LiteDB" Version="5.0.21" />
       <PackageReference Include="Persistity.Flow" Version="2.0.47" />
       <PackageReference Include="Persistity.Serializers.Json" Version="2.0.47" />
-      <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
-      <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
-      <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+      <PackageReference Include="Serilog.Extensions.Logging" Version="9.0.0" />
+      <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
+      <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
+      <PackageReference Include="System.Reactive" Version="6.0.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Strem.OBS/Strem.OBS.csproj b/src/Strem.OBS/Strem.OBS.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <LangVersion>12</LangVersion>
@@ -13,9 +13,10 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
         <PackageReference Include="Obs.v5.WebSocket.Reactive" Version="1.0.11" />
         <PackageReference Include="Persistity" Version="2.0.47" />
+        <PackageReference Include="System.Reactive" Version="6.0.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Strem.Platforms.Windows/Strem.Platforms.Windows.csproj b/src/Strem.Platforms.Windows/Strem.Platforms.Windows.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <IsPackable>false</IsPackable>
@@ -10,7 +10,8 @@
 
     <ItemGroup>
       <PackageReference Include="NAudio" Version="2.2.1" />
-      <PackageReference Include="System.Speech" Version="8.0.0" />
+      <PackageReference Include="System.Reactive" Version="6.0.1" />
+      <PackageReference Include="System.Speech" Version="9.0.0" />
       <PackageReference Include="TextCopy" Version="6.2.1" />
     </ItemGroup>
 

diff --git a/src/Strem.Portals/Components/App/PortalCreator.razor b/src/Strem.Portals/Components/App/PortalCreator.razor
@@ -40,9 +40,9 @@
 
     public void Create()
     {
-        var newFlow = new PortalData(Guid.NewGuid(), Data.Name);
+        var newPortal = new PortalData(Guid.NewGuid(), Data.Name);
         Data.Name = string.Empty;
-        OnPortalCreated.InvokeAsync(newFlow);
+        OnPortalCreated.InvokeAsync(newPortal);
     }
 
     public void Cancel()

diff --git a/src/Strem.Portals/Components/App/UserPortals.razor b/src/Strem.Portals/Components/App/UserPortals.razor
@@ -1,12 +1,11 @@
 @using Strem.Core.Extensions
-@using Strem.Core.Events.Bus
 @using System.Reactive.Disposables
 @using Strem.Core.Services.Browsers.File
 @using Strem.Core.Services.UI.Modal
 @using Strem.Core.Services.UI.Notifications
-@using Strem.Flows.Services.Data
 @using Strem.Portals.Data
-@using Strem.Portals.Events
+@using Strem.Portals.Data.Overrides
+@using Strem.Portals.Extensions
 @using Strem.Portals.Services.Data
 @using Strem.Portals.Services.Stores
 
@@ -15,6 +14,7 @@
 @inject IFileBrowser FileBrowser;
 @inject IPortalImporter PortalImporter;
 @inject IPortalExporter PortalExporter;
+@inject GridElementRuntimeStyles GridElementRuntimeStyles 
 
 @implements IDisposable
 
@@ -119,6 +119,8 @@
   public void OnPortalCreated(PortalData newPortal)
   {
     PortalStore.Add(newPortal);
+    GridElementRuntimeStyles.RefreshStylesFor(newPortal);
+
     SelectPortal(newPortal);
     ModalService.CloseModal();
   }

diff --git a/src/Strem.Portals/Components/Client/PortalViewer.razor b/src/Strem.Portals/Components/Client/PortalViewer.razor
@@ -224,7 +224,7 @@
     public async Task NotifyButtonPressed(GridElementData gridElementData)
     {
         EventBus.PublishAsync(new PortalElementPressedEvent(Portal.Id, Portal.Name, gridElementData.Id, gridElementData.Name));
-        await Js.InvokeVoidAsync("animateElementById", gridElementData.Id, "heartBeat");
+        await Js.InvokeVoidAsync("animateElementById", gridElementData.Id, "pulse", "1s");
     }
 
     public void NotifySliderValueChanged(GridElementData gridElementData, int value)

diff --git a/src/Strem.Portals/Extensions/ButtonRuntimeStylesExtensions.cs b/src/Strem.Portals/Extensions/ButtonRuntimeStylesExtensions.cs
@@ -18,15 +18,24 @@ public static GridElementRuntimeStyles PopulateRuntimeStyles(this GridElementRun
         return buttonRuntimeStyles;
     }
 
+    public static void RefreshStylesFor(this GridElementRuntimeStyles styles, PortalData portalData)
+    {
+        if (!styles.RuntimeStyles.ContainsKey(portalData.Id))
+        { styles.RuntimeStyles.Add(portalData.Id, new Dictionary<Guid, ElementStyles>()); }
+
+        var portalRuntimeStyles = styles.RuntimeStyles[portalData.Id];
+        portalRuntimeStyles.Clear();
+
+        foreach (var elementData in portalData.Elements)
+        { portalRuntimeStyles.Add(elementData.Id, new ElementStyles(elementData.DefaultStyles)); }
+    }
+
     public static void RefreshStylesFor(this GridElementRuntimeStyles styles, Guid portalId, GridElementData gridElement)
     {
         if(!styles.RuntimeStyles.ContainsKey(portalId))
-        { return; }
+        { styles.RuntimeStyles.Add(portalId, new Dictionary<Guid, ElementStyles>()); }
 
         var portalStyles = styles.RuntimeStyles[portalId];
-        if(!portalStyles.ContainsKey(gridElement.Id))
-        { return; }
-
         portalStyles[gridElement.Id] = new ElementStyles(gridElement.DefaultStyles);
     }
 

diff --git a/src/Strem.Portals/Strem.Portals.csproj b/src/Strem.Portals/Strem.Portals.csproj
@@ -7,7 +7,7 @@
         <Version>0.0.0</Version>
         <IsPackable>true</IsPackable>
         <LangVersion>12</LangVersion>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
     </PropertyGroup>
 
 
@@ -16,7 +16,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
+        <PackageReference Include="System.Reactive" Version="6.0.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Strem.StreamElements/Strem.StreamElements.csproj b/src/Strem.StreamElements/Strem.StreamElements.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <Version>0.0.0</Version>
@@ -15,9 +15,10 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="StreamElements.WebSocket.Reactive" Version="1.0.2" />
+        <PackageReference Include="System.Reactive" Version="6.0.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Strem.Todos/Strem.Todos.csproj b/src/Strem.Todos/Strem.Todos.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <IsPackable>true</IsPackable>
@@ -14,7 +14,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
+        <PackageReference Include="System.Reactive" Version="6.0.1" />
     </ItemGroup>
 
     <ItemGroup>