continued wip

Directory.Packages.props

@@ -5,10 +5,10 @@
   </PropertyGroup>
   <ItemGroup>
     <!-- Aspire -->
-    <PackageVersion Include="Aspire.Hosting.PostgreSQL" Version="13.1.3" />
+    <PackageVersion Include="Aspire.Hosting.PostgreSQL" Version="13.2.0" />
     <!-- OpenTelemetry -->
-    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.0" />
-    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.15.0" />
+    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.1" />
+    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.15.1" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.1" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.15.0-beta.1" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.15.0-beta.1" />
@@ -19,7 +19,7 @@
     <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.5" />
     <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.5" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.5" />
-    <PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.4" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.5" />
     <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.4.0" />
     <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.4.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="10.0.5" />
@@ -45,9 +45,9 @@
     <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.5" />
     <PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.5" />
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.5" />
-    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.16.0" />
+    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.17.0" />
     <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.16.0" />
-    <PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.16.0" />
+    <PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.17.0" />
     <!-- gRPC -->
     <PackageVersion Include="Grpc.AspNetCore" Version="2.76.0" />
     <PackageVersion Include="Grpc.Tools" Version="2.78.0" />

Werkr.slnx

@@ -29,7 +29,6 @@
   </Folder>
   <Folder Name="/scripts/">
     <File Path="scripts/publish.ps1" />
-    <File Path="scripts/docker-build.sh" />
     <File Path="scripts/docker-build.ps1" />
   </Folder>
   <Folder Name="/src/">
@@ -46,12 +45,12 @@
   </Folder>
   <Folder Name="/src/Installer/" />
   <Folder Name="/src/Installer/Msi/">
-    <Project Path="src/Installer/Msi/Agent/Agent.wixproj" Type="b7dd6f7e-def8-4e67-b5b7-07ef123db6f0">
+    <Project Path="src/Installer/Msi/Agent/Agent.wixproj" Type="b7dd6f7e-def8-4e67-b5b7-07ef123db6f0">
       <Configuration Solution="*" Build="false" />
       <Platform Solution="*|Any CPU" Project="x64" />
     </Project>
     <Project Path="src/Installer/Msi/CustomActions/Werkr.Installer.Msi.CustomActions.csproj" />
-    <Project Path="src/Installer/Msi/Server/Server.wixproj" Type="b7dd6f7e-def8-4e67-b5b7-07ef123db6f0">
+    <Project Path="src/Installer/Msi/Server/Server.wixproj" Type="b7dd6f7e-def8-4e67-b5b7-07ef123db6f0">
       <Configuration Solution="*" Build="false" />
       <Platform Solution="*|Any CPU" Project="x64" />
     </Project>

docker-compose.yml

@@ -144,7 +144,7 @@ services:
       ASPNETCORE_Kestrel__Certificates__Default__Path: /app/certs/werkr-server.pfx
       ASPNETCORE_Kestrel__Certificates__Default__Password: werkr-dev
       SSL_CERT_FILE: /app/certs/werkr-ca.pem
-      ConnectionStrings__werkrdb: "Host=postgres;Port=5432;Database=werkrdb;Username=werkr;Password=werkr_dev_password"
+      ConnectionStrings__werkridentitydb: "Host=postgres;Port=5432;Database=werkrdb;Username=werkr;Password=werkr_dev_password"
       services__api__https__0: "https://werkr-api:8443"
       services__agent__https__0: "https://werkr-agent:8443"
       WERKR_CONFIG_PATH: /app/config

scripts/docker-build.ps1

@@ -1,4 +1,4 @@
-#Requires -Version 7.2
+#Requires -Version 7.6
 <#
     .SYNOPSIS
         Build Werkr Docker images.

scripts/publish.ps1

@@ -1,4 +1,4 @@
-#Requires -Version 7.2
+#Requires -Version 7.6
 using namespace System.IO
 <#
     .SYNOPSIS
@@ -262,10 +262,10 @@ function New-Executable {
         "-p:FileVersion=$($VersionInfo.Major).$($VersionInfo.Minor).$($VersionInfo.Patch).0"
         "-p:InformationalVersion=$($VersionInfo.InformationalVersion)"
     )
