Merge branch 'main' into ev/bff/separate-settings-for-polling

DuendeSoftware · Feb 7, 2025 · 8b36a07 · 8b36a07
2 parents 876683d + 4ee3d55
commit 8b36a07
Show file tree

Hide file tree

Showing 21 changed files with 817 additions and 1,087 deletions.
diff --git a/.github/workflow-gen/Program.cs b/.github/workflow-gen/Program.cs
@@ -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);
 }

diff --git a/.github/workflow-gen/workflow-gen.sln b/.github/workflow-gen/workflow-gen.sln
diff --git a/.github/workflows/bff-ci.yml b/.github/workflows/bff-ci.yml
@@ -44,16 +44,16 @@ 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
     - name: Test report
-      if: success() || failure()
+      if: github.event == 'push' && (success() || failure())
       uses: dorny/test-reporter@31a54ee7ebcacc03a09ea97a7e5465a47b84aea5
       with:
         name: Test Report
@@ -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: |-

diff --git a/.github/workflows/bff-release.yml b/.github/workflows/bff-release.yml
@@ -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

diff --git a/.github/workflows/identity-server-ci.yml b/.github/workflows/identity-server-ci.yml
@@ -44,14 +44,14 @@ 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
     - name: Test report
-      if: success() || failure()
+      if: github.event == 'push' && (success() || failure())
       uses: dorny/test-reporter@31a54ee7ebcacc03a09ea97a7e5465a47b84aea5
       with:
         name: Test Report
@@ -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: |-

diff --git a/.github/workflows/identity-server-release.yml b/.github/workflows/identity-server-release.yml
@@ -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