Skip to content

Commit af5de13

Browse files
Merge branch 'main' into benjaminmichaelis/canonical-url-metadata
2 parents b18d7c0 + 5a4f691 commit af5de13

36 files changed

Lines changed: 1016 additions & 531 deletions

‎.config/dotnet-tools.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"isRoot": true,
44
"tools": {
55
"dotnet-ef": {
6-
"version": "10.0.8",
6+
"version": "10.0.10",
77
"commands": [
88
"dotnet-ef"
99
],
1010
"rollForward": false
1111
},
1212
"trx-to-vsplaylist": {
13-
"version": "1.3.0",
13+
"version": "2.0.0",
1414
"commands": [
1515
"trx-to-vsplaylist"
1616
],

‎.dockerignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
**/.buildkit-cache
2+
**/buildkit-cache
13
**/.classpath
24
**/.dockerignore
35
**/.env

‎.github/copilot-instructions.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,22 @@ docker-compose up --build
145145

146146
## Configuration & Environment Setup
147147

148+
### NuGet Feed Selection
149+
150+
`Directory.Packages.props` defaults `AccessToNugetFeed` to `false`. Keep it disabled for contributors without Azure DevOps feed access or when troubleshooting public dependency resolution:
151+
152+
```xml
153+
<AccessToNugetFeed>false</AccessToNugetFeed>
154+
```
155+
156+
Set it to `true` only after authenticating to the private Azure DevOps feed. This enables the internal `ContentFeedNuget` package and production content; with the value set to `false`, the web project copies placeholder content instead:
157+
158+
```xml
159+
<AccessToNugetFeed>true</AccessToNugetFeed>
160+
```
161+
162+
If restore reports private-feed authentication or connectivity errors, set the value back to `false` before investigating public package versions.
163+
148164
### Required Secrets (Use dotnet user-secrets)
149165
```bash
150166
# Email configuration

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

Lines changed: 38 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,25 @@ jobs:
1515
environment: "BuildAndUploadImage"
1616

1717
steps:
18-
- uses: actions/checkout@v6
18+
- uses: actions/checkout@v7
1919

2020
- name: Set up .NET Core
21-
uses: actions/setup-dotnet@v5
21+
uses: actions/setup-dotnet@v6
2222
with:
2323
global-json-file: global.json
2424
source-url: https://pkgs.dev.azure.com/intelliTect/_packaging/EssentialCSharp/nuget/v3/index.json
2525
env:
2626
NUGET_AUTH_TOKEN: ${{ secrets.AZURE_DEVOPS_PAT }}
2727

2828
- name: Set up Node.js
29-
uses: actions/setup-node@v6
29+
uses: actions/setup-node@v7
3030
with:
3131
node-version: 24
3232
cache: npm
3333
cache-dependency-path: EssentialCSharp.Web/package-lock.json
3434

3535
- name: Set up dependency caching for faster builds
36-
uses: actions/cache@v5
36+
uses: actions/cache@v6
3737
id: nuget-cache
3838
with:
3939
path: |
@@ -62,6 +62,31 @@ jobs:
6262

6363
- name: Set up Docker Buildx
6464
uses: docker/setup-buildx-action@v4
65+
id: buildx
66+
67+
- name: Restore BuildKit cache mounts
68+
uses: actions/cache@v6
69+
id: buildkit-cache
70+
with:
71+
path: buildkit-cache
72+
key: buildkit-cache-${{ hashFiles('EssentialCSharp.Web/Dockerfile', 'Directory.Packages.props', '**/*.csproj', 'EssentialCSharp.Web/package-lock.json') }}
73+
restore-keys: buildkit-cache-
74+
75+
- name: Inject BuildKit cache mounts
76+
uses: reproducible-containers/buildkit-cache-dance@v3
77+
with:
78+
builder: ${{ steps.buildx.outputs.name }}
79+
dockerfile: EssentialCSharp.Web/Dockerfile
80+
cache-dir: buildkit-cache
81+
skip-extraction: false
82+
83+
- name: Generate Docker NuGet credentials config
84+
env:
85+
NUGET_FEED_TOKEN: ${{ secrets.AZURE_DEVOPS_PAT }}
86+
run: |
87+
mkdir -p "${RUNNER_TEMP}/nuget"
88+
bash scripts/nuget/emit-creds-config.sh > "${RUNNER_TEMP}/nuget/NuGet.Config"
89+
chmod 600 "${RUNNER_TEMP}/nuget/NuGet.Config"
6590
6691
# Only build for dev registry — prod gets the image via az acr import in deploy-production
6792
- name: Build Container Image
@@ -71,11 +96,15 @@ jobs:
7196
tags: ${{ vars.DEVCONTAINER_REGISTRY }}/essentialcsharpweb:${{ github.sha }},${{ vars.DEVCONTAINER_REGISTRY }}/essentialcsharpweb:latest
7297
file: ./EssentialCSharp.Web/Dockerfile
7398
context: .
74-
secrets: |
75-
"nuget_pat=${{ secrets.AZURE_DEVOPS_PAT }}"
99+
secret-files: |
100+
"nuget_config=${{ runner.temp }}/nuget/NuGet.Config"
76101
outputs: type=docker,dest=${{ github.workspace }}/essentialcsharpwebimage.tar
77-
cache-from: type=gha
78-
cache-to: type=gha,mode=max
102+
cache-from: type=gha,scope=essentialcsharpweb-main
103+
cache-to: type=gha,mode=max,scope=essentialcsharpweb-main
104+
105+
- name: Remove Docker NuGet credentials config
106+
if: always()
107+
run: rm -f "${RUNNER_TEMP}/nuget/NuGet.Config"
79108

80109
- name: Upload artifact
81110
uses: actions/upload-artifact@v7
@@ -128,7 +157,6 @@ jobs:
128157
CONTAINER_APP_NAME: ${{ vars.CONTAINER_APP_NAME }}
129158
RESOURCEGROUP: ${{ vars.RESOURCEGROUP }}
130159
run: |
131-
az extension add --name containerapp --upgrade --only-show-errors
132160
az containerapp update \
133161
--name "$CONTAINER_APP_NAME" \
134162
--resource-group "$RESOURCEGROUP" \
@@ -158,7 +186,7 @@ jobs:
158186
actions: write
159187

160188
steps:
161-
- uses: actions/checkout@v6
189+
- uses: actions/checkout@v7
162190
with:
163191
fetch-depth: 0
164192

@@ -197,7 +225,6 @@ jobs:
197225
CONTAINER_APP_NAME: ${{ vars.CONTAINER_APP_NAME }}
198226
RESOURCEGROUP: ${{ vars.RESOURCEGROUP }}
199227
run: |
200-
az extension add --name containerapp --upgrade --only-show-errors
201228
az containerapp update \
202229
--name "$CONTAINER_APP_NAME" \
203230
--resource-group "$RESOURCEGROUP" \
@@ -304,4 +331,3 @@ jobs:
304331
az logout
305332
az cache purge
306333
az account clear
307-

‎.github/workflows/Build-Vector-DB.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010
build:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v6
13+
- uses: actions/checkout@v7
1414
- name: Set up Python 3.8
15-
uses: actions/setup-python@v6
15+
uses: actions/setup-python@v7
1616
with:
1717
python-version: 3.8
1818
- name: Install dependencies

‎.github/workflows/PR-Build-And-Test.yml‎

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
frontend-build:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v6
13+
- uses: actions/checkout@v7
1414

1515
- name: Set up Node.js
16-
uses: actions/setup-node@v6
16+
uses: actions/setup-node@v7
1717
with:
1818
node-version: '26'
1919
cache: npm
@@ -30,15 +30,15 @@ jobs:
3030
build-and-test:
3131
runs-on: ubuntu-latest
3232
steps:
33-
- uses: actions/checkout@v6
33+
- uses: actions/checkout@v7
3434

3535
- name: Set up .NET Core
36-
uses: actions/setup-dotnet@v5
36+
uses: actions/setup-dotnet@v6
3737
with:
3838
global-json-file: global.json
3939

4040
- name: Set up dependency caching for faster builds
41-
uses: actions/cache@v5
41+
uses: actions/cache@v6
4242
id: nuget-cache
4343
with:
4444
path: |
@@ -75,20 +75,39 @@ jobs:
7575

7676
- name: Convert TRX to VS Playlist
7777
if: failure()
78-
uses: BenjaminMichaelis/trx-to-vsplaylist@v3
78+
uses: BenjaminMichaelis/trx-to-vsplaylist@v4
7979
with:
8080
trx-file-path: '${{ runner.temp }}/*.trx'
8181
output-directory: '${{ runner.temp }}/vsplaylists'
8282

8383
- name: Set up Docker Buildx
8484
uses: docker/setup-buildx-action@v4
85+
id: buildx
86+
87+
- name: Restore BuildKit cache mounts
88+
uses: actions/cache/restore@v6
89+
id: buildkit-cache
90+
with:
91+
path: buildkit-cache
92+
key: buildkit-cache-${{ hashFiles('EssentialCSharp.Web/Dockerfile', 'Directory.Packages.props', '**/*.csproj', 'EssentialCSharp.Web/package-lock.json') }}
93+
restore-keys: buildkit-cache-
94+
95+
- name: Inject BuildKit cache mounts
96+
uses: reproducible-containers/buildkit-cache-dance@v3
97+
with:
98+
builder: ${{ steps.buildx.outputs.name }}
99+
dockerfile: EssentialCSharp.Web/Dockerfile
100+
cache-dir: buildkit-cache
101+
skip-extraction: true
85102

86103
- name: Build Container Image
87104
uses: docker/build-push-action@v7
88105
with:
89106
file: ./EssentialCSharp.Web/Dockerfile
90107
context: .
91108
push: false
92-
cache-from: type=gha
93-
cache-to: type=gha,mode=max
109+
cache-from: |
110+
type=gha,scope=essentialcsharpweb-main
111+
type=gha,scope=essentialcsharpweb-pr
112+
cache-to: type=gha,mode=min,scope=essentialcsharpweb-pr
94113
build-args: ACCESS_TO_NUGET_FEED=false

‎.github/workflows/codeql.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,20 @@ jobs:
2525

2626
steps:
2727
- name: Checkout repository
28-
uses: actions/checkout@v6
28+
uses: actions/checkout@v7
2929

3030
# Initializes the CodeQL tools for scanning.
3131
- name: Initialize CodeQL
3232
uses: github/codeql-action/init@v4
3333
with:
3434
languages: ${{ matrix.language }}
35+
build-mode: none
3536

3637
- name: Set up .NET Core
37-
uses: actions/setup-dotnet@v5
38+
uses: actions/setup-dotnet@v6
3839

3940
- name: Set up dependency caching for faster builds
40-
uses: actions/cache@v5
41+
uses: actions/cache@v6
4142
id: nuget-cache
4243
with:
4344
path: |
@@ -74,7 +75,7 @@ jobs:
7475

7576
steps:
7677
- name: Checkout repository
77-
uses: actions/checkout@v6
78+
uses: actions/checkout@v7
7879

7980
# Initializes the CodeQL tools for scanning.
8081
- name: Initialize CodeQL

‎.github/workflows/copilot-setup-steps.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,23 @@ jobs:
1818
permissions:
1919
contents: read
2020
steps:
21-
- uses: actions/checkout@v6
21+
- uses: actions/checkout@v7
2222

2323
- name: Set up .NET Core
24-
uses: actions/setup-dotnet@v5
24+
uses: actions/setup-dotnet@v6
2525
with:
2626
global-json-file: global.json
2727
source-url: https://pkgs.dev.azure.com/intelliTect/_packaging/EssentialCSharp/nuget/v3/index.json
2828
env:
2929
NUGET_AUTH_TOKEN: ${{ secrets.AZURE_DEVOPS_PAT }}
3030

3131
- name: Set up Node.js for frontend development
32-
uses: actions/setup-node@v6
32+
uses: actions/setup-node@v7
3333
with:
3434
node-version: '24'
3535

3636
- name: Set up dependency caching for faster builds
37-
uses: actions/cache@v5
37+
uses: actions/cache@v6
3838
id: nuget-cache
3939
with:
4040
path: |

0 commit comments

Comments
 (0)