Merge branch 'main' into BMichaelis/TOCFiltering

Author: BenjaminMichaelis

.github/workflows/Build-Test-And-Deploy.yml

@@ -51,11 +51,11 @@ jobs:
         run: dotnet test --no-build --configuration Release
 
       - name: Set up Docker Buildx
-        if: github.event_name != 'pull_request_target'
+        if: github.event_name != 'pull_request_target' && github.event_name != 'pull_request'
         uses: docker/setup-buildx-action@v3
 
       - name: Build Container Image
-        if: github.event_name != 'pull_request_target'
+        if: github.event_name != 'pull_request_target' && github.event_name != 'pull_request'
         uses: docker/build-push-action@v6
         with:
           tags: ${{ vars.DEVCONTAINER_REGISTRY }}/essentialcsharpweb:${{ github.sha }},${{ vars.DEVCONTAINER_REGISTRY }}/essentialcsharpweb:latest,${{ vars.PRODCONTAINER_REGISTRY }}/essentialcsharpweb:${{ github.sha }},${{ vars.PRODCONTAINER_REGISTRY }}/essentialcsharpweb:latest
@@ -73,7 +73,7 @@ jobs:
           path: ${{ github.workspace }}/essentialcsharpwebimage.tar
 
   deploy-development:
-    if: github.event_name != 'pull_request_target'
+    if: github.event_name != 'pull_request_target' && github.event_name != 'pull_request'
     runs-on: ubuntu-latest
     needs: build-and-test
     environment:
@@ -99,19 +99,16 @@ jobs:
           docker image ls -a
 
       - name: Log in to container registry
-        if: github.event_name != 'pull_request_target'
         uses: docker/login-action@v3
         with:
           registry: ${{ vars.DEVCONTAINER_REGISTRY }}
           username: ${{ secrets.ESSENTIALCSHARP_ACR_USERNAME }}
           password: ${{ secrets.ESSENTIALCSHARP_ACR_PASSWORD }}
 
       - name: Push Image to Container Registry
-        if: github.event_name != 'pull_request_target'
         run: docker push --all-tags ${{ vars.DEVCONTAINER_REGISTRY }}/essentialcsharpweb
 
       - name: Create and Deploy to Container App
-        if: github.event_name != 'pull_request_target'
         uses: azure/CLI@v2
         env:
           CONTAINER_APP_NAME: ${{ vars.CONTAINER_APP_NAME }}
@@ -161,7 +158,7 @@ jobs:
             az account clear
 
   deploy-production:
-    if: github.event_name != 'pull_request_target'
+    if: github.event_name != 'pull_request_target' && github.event_name != 'pull_request'
     runs-on: ubuntu-latest
     needs: [deploy-development]
     environment:
@@ -187,15 +184,13 @@ jobs:
           docker image ls -a
 
       - name: Log in to container registry
-        if: github.event_name != 'pull_request_target'
         uses: docker/login-action@v3
         with:
           registry: ${{ vars.PRODCONTAINER_REGISTRY }}
           username: ${{ secrets.ESSENTIALCSHARP_ACR_USERNAME }}
           password: ${{ secrets.ESSENTIALCSHARP_ACR_PASSWORD }}
 
       - name: Push Image to Container Registry
-        if: github.event_name != 'pull_request_target'
         run: docker push --all-tags ${{ vars.PRODCONTAINER_REGISTRY }}/essentialcsharpweb
 
       - name: Create and Deploy to Container App

Directory.Packages.props

@@ -3,14 +3,14 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
     <AccessToNugetFeed>true</AccessToNugetFeed>
-    <ToolingPackagesVersion>1.1.1.4268</ToolingPackagesVersion>
+    <ToolingPackagesVersion>1.1.1.4285</ToolingPackagesVersion>
   </PropertyGroup>
   <ItemGroup Condition="$(AccessToNugetFeed)">
     <PackageVersion Include="ContentFeedNuget" Version="$(ToolingPackagesVersion)" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.8" />
   </ItemGroup>
   <ItemGroup>
-    <PackageVersion Include="EssentialCSharp.Shared.Models" Version="1.1.1.4268" />
+    <PackageVersion Include="EssentialCSharp.Shared.Models" Version="1.1.1.4285" />
     <PackageVersion Include="AspNet.Security.OAuth.GitHub" Version="8.2.0" />
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />
     <PackageVersion Include="HtmlAgilityPack" Version="1.11.66" />