Merging v3.0.0 to master

NCIOCPL · Jan 13, 2025 · 21159ba · 21159ba
2 parents fbdbf63 + 372d37d
commit 21159ba
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 189 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,19 @@
+name: Glossary API CI workflow
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+      - 'hotfix/**'
+      - 'release/**'
+      - 'feature/**'
+  pull_request:
+    types: [opened, reopened, synchronize, ready_for_review]
+
+jobs:
+  ci_remote:
+    uses: nciocpl/nci.ocpl.api.shared/.github/workflows/[email protected]
+    with:
+      api-project: src/NCI.OCPL.Api.Glossary/NCI.OCPL.Api.Glossary.csproj
+      artifact-name: glossary
diff --git a/.github/workflows/ocpl_cm_standards_check.yml b/.github/workflows/ocpl_cm_standards_check.yml
@@ -0,0 +1,9 @@
+name: OCPL Configuration Management Standards Check
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize, ready_for_review]
+
+jobs:
+  commitlint_remote:
+    uses: nciocpl/.github/.github/workflows/ocpl_cm_standards_check.yml@workflow/v2
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
diff --git a/global.json b/global.json
@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "rollForward": "latestFeature",
+    "version": "8.0.0"
+  }
+}
diff --git a/integration-tests/bin/karate.jar b/integration-tests/bin/karate.jar
diff --git a/integration-tests/bin/start-api.sh b/integration-tests/bin/start-api.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# Used in CI builds to abstract any API-specific start up steps.
+dotnet NCI.OCPL.Api.Glossary.dll
diff --git a/src/NCI.OCPL.Api.Glossary/NCI.OCPL.Api.Glossary.csproj b/src/NCI.OCPL.Api.Glossary/NCI.OCPL.Api.Glossary.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp6.0</TargetFramework>
+        <TargetFramework>netcoreapp8.0</TargetFramework>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
     </PropertyGroup>
 
@@ -12,7 +12,7 @@
     <ItemGroup>
         <PackageReference Include="NSwag.AspNetCore" Version="13.20.*" />
         <PackageReference Include="NEST" Version="7.9.*" />
-        <PackageReference Include="NCI.OCPL.Api.Common" Version="2.1.*" />
+        <PackageReference Include="NCI.OCPL.Api.Common" Version="3.0.0" />
     </ItemGroup>
 
 </Project>
diff --git a/src/NCI.OCPL.Api.Glossary/web.config b/src/NCI.OCPL.Api.Glossary/web.config
@@ -7,13 +7,18 @@
       </handlers>
       <aspNetCore processPath="dotnet" arguments=".\NCI.OCPL.Api.Glossary.dll" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" />
       <security>
-        <requestFiltering allowHighBitCharacters="true">
+        <requestFiltering allowHighBitCharacters="true" removeServerHeader="true">
           <fileExtensions allowUnlisted="true" />
           <hiddenSegments>
             <remove segment="bin" />
           </hiddenSegments>
         </requestFiltering>
       </security>
+      <httpProtocol>
+        <customHeaders>
+          <remove name="X-Powered-By" />
+        </customHeaders>
+      </httpProtocol>
     </system.webServer>
   </location>
 </configuration>
diff --git a/test/NCI.OCPL.Api.Glossary.Tests/NCI.OCPL.Api.Glossary.Tests.csproj b/test/NCI.OCPL.Api.Glossary.Tests/NCI.OCPL.Api.Glossary.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp6.0</TargetFramework>
+        <TargetFramework>netcoreapp8.0</TargetFramework>
 
         <IsPackable>false</IsPackable>
     </PropertyGroup>
@@ -26,8 +26,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="NCI.OCPL.Api.Common" Version="2.1.*" />
-        <PackageReference Include="NCI.OCPL.Api.Common.Testing" Version="2.1.*" />
+        <PackageReference Include="NCI.OCPL.Api.Common" Version="3.0.0" />
+        <PackageReference Include="NCI.OCPL.Api.Common.Testing" Version="3.0.0" />
     </ItemGroup>
 
 </Project>