Skip to content
This repository has been archived by the owner on Jan 24, 2025. It is now read-only.

Update dependencies #192

Merged
merged 2 commits into from
May 7, 2024
Merged

Update dependencies #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03b953b
Update dependencies
josephdecock May 7, 2024
c0c0631
Drop .net 6/7 from CI pipeline
josephdecock May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
103 changes: 20 additions & 83 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand All @@ -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
}
},
}
]
}
41 changes: 9 additions & 32 deletions .vscode/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
},

]

}
21 changes: 3 additions & 18 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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)" />

Expand Down
Loading
Loading