Merge pull request #240 from bcgov/package-updates

Package updates
bcgov · Jan 27, 2024 · ba98cd4 · ba98cd4
2 parents c3d4664 + eaf9322
commit ba98cd4
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 42 deletions.
diff --git a/.github/workflows/build-app.yml b/.github/workflows/build-app.yml
@@ -17,11 +17,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.202
+        dotnet-version: 7.0.405
     - name: Install dependencies
       run: dotnet restore
     - name: Build

diff --git a/...ntManagement/BcGov.Jag.AccountManagement/Client/BcGov.Jag.AccountManagement.Client.csproj b/...ntManagement/BcGov.Jag.AccountManagement/Client/BcGov.Jag.AccountManagement.Client.csproj
@@ -9,11 +9,11 @@
 
   <ItemGroup>
     <PackageReference Include="Blazored.Toast" Version="4.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="7.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.5" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
-    <PackageReference Include="Refit.HttpClientFactory" Version="6.3.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.15" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="7.0.15" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.15" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+    <PackageReference Include="Refit.HttpClientFactory" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...ntManagement/BcGov.Jag.AccountManagement/Server/BcGov.Jag.AccountManagement.Server.csproj b/...ntManagement/BcGov.Jag.AccountManagement/Server/BcGov.Jag.AccountManagement.Server.csproj
@@ -20,26 +20,26 @@
   <ItemGroup>
     <PackageReference Include="Blazored.Toast" Version="4.1.0" />
     <PackageReference Include="FlatFiles" Version="5.0.4" />
-    <PackageReference Include="MediatR" Version="12.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.5" />
-    <PackageReference Include="Microsoft.OData.Core" Version="7.15.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
+    <PackageReference Include="MediatR" Version="12.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.15" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.15" />
+    <PackageReference Include="Microsoft.OData.Core" Version="7.20.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
     <PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="4.0.0-beta4" />
-    <PackageReference Include="OpenTelemetry" Version="1.4.0" />
-    <PackageReference Include="OpenTelemetry.Exporter.Jaeger" Version="1.4.0" />
-    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.4.0" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9" />
-    <PackageReference Include="Serilog" Version="2.12.0" />
-    <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
-    <PackageReference Include="Serilog.Enrichers.Context" Version="4.6.0" />
-    <PackageReference Include="Serilog.Enrichers.Environment" Version="2.2.0" />
+    <PackageReference Include="OpenTelemetry" Version="1.7.0" />
+    <PackageReference Include="OpenTelemetry.Exporter.Jaeger" Version="1.5.1" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.7.0" />
+    <PackageReference Include="Serilog" Version="3.1.1" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
+    <PackageReference Include="Serilog.Enrichers.Context" Version="4.6.5" />
+    <PackageReference Include="Serilog.Enrichers.Environment" Version="2.3.0" />
     <PackageReference Include="Serilog.Enrichers.Process" Version="2.0.2" />
     <PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
     <PackageReference Include="Serilog.Exceptions" Version="8.4.0" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="7.0.0" />
-    <PackageReference Include="Serilog.Sinks.Seq" Version="5.2.2" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
+    <PackageReference Include="Serilog.Sinks.Seq" Version="6.0.0" />
     <PackageReference Include="Serilog.Sinks.Splunk" Version="3.7.0" />
     <PackageReference Include="Simple.OData.V4.Client" Version="6.0.1" />
   </ItemGroup>

diff --git a/src/BcGov.Jag.AccountManagement/BcGov.Jag.AccountManagement/Server/Dockerfile.rhel8 b/src/BcGov.Jag.AccountManagement/BcGov.Jag.AccountManagement/Server/Dockerfile.rhel8
@@ -1,8 +1,8 @@
-FROM registry.access.redhat.com/ubi8/dotnet-70-runtime:latest AS base
+FROM image-registry.openshift-image-registry.svc:5000/a461af-tools/dotnet-70-runtime:latest AS base
 WORKDIR /opt/app-root/app
 EXPOSE 8080
 
-FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
+FROM image-registry.openshift-image-registry.svc:5000/a461af-tools/dotnet-sdk:7.0 AS build
 WORKDIR /src
 COPY ["BcGov.Jag.AccountManagement/Server/BcGov.Jag.AccountManagement.Server.csproj", "BcGov.Jag.AccountManagement/Server/"]
 COPY ["BcGov.Jag.AccountManagement/Shared/BcGov.Jag.AccountManagement.Shared.csproj", "BcGov.Jag.AccountManagement/Shared/"]

diff --git a/...Gov.Jag.AccountManagement/BcGov.Jag.AccountManagement/Server/Infrastructure/Extensions.cs b/...Gov.Jag.AccountManagement/BcGov.Jag.AccountManagement/Server/Infrastructure/Extensions.cs
@@ -17,16 +17,6 @@ public static void AddTelemetry(this WebApplicationBuilder builder, Serilog.ILog
             return;
         }
 
-        builder.Services.Configure<AspNetCoreInstrumentationOptions>(options =>
-        {
-            options.Filter = AspNetCoreFilter;
-        });
-
-        builder.Services.Configure<HttpClientInstrumentationOptions>(options =>
-        {
-            options.Filter = HttpClientRequestFilter;
-        });
-
         var resourceBuilder = ResourceBuilder
             .CreateDefault()
             .AddService(Diagnostics.Source.Name, serviceInstanceId: Environment.MachineName);
@@ -38,9 +28,12 @@ public static void AddTelemetry(this WebApplicationBuilder builder, Serilog.ILog
                     .SetResourceBuilder(resourceBuilder)
                     .AddHttpClientInstrumentation(options =>
                     {
-                        options.Filter = HttpClientRequestFilter;
+                        options.FilterHttpRequestMessage = HttpClientRequestFilter;
+                    })
+                    .AddAspNetCoreInstrumentation(options =>
+                    {
+                        options.Filter = AspNetCoreFilter;
                     })
-                    .AddAspNetCoreInstrumentation()
                     .AddSource(Diagnostics.Source.Name)
                     .AddJaegerExporter();
             });

diff --git a/src/BcGov.Jag.AccountManagement/global.json b/src/BcGov.Jag.AccountManagement/global.json
@@ -1,7 +1,7 @@
 {
-	"sdk": {
-      "version": "7.0.102",
-	   "rollForward": "minor" 
-	}
+  "sdk": {
+    "version": "7.0.405",
+    "rollForward": "minor"
   }
+}