Skip to content

Commit 03b953b

Browse files
josephdecockjosephdecock
committed
Update dependencies
- Use .NET 8 - Drop .NET 6/7 - Use IdentityModel 7.0.0 - Use Duende.AccessTokenManagement 3.0.0-preview.1 - Rebuilt Blazor sample using .NET 8
1 parent 7c799aa commit 03b953b

File tree

112 files changed

+546
-3764
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+546
-3764
lines changed

‎.vscode/launch.json

+20-83
Original file line numberDiff line numberDiff line change
@@ -94,55 +94,13 @@
9494
}
9595
},
9696
{
97-
"name": "JS6",
98-
"type": "coreclr",
99-
"request": "launch",
100-
"preLaunchTask": "build-js6",
101-
"program": "${workspaceFolder}/samples/JS6/bin/Debug/net6.0/JS6.dll",
102-
"args": [],
103-
"cwd": "${workspaceFolder}/samples/JS6",
104-
"env": {
105-
"ASPNETCORE_ENVIRONMENT": "Development"
106-
},
107-
"serverReadyAction": {
108-
"action": "openExternally",
109-
"pattern": "\\bNow listening on:\\s+(https?://\\S+)"
110-
},
111-
"console": "integratedTerminal",
112-
"presentation": {
113-
"hidden": false,
114-
"order": 10
115-
}
116-
},
117-
{
118-
"name": "JS6 EF",
119-
"type": "coreclr",
120-
"request": "launch",
121-
"preLaunchTask": "build-js6ef",
122-
"program": "${workspaceFolder}/samples/JS6.EF/bin/Debug/net6.0/JS6.EF.dll",
123-
"args": [],
124-
"cwd": "${workspaceFolder}/samples/JS6.EF",
125-
"env": {
126-
"ASPNETCORE_ENVIRONMENT": "Development"
127-
},
128-
"serverReadyAction": {
129-
"action": "openExternally",
130-
"pattern": "\\bNow listening on:\\s+(https?://\\S+)"
131-
},
132-
"console": "integratedTerminal",
133-
"presentation": {
134-
"hidden": false,
135-
"order": 10
136-
}
137-
},
138-
{
139-
"name": "JS Yarp",
97+
"name": "JS8",
14098
"type": "coreclr",
14199
"request": "launch",
142-
"preLaunchTask": "build-jsyarp",
143-
"program": "${workspaceFolder}/samples/JS.Yarp/bin/Debug/net6.0/JS.Yarp.dll",
100+
"preLaunchTask": "build-js8",
101+
"program": "${workspaceFolder}/samples/JS8/bin/Debug/net8.0/JS8.dll",
144102
"args": [],
145-
"cwd": "${workspaceFolder}/samples/JS.Yarp",
103+
"cwd": "${workspaceFolder}/samples/JS8",
146104
"env": {
147105
"ASPNETCORE_ENVIRONMENT": "Development"
148106
},
@@ -157,88 +115,67 @@
157115
}
158116
},
159117
{
160-
"name": "JS6 DPoP",
161-
"type": "coreclr",
162-
"request": "launch",
163-
"preLaunchTask": "build-js6dpop",
164-
"program": "${workspaceFolder}/samples/JS6.DPoP/bin/Debug/net6.0/JS6.DPoP.dll",
165-
"args": [],
166-
"cwd": "${workspaceFolder}/samples/JS6.DPoP",
167-
"env": {
168-
"ASPNETCORE_ENVIRONMENT": "Development"
169-
},
170-
"serverReadyAction": {
171-
"action": "openExternally",
172-
"pattern": "\\bNow listening on:\\s+(https?://\\S+)"
173-
},
174-
"console": "integratedTerminal",
175-
"presentation": {
176-
"hidden": false,
177-
"order": 10
178-
}
179-
},
180-
{
181-
"name": "JS8",
118+
"name": "JS8 DPoP",
182119
"type": "coreclr",
183120
"request": "launch",
184-
"preLaunchTask": "build-js8",
185-
"program": "${workspaceFolder}/samples/JS8/bin/Debug/net8.0/JS8.dll",
121+
"preLaunchTask": "build-js8dpop",
122+
"program": "${workspaceFolder}/samples/JS8.DPoP/bin/Debug/net8.0/JS8.DPoP.dll",
186123
"args": [],
187-
"cwd": "${workspaceFolder}/samples/JS8",
124+
"cwd": "${workspaceFolder}/samples/JS8.DPoP",
188125
"env": {
189126
"ASPNETCORE_ENVIRONMENT": "Development"
190127
},
191128
"serverReadyAction": {
192129
"action": "openExternally",
193130
"pattern": "\\bNow listening on:\\s+(https?://\\S+)"
194131
},
195-
"console": "integratedTerminal",
132+
"console": "externalTerminal",
196133
"presentation": {
197134
"hidden": false,
198135
"order": 10
199136
}
200137
},
201138
{
202-
"name": "JS8 DPoP",
139+
"name": "JS8 EF",
203140
"type": "coreclr",
204141
"request": "launch",
205-
"preLaunchTask": "build-js8dpop",
206-
"program": "${workspaceFolder}/samples/JS8.DPoP/bin/Debug/net8.0/JS8.DPoP.dll",
142+
"preLaunchTask": "build-js8ef",
143+
"program": "${workspaceFolder}/samples/JS8.EF/bin/Debug/net8.0/JS8.EF.dll",
207144
"args": [],
208-
"cwd": "${workspaceFolder}/samples/JS8.DPoP",
145+
"cwd": "${workspaceFolder}/samples/JS8.EF",
209146
"env": {
210147
"ASPNETCORE_ENVIRONMENT": "Development"
211148
},
212149
"serverReadyAction": {
213150
"action": "openExternally",
214151
"pattern": "\\bNow listening on:\\s+(https?://\\S+)"
215152
},
216-
"console": "integratedTerminal",
153+
"console": "externalTerminal",
217154
"presentation": {
218155
"hidden": false,
219156
"order": 10
220157
}
221158
},
222159
{
223-
"name": "JS8 EF",
160+
"name": "Blazor Wasm",
224161
"type": "coreclr",
225162
"request": "launch",
226-
"preLaunchTask": "build-js8ef",
227-
"program": "${workspaceFolder}/samples/JS8.EF/bin/Debug/net8.0/JS8.EF.dll",
163+
"preLaunchTask": "build-blazor.wasm",
164+
"program": "${workspaceFolder}/samples/Blazor.Wasm/Blazor.Wasm.Bff/bin/Debug/net8.0/Blazor.Wasm.Bff.dll",
228165
"args": [],
229-
"cwd": "${workspaceFolder}/samples/JS8.EF",
166+
"cwd": "${workspaceFolder}/samples/Blazor.Wasm/Blazor.Wasm.Bff",
230167
"env": {
231168
"ASPNETCORE_ENVIRONMENT": "Development"
232169
},
233170
"serverReadyAction": {
234171
"action": "openExternally",
235172
"pattern": "\\bNow listening on:\\s+(https?://\\S+)"
236173
},
237-
"console": "integratedTerminal",
174+
"console": "externalTerminal",
238175
"presentation": {
239176
"hidden": false,
240177
"order": 10
241178
}
242-
},
179+
}
243180
]
244181
}

