Skip to content

Commit d300eec

Browse files
czprzczprz
committed
Switch to .sln and move Helm values to root
Replace the old ServiceTemplate.slnx with a proper ServiceTemplate.sln and update all references (devcontainer, VSCode settings, CI workflow, Makefile) to use the .sln file. Move Helm environment override files out of charts/ (rename charts/values.local.yaml -> values.local.yaml and add values.staging.yaml at repo root) so local/staging overrides are not packaged into the chart; update Makefile, skaffold.yaml, README and helm commands to reference the new paths. Add charts/Chart.lock and remove the old ServiceTemplate.slnx and charts/values.staging.yaml files.
1 parent ac92fd3 commit d300eec

File tree

12 files changed

+138
-66
lines changed

12 files changed

+138
-66
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"editor.codeActionsOnSave": {
4444
"source.organizeImports": "explicit"
4545
},
46-
"dotnet.defaultSolution": "ServiceTemplate.slnx",
46+
"dotnet.defaultSolution": "ServiceTemplate.sln",
4747
"omnisharp.enableRoslynAnalyzers": true,
4848
"omnisharp.enableEditorConfigSupport": true,
4949
"files.exclude": {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ jobs:
2222
global-json-file: global.json
2323

2424
- name: Restore NuGet packages
25-
run: dotnet restore ServiceTemplate.slnx
25+
run: dotnet restore ServiceTemplate.sln
2626

2727
- name: Install dotnet tools
2828
run: dotnet tool restore
2929

3030
- name: Build solution
31-
run: dotnet build ServiceTemplate.slnx -c Release --no-restore
31+
run: dotnet build ServiceTemplate.sln -c Release --no-restore
3232

3333
- name: Verify unit tests pass
3434
run: dotnet test tests/UnitTests/ServiceTemplate.UnitTests.csproj --no-build -c Release

‎.vscode/settings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"**/obj": true,
1010
"**/.git": false
1111
},
12-
"dotnet.defaultSolution": "ServiceTemplate.slnx",
12+
"dotnet.defaultSolution": "ServiceTemplate.sln",
1313

