Skip to content

Commit 1901382

Browse files
adamralphadamralph
authored
Merge pull request #195 from DuendeSoftware/jmdc/slnx
Migrate to slnx, set SDK to 9.0.203, and remove SDK upper bound
2 parents 274f14f + 656450c commit 1901382

13 files changed

+93
-298
lines changed

‎.github/workflow-gen/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ public static void EnvDefaults(this Workflow workflow)
254254
public static void StepSetupDotNet(this Job job)
255255
=> job.Step()
256256
.Name("Setup .NET")
257-
.ActionsSetupDotNet("3e891b0cb619bf60e2c25674b222b8940e2c1c25", ["6.0.x", "8.0.x", "9.0.103"]); // v4.1.0
257+
.ActionsSetupDotNet("3e891b0cb619bf60e2c25674b222b8940e2c1c25", ["6.0.x", "8.0.x", "9.0.203"]); // v4.1.0
258258

259259
public static Step IfRefMain(this Step step)
260260
=> step.If("github.ref == 'refs/heads/main'");

‎.github/workflows/access-token-management-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
dotnet-version: |-
5050
6.0.x
5151
8.0.x
52-
9.0.103
52+
9.0.203
5353
- name: Verify Formatting
5454
run: |-
5555
dotnet restore ../

‎.github/workflows/access-token-management-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
dotnet-version: |-
4848
6.0.x
4949
8.0.x
50-
9.0.103
50+
9.0.203
5151
- name: Git Config
5252
run: |-
5353
git config --global user.email "github-bot@duendesoftware.com"
@@ -106,7 +106,7 @@ jobs:
106106
dotnet-version: |-
107107
6.0.x
108108
8.0.x
109-
9.0.103
109+
9.0.203
110110
- name: List files
111111
run: tree
112112
shell: bash

‎.github/workflows/identity-model-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
dotnet-version: |-
5050
6.0.x
5151
8.0.x
52-
9.0.103
52+
9.0.203
5353
- name: Verify Formatting
5454
run: |-
5555
dotnet restore ../

‎.github/workflows/identity-model-oidc-client-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
dotnet-version: |-
5050
6.0.x
5151
8.0.x
52-
9.0.103
52+
9.0.203
5353
- name: Verify Formatting
5454
run: |-
5555
dotnet restore ../

‎.github/workflows/identity-model-oidc-client-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
dotnet-version: |-
4848
6.0.x
4949
8.0.x
50-
9.0.103
50+
9.0.203
5151
- name: Git Config
5252
run: |-
5353
git config --global user.email "github-bot@duendesoftware.com"
@@ -106,7 +106,7 @@ jobs:
106106
dotnet-version: |-
107107
6.0.x
108108
8.0.x
109-
9.0.103
109+
9.0.203
110110
- name: List files
111111
run: tree
112112
shell: bash

‎.github/workflows/identity-model-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
dotnet-version: |-
4848
6.0.x
4949
8.0.x
50-
9.0.103
50+
9.0.203
5151
- name: Git Config
5252
run: |-
5353
git config --global user.email "github-bot@duendesoftware.com"
@@ -104,7 +104,7 @@ jobs:
104104
dotnet-version: |-
105105
6.0.x
106106
8.0.x
107-
9.0.103
107+
9.0.203
108108
- name: List files
109109
run: tree
110110
shell: bash

‎.github/workflows/ignore-this-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
dotnet-version: |-
5050
6.0.x
5151
8.0.x
52-
9.0.103
52+
9.0.203
5353
- name: Verify Formatting
5454
run: |-
5555
dotnet restore ../

‎.github/workflows/ignore-this-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
dotnet-version: |-
4848
6.0.x
4949
8.0.x
50-
9.0.103
50+
9.0.203
5151
- name: Git Config
5252
run: |-
5353
git config --global user.email "github-bot@duendesoftware.com"
@@ -104,7 +104,7 @@ jobs:
104104
dotnet-version: |-
105105
6.0.x
106106
8.0.x
107-
9.0.103
107+
9.0.203
108108
- name: List files
109109
run: tree
110110
shell: bash

‎.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,4 +206,8 @@ tools/
206206
.idea
207207

208208
# Verify Tests
209-
*.received.*
209+
*.received.*
210+
211+
# Visual Studio Code - Ignore only settings.json. launch.json and tasks.json
212+
# are checked deliberately
213+
**/.vscode/settings.json

‎foss.sln

Lines changed: 0 additions & 282 deletions
This file was deleted.

