Merge pull request #192 from DuendeSoftware/joe/dependencies

Update dependencies
DuendeSoftware · May 7, 2024 · 88c5c9c · 88c5c9c
2 parents 7c799aa + c0c0631
commit 88c5c9c
Show file tree

Hide file tree

Showing 113 changed files with 546 additions and 3,766 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,8 +33,6 @@ jobs:
  uses: actions/setup-dotnet@v1
  with:
  dotnet-version: |
- 6.0.x
- 7.0.x
  8.0.x
  
  - run: dotnet --info

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -94,55 +94,13 @@
  }
  },
  {
- "name": "JS6",
- "type": "coreclr",
- "request": "launch",
- "preLaunchTask": "build-js6",
- "program": "${workspaceFolder}/samples/JS6/bin/Debug/net6.0/JS6.dll",
- "args": [],
- "cwd": "${workspaceFolder}/samples/JS6",
- "env": {
- "ASPNETCORE_ENVIRONMENT": "Development"
- },
- "serverReadyAction": {
- "action": "openExternally",
- "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
- },
- "console": "integratedTerminal",
- "presentation": {
- "hidden": false,
- "order": 10
- }
- },
- {
- "name": "JS6 EF",
- "type": "coreclr",
- "request": "launch",
- "preLaunchTask": "build-js6ef",
- "program": "${workspaceFolder}/samples/JS6.EF/bin/Debug/net6.0/JS6.EF.dll",
- "args": [],
- "cwd": "${workspaceFolder}/samples/JS6.EF",
- "env": {
- "ASPNETCORE_ENVIRONMENT": "Development"
- },
- "serverReadyAction": {
- "action": "openExternally",
- "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
- },
- "console": "integratedTerminal",
- "presentation": {
- "hidden": false,
- "order": 10
- }
- },
- {
- "name": "JS Yarp",
+ "name": "JS8",
  "type": "coreclr",
  "request": "launch",
- "preLaunchTask": "build-jsyarp",
- "program": "${workspaceFolder}/samples/JS.Yarp/bin/Debug/net6.0/JS.Yarp.dll",
+ "preLaunchTask": "build-js8",
+ "program": "${workspaceFolder}/samples/JS8/bin/Debug/net8.0/JS8.dll",
  "args": [],
- "cwd": "${workspaceFolder}/samples/JS.Yarp",
+ "cwd": "${workspaceFolder}/samples/JS8",
  "env": {
  "ASPNETCORE_ENVIRONMENT": "Development"
  },
@@ -157,88 +115,67 @@
  }
  },
  {
- "name": "JS6 DPoP",
- "type": "coreclr",
- "request": "launch",
- "preLaunchTask": "build-js6dpop",
- "program": "${workspaceFolder}/samples/JS6.DPoP/bin/Debug/net6.0/JS6.DPoP.dll",
- "args": [],
- "cwd": "${workspaceFolder}/samples/JS6.DPoP",
- "env": {
- "ASPNETCORE_ENVIRONMENT": "Development"
- },
- "serverReadyAction": {
- "action": "openExternally",
- "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
- },
- "console": "integratedTerminal",
- "presentation": {
- "hidden": false,
- "order": 10
- }
- },
- {
- "name": "JS8",
+ "name": "JS8 DPoP",
  "type": "coreclr",
  "request": "launch",
- "preLaunchTask": "build-js8",
- "program": "${workspaceFolder}/samples/JS8/bin/Debug/net8.0/JS8.dll",
+ "preLaunchTask": "build-js8dpop",
+ "program": "${workspaceFolder}/samples/JS8.DPoP/bin/Debug/net8.0/JS8.DPoP.dll",
  "args": [],
- "cwd": "${workspaceFolder}/samples/JS8",
+ "cwd": "${workspaceFolder}/samples/JS8.DPoP",
  "env": {
  "ASPNETCORE_ENVIRONMENT": "Development"
  },
  "serverReadyAction": {
  "action": "openExternally",
  "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
  },
- "console": "integratedTerminal",
+ "console": "externalTerminal",
  "presentation": {
  "hidden": false,
  "order": 10
  }
  },
  {
- "name": "JS8 DPoP",
+ "name": "JS8 EF",
  "type": "coreclr",
  "request": "launch",
- "preLaunchTask": "build-js8dpop",
- "program": "${workspaceFolder}/samples/JS8.DPoP/bin/Debug/net8.0/JS8.DPoP.dll",
+ "preLaunchTask": "build-js8ef",
+ "program": "${workspaceFolder}/samples/JS8.EF/bin/Debug/net8.0/JS8.EF.dll",
  "args": [],
- "cwd": "${workspaceFolder}/samples/JS8.DPoP",
+ "cwd": "${workspaceFolder}/samples/JS8.EF",
  "env": {
  "ASPNETCORE_ENVIRONMENT": "Development"
  },
  "serverReadyAction": {
  "action": "openExternally",
  "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
  },
- "console": "integratedTerminal",
+ "console": "externalTerminal",
  "presentation": {
  "hidden": false,
  "order": 10
  }
  },
  {
- "name": "JS8 EF",
+ "name": "Blazor Wasm",
  "type": "coreclr",
  "request": "launch",
- "preLaunchTask": "build-js8ef",
- "program": "${workspaceFolder}/samples/JS8.EF/bin/Debug/net8.0/JS8.EF.dll",
+ "preLaunchTask": "build-blazor.wasm",
+ "program": "${workspaceFolder}/samples/Blazor.Wasm/Blazor.Wasm.Bff/bin/Debug/net8.0/Blazor.Wasm.Bff.dll",
  "args": [],
- "cwd": "${workspaceFolder}/samples/JS8.EF",
+ "cwd": "${workspaceFolder}/samples/Blazor.Wasm/Blazor.Wasm.Bff",
  "env": {
  "ASPNETCORE_ENVIRONMENT": "Development"
  },
  "serverReadyAction": {
  "action": "openExternally",
  "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
  },
- "console": "integratedTerminal",
+ "console": "externalTerminal",
  "presentation": {
  "hidden": false,
  "order": 10
  }
- },
+ }
  ]
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -61,30 +61,6 @@
  ],
  "problemMatcher": "$msCompile"
  },
