From b5168a6449e2557157a0d496da12c8bdf38bc55e Mon Sep 17 00:00:00 2001
From: jpardogrowthaccelerationpartners
 <111309322+jpardogrowthaccelerationpartners@users.noreply.github.com>
Date: Thu, 11 Jul 2024 11:46:35 -0400
Subject: [PATCH] [APIPUB-59] Update after release pipeline and error on wget
 (#65)

* [APIPUB-59] Update after release pipeline and error on wget

* Update Package version
---
 .github/workflows/after-pullrequest.yml | 29 +++++++++++++++++++------
 src/Dockerfile                          |  4 ++--
 src/dev.Dockerfile                      |  4 ++--
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/after-pullrequest.yml b/.github/workflows/after-pullrequest.yml
index 2dd1794..ae966fa 100644
--- a/.github/workflows/after-pullrequest.yml
+++ b/.github/workflows/after-pullrequest.yml
@@ -17,12 +17,27 @@ jobs:
   report-test-results:
     name: Report Test Results
     runs-on: ubuntu-latest
+    if: github.event.workflow_run.conclusion != 'skipped'
+
+    permissions:
+      checks: write
+      pull-requests: write
+      # actions: read
+      # only needed for private repository
+      # contents: read
+      # issues: read
+
     steps:
-      - name: Upload Test Results
-        uses: dorny/test-reporter@eaa763f6ffc21c7a37837f56cd5f9737f27fc6c8 # v1.8.0
+      - name: Download and Extract Artifacts
+        uses: dawidd6/action-download-artifact@71072fbb1229e1317f1a8de6b04206afb461bd67 # v3.1.2
+        with:
+          run_id: ${{ github.event.workflow_run.id }}
+          path: artifacts
+
+      - name: Publish Test Results
+        uses: EnricoMi/publish-unit-test-result-action@f355d34d53ad4e7f506f699478db2dd71da9de5f # v2.15.1
         with:
-          artifact: csharp-tests
-          name: C# Unit Test Results
-          path: "**/*.trx"
-          reporter: dotnet-trx
-          fail-on-error: false
+          commit: ${{ github.event.workflow_run.head_sha }}
+          event_file: artifacts/Event File/event.json
+          event_name: ${{ github.event.workflow_run.event }}
+          files: "artifacts/**/*.trx"
\ No newline at end of file
diff --git a/src/Dockerfile b/src/Dockerfile
index 8f0f121..7ac514d 100644
--- a/src/Dockerfile
+++ b/src/Dockerfile
@@ -4,7 +4,7 @@
 # See the LICENSE and NOTICES files in the project root for more information.
 
 # Tag aspnet:8.0-alpine
-FROM mcr.microsoft.com/dotnet/aspnet@sha256:de73c1e1abd69d3ffa2658075ad4cd4edccfef37eb92ddda2c78f20173403238
+FROM mcr.microsoft.com/dotnet/aspnet@sha256:ba398f8c6a0469436cc115bfbd278002baf4ce9423b6d8a9e904da6adc31a23d
 LABEL maintainer="Ed-Fi Alliance, LLC and Contributors <techsupport@ed-fi.org>"
 
 ENV VERSION="1.0.0"
@@ -22,7 +22,7 @@ COPY ./Docker/plainTextNamedConnections.template.json /app/plainTextNamedConnect
 COPY ./Docker/run.sh /app/run.sh
 
 RUN apk --no-cache add unzip=~6 dos2unix=~7 bash=~5 gettext=~0 postgresql13-client=~13 icu=~74 curl=~8 && \
-    wget -O /app/ApiPublisher.zip https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_apis/packaging/feeds/EdFi/nuget/packages/EdFi.ApiPublisher/versions/${VERSION}/content && \
+    wget -nv -O /app/ApiPublisher.zip https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_apis/packaging/feeds/EdFi/nuget/packages/EdFi.ApiPublisher/versions/${VERSION}/content && \
     unzip /app/ApiPublisher.zip 'EdFi.ApiPublisher/**' -d /app/ && \
     mv /app/EdFi.ApiPublisher/* /app/ && \
     rmdir /app/EdFi.ApiPublisher && \
diff --git a/src/dev.Dockerfile b/src/dev.Dockerfile
index 5b9ee12..8c78d95 100644
--- a/src/dev.Dockerfile
+++ b/src/dev.Dockerfile
@@ -5,7 +5,7 @@
 
 
 # tag sdk:8.0 alpine
-FROM mcr.microsoft.com/dotnet/sdk@sha256:e9f2d4a0452e823d615bf6da6e0575489d8037498571db6fa1c6ce6fb9987ecd AS build
+FROM mcr.microsoft.com/dotnet/sdk@sha256:91cb46b0ee207d0df53e2e38f2e4013fe2668ab52dcca13c971afbbef94c83ef AS build
 WORKDIR /source
 
 COPY ./EdFi.Tools.ApiPublisher.Cli/ EdFi.Tools.ApiPublisher.Cli/
@@ -36,7 +36,7 @@ RUN dotnet publish -c Release -o /app/EdFi.Tools.ApiPiblisher.Cli --no-build --n
 
 
 # Tag aspnet:8.0 alpine
-FROM mcr.microsoft.com/dotnet/aspnet@sha256:de73c1e1abd69d3ffa2658075ad4cd4edccfef37eb92ddda2c78f20173403238
+FROM mcr.microsoft.com/dotnet/aspnet@sha256:ba398f8c6a0469436cc115bfbd278002baf4ce9423b6d8a9e904da6adc31a23d
 LABEL maintainer="Ed-Fi Alliance, LLC and Contributors <techsupport@ed-fi.org>"
 
 # Alpine image does not contain Globalization Cultures library so we need to install ICU library to get fopr LINQ expression to work