Particular · bording · Aug 9, 2024 · Jul 24, 2024 · Jul 24, 2024 · Jul 24, 2024
diff --git a/.dockerignore b/.dockerignore
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v4.0.3
         with:
-          node-version: 21.6.x      
+          node-version: 21.6.x
       - name: Build Frontend
         run: .\build.ps1
         working-directory: src/ServicePulse.Host
@@ -38,7 +38,7 @@ jobs:
       - name: Build
         run: dotnet build src --configuration Release
       - name: Run .NET tests
-        uses: Particular/run-tests-action@v1.7.0       
+        uses: Particular/run-tests-action@v1.7.0
       # Upload assets and packages
       - name: Upload assets
         uses: actions/upload-artifact@v4.3.6

diff --git a/.github/workflows/push-container-images.yml b/.github/workflows/push-container-images.yml
@@ -52,4 +52,4 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
           repository: particular/servicepulse
-          readme-filepath: ./src/Container/README.md
+          readme-filepath: ./Container-README.md
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -121,43 +121,35 @@ jobs:
       - name: Install MinVer CLI
         run: dotnet tool install --global minver-cli
       - name: Determine version
-        run: echo "MinVerVersion=$(minver)" >> $GITHUB_ENV
+        shell: pwsh
+        run: |
+          # Read settings from Custom.Build.props
+          [xml]$xml = Get-Content ./src/Custom.Build.props
+          $minMajorMinor = $xml.selectNodes('/Project/PropertyGroup/MinVerMinimumMajorMinor').InnerText
+          $autoIncrement = $xml.selectNodes('/Project/PropertyGroup/MinVerAutoIncrement').InnerText
+          echo "MinVerMinimumMajorMinor=$minMajorMinor, MinVerAutoIncrement=$autoIncrement"
+          if (-not ($minMajorMinor -and $autoIncrement)) {
+            throw "Missing MinVer settings in Custom.Build.props"
+          }
+
+          # Execute MinVer
+          echo "MinVerVersion=$(minver --minimum-major-minor $minMajorMinor --auto-increment $autoIncrement)" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
       - name: Validate build version
         if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
         uses: ./.github/actions/validate-version
         with:
           version: ${{ env.MinVerVersion }}
-      - name: Set up Node.js
-        uses: actions/setup-node@v4.0.3
-        with:
-          node-version: 21.6.x
-      - name: Build Frontend
-        run: .\build.ps1
-        working-directory: src/ServicePulse.Host
-        shell: pwsh
-      - name: Update app.constants.js with MinVerVersion
-        run: |
-          $filename = "src/ServicePulse.Host/app/js/app.constants.js"
-          (Get-Content $filename).replace("1.2.0", "${{ env.MinVerVersion }}") | Set-Content $filename
-        shell: pwsh
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3.6.1
-      - name: Pull nginx:stable-alpine and determine digest
-        run: |
-          docker pull nginx:stable-alpine
-          echo "NGINX_DIGEST=$(docker inspect -f json nginx:stable-alpine | jq -r .[0].RepoDigests[0] | cut -d@ -f2)" >> $GITHUB_ENV
       - name: Log in to GitHub container registry
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
       - name: Build & inspect image
         env:
           TAG_NAME: ${{ github.event_name == 'pull_request' && format('pr-{0}', github.event.number) || env.MinVerVersion }}
         run: |
           docker buildx build --push --tag ghcr.io/particular/servicepulse:${{ env.TAG_NAME }} \
-            --file src/Container/Dockerfile \
-            --build-arg NGINX_TAGORDIGEST="@${{ env.NGINX_DIGEST }}" \
+            --file src/ServicePulse/Dockerfile \
             --build-arg VERSION=${{ env.MinVerVersion }} \
