Update to .NET 7

Seji64 · Apr 6, 2023 · 1ed0f11 · 1ed0f11
1 parent fd0aba6
commit 1ed0f11
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 22 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -39,15 +39,15 @@ jobs:
  - name: Setup dotnet
  uses: actions/setup-dotnet@v3
  with:
- dotnet-version: '6.0.x'
+ dotnet-version: '7.0.x'
 
  - name: Build
  shell: bash
  run: |
  tag=$(git describe --tags --abbrev=0)
  release_name="LAPS-WebUI-$tag-${{ matrix.target }}"
  # Build everything
- dotnet publish src/LAPS-WebUI.csproj --self-contained --framework net6.0 --runtime "${{ matrix.target }}" -c Release -o "$release_name"
+ dotnet publish src/LAPS-WebUI.csproj --self-contained --framework net7.0 --runtime "${{ matrix.target }}" -c Release -o "$release_name"
  # Pack files
  if [ "${{ matrix.target }}" == "win-x64" ]; then
  # Pack to zip for Windows

diff --git a/src/Dockerfile b/src/Dockerfile
@@ -1,11 +1,11 @@
 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
 WORKDIR /app
 EXPOSE 80
 EXPOSE 443
 
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
 WORKDIR /src
 COPY ["LAPS-WebUI.csproj", "."]
 RUN dotnet restore "./LAPS-WebUI.csproj"

diff --git a/src/LAPS-WebUI.csproj b/src/LAPS-WebUI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
  <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net7.0</TargetFramework>
  <Nullable>enable</Nullable>
  <ImplicitUsings>enable</ImplicitUsings>
  <RootNamespace>LAPS_WebUI</RootNamespace>
@@ -11,15 +11,15 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Blazored.SessionStorage" Version="2.2.0" />
- <PackageReference Include="CurrieTechnologies.Razor.Clipboard" Version="1.4.0" />
+ <PackageReference Include="Blazored.SessionStorage" Version="2.3.0" />
+ <PackageReference Include="CurrieTechnologies.Razor.Clipboard" Version="1.6.0" />
  <PackageReference Include="LdapForNet" Version="2.7.15" />
- <PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="7.0.0" />
- <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
+ <PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="7.0.4" />
+ <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
  <PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="2.1.175" />
- <PackageReference Include="MudBlazor" Version="6.1.2" />
+ <PackageReference Include="MudBlazor" Version="6.2.0" />
  <PackageReference Include="Serilog" Version="2.12.0" />
- <PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
+ <PackageReference Include="Serilog.AspNetCore" Version="6.1.0" />
  <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
  </ItemGroup>
 

diff --git a/src/Models/LDAPOptions.cs b/src/Models/LDAPOptions.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace LAPS_WebUI.Models
+namespace LAPS_WebUI.Models
 {
  public class LDAPOptions
  {

diff --git a/src/Models/UserLoginRequest.cs b/src/Models/UserLoginRequest.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
 namespace LAPS_WebUI.Models
 {

diff --git a/src/Services/LDAPService.cs b/src/Services/LDAPService.cs
@@ -36,7 +36,7 @@ public LDAPService(IOptions<LDAPOptions> ldapoptions)
  }
  catch (Exception ex)
  {
- Log.Error(ex.Message);
+ Log.Error("{ErrorMessage}",ex.Message);
  return null;
  }
 
@@ -114,7 +114,7 @@ public async Task<bool> TestCredentialsAsync(LdapCredential ldapCredential)
 
  public async Task<List<ADComputer>> SearchADComputersAsync(LdapCredential ldapCredential, string query)
  {
- List<ADComputer> result = new List<ADComputer>();
+ List<ADComputer> result = new();
 
  if (ldapCredential is null)
  {
@@ -143,7 +143,7 @@ public async Task<List<ADComputer>> SearchADComputersAsync(LdapCredential ldapCr
  }
  catch (Exception ex)
  {
- Log.Error(ex.Message);
+ Log.Error("{ErrorMessage}", ex.Message);
  }
  }
  return result;