feat: upgrade to .NET 6 and use docker image that supports both ARM a…

…nd Intel CPU architectures

.github/workflows/pull-request.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.x
+          dotnet-version: 6.0.x
 
       - name: Verify
         run: make verify

.github/workflows/verify.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.x
+          dotnet-version: 6.0.x
 
       - name: Setup Node
         uses: actions/setup-node@v2

AzureKeyVaultEmulator.AcceptanceTests/AzureKeyVaultEmulator.AcceptanceTests.csproj

@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
 
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="Azure.Security.KeyVault.Keys" Version="4.2.0" />
         <PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.2.0" />
-        <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.14.0" />
+        <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.14.1" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
         <PackageReference Include="xunit" Version="2.4.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">

AzureKeyVaultEmulator.sln

@@ -22,11 +22,9 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{EEEEDF54-ADE9-447E-8ED7-36A9E3CC0FD0}"
 ProjectSection(SolutionItems) = preProject
 	scripts\acceptancetest.sh = scripts\acceptancetest.sh
-	scripts\build.sh = scripts\build.sh
 	scripts\dependencycheck.sh = scripts\dependencycheck.sh
 	scripts\serviceup.sh = scripts\serviceup.sh
 	scripts\startdocker.sh = scripts\startdocker.sh
-	scripts\startlocal.sh = scripts\startlocal.sh
 	scripts\stopdocker.sh = scripts\stopdocker.sh
 	scripts\stopservice.sh = scripts\stopservice.sh
 	scripts\verify.sh = scripts\verify.sh
@@ -46,6 +44,13 @@ ProjectSection(SolutionItems) = preProject
 	.github\PULL_REQUEST_TEMPLATE.md = .github\PULL_REQUEST_TEMPLATE.md
 EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Checks", "Checks", "{9D107928-7669-4B0C-9291-F5318F9F334B}"