- {
- "label": "build-js6",
- "type": "process",
- "command": "dotnet",
- "args": [
- "build",
- "${workspaceFolder}/samples/JS6/JS6.csproj",
- "/property:GenerateFullPaths=true",
- "/consoleloggerparameters:NoSummary"
- ],
- "problemMatcher": "$msCompile"
- },
- {
- "label": "build-js6ef",
- "type": "process",
- "command": "dotnet",
- "args": [
- "build",
- "${workspaceFolder}/samples/JS6.EF/JS6.EF.csproj",
- "/property:GenerateFullPaths=true",
- "/consoleloggerparameters:NoSummary"
- ],
- "problemMatcher": "$msCompile"
- },
  {
  "label": "build-jsyarp",
  "type": "process",
@@ -98,53 +74,54 @@
  "problemMatcher": "$msCompile"
  },
  {
- "label": "build-js6dpop",
+ "label": "build-js8",
  "type": "process",
  "command": "dotnet",
  "args": [
  "build",
- "${workspaceFolder}/samples/JS6.DPoP/JS6.DPoP.csproj",
+ "${workspaceFolder}/samples/JS8/JS8.csproj",
  "/property:GenerateFullPaths=true",
  "/consoleloggerparameters:NoSummary"
  ],
  "problemMatcher": "$msCompile"
  },
  {
- "label": "build-js8",
+ "label": "build-js8dpop",
  "type": "process",
  "command": "dotnet",
  "args": [
  "build",
- "${workspaceFolder}/samples/JS8/JS8.csproj",
+ "${workspaceFolder}/samples/JS8.DPoP/JS8.DPoP.csproj",
  "/property:GenerateFullPaths=true",
  "/consoleloggerparameters:NoSummary"
  ],
  "problemMatcher": "$msCompile"
  },
  {
- "label": "build-js8dpop",
+ "label": "build-js8ef",
  "type": "process",
  "command": "dotnet",
  "args": [
  "build",
- "${workspaceFolder}/samples/JS8.DPoP/JS8.DPoP.csproj",
+ "${workspaceFolder}/samples/JS8.EF/JS8.EF.csproj",
  "/property:GenerateFullPaths=true",
  "/consoleloggerparameters:NoSummary"
  ],
  "problemMatcher": "$msCompile"
  },
  {
- "label": "build-js8ef",
+ "label": "build-blazor.wasm",
  "type": "process",
  "command": "dotnet",
  "args": [
  "build",
- "${workspaceFolder}/samples/JS8.EF/JS8.EF.csproj",
+ "${workspaceFolder}/samples/Blazor.Wasm/Blazor.Wasm.Bff/Blazor.Wasm.Bff.csproj",
  "/property:GenerateFullPaths=true",
  "/consoleloggerparameters:NoSummary"
  ],
  "problemMatcher": "$msCompile"
  },
+
  ]
 
 }
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -1,24 +1,9 @@
 <Project>
-
- <PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0'">
- <FrameworkVersionRuntime>6.0.0</FrameworkVersionRuntime>
- <FrameworkVersionTesting>6.0.11</FrameworkVersionTesting>
- <YarpVersion>2.0.1</YarpVersion>
- <IdentityServerVersion>6.3.6</IdentityServerVersion>
- </PropertyGroup>
-
- <PropertyGroup Condition=" '$(TargetFramework)' == 'net7.0'">
- <FrameworkVersionRuntime>7.0.0</FrameworkVersionRuntime>
- <FrameworkVersionTesting>7.0.0</FrameworkVersionTesting>
- <YarpVersion>2.0.1</YarpVersion>
- <IdentityServerVersion>6.3.6</IdentityServerVersion>
- </PropertyGroup>
-
  <PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0'">
  <FrameworkVersionRuntime>8.0.0</FrameworkVersionRuntime>
  <FrameworkVersionTesting>8.0.0</FrameworkVersionTesting>
  <YarpVersion>2.1.0</YarpVersion>
- <IdentityServerVersion>7.0.0-preview.2</IdentityServerVersion>
+ <IdentityServerVersion>7.0.4</IdentityServerVersion>
  </PropertyGroup>
 
  <ItemGroup>
@@ -27,8 +12,8 @@
  <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
 
  <!-- runtime -->
- <PackageReference Update="IdentityModel" Version="6.1.0" />
- <PackageReference Update="Duende.AccessTokenManagement.OpenIdConnect" Version="2.1.0" />
+ <PackageReference Update="IdentityModel" Version="7.0.0" />
+ <PackageReference Update="Duende.AccessTokenManagement.OpenIdConnect" Version="3.0.0-preview.1" />
  <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(FrameworkVersionRuntime)" />
  <PackageReference Update="Yarp.ReverseProxy" Version="$(YarpVersion)" />