Skip to content

Commit

Permalink
making sure build uses the slnf files
Browse files Browse the repository at this point in the history
  • Loading branch information
Erwinvandervalk committed Feb 7, 2025
1 parent a3ebe80 commit 29a9633
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflow-gen/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
var contexts = Instance;

{
SystemDescription identityServer = new("identity-server", "Duende.IdentityServer.sln", "is");
SystemDescription identityServer = new("identity-server", "identity-server.slnf", "is");
GenerateIdentityServerWorkflow(identityServer);
GenerateIdentityServerReleaseWorkflow(identityServer);
}

{
SystemDescription bff = new("bff", "bff.sln", "bff");
SystemDescription bff = new("bff", "bff.slnf", "bff");
GenerateBffWorkflow(bff);
GenerateBffReleaseWorkflow(bff);
}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/bff-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ jobs:
8.0.x
9.0.x
- name: Build
run: dotnet build bff.sln -c Release
run: dotnet build bff.slnf -c Release
- name: Dotnet devcerts
run: dotnet dev-certs https --trust
- name: Test
run: dotnet test bff.sln -c Release --no-build --logger "console;verbosity=normal" --logger "trx;LogFileName=Tests.trx" --collect:"XPlat Code Coverage"
run: dotnet test bff.slnf -c Release --no-build --logger "console;verbosity=normal" --logger "trx;LogFileName=Tests.trx" --collect:"XPlat Code Coverage"
- name: test
run: 'ls '
working-directory: test
Expand All @@ -63,8 +63,8 @@ jobs:
fail-on-empty: true
- name: Tool restore
run: dotnet tool restore
- name: Pack bff.sln
run: dotnet pack -c Release bff.sln -o artifacts
- name: Pack bff.slnf
run: dotnet pack -c Release bff.slnf -o artifacts
- name: Sign packages
if: github.event == 'push'
run: |-
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/bff-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ jobs:
git config --global user.name "Duende Software GitHub Bot"
git tag -a bff-${{ github.event.inputs.version }} -m "Release v${{ github.event.inputs.version }}"
git push origin bff-${{ github.event.inputs.version }}
- name: Pack bff.sln
run: dotnet pack -c Release bff.sln -o artifacts
- name: Pack bff.slnf
run: dotnet pack -c Release bff.slnf -o artifacts
- name: Tool restore
run: dotnet tool restore
- name: Sign packages
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/identity-server-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ jobs:
8.0.x
9.0.x
- name: Build
run: dotnet build Duende.IdentityServer.sln -c Release
run: dotnet build identity-server.slnf -c Release
- name: Test
run: dotnet test Duende.IdentityServer.sln -c Release --no-build --logger "console;verbosity=normal" --logger "trx;LogFileName=Tests.trx" --collect:"XPlat Code Coverage"
run: dotnet test identity-server.slnf -c Release --no-build --logger "console;verbosity=normal" --logger "trx;LogFileName=Tests.trx" --collect:"XPlat Code Coverage"
- name: test
run: 'ls '
working-directory: test
Expand All @@ -61,8 +61,8 @@ jobs:
fail-on-empty: true
- name: Tool restore
run: dotnet tool restore
- name: Pack Duende.IdentityServer.sln
run: dotnet pack -c Release Duende.IdentityServer.sln -o artifacts
- name: Pack identity-server.slnf
run: dotnet pack -c Release identity-server.slnf -o artifacts
- name: Sign packages
if: github.event == 'push'
run: |-
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/identity-server-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ jobs:
git config --global user.name "Duende Software GitHub Bot"
git tag -a is-${{ github.event.inputs.version }} -m "Release v${{ github.event.inputs.version }}"
git push origin is-${{ github.event.inputs.version }}
- name: Pack Duende.IdentityServer.sln
run: dotnet pack -c Release Duende.IdentityServer.sln -o artifacts
- name: Pack identity-server.slnf
run: dotnet pack -c Release identity-server.slnf -o artifacts
- name: Tool restore
run: dotnet tool restore
- name: Sign packages
Expand Down
1 change: 1 addition & 0 deletions bff/bff.slnf
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"solution": {
"path": "..\\products.sln",
"projects": [
".github\\workflow-gen\\workflow-gen.csproj",
"bff\\hosts\\Blazor\\PerComponent\\Hosts.Bff.Blazor.PerComponent.Client\\Hosts.Bff.Blazor.PerComponent.Client.csproj",
"bff\\hosts\\Blazor\\PerComponent\\Hosts.Bff.Blazor.PerComponent\\Hosts.Bff.Blazor.PerComponent.csproj",
"bff\\hosts\\Blazor\\WebAssembly\\Hosts.Bff.Blazor.WebAssembly.Client\\Hosts.Bff.Blazor.WebAssembly.Client.csproj",
Expand Down

0 comments on commit 29a9633

Please sign in to comment.