Merge branch 'dev' into nesting

Author: Warren Buckley

.github/workflows/ci.yml

@@ -23,9 +23,9 @@ jobs:
         run: 'dir env:'
 
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '6.0.x'
+          dotnet-version: '7.0.x'
 
       - name: Run .NET test
         run: dotnet test
@@ -40,9 +40,9 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '6.0.x'
+          dotnet-version: '7.0.x'
 
       - name: Make .NET Core Server excutable
         working-directory: LogViewer.Server

.github/workflows/codeql-analysis.yml

@@ -28,9 +28,9 @@ jobs:
       if: ${{ github.event_name == 'pull_request' }}
 
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '6.0.x'
+        dotnet-version: '7.0.x'
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/intellicode.yml

@@ -15,9 +15,9 @@ jobs:
         fetch-depth: 0 # We need to fetch the entire Git history in order to verify the authenticity.
 
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '6.0.x' 
+        dotnet-version: '7.0.x' 
     - name: Build with dotnet
       working-directory: LogViewer.Server
       run: dotnet build # Project needs to build before training a model.

.github/workflows/richcodenav.yml

@@ -18,9 +18,9 @@ jobs:
 
     # **** Please change 'dotnet-version' to be the version of the .NET SDK used in your project **** #
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '6.0.x'
+        dotnet-version: '7.0.x'
 
     # **** Please change 'working-directory' to be the location where your .SLN file is located **** #
     - name: Install dependencies
@@ -37,7 +37,7 @@ jobs:
       working-directory: LogViewer.Client
       run: npm install
 
-    - uses: microsoft/RichCodeNavIndexer@v0.1.9
+    - uses: microsoft/RichCodeNavIndexer@v0.1
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         languages: csharp,typescript

LogViewer.Server.Tests/LogViewer.Server.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
 

LogViewer.Server/LogViewer.Server.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <PublishTrimmed>true</PublishTrimmed>
         <NoWarn>NU1603</NoWarn>
         <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
@@ -18,9 +18,9 @@
 	</PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.10" />
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0" />
         <PackageReference Include="Serilog.Expressions" Version="3.4.1" />
-        <PackageReference Include="Serilog.Formatting.Compact.Reader" Version="1.0.5" />
+        <PackageReference Include="Serilog.Formatting.Compact.Reader" Version="2.0.0" />
         <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
     </ItemGroup>