Update .NET SDK to 6.0.419 (#268)

* Update .NET SDK Update .NET SDK to version 6.0.419. --- updated-dependencies: - dependency-name: Microsoft.NET.Sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * Bump .NET NuGet packages with 5 updates Bump .NET NuGet packages with 5 updates: Update Microsoft.AspNetCore.Authentication.JwtBearer from 6.0.26 to 6.0.27. Update Microsoft.AspNetCore.HeaderPropagation from 6.0.26 to 6.0.27. Update Microsoft.AspNetCore.Mvc.NewtonsoftJson from 6.0.26 to 6.0.27. Update Microsoft.Extensions.Http.Polly from 7.0.15 to 7.0.16. Update Microsoft.Extensions.Logging.AzureAppServices from 7.0.15 to 7.0.16. --- updated-dependencies: - dependency-name: Microsoft.AspNetCore.Authentication.JwtBearer dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: Microsoft.AspNetCore.HeaderPropagation dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: Microsoft.AspNetCore.Mvc.NewtonsoftJson dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: Microsoft.Extensions.Http.Polly dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: Microsoft.Extensions.Logging.AzureAppServices dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * Update suppressions and vNext pipeline conditions * Add develop trigger --------- Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: HugoBurgess <[email protected]> Co-authored-by: HugoBurgess <[email protected]>
UKHO · Feb 15, 2024 · 910cab6 · 910cab6
1 parent d6227a1
commit 910cab6
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 22 deletions.
diff --git a/NVDSuppressions.xml b/NVDSuppressions.xml
@@ -450,23 +450,17 @@
   <suppress>
     <notes>
       <![CDATA[
-   file name: System.Security.Cryptography.X509Certificates:Various
-   Fixed in SDK >= 6.0.418
+   file name: Microsoft.IdentityModel.Abstractions.dll
    ]]>
     </notes>
-    <packageUrl regex="true">^pkg:nuget/System\.Security\.Cryptography\.X509Certificates@.*$</packageUrl>
-    <vulnerabilityName>CVE-2024-0057</vulnerabilityName>
+    <cve>CVE-2024-21319</cve>
   </suppress>
   <suppress>
-   <notes><![CDATA[
-   file name: Microsoft.IdentityModel.Abstractions.dll
-   ]]></notes>
-   <cve>CVE-2024-21319</cve>
-</suppress>
-<suppress>
-   <notes><![CDATA[
+    <notes>
+      <![CDATA[
    file name: Newtonsoft.Json.Bson.dll
-   ]]></notes>
-   <cve>CVE-2024-21907</cve>
-</suppress>
+   ]]>
+    </notes>
+    <cve>CVE-2024-21907</cve>
+  </suppress>
 </suppressions>
diff --git a/UKHO.ExchangeSetService.API/UKHO.ExchangeSetService.API/UKHO.ExchangeSetService.API.csproj b/UKHO.ExchangeSetService.API/UKHO.ExchangeSetService.API/UKHO.ExchangeSetService.API.csproj
@@ -15,11 +15,11 @@
     <PackageReference Include="Azure.Storage.Blobs" Version="12.15.1" />
     <PackageReference Include="Elastic.Apm.AspNetCore" Version="1.23.0" />
     <PackageReference Include="FluentValidation" Version="11.5.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.26" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.27" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
-    <PackageReference Include="Microsoft.AspNetCore.HeaderPropagation" Version="6.0.26" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.26" />
-    <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="7.0.15" />
+    <PackageReference Include="Microsoft.AspNetCore.HeaderPropagation" Version="6.0.27" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.27" />
+    <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="7.0.16" />
     <PackageReference Include="Microsoft.Graph.Core" Version="3.0.4" />
     <PackageReference Include="NWebsec.AspNetCore.Middleware" Version="3.0.0" />
     <PackageReference Include="Serilog.Extensions.Logging.File" Version="3.0.0" />

diff --git a/...changeSetService.API/UKHO.ExchangeSetService.Common/UKHO.ExchangeSetService.Common.csproj b/...changeSetService.API/UKHO.ExchangeSetService.Common/UKHO.ExchangeSetService.Common.csproj
@@ -19,7 +19,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.ApplicationInsights" Version="2.22.0" />
     <PackageReference Include="Microsoft.IdentityModel.Logging" Version="6.34.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.15" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.16" />
     <PackageReference Include="SonarAnalyzer.CSharp" Version="8.55.0.65544">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -9,6 +9,7 @@ parameters:
 trigger:
   - main
   - release/*
+  - develop
 
 schedules:
 - cron: "0 4 * * 1"
@@ -875,7 +876,7 @@ stages:
     dependsOn:
       - Devdeploy
     displayName: vNext IAT Deploy (inc terraform, webapp deploy)
-    condition: and(succeeded(), variables['Build.SourceBranch'], 'refs/heads/develop', startsWith(variables['Build.SourceBranch'], 'refs/heads/dev/'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/develop'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dev/')))
     jobs:
       - deployment: vnextiatDeploy
         displayName: VnexT IAT - deploy terraform and dotnet App
@@ -1026,7 +1027,7 @@ stages:
     dependsOn: 
       - vnextiatDeploy
     displayName: vNext E2E Deploy (inc terraform, webapp deploy)
-    condition: and(succeeded(), variables['Build.SourceBranch'], 'refs/heads/develop')
+    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop'))
     jobs:
       - deployment: E2EDeploy
         displayName: vnexte2e - deploy terraform and dotnet App

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.418",
+    "version": "6.0.419",
     "rollForward": "latestFeature"
   }
 }