‎.vscode/tasks.json

+9-32
Original file line numberDiff line numberDiff line change
@@ -61,30 +61,6 @@
6161
],
6262
"problemMatcher": "$msCompile"
6363
},
64-
{
65-
"label": "build-js6",
66-
"type": "process",
67-
"command": "dotnet",
68-
"args": [
69-
"build",
70-
"${workspaceFolder}/samples/JS6/JS6.csproj",
71-
"/property:GenerateFullPaths=true",
72-
"/consoleloggerparameters:NoSummary"
73-
],
74-
"problemMatcher": "$msCompile"
75-
},
76-
{
77-
"label": "build-js6ef",
78-
"type": "process",
79-
"command": "dotnet",
80-
"args": [
81-
"build",
82-
"${workspaceFolder}/samples/JS6.EF/JS6.EF.csproj",
83-
"/property:GenerateFullPaths=true",
84-
"/consoleloggerparameters:NoSummary"
85-
],
86-
"problemMatcher": "$msCompile"
87-
},
8864
{
8965
"label": "build-jsyarp",
9066
"type": "process",
@@ -98,53 +74,54 @@
9874
"problemMatcher": "$msCompile"
9975
},
10076
{
101-
"label": "build-js6dpop",
77+
"label": "build-js8",
10278
"type": "process",
10379
"command": "dotnet",
10480
"args": [
10581
"build",
106-
"${workspaceFolder}/samples/JS6.DPoP/JS6.DPoP.csproj",
82+
"${workspaceFolder}/samples/JS8/JS8.csproj",
10783
"/property:GenerateFullPaths=true",
10884
"/consoleloggerparameters:NoSummary"
10985
],
11086
"problemMatcher": "$msCompile"
11187
},
11288
{
113-
"label": "build-js8",
89+
"label": "build-js8dpop",
11490
"type": "process",
11591
"command": "dotnet",
11692
"args": [
11793
"build",
118-
"${workspaceFolder}/samples/JS8/JS8.csproj",
94+
"${workspaceFolder}/samples/JS8.DPoP/JS8.DPoP.csproj",
11995
"/property:GenerateFullPaths=true",
12096
"/consoleloggerparameters:NoSummary"
12197
],
12298
"problemMatcher": "$msCompile"
12399
},
124100
{
125-
"label": "build-js8dpop",
101+
"label": "build-js8ef",
126102
"type": "process",
127103
"command": "dotnet",
128104
"args": [
129105
"build",
130-
"${workspaceFolder}/samples/JS8.DPoP/JS8.DPoP.csproj",
106+
"${workspaceFolder}/samples/JS8.EF/JS8.EF.csproj",
131107
"/property:GenerateFullPaths=true",
132108
"/consoleloggerparameters:NoSummary"
133109
],
134110
"problemMatcher": "$msCompile"
135111
},
136112
{
137-
"label": "build-js8ef",
113+
"label": "build-blazor.wasm",
138114
"type": "process",
139115
"command": "dotnet",
140116
"args": [
141117
"build",
142-
"${workspaceFolder}/samples/JS8.EF/JS8.EF.csproj",
118+
"${workspaceFolder}/samples/Blazor.Wasm/Blazor.Wasm.Bff/Blazor.Wasm.Bff.csproj",
143119
"/property:GenerateFullPaths=true",
144120
"/consoleloggerparameters:NoSummary"
145121
],
146122
"problemMatcher": "$msCompile"
147123
},
124+
148125
]
149126

150127
}

‎Directory.Build.targets

+3-18
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,9 @@
11
<Project>
2-
3-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0'">
4-
<FrameworkVersionRuntime>6.0.0</FrameworkVersionRuntime>
5-
<FrameworkVersionTesting>6.0.11</FrameworkVersionTesting>
6-
<YarpVersion>2.0.1</YarpVersion>
7-
<IdentityServerVersion>6.3.6</IdentityServerVersion>
8-
</PropertyGroup>
9-
10-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net7.0'">
11-
<FrameworkVersionRuntime>7.0.0</FrameworkVersionRuntime>
12-
<FrameworkVersionTesting>7.0.0</FrameworkVersionTesting>
13-
<YarpVersion>2.0.1</YarpVersion>
14-
<IdentityServerVersion>6.3.6</IdentityServerVersion>
15-
</PropertyGroup>
16-
172
<PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0'">
183
<FrameworkVersionRuntime>8.0.0</FrameworkVersionRuntime>
194
<FrameworkVersionTesting>8.0.0</FrameworkVersionTesting>
205
<YarpVersion>2.1.0</YarpVersion>
21-
<IdentityServerVersion>7.0.0-preview.2</IdentityServerVersion>
6+
<IdentityServerVersion>7.0.4</IdentityServerVersion>
227
</PropertyGroup>
238

249
<ItemGroup>
@@ -27,8 +12,8 @@
2712
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
2813

2914
<!-- runtime -->
30-
<PackageReference Update="IdentityModel" Version="6.1.0" />
31-
<PackageReference Update="Duende.AccessTokenManagement.OpenIdConnect" Version="2.1.0" />
15+
<PackageReference Update="IdentityModel" Version="7.0.0" />
16+
<PackageReference Update="Duende.AccessTokenManagement.OpenIdConnect" Version="3.0.0-preview.1" />
3217
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(FrameworkVersionRuntime)" />
3318
<PackageReference Update="Yarp.ReverseProxy" Version="$(YarpVersion)" />
3419

0 commit comments

Comments
 (0)