-            --build-arg GITHUB_SHA=${{ github.sha }} \
-            --build-arg GITHUB_REF_NAME=${{ github.ref.name }} \
             --annotation "index:org.opencontainers.image.title=ServicePulse" \
             --annotation "index:org.opencontainers.image.description=ServicePulse provides real-time production monitoring for distributed applications. It monitors the health of a system's endpoints, detects processing errors, sends failed messages for reprocessing, and ensures the specific environment's needs are met, all in one consolidated dashboard." \
             --annotation "index:org.opencontainers.image.created=$(date '+%FT%TZ')" \
@@ -168,6 +160,6 @@ jobs:
             --annotation "index:org.opencontainers.image.source=https://github.com/${{ github.repository }}/tree/${{ github.sha }}" \
             --annotation "index:org.opencontainers.image.url=https://hub.docker.com/r/particular/servicepulse" \
             --annotation "index:org.opencontainers.image.documentation=https://docs.particular.net/servicepulse/" \
-            --annotation "index:org.opencontainers.image.base.name=nginx@${{ env.NGINX_DIGEST }}" \
-            --platform linux/arm64,linux/arm,linux/amd64 .
-          docker buildx imagetools inspect ghcr.io/particular/servicepulse:${{ env.TAG_NAME }}
+            --annotation "index:org.opencontainers.image.base.name=mcr.microsoft.com/dotnet/aspnet:8.0-noble-chiseled-composite" \
+            --platform linux/arm64,linux/amd64 .
+          docker buildx imagetools inspect ghcr.io/particular/servicepulse:${{ env.TAG_NAME }}
diff --git a/src/Container/README.md → Container-README.md b/src/Container/README.md → Container-README.md
@@ -7,20 +7,20 @@ This document describes basic usage and information related to the ServicePulse
 The following is the most basic way to create a ServicePulse container using [Docker](https://www.docker.com/):
 
 ```shell
-docker run -p 9090:90 particular/servicepulse:latest
+docker run -p 9090:9090 particular/servicepulse:latest
 ```
 
 ### Environment Variables
 
-- **`SERVICECONTROL_URL`**: _Default_: `http://localhost:33333/api/`. The url to your ServiceControl instance
-- **`MONITORING_URLS`**: _Default_: `['http://localhost:33633/']`. A JSON array of URLs to your monitoring instances
+- **`SERVICECONTROL_URL`**: _Default_: `http://localhost:33333`. The url to your ServiceControl instance
+- **`MONITORING_URL`**: _Default_: `http://localhost:33633`. The url to your monitoring instance
 - **`DEFAULT_ROUTE`**: _Default_: `/dashboard`. The default page that should be displayed when visiting the site
 - **`SHOW_PENDING_RETRY`** _Default_: `false`. Set to `true` to show details of pending retries
 
-It may be desireable to run the ServiceControl services in an isolated network. When doing so ServicePulse must be configured to connect to those services using environment variables:
+It may be desireable to run the ServiceControl services in an isolated network. When doing so, ServicePulse must be configured to connect to those services using environment variables:
 
 ```shell
-docker run -p 9090:90 -e SERVICECONTROL_URL="http://servicecontrol:33333/api/" -e MONITORING_URLS="['http://servicecontrol-monitoring:33633']" particular/servicepulse:latest
+docker run -p 9090:9090 -e SERVICECONTROL_URL="http://servicecontrol:33333" -e MONITORING_URL="http://servicecontrol-monitoring:33633" particular/servicepulse:latest
 ```
 
 Or as part of a [Docker Compose services specification](https://docs.docker.com/compose/compose-file/05-services/):
@@ -29,10 +29,10 @@ Or as part of a [Docker Compose services specification](https://docs.docker.com/
 services:
     servicepulse:
         ports:
-            - 9090:90
+            - 9090:9090
         environment:
-            - SERVICECONTROL_URL=http://servicecontrol:33333/api/
-            - MONITORING_URLS=['http://servicecontrol-monitoring:33633']
+            - SERVICECONTROL_URL=http://servicecontrol:33333
+            - MONITORING_URL=http://servicecontrol-monitoring:33633
         image: particular/servicepulse:latest
 ```
 
@@ -68,9 +68,9 @@ The major version tag is never added to images pushed to [the GitHub Container R
 
 The latest release within a minor version will be tagged with `{major}.{minor}` on images pushed to Docker Hub. This allows users to target the latest patch within a specific minor version.
 
-## Built With
+## Image architecture
 
-This image is built from the stable Alpine version of the [nginx official Docker image](https://hub.docker.com/_/nginx/).
+This image is a multi-arch image based on the `mcr.microsoft.com/dotnet/aspnet:8.0-noble-chiseled-composite` base image supporting `linux/arm64` and `linux/amd64`.
 
 ## Contributing
 

diff --git a/README.md b/README.md
@@ -137,4 +137,4 @@ ServicePulse is supported on the following desktop browser versions:
 
 ## Container image development
 
-A Dockerfile for ServicePulse resides within the [`src/Container`](https://github.com/Particular/ServicePulse/tree/master/src/Container) folder. The container images are all built as part of the [release workflow](https://github.com/Particular/ServicePulse/blob/master/.github/workflows/release.yml) and staged in the [Github Container Registry](https://github.com/Particular/ServicePulse/pkgs/container/servicepulse). For branches with PRs the image will be tagged with the pr number, e.g. `pr-1234`.
+A Dockerfile for ServicePulse resides within the [`src/ServicePulse`](https://github.com/Particular/ServicePulse/tree/master/src/ServicePulse) folder. The container images are all built as part of the [release workflow](https://github.com/Particular/ServicePulse/blob/master/.github/workflows/release.yml) and staged in the [Github Container Registry](https://github.com/Particular/ServicePulse/pkgs/container/servicepulse). For branches with PRs, the image will be tagged with the PR number, e.g. `pr-1234`.
diff --git a/src/.gitignore b/src/.gitignore
@@ -8,11 +8,8 @@ src/scaffolding.config
 ServicePulse.Host.Tests/node_modules
 package-lock.json	
 
-# bower artifacts	
-ServicePulse.Host/app/bower_components	
-
 # Chutzpah folders	
 _Chutzpah.*/	
 
-# Webpack results	
-ServicePulse.Host/angular/app/modules/dist
+# ServicePulse.Host app
+ServicePulse.Host/app
diff --git a/src/Container/Dockerfile b/src/Container/Dockerfile
diff --git a/src/Container/app.constants.template b/src/Container/app.constants.template
diff --git a/src/Container/nginx.conf b/src/Container/nginx.conf
diff --git a/src/Container/updateconstants.sh b/src/Container/updateconstants.sh
diff --git a/src/Custom.Build.props b/src/Custom.Build.props
@@ -8,5 +8,5 @@
   <PropertyGroup Label="Treat as warnings the transitive dependencies problems">
     <NuGetAuditMode>all</NuGetAuditMode>
   </PropertyGroup>
-  
+
 </Project>
diff --git a/src/Frontend/vite.config.ts b/src/Frontend/vite.config.ts
@@ -60,7 +60,6 @@ export default defineConfig({
   },
   base: "./",
   build: {
-    outDir: "../ServicePulse.Host/app",
     emptyOutDir: true,
     sourcemap: true,
     rollupOptions: {

diff --git a/src/Particular.PlatformSample.ServicePulse/Particular.PlatformSample.ServicePulse.csproj b/src/Particular.PlatformSample.ServicePulse/Particular.PlatformSample.ServicePulse.csproj
@@ -1,28 +1,32 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
     <Description>Particular ServicePulse binaries for use by Particular.PlatformSample. Not intended for use outside of Particular.PlatformSample.</Description>
     <PackageProjectUrl>https://docs.particular.net/servicepulse/</PackageProjectUrl>
+    <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);AddFilesToPackage</TargetsForTfmSpecificContentInPackage>
+    <NoWarn>$(NoWarn);NU5100</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ServicePulse.Host\ServicePulse.Host.csproj" PrivateAssets="All" />
+    <ProjectReference Include="..\ServicePulse\ServicePulse.csproj" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Particular.Packaging" Version="4.1.0" PrivateAssets="All" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Content Include="..\ServicePulse.Host\app\**\*" PackagePath="platform\servicepulse" Visible="false" Link="hidden" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Remove="buildProps\**\*" />
     <Content Include="buildProps\**\*" PackagePath="" />
   </ItemGroup>
 
+  <Target Name="AddFilesToPackage">
+    <ItemGroup>
+      <TfmSpecificPackageFile Include="..\ServicePulse\bin\$(Configuration)\$(TargetFramework)\**\*" PackagePath="platform\servicepulse" />
+    </ItemGroup>
+  </Target>
+
 </Project>
diff --git a/...PlatformSample.ServicePulse/buildProps/build/Particular.PlatformSample.ServicePulse.props b/...PlatformSample.ServicePulse/buildProps/build/Particular.PlatformSample.ServicePulse.props
@@ -1,11 +1,7 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <MSBuildAllProjects Condition="'$(MSBuildAssemblyVersion)' == '' Or '$(MSBuildAssemblyVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-  </PropertyGroup>
+<Project>
 
   <ItemGroup>
-    <None Include="$(MSBuildThisFileDirectory)\..\platform\servicepulse\**\*" CopyToOutputDirectory="PreserveNewest" Link="platform\servicepulse\%(RecursiveDir)%(Filename)%(Extension)" />
+    <None Include="$(MSBuildThisFileDirectory)\..\platform\servicepulse\**\*" CopyToOutputDirectory="PreserveNewest" LinkBase="platform\servicepulse" />
   </ItemGroup>
 
 </Project>
diff --git a/....ServicePulse/buildProps/buildMultiTargeting/Particular.PlatformSample.ServicePulse.props b/....ServicePulse/buildProps/buildMultiTargeting/Particular.PlatformSample.ServicePulse.props
@@ -1,8 +1,4 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <MSBuildAllProjects Condition="'$(MSBuildAssemblyVersion)' == '' Or '$(MSBuildAssemblyVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-  </PropertyGroup>
+<Project>
 
   <Import Project="../build/Particular.PlatformSample.ServicePulse.props" />
 

diff --git a/src/ServicePulse.Host.Tests/Api/APIApprovals.cs b/src/ServicePulse.Host.Tests/Api/APIApprovals.cs
diff --git a/src/ServicePulse.Host.Tests/ApprovalFiles/APIApprovals.PlatformSampleApprovals.approved.txt b/src/ServicePulse.Host.Tests/ApprovalFiles/APIApprovals.PlatformSampleApprovals.approved.txt
diff --git a/src/ServicePulse.Host.Tests/Owin/StaticMiddlewareTests.cs b/src/ServicePulse.Host.Tests/Owin/StaticMiddlewareTests.cs
@@ -129,7 +129,7 @@ public async Task Should_find_prefer_constants_file_on_disk_over_embedded_if_bot
                 }
             };
             await middleware.Invoke(context);
-            const long sizeOfFileOnDisk = 232; // this is the /app/js/app.constants.js file
+            const long sizeOfFileOnDisk = 215; // this is the /app/js/app.constants.js file
             Assert.That(context.Response.ContentLength, Is.EqualTo(sizeOfFileOnDisk));
             Assert.That(context.Response.ContentType, Is.EqualTo("application/javascript"));
         }

diff --git a/src/ServicePulse.Host.Tests/ServicePulse.Host.Tests.csproj b/src/ServicePulse.Host.Tests/ServicePulse.Host.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net48</TargetFramework>
@@ -9,10 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="NUnit" Version="4.1.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
@@ -21,17 +18,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="..\Frontend\public\js\app.constants.js" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="app\filename.js">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="app\js\app.constants.js">
-      <LogicalName>%(RelativeDir)%(Filename)%(Extension)</LogicalName>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+    <Content Include="..\Frontend\public\js\app.constants.js" CopyToOutputDirectory="PreserveNewest" LinkBase="app/js" />
+    <None Update="app\filename.js" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
 </Project>