From 4376d05d8d8453bf89659b0d0a1011286c0f9dc0 Mon Sep 17 00:00:00 2001 From: Sam Smith Date: Wed, 27 Mar 2024 06:33:19 -0400 Subject: [PATCH 1/5] updated nuget packages --- src/DevOpsMetrics.Cmd/DevOpsMetrics.Cmd.csproj | 4 ++-- src/DevOpsMetrics.Core/DevOpsMetrics.Core.csproj | 2 +- .../DevOpsMetrics.Function.csproj | 4 ++-- .../DevOpsMetrics.FunctionalTests.csproj | 12 ++++++------ .../DevOpsMetrics.Service.csproj | 8 ++++---- .../DevOpsMetrics.Tests.csproj | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/DevOpsMetrics.Cmd/DevOpsMetrics.Cmd.csproj b/src/DevOpsMetrics.Cmd/DevOpsMetrics.Cmd.csproj index 23a5eab4..5d59e345 100644 --- a/src/DevOpsMetrics.Cmd/DevOpsMetrics.Cmd.csproj +++ b/src/DevOpsMetrics.Cmd/DevOpsMetrics.Cmd.csproj @@ -20,8 +20,8 @@ - - + + diff --git a/src/DevOpsMetrics.Core/DevOpsMetrics.Core.csproj b/src/DevOpsMetrics.Core/DevOpsMetrics.Core.csproj index fbcdaf61..1f682a27 100644 --- a/src/DevOpsMetrics.Core/DevOpsMetrics.Core.csproj +++ b/src/DevOpsMetrics.Core/DevOpsMetrics.Core.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/DevOpsMetrics.Function/DevOpsMetrics.Function.csproj b/src/DevOpsMetrics.Function/DevOpsMetrics.Function.csproj index 8032ffc1..86eb9b2e 100644 --- a/src/DevOpsMetrics.Function/DevOpsMetrics.Function.csproj +++ b/src/DevOpsMetrics.Function/DevOpsMetrics.Function.csproj @@ -7,9 +7,9 @@ - + - + diff --git a/src/DevOpsMetrics.FunctionalTests/DevOpsMetrics.FunctionalTests.csproj b/src/DevOpsMetrics.FunctionalTests/DevOpsMetrics.FunctionalTests.csproj index ec31eb14..00a804c2 100644 --- a/src/DevOpsMetrics.FunctionalTests/DevOpsMetrics.FunctionalTests.csproj +++ b/src/DevOpsMetrics.FunctionalTests/DevOpsMetrics.FunctionalTests.csproj @@ -7,15 +7,15 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/src/DevOpsMetrics.Service/DevOpsMetrics.Service.csproj b/src/DevOpsMetrics.Service/DevOpsMetrics.Service.csproj index fa5dc6e1..1bab5091 100644 --- a/src/DevOpsMetrics.Service/DevOpsMetrics.Service.csproj +++ b/src/DevOpsMetrics.Service/DevOpsMetrics.Service.csproj @@ -7,12 +7,12 @@ - + - - + + - + diff --git a/src/DevOpsMetrics.Tests/DevOpsMetrics.Tests.csproj b/src/DevOpsMetrics.Tests/DevOpsMetrics.Tests.csproj index 5178b95f..a10e0ba3 100644 --- a/src/DevOpsMetrics.Tests/DevOpsMetrics.Tests.csproj +++ b/src/DevOpsMetrics.Tests/DevOpsMetrics.Tests.csproj @@ -21,19 +21,19 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive From 7ca819e2f122ca25212b8a033dd4507887fb2ef4 Mon Sep 17 00:00:00 2001 From: Sam Smith Date: Wed, 27 Mar 2024 06:33:58 -0400 Subject: [PATCH 2/5] UPdated actions --- .github/workflows/dotnetcore.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index ba0e11d5..b9f43a69 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -151,7 +151,7 @@ jobs: # steps: # # Login with the secret SP details # - name: Log into Azure -# uses: azure/login@v1 +# uses: azure/login@v2 # with: # creds: ${{ secrets.AZURE_SP_PROBOT }} # - name: Download webapp artifact @@ -179,7 +179,7 @@ jobs: steps: # Login with the secret SP details - name: Log into Azure - uses: azure/login@v1 + uses: azure/login@v2 with: creds: ${{ secrets.AZURE_SP }} @@ -269,7 +269,7 @@ jobs: steps: # Login with the secret SP details - name: Log into Azure - uses: azure/login@v1 + uses: azure/login@v2 with: creds: ${{ secrets.AZURE_SP }} #Swap staging slots with prod From e307cdf6ef0e64764d14f68521406608935fd01f Mon Sep 17 00:00:00 2001 From: Sam Smith Date: Wed, 27 Mar 2024 06:34:25 -0400 Subject: [PATCH 3/5] updated action --- .github/workflows/dotnetcore.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index b9f43a69..04a044cc 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -20,11 +20,11 @@ jobs: fetch-depth: 0 #fetch-depth is needed for GitVersion #Install and calculate the new version with GitVersion - name: Install GitVersion - uses: gittools/actions/gitversion/setup@v0.10.2 + uses: gittools/actions/gitversion/setup@v1.1.1 with: versionSpec: 5.x - name: Determine Version - uses: gittools/actions/gitversion/execute@v0.10.2 + uses: gittools/actions/gitversion/execute@v1.1.1 id: gitversion # step id used as reference for output values - name: Display GitVersion outputs run: | From 4d099b4dbb9c782454b9ca678fa6a661460d3e59 Mon Sep 17 00:00:00 2001 From: Sam Smith Date: Wed, 27 Mar 2024 06:35:08 -0400 Subject: [PATCH 4/5] updated action --- .github/workflows/dotnetcore.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index 04a044cc..35a8d239 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -274,13 +274,13 @@ jobs: creds: ${{ secrets.AZURE_SP }} #Swap staging slots with prod - name: Swap web service staging slot to production - uses: Azure/cli@v1.0.8 + uses: Azure/cli@v2.0.0 with: inlineScript: az webapp deployment slot swap --name "devops-prod-eu-service" --resource-group "devopsmetrics" --slot staging --target-slot production - name: Deploy web service app settings run: az webapp config appsettings set --name "devops-prod-eu-service" --resource-group "devopsmetrics" --settings "AppSettings:AzureDevOpsPatToken=${{ secrets.AzureDevOpsPATToken }}" "AppSettings:GitHubClientId=${{ secrets.GitHubClientId }}" "AppSettings:GitHubClientSecret=${{ secrets.GitHubClientSecret }}" "AppSettings:AzureStorageAccountConfigurationString=${{ secrets.AzureStorageConnectionString }}" - name: Swap web site staging slot to production - uses: Azure/cli@v1.0.8 + uses: Azure/cli@v2.0.0 with: inlineScript: az webapp deployment slot swap --name "devops-prod-eu-web" --resource-group "devopsmetrics" --slot staging --target-slot production - name: Deploy website app settings From 75ad034c651fe3f7c50a953a97b70a7f9924291a Mon Sep 17 00:00:00 2001 From: Sam Smith Date: Wed, 27 Mar 2024 06:36:05 -0400 Subject: [PATCH 5/5] updated action --- .github/workflows/dotnetcore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index 35a8d239..a56c6835 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -132,7 +132,7 @@ jobs: if: github.ref == 'refs/heads/main' steps: - name: Run Sonarcloud test - uses: samsmithnz/SamsDotNetSonarCloudAction@v2.1.0 + uses: samsmithnz/SamsDotNetSonarCloudAction@v2.1 with: projects: 'src/DevOpsMetrics.Core/DevOpsMetrics.Core.csproj,src/DevOpsMetrics.Function/DevOpsMetrics.Function.csproj,src/DevOpsMetrics.FunctionalTests/DevOpsMetrics.FunctionalTests.csproj,src/DevOpsMetrics.Service/DevOpsMetrics.Service.csproj,src/DevOpsMetrics.Tests/DevOpsMetrics.Tests.csproj,src/DevOpsMetrics.Web/DevOpsMetrics.Web.csproj,src/DevOpsMetrics.Cmd/DevOpsMetrics.Cmd.csproj' dotnet-version: '8.0.x'