+	ProjectSection(SolutionItems) = preProject
+		scripts\checks\dockercheck.sh = scripts\checks\dockercheck.sh
+		scripts\checks\dockercomposecheck.sh = scripts\checks\dockercomposecheck.sh
+		scripts\checks\dotnetcheck.sh = scripts\checks\dotnetcheck.sh
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -61,4 +66,7 @@ Global
 		{181CD468-BBCA-424A-97A7-5ACC8331FE5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{181CD468-BBCA-424A-97A7-5ACC8331FE5A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{9D107928-7669-4B0C-9291-F5318F9F334B} = {EEEEDF54-ADE9-447E-8ED7-36A9E3CC0FD0}
+	EndGlobalSection
 EndGlobal

AzureKeyVaultEmulator/AzureKeyVaultEmulator.csproj

@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.11" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
         <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
     </ItemGroup>

Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:5.0-alpine AS builder
+FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine AS builder
 WORKDIR /app
 
 COPY *.sln .
@@ -8,12 +8,11 @@ RUN for file in $(ls *.csproj); do mkdir -p ./${file%.*}/ && mv $file ./${file%.
 RUN dotnet restore
 
 COPY . .
-RUN dotnet build AzureKeyVaultEmulator.sln --no-restore -c Release
-RUN dotnet publish AzureKeyVaultEmulator/AzureKeyVaultEmulator.csproj -c Release -o publish --no-restore --no-build
+RUN dotnet publish AzureKeyVaultEmulator/AzureKeyVaultEmulator.csproj -c Release -o publish --no-restore
 
 ########################################
 
-FROM mcr.microsoft.com/dotnet/aspnet:5.0-alpine
+FROM mcr.microsoft.com/dotnet/aspnet:6.0-alpine
 WORKDIR /app
 
 RUN apk add --no-cache icu-libs tzdata

README.md

@@ -73,7 +73,7 @@ For the Azure KeyVault Emulator to be accessible from other containers in the sa
 1. Add a service to docker-compose.yml for Azure KeyVault Emulator:
 
     ```
-    version: '3.7'
+    version: '3.9'
 
     services:
       ...
@@ -94,7 +94,7 @@ For the Azure KeyVault Emulator to be accessible from other containers in the sa
 1. Modify the client application's entrypoint to add the self-signed certificate to the truststore. Example using docker-compose.yml to override the entrypoint:
 
     ```
-    version: '3.7'
+    version: '3.9'
 
     services:
       my-awesome-keyvault-client:
@@ -117,7 +117,7 @@ The provided scripts will check for all dependencies, start docker, build the so
 ### Dependencies
 - [Docker](https://www.docker.com/products/docker-desktop)
 - [Docker Compose](https://www.docker.com/products/docker-desktop)
-- [.NET 5](https://dotnet.microsoft.com/download/dotnet/5.0)
+- [.NET 6](https://dotnet.microsoft.com/download/dotnet/6.0)
 
 ### Build the KeyVault emulator and run Tests
 

docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3.7'
+version: '3.9'
 
 services:
   key-vault-emulator:

makefile

@@ -3,12 +3,6 @@ MAKEFLAGS += --silent
 verify:
 	docker-compose pull && ./scripts/verify.sh
 
-start-local:
-	docker-compose pull && ./scripts/startlocal.sh
-
-build:
-	./scripts/build.sh
-
 acceptance-test:
 	./scripts/acceptancetest.sh
 

scripts/acceptancetest.sh

@@ -7,6 +7,8 @@ cd $(dirname $0)/..
 
 echo "Running acceptance tests..."
 
+dotnet restore -v=quiet
+dotnet build AzureKeyVaultEmulator.AcceptanceTests/AzureKeyVaultEmulator.AcceptanceTests.csproj --no-restore -c Release -v=minimal
 dotnet test AzureKeyVaultEmulator.AcceptanceTests/AzureKeyVaultEmulator.AcceptanceTests.csproj --no-restore --no-build -c Release -v=normal
 
 result=$?

scripts/checks/dotnetcheck.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
 echo "Checking .NET..."
-EXPECTED_DOTNET="5.0.x"
-EXPECTED_DOTNET_REGEX="5\.0\.([0-9]*)"
+EXPECTED_DOTNET="6.0.x"
+EXPECTED_DOTNET_REGEX="6\.0\.([0-9]*)"
 
 while IFS= read -r line
 do
@@ -13,5 +13,5 @@ do
     fi
 done <<<"$(dotnet --list-sdks)"
 
-echo "Please Install .NET $EXPECTED_DOTNET SDK from here: https://dotnet.microsoft.com/download/dotnet/5.0"
+echo "Please Install .NET $EXPECTED_DOTNET SDK from here: https://dotnet.microsoft.com/download/dotnet/6.0"
 exit 1

scripts/importcert.sh

@@ -6,9 +6,13 @@ current_directory="$PWD"
 cd $(dirname $0)/..
 
 if [ "$(uname)" == "Darwin" ]; then
-    sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain local-certs/azure-key-vault-emulator.crt
+    if ! security find-certificate -c azure-key-vault-emulator > /dev/null; then
+        sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain local-certs/azure-key-vault-emulator.crt
+    else
+        echo "azure-key-vault-emulator certificate already installed"
+    fi
 elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
-    sudo cp local-certs/azure-key-vault-emulator.crt /usr/local/share/ca-certificates/azure-key-vault-emulator.crt
+    sudo cp local-certs/azure-key-vault-emulator.crt /Library/Keychains/System.keychain local-certs/azure-key-vault-emulator.crt
     sudo update-ca-certificates
 fi
 

scripts/verify.sh

@@ -11,7 +11,6 @@ time {
     ./dependencycheck.sh
     ./importcert.sh
     ./stopdocker.sh
-    ./build.sh
     ./startdocker.sh
     ./serviceup.sh
     ./acceptancetest.sh