1414
// ── GitHub Copilot ──────────────────────────────────────────────────────────
1515
"github.copilot.enable": {

‎Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SHELL := /bin/bash
44

55
# ── Variables ──────────────────────────────────────────────────────────────────
66
PROJECT := ServiceTemplate
7-
SOLUTION := ServiceTemplate.slnx
7+
SOLUTION := ServiceTemplate.sln
88
SRC_API := src/Api
99
VERSION ?= $(shell git describe --tags --always --dirty 2>/dev/null || echo "0.0.1-local")
1010
CLUSTER_NAME := service-template
@@ -167,20 +167,20 @@ helm-deps: ## Download/update Helm chart dependencies (subcharts)
167167

168168
.PHONY: helm-lint
169169
helm-lint: ## Lint the Helm chart
170-
helm lint $(HELM_CHART) -f $(HELM_CHART)/values.local.yaml
170+
helm lint $(HELM_CHART) -f values.local.yaml
171171

172172
.PHONY: helm-template
173173
helm-template: ## Render Helm templates with local values (dry run)
174174
helm template $(HELM_RELEASE) $(HELM_CHART) \
175175
-f $(HELM_CHART)/values.yaml \
176-
-f $(HELM_CHART)/values.local.yaml \
176+
-f values.local.yaml \
177177
--debug
178178

179179
.PHONY: helm-install
180180
helm-install: ## Install chart to local cluster
181181
helm upgrade --install $(HELM_RELEASE) $(HELM_CHART) \
182182
-f $(HELM_CHART)/values.yaml \
183-
-f $(HELM_CHART)/values.local.yaml \
183+
-f values.local.yaml \
184184
--namespace $(NAMESPACE) \
185185
--wait --timeout 5m \
186186
--set image.tag=$(VERSION)

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ make helm-package
216216
# Deploy to staging
217217
helm upgrade --install my-service charts \
218218
-f charts/values.yaml \
219-
-f charts/values.staging.yaml \
219+
-f values.staging.yaml \
220220
--set image.tag=1.2.3 \
221221
--namespace my-namespace --create-namespace
222222
```

‎ServiceTemplate.sln‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.31903.59
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{AB660A63-83CA-4928-A9D6-8183063D4DCF}"
7+
EndProject
8+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{88EE924D-93FD-4E50-947A-5F0F9B112049}"
9+
EndProject
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceTemplate.Domain", "src\Domain\ServiceTemplate.Domain.csproj", "{4E67B1DC-43BB-4F7C-90F8-9967CB99F907}"
11+
EndProject
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceTemplate.Application", "src\Application\ServiceTemplate.Application.csproj", "{7F806516-C11D-423D-A1AB-3F91A2B1CDDA}"
13+
EndProject
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceTemplate.Infrastructure", "src\Infrastructure\ServiceTemplate.Infrastructure.csproj", "{814517F2-20BB-4863-A420-E5FE774D6691}"
15+
EndProject
16+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceTemplate.Api", "src\Api\ServiceTemplate.Api.csproj", "{33956AAE-E350-4684-9E05-7D57BFE6477A}"
17+
EndProject
18+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceTemplate.McpServer", "src\McpServer\ServiceTemplate.McpServer.csproj", "{1D89A2F1-FDA8-45AD-A57A-F08F7893A6DC}"
19+
EndProject
20+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceTemplate.UnitTests", "tests\UnitTests\ServiceTemplate.UnitTests.csproj", "{7330AD4D-DB0C-4C2D-AE16-D585804625F9}"
21+
EndProject
22+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceTemplate.IntegrationTests", "tests\IntegrationTests\ServiceTemplate.IntegrationTests.csproj", "{8A415B9B-437E-4671-8F9B-60B3D3A20738}"
23+
EndProject
24+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceTemplate.AcceptanceTests", "tests\AcceptanceTests\ServiceTemplate.AcceptanceTests.csproj", "{D39CD09A-627E-420C-8AE8-B400D74B9035}"
25+
EndProject
26+
Global
27+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
28+
Debug|Any CPU = Debug|Any CPU
29+
Release|Any CPU = Release|Any CPU
30+
EndGlobalSection
31+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
32+
{4E67B1DC-43BB-4F7C-90F8-9967CB99F907}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33+
{4E67B1DC-43BB-4F7C-90F8-9967CB99F907}.Debug|Any CPU.Build.0 = Debug|Any CPU
34+
{4E67B1DC-43BB-4F7C-90F8-9967CB99F907}.Release|Any CPU.ActiveCfg = Release|Any CPU
35+
{4E67B1DC-43BB-4F7C-90F8-9967CB99F907}.Release|Any CPU.Build.0 = Release|Any CPU
36+
{7F806516-C11D-423D-A1AB-3F91A2B1CDDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
37+
{7F806516-C11D-423D-A1AB-3F91A2B1CDDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
38+
{7F806516-C11D-423D-A1AB-3F91A2B1CDDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
39+
{7F806516-C11D-423D-A1AB-3F91A2B1CDDA}.Release|Any CPU.Build.0 = Release|Any CPU
40+
{814517F2-20BB-4863-A420-E5FE774D6691}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
41+
{814517F2-20BB-4863-A420-E5FE774D6691}.Debug|Any CPU.Build.0 = Debug|Any CPU
42+
{814517F2-20BB-4863-A420-E5FE774D6691}.Release|Any CPU.ActiveCfg = Release|Any CPU
43+
{814517F2-20BB-4863-A420-E5FE774D6691}.Release|Any CPU.Build.0 = Release|Any CPU
44+
{33956AAE-E350-4684-9E05-7D57BFE6477A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
45+
{33956AAE-E350-4684-9E05-7D57BFE6477A}.Debug|Any CPU.Build.0 = Debug|Any CPU
46+
{33956AAE-E350-4684-9E05-7D57BFE6477A}.Release|Any CPU.ActiveCfg = Release|Any CPU
47+
{33956AAE-E350-4684-9E05-7D57BFE6477A}.Release|Any CPU.Build.0 = Release|Any CPU
48+
{1D89A2F1-FDA8-45AD-A57A-F08F7893A6DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
49+
{1D89A2F1-FDA8-45AD-A57A-F08F7893A6DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
50+
{1D89A2F1-FDA8-45AD-A57A-F08F7893A6DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
51+
{1D89A2F1-FDA8-45AD-A57A-F08F7893A6DC}.Release|Any CPU.Build.0 = Release|Any CPU
52+
{7330AD4D-DB0C-4C2D-AE16-D585804625F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
53+
{7330AD4D-DB0C-4C2D-AE16-D585804625F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
54+
{7330AD4D-DB0C-4C2D-AE16-D585804625F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
55+
{7330AD4D-DB0C-4C2D-AE16-D585804625F9}.Release|Any CPU.Build.0 = Release|Any CPU
56+
{8A415B9B-437E-4671-8F9B-60B3D3A20738}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
57+
{8A415B9B-437E-4671-8F9B-60B3D3A20738}.Debug|Any CPU.Build.0 = Debug|Any CPU
58+
{8A415B9B-437E-4671-8F9B-60B3D3A20738}.Release|Any CPU.ActiveCfg = Release|Any CPU
59+
{8A415B9B-437E-4671-8F9B-60B3D3A20738}.Release|Any CPU.Build.0 = Release|Any CPU
60+
{D39CD09A-627E-420C-8AE8-B400D74B9035}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
61+
{D39CD09A-627E-420C-8AE8-B400D74B9035}.Debug|Any CPU.Build.0 = Debug|Any CPU
62+
{D39CD09A-627E-420C-8AE8-B400D74B9035}.Release|Any CPU.ActiveCfg = Release|Any CPU
63+
{D39CD09A-627E-420C-8AE8-B400D74B9035}.Release|Any CPU.Build.0 = Release|Any CPU
64+
EndGlobalSection
65+
GlobalSection(NestedProjects) = preSolution
66+
{4E67B1DC-43BB-4F7C-90F8-9967CB99F907} = {AB660A63-83CA-4928-A9D6-8183063D4DCF}
67+
{7F806516-C11D-423D-A1AB-3F91A2B1CDDA} = {AB660A63-83CA-4928-A9D6-8183063D4DCF}
68+
{814517F2-20BB-4863-A420-E5FE774D6691} = {AB660A63-83CA-4928-A9D6-8183063D4DCF}
69+
{33956AAE-E350-4684-9E05-7D57BFE6477A} = {AB660A63-83CA-4928-A9D6-8183063D4DCF}
70+
{1D89A2F1-FDA8-45AD-A57A-F08F7893A6DC} = {AB660A63-83CA-4928-A9D6-8183063D4DCF}
71+
{7330AD4D-DB0C-4C2D-AE16-D585804625F9} = {88EE924D-93FD-4E50-947A-5F0F9B112049}
72+
{8A415B9B-437E-4671-8F9B-60B3D3A20738} = {88EE924D-93FD-4E50-947A-5F0F9B112049}
73+
{D39CD09A-627E-420C-8AE8-B400D74B9035} = {88EE924D-93FD-4E50-947A-5F0F9B112049}
74+
EndGlobalSection
75+
GlobalSection(SolutionProperties) = preSolution
76+
HideSolutionNode = FALSE
77+
EndGlobalSection
78+
EndGlobal

‎ServiceTemplate.slnx‎

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

‎charts/Chart.lock‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
dependencies:
2+
- name: opentelemetry-collector
3+
repository: https://open-telemetry.github.io/opentelemetry-helm-charts
4+
version: 0.108.0
5+
- name: postgresql
6+
repository: https://charts.bitnami.com/bitnami
7+
version: 16.4.3
8+
digest: sha256:0f95fd5e5f69ad8ca9412c19303f0be457f456c6395769e8f5c9b3dd12da77a7
9+
generated: "2026-02-28T22:31:07.7391604+01:00"

‎charts/values.staging.yaml‎

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

‎skaffold.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ deploy:
2121
chartPath: charts
2222
valuesFiles:
2323
- charts/values.yaml
24-
- charts/values.local.yaml
24+
- values.local.yaml
2525
# Skaffold injects the built image tag by matching image.repository in values.local.yaml
2626
# against the artifact image name above. The tag is set automatically on each build.
2727
setValueTemplates:

0 commit comments

Comments
 (0)