diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5a3a451..361ceb9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v3 with: - dotnet-version: 7.0.x + dotnet-version: 8.0.x - name: Install maui workloads run: dotnet workload install maui-android - name: Build with dotnet diff --git a/.github/workflows/master_huelightdj.yml b/.github/workflows/master_huelightdj.yml index 685907d..70327a5 100644 --- a/.github/workflows/master_huelightdj.yml +++ b/.github/workflows/master_huelightdj.yml @@ -19,7 +19,7 @@ jobs: - name: Set up .NET Core uses: actions/setup-dotnet@v3 with: - dotnet-version: '7.x' + dotnet-version: '8.x' - name: Install maui workloads run: dotnet workload install maui-android - name: dotnet publish diff --git a/Dockerfile b/Dockerfile index df0e87d..b62f857 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base WORKDIR /app EXPOSE 59919 EXPOSE 44339 EXPOSE 80 -FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /src COPY ["HueLightDJ.BlazorWeb/Server/HueLightDJ.BlazorWeb.Server.csproj", "HueLightDJ.BlazorWeb/Server/"] COPY ["HueLightDJ.Effects/HueLightDJ.Effects.csproj", "HueLightDJ.Effects/"] diff --git a/HueLightDJ.Blazor.Controls/HueLightDJ.Blazor.Controls.csproj b/HueLightDJ.Blazor.Controls/HueLightDJ.Blazor.Controls.csproj index 5ad2bbc..dca63ed 100644 --- a/HueLightDJ.Blazor.Controls/HueLightDJ.Blazor.Controls.csproj +++ b/HueLightDJ.Blazor.Controls/HueLightDJ.Blazor.Controls.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable false @@ -16,8 +16,8 @@ - - + + diff --git a/HueLightDJ.BlazorWeb/Client/HueLightDJ.BlazorWeb.Client.csproj b/HueLightDJ.BlazorWeb/Client/HueLightDJ.BlazorWeb.Client.csproj index 18723f2..1ee8558 100644 --- a/HueLightDJ.BlazorWeb/Client/HueLightDJ.BlazorWeb.Client.csproj +++ b/HueLightDJ.BlazorWeb/Client/HueLightDJ.BlazorWeb.Client.csproj @@ -1,7 +1,7 @@ - + - net7.0 + net8.0 enable enable nullable @@ -11,14 +11,14 @@ - + - - - - - - + + + + + + diff --git a/HueLightDJ.BlazorWeb/Server/HueLightDJ.BlazorWeb.Server.csproj b/HueLightDJ.BlazorWeb/Server/HueLightDJ.BlazorWeb.Server.csproj index 4099058..a5e24fe 100644 --- a/HueLightDJ.BlazorWeb/Server/HueLightDJ.BlazorWeb.Server.csproj +++ b/HueLightDJ.BlazorWeb/Server/HueLightDJ.BlazorWeb.Server.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable nullable @@ -12,14 +12,14 @@ - - - + + + - - - - + + + + diff --git a/HueLightDJ.Effects/HueLightDJ.Effects.csproj b/HueLightDJ.Effects/HueLightDJ.Effects.csproj index 2b4d58b..ee99a4e 100644 --- a/HueLightDJ.Effects/HueLightDJ.Effects.csproj +++ b/HueLightDJ.Effects/HueLightDJ.Effects.csproj @@ -1,15 +1,15 @@ - net7.0 + net8.0 enable nullable - - - + + + diff --git a/HueLightDJ.Maui/HueLightDJ.Maui.csproj b/HueLightDJ.Maui/HueLightDJ.Maui.csproj index b3854d6..2586cd2 100644 --- a/HueLightDJ.Maui/HueLightDJ.Maui.csproj +++ b/HueLightDJ.Maui/HueLightDJ.Maui.csproj @@ -1,9 +1,8 @@ - net7.0-android33.0 + net8.0-android - $(TargetFrameworks);net7.0-windows10.0.19041.0 enable @@ -33,32 +32,36 @@ 14.2 14.0 - 32.0 + 30.0 10.0.17763.0 10.0.17763.0 6.5 - + com.webvnext.huelightdj.maui 1.0.0 - + com.webvnext.huelightdj.maui 1.0.0 - + com.webvnext.huelightdj.maui 1.0.0 - + com.webvnext.huelightdj.maui 1.0.0 + + $(TargetFrameworks);net8.0-windows10.0.19041.0 + + @@ -77,7 +80,7 @@ - + diff --git a/HueLightDJ.Services.Interfaces/HueLightDJ.Services.Interfaces.csproj b/HueLightDJ.Services.Interfaces/HueLightDJ.Services.Interfaces.csproj index ce2ebb3..3e646df 100644 --- a/HueLightDJ.Services.Interfaces/HueLightDJ.Services.Interfaces.csproj +++ b/HueLightDJ.Services.Interfaces/HueLightDJ.Services.Interfaces.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable nullable diff --git a/HueLightDJ.Services/HueLightDJ.Services.csproj b/HueLightDJ.Services/HueLightDJ.Services.csproj index 8966970..2bb8ba3 100644 --- a/HueLightDJ.Services/HueLightDJ.Services.csproj +++ b/HueLightDJ.Services/HueLightDJ.Services.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable nullable @@ -31,11 +31,11 @@ - - - - - + + + + + diff --git a/HueLightDJ.Services/Internal/StreamingSetup.cs b/HueLightDJ.Services/Internal/StreamingSetup.cs index ae63120..436b99d 100644 --- a/HueLightDJ.Services/Internal/StreamingSetup.cs +++ b/HueLightDJ.Services/Internal/StreamingSetup.cs @@ -287,8 +287,14 @@ private async Task Connect(bool demoMode, bool useSimulator, ConnectionConfigura if (locations == null) throw new Exception("No locations found."); + //new locations + Dictionary>> newLocations = new Dictionary>>(); + foreach (var location in locations) + { + newLocations.Add(location.Key, new Tuple>(location.Value, new List())); + } //Create a streaming group - var stream = new StreamingGroup(locations); + var stream = new StreamingGroup(newLocations); stream.IsForSimulator = useSimulator; if (!demoMode) diff --git a/HueLightDJ.Web/HueLightDJ.Web.csproj b/HueLightDJ.Web/HueLightDJ.Web.csproj index 782a037..c0d948b 100644 --- a/HueLightDJ.Web/HueLightDJ.Web.csproj +++ b/HueLightDJ.Web/HueLightDJ.Web.csproj @@ -1,7 +1,7 @@ - + - net7.0 + net8.0 enable nullable Linux @@ -10,10 +10,10 @@ - - - - + + + +