-    & dotnet @PublishArgs
+    & dotnet @PublishArgs | Write-Host
     if ($LASTEXITCODE -ne 0) { throw "dotnet publish failed for $RuntimeIdentifier (exit $LASTEXITCODE)" }
 
-    return $Counter + 1
+    return ($Counter + 1)
 }
 
 function Build-Installer {
@@ -483,13 +483,16 @@ function New-DebPackage {
         throw "build-deb.ps1 not found at $BuildScript. Ensure src/Installer/Deb/ is intact."
     }
 
-    & $BuildScript `
-        -ProductType $ProductType `
-        -BinaryPath $OutputPath `
-        -Version $VersionInfo.MajorMinorPatch `
-        -Architecture $DebArch `
-        -OutputPath $PublishPath `
-        -EditionName $EditionName
+    [hashtable]$BuildParams = @{
+        ProductType  = $ProductType
+        BinaryPath   = $OutputPath
+        Version      = $VersionInfo.MajorMinorPatch
+        Architecture = $DebArch
+        OutputPath   = $PublishPath
+        EditionName  = $EditionName
+    }
+
+    & $BuildScript @BuildParams
 
     if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
         throw "build-deb.ps1 failed for $EditionName (exit $LASTEXITCODE)"
@@ -540,13 +543,16 @@ function New-PkgInstaller {
         throw "build-pkg.ps1 not found at $BuildScript. Ensure src/Installer/Pkg/ is intact."
     }
 
-    & $BuildScript `
-        -ProductType $ProductType `
-        -BinaryPath $OutputPath `
-        -Version $VersionInfo.MajorMinorPatch `
-        -Architecture $Arch `
-        -OutputPath $PublishPath `
-        -EditionName $EditionName
+   [hashtable]$BuildParams = @{
+        ProductType = $ProductType
+        BinaryPath  = $OutputPath
+        Version     = $VersionInfo.MajorMinorPatch
+        Architecture= $Arch
+        OutputPath  = $PublishPath
+        EditionName = $EditionName
+    }
+
+    & $BuildScript @BuildParams
 
     if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
         throw "build-pkg.ps1 failed for $EditionName (exit $LASTEXITCODE)"

src/Installer/Msi/Agent/packages.lock.json

@@ -1,19 +1,19 @@
-{
-  "version": 2,
-  "dependencies": {
-    "native,Version=v0.0": {
-      "WixToolset.UI.wixext": {
-        "type": "Direct",
-        "requested": "[6.0.2, )",
-        "resolved": "6.0.2",
-        "contentHash": "1Hq+Kp4WTb9TLRLRpv/iGod6MnNadz1ZrmY1USS6SL/WVxFuiBvQVGGLXrcdQld9J7oVWCZ8k9eMFtaYJOJ5AQ=="
-      },
-      "WixToolset.Util.wixext": {
-        "type": "Direct",
-        "requested": "[6.0.2, )",
-        "resolved": "6.0.2",
-        "contentHash": "plP64ub/0KjNbtLeaeiibVCPkKfr439WTKZmTwVSoQ4fznLHBZLsE0+wcyk6dA5cQuQsD5hlmnVGTKgPioiusQ=="
-      }
-    }
-  }
+{
+  "version": 2,
+  "dependencies": {
+    "native,Version=v0.0": {
+      "WixToolset.UI.wixext": {
+        "type": "Direct",
+        "requested": "[6.0.2, )",
+        "resolved": "6.0.2",
+        "contentHash": "1Hq+Kp4WTb9TLRLRpv/iGod6MnNadz1ZrmY1USS6SL/WVxFuiBvQVGGLXrcdQld9J7oVWCZ8k9eMFtaYJOJ5AQ=="
+      },
+      "WixToolset.Util.wixext": {
+        "type": "Direct",
+        "requested": "[6.0.2, )",
+        "resolved": "6.0.2",
+        "contentHash": "plP64ub/0KjNbtLeaeiibVCPkKfr439WTKZmTwVSoQ4fznLHBZLsE0+wcyk6dA5cQuQsD5hlmnVGTKgPioiusQ=="
+      }
+    }
+  }
 }