‎foss.slnx

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
<Solution>
2+
<Folder Name="/.github/">
3+
<Project Path=".github/workflow-gen/workflow-gen.csproj" />
4+
</Folder>
5+
<Folder Name="/access-token-management/">
6+
<File Path="access-token-management/README.md" />
7+
</Folder>
8+
<Folder Name="/access-token-management/perf/">
9+
<Project Path="access-token-management/perf/Perf.DevServer.ServiceDefaults/Perf.DevServer.ServiceDefaults.csproj" />
10+
<Project Path="access-token-management/perf/Perf.DevServer/Perf.DevServer.csproj" />
11+
<Project Path="access-token-management/perf/Perf.IdentityServer/Perf.IdentityServer.csproj" />
12+
<Project Path="access-token-management/perf/Perf.TokenEndpoint/Perf.TokenEndpoint.csproj" />
13+
</Folder>
14+
<Folder Name="/access-token-management/samples/">
15+
<Project Path="access-token-management/samples/BlazorServer/BlazorServer.csproj" />
16+
<Project Path="access-token-management/samples/Web/Web.csproj" />
17+
<Project Path="access-token-management/samples/WebJarJwt/WebJarJwt.csproj" />
18+
<Project Path="access-token-management/samples/Worker/Worker.csproj" />
19+
<Project Path="access-token-management/samples/WorkerDI/WorkerDI.csproj" />
20+
</Folder>
21+
<Folder Name="/access-token-management/src/">
22+
<File Path="access-token-management/src/Directory.Build.props" />
23+
<Project Path="access-token-management/src/AccessTokenManagement.OpenIdConnect/AccessTokenManagement.OpenIdConnect.csproj" />
24+
<Project Path="access-token-management/src/AccessTokenManagement/AccessTokenManagement.csproj" />
25+
</Folder>
26+
<Folder Name="/access-token-management/test/">
27+
<File Path="access-token-management/test/Directory.Build.props" />
28+
<Project Path="access-token-management/test/AccessTokenManagement.Tests/AccessTokenManagement.Tests.csproj" />
29+
</Folder>
30+
<Folder Name="/identity-model-oidc-client/">
31+
<File Path="identity-model-oidc-client/README.md" />
32+
</Folder>
33+
<Folder Name="/identity-model-oidc-client/clients/">
34+
<Project Path="identity-model-oidc-client/clients/ConsoleClientWithBrowser/ConsoleClientWithBrowser.csproj" />
35+
<Project Path="identity-model-oidc-client/clients/ConsoleClientWithBrowserAndDPoP/ConsoleClientWithBrowserAndDPoP.csproj" />
36+
<Project Path="identity-model-oidc-client/clients/ManualModeConsoleClient/ManualModeConsoleClient.csproj" />
37+
</Folder>
38+
<Folder Name="/identity-model-oidc-client/src/">
39+
<File Path="identity-model-oidc-client/src/Directory.Build.props" />
40+
<Project Path="identity-model-oidc-client/src/IdentityModel.OidcClient.Extensions/IdentityModel.OidcClient.Extensions.csproj" />
41+
<Project Path="identity-model-oidc-client/src/IdentityModel.OidcClient/IdentityModel.OidcClient.csproj" />
42+
<Project Path="identity-model-oidc-client/src/TrimmableAnalysis/TrimmableAnalysis.csproj" />
43+
</Folder>
44+
<Folder Name="/identity-model-oidc-client/test/">
45+
<File Path="identity-model-oidc-client/test/Directory.Build.props" />
46+
<Project Path="identity-model-oidc-client/test/IdentityModel.OidcClient.Tests/IdentityModel.OidcClient.Tests.csproj" />
47+
</Folder>
48+
<Folder Name="/identity-model/">
49+
<File Path="identity-model/README.md" />
50+
</Folder>
51+
<Folder Name="/identity-model/samples/">
52+
<Project Path="identity-model/samples/HttpClientFactory/HttpClientFactory.csproj" />
53+
</Folder>
54+
<Folder Name="/identity-model/src/">
55+
<File Path="identity-model/src/Directory.Build.props" />
56+
<Project Path="identity-model/src/IdentityModel/IdentityModel.csproj" />
57+
<Project Path="identity-model/src/TrimmableAnalysis/TrimmableAnalysis.csproj" />
58+
</Folder>
59+
<Folder Name="/identity-model/test/">
60+
<File Path="identity-model/test/Directory.Build.props" />
61+
<Project Path="identity-model/test/IdentityModel.Tests/IdentityModel.Tests.csproj" />
62+
</Folder>
63+
<Folder Name="/ignore-this/">
64+
<File Path="ignore-this/README.md" />
65+
</Folder>
66+
<Folder Name="/ignore-this/src/">
67+
<File Path="ignore-this/src/Directory.Build.props" />
68+
<Project Path="ignore-this/src/IgnoreThis/IgnoreThis.csproj" />
69+
</Folder>
70+
<Folder Name="/ignore-this/test/">
71+
<Project Path="ignore-this/test/IgnoreThis.Tests/IgnoreThis.Tests.csproj" />
72+
</Folder>
73+
</Solution>

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"sdk": {
3-
"version": "9.0.102",
4-
"rollForward": "latestPatch",
3+
"version": "9.0.203",
4+
"rollForward": "latestMajor",
55
"allowPrerelease": false
66
}
77
}

0 commit comments

Comments
 (0)