Update net7.0

LordMike · Aug 8, 2023 · 5221cd6 · 5221cd6
1 parent 4db4896
commit 5221cd6
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 26 deletions.
diff --git a/.github/workflows/generic-build.yml b/.github/workflows/generic-build.yml
@@ -14,7 +14,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
 
     - name: Restore dependencies
       run: dotnet restore

diff --git a/MBW.BlueRiiot2MQTT.Tests/MBW.BlueRiiot2MQTT.Tests.csproj b/MBW.BlueRiiot2MQTT.Tests/MBW.BlueRiiot2MQTT.Tests.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
+    <PackageReference Include="xunit" Version="2.5.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/MBW.BlueRiiot2MQTT/Dockerfile.aarch64 b/MBW.BlueRiiot2MQTT/Dockerfile.aarch64
@@ -1,13 +1,13 @@
 # https://hub.docker.com/_/microsoft-dotnet-runtime
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
 WORKDIR /src
 
 COPY . .
 WORKDIR "/src/MBW.BlueRiiot2MQTT/"
 RUN dotnet publish -c release -o /app
 
 # Final
-FROM mcr.microsoft.com/dotnet/runtime:6.0-focal-arm64v8
+FROM mcr.microsoft.com/dotnet/runtime:7.0-focal-arm64v8
 WORKDIR /app
 COPY --from=build /app .
 ENTRYPOINT ["dotnet", "MBW.BlueRiiot2MQTT.dll"]
diff --git a/MBW.BlueRiiot2MQTT/Dockerfile.amd64 b/MBW.BlueRiiot2MQTT/Dockerfile.amd64
@@ -1,13 +1,13 @@
 # https://hub.docker.com/_/microsoft-dotnet-runtime
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
 WORKDIR /src
 
 COPY . .
 WORKDIR "/src/MBW.BlueRiiot2MQTT/"
 RUN dotnet publish -c release -o /app
 
 # Final
-FROM mcr.microsoft.com/dotnet/runtime:6.0-focal-amd64
+FROM mcr.microsoft.com/dotnet/runtime:7.0-focal-amd64
 WORKDIR /app
 COPY --from=build /app .
 ENTRYPOINT ["dotnet", "MBW.BlueRiiot2MQTT.dll"]
diff --git a/MBW.BlueRiiot2MQTT/Dockerfile.armv7 b/MBW.BlueRiiot2MQTT/Dockerfile.armv7
@@ -1,13 +1,13 @@
 # https://hub.docker.com/_/microsoft-dotnet-runtime
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
 WORKDIR /src
 
 COPY . .
 WORKDIR "/src/MBW.BlueRiiot2MQTT/"
 RUN dotnet publish -c release -o /app
 
 # Final
-FROM mcr.microsoft.com/dotnet/runtime:6.0-focal-arm32v7
+FROM mcr.microsoft.com/dotnet/runtime:7.0-focal-arm32v7
 WORKDIR /app
 COPY --from=build /app .
 ENTRYPOINT ["dotnet", "MBW.BlueRiiot2MQTT.dll"]
diff --git a/MBW.BlueRiiot2MQTT/MBW.BlueRiiot2MQTT.csproj b/MBW.BlueRiiot2MQTT/MBW.BlueRiiot2MQTT.csproj
@@ -2,27 +2,27 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Enums.NET" Version="4.0.0" />
+    <PackageReference Include="Enums.NET" Version="4.0.1" />
     <PackageReference Include="Humanizer.Core" Version="2.14.1" />
     <PackageReference Include="MBW.Client.BlueRiiotAPI" Version="0.8.5" />
-    <PackageReference Include="MBW.HassMQTT.CommonServices" Version="3.6.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.KeyPerFile" Version="6.0.8" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="6.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+    <PackageReference Include="MBW.HassMQTT.CommonServices" Version="3.7.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.KeyPerFile" Version="7.0.10" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.10" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
     <PackageReference Include="Nito.AsyncEx.Coordination" Version="5.1.2" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="Serilog" Version="2.11.0" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="3.3.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Serilog" Version="3.0.1" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="7.0.0" />
     <PackageReference Include="Serilog.Formatting.Compact" Version="1.1.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
   </ItemGroup>
 
   <ItemGroup>