Merge branch 'main' into releases/6.3.x

DuendeSoftware · Dec 15, 2023 · de3702a · de3702a
2 parents a23764b + 5a63caf
commit de3702a
Show file tree

Hide file tree

Showing 1,108 changed files with 52,743 additions and 24,165 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,11 +29,10 @@ jobs:
         fetch-depth: 0
 
     - name: Setup dotnet (main)
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
-          6.0.x
-          7.0.x
+            8.0.100
     
     - run: dotnet --info
 

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -38,11 +38,10 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Setup dotnet
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
-          6.0.x
-          7.0.x
+            8.0.100
       
     - run: dotnet --info
 

diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -32,18 +32,6 @@
       ],
       "problemMatcher": "$msCompile"
     },
-    {
-      "label": "build-host-main7",
-      "type": "process",
-      "command": "dotnet",
-      "args": [
-          "build",
-          "${workspaceFolder}/hosts/main7/Host.Main7.csproj",
-          "/property:GenerateFullPaths=true",
-          "/consoleloggerparameters:NoSummary"
-      ],
-      "problemMatcher": "$msCompile"
-    },
     {
       "label": "build-host-entityframework",
       "type": "process",
@@ -177,7 +165,7 @@
       "command": "dotnet",
       "args": [
           "build",
-          "${workspaceFolder}/clients/src/ConsoleCustomGrant/ConsoleCustomGrant.csproj",
+          "${workspaceFolder}/clients/src/ConsoleCustomGrant/ConsoleExtensionGrant.csproj",
           "/property:GenerateFullPaths=true",
           "/consoleloggerparameters:NoSummary"
       ],
@@ -399,6 +387,30 @@
       ],
       "problemMatcher": "$msCompile"
     },
+    {
+      "label": "build-client-MvcPar",
+      "type": "process",
+      "command": "dotnet",
+      "args": [
+          "build",
+          "${workspaceFolder}/clients/src/MvcPar/MvcPar.csproj",
+          "/property:GenerateFullPaths=true",
+          "/consoleloggerparameters:NoSummary"
+      ],
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "label": "build-client-MvcJarPar",
+      "type": "process",
+      "command": "dotnet",
+      "args": [
+          "build",
+          "${workspaceFolder}/clients/src/MvcJarPar/MvcJarPar.csproj",
+          "/property:GenerateFullPaths=true",
+          "/consoleloggerparameters:NoSummary"
+      ],
+      "problemMatcher": "$msCompile"
+    },
     {
       "label": "build-client-MvcHybridBackChannel",
       "type": "process",

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -30,6 +30,5 @@
     <PropertyGroup>
         <MinVerAutoIncrement>minor</MinVerAutoIncrement>
         <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
-        <!--<WarningsNotAsErrors>9057</WarningsNotAsErrors>-->
     </PropertyGroup>
 </Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -1,6 +1,6 @@
 <Project>
 
-    <PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0'">
+    <!--<PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0'">
         <FrameworkVersion>6.0.0</FrameworkVersion>
         <ExtensionsVersion>6.0.0</ExtensionsVersion>
         <EntityFrameworkVersion>6.0.0</EntityFrameworkVersion>
@@ -12,11 +12,18 @@
         <ExtensionsVersion>7.0.0</ExtensionsVersion>
         <EntityFrameworkVersion>7.0.0</EntityFrameworkVersion>
         <WilsonVersion>6.15.1</WilsonVersion>
+    </PropertyGroup>-->
+
+    <PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0'">
+        <FrameworkVersion>8.0.0</FrameworkVersion>
+        <ExtensionsVersion>8.0.0</ExtensionsVersion>
+        <EntityFrameworkVersion>8.0.0</EntityFrameworkVersion>
+        <WilsonVersion>7.0.3</WilsonVersion>
     </PropertyGroup>
 
     <ItemGroup>
         <!--our stuff -->
-        <PackageReference Update="IdentityModel" Version="6.1.0"/>
+        <PackageReference Update="IdentityModel" Version="6.2.0"/>
 
         <!--build related-->
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
@@ -25,19 +32,16 @@
         <PackageReference Update="Bullseye" Version="4.2.1"/>
 
         <!--tests -->
-        <PackageReference Update="FluentAssertions" Version="5.10.3"/>
-        <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.4.1"/>
-        <PackageReference Update="xunit" Version="2.4.1"/>
-        <PackageReference Update="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="All"/>
+        <PackageReference Update="FluentAssertions" Version="6.5.1"/>
+        <PackageReference Update="FluentAssertions.Web" Version="1.2.5"/>
+        <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
+        <PackageReference Update="xunit" Version="2.6.2"/>
+        <PackageReference Update="xunit.runner.visualstudio" Version="2.5.4" PrivateAssets="All"/>
 
         <!-- testing -->
         <PackageReference Update="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(FrameworkVersion)" />
         <PackageReference Update="CsQuery.NETStandard" Version="1.3.6.1" />
-        <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.3.1" />
-        <PackageReference Update="coverlet.collector" Version="3.1.2">
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-            <PrivateAssets>all</PrivateAssets>
-        </PackageReference>
+        <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.8.0" />
 
 
         <!--microsoft extensions -->
@@ -52,8 +56,7 @@
         <PackageReference Update="Microsoft.IdentityModel.JsonWebTokens" Version="$(WilsonVersion)"/>
         <PackageReference Update="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(WilsonVersion)"/>
         <PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="$(WilsonVersion)"/>
-        <PackageReference Update="AutoMapper" Version="[12.0.0,13.0)"/>
-        <PackageReference Update="Serilog.AspNetCore" Version="6.0.0"/>
+        <PackageReference Update="Serilog.AspNetCore" Version="8.0.0"/>
 
         <!--microsoft asp.net core -->
         <PackageReference Update="Microsoft.AspNetCore.DataProtection.Abstractions" Version="$(FrameworkVersion)"/>
@@ -72,13 +75,15 @@
         <PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="$(EntityFrameworkVersion)" PrivateAssets="All"/>
 
         <!-- open telemetry -->
-        <PackageReference Update="OpenTelemetry" Version="1.3.0" />
-        <PackageReference Update="OpenTelemetry.Exporter.Console" Version="1.3.0" />
-        <PackageReference Update="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.3.0" />
-        <PackageReference Update="OpenTelemetry.Extensions.Hosting" Version="1.0.0-rc9" />
-        <PackageReference Update="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9" />
-        <PackageReference Update="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9" />
+        <PackageReference Update="OpenTelemetry" Version="1.6.0" />
+        <PackageReference Update="OpenTelemetry.Exporter.Console" Version="1.6.0" />
+        <PackageReference Update="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.6.0" />
+        <PackageReference Update="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.6.0-rc.1" />
+        <PackageReference Update="OpenTelemetry.Extensions.Hosting" Version="1.6.0" />
+        <PackageReference Update="OpenTelemetry.Instrumentation.AspNetCore" Version="1.5.1-beta.1" />
+        <PackageReference Update="OpenTelemetry.Instrumentation.Http" Version="1.5.1-beta.1" />
         <PackageReference Update="OpenTelemetry.Instrumentation.SqlClient" Version="1.0.0-rc9" />
+
     </ItemGroup>
 
     <Target Name="SetAssemblyVersion" AfterTargets="MinVer">