Upgrade to .NET 7 (#139)

Upgrade to .NET 7

.github/workflows/test.yml

@@ -8,11 +8,27 @@ on:
   workflow_dispatch:
 
 jobs:
-  test:
-    runs-on: ubuntu-18.04
+  build:
+    name: Tests
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
-      - uses: actions/setup-dotnet@v3.0.3
+      - name: Checkout code
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@8c0edbc76e98fa90f69d9a2c020dcb50019dc325
+        with:
+          install: true
+
+      - name: Build and push
+        uses: docker/build-push-action@c56af957549030174b10d6867f20e78cfd7debc5
         with:
-          dotnet-version: "6.0.100"
-      - run: pwsh ./test.ps1 -UseDocker
+          context: .
+          push: false
+          load: true
+          tags: exercism/csharp-test-runner:latest
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Run Tests in Docker
+        run: bin/run-tests-in-docker.sh

.gitignore

@@ -2,6 +2,8 @@
 bin/
 obj/
 
+!/bin
+
 # IDE files
 .vs/
 .vscode/

Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine3.13-amd64 AS build
+FROM mcr.microsoft.com/dotnet/sdk:7.0.100-alpine3.16-amd64 AS build
 WORKDIR /app
 
 # Copy csproj and restore as distinct layers
@@ -10,17 +10,17 @@ COPY src/Exercism.TestRunner.CSharp/ ./
 RUN dotnet publish -r linux-musl-x64 -c Release -o /opt/test-runner --no-restore --self-contained true
 
 # Build runtime image
-FROM mcr.microsoft.com/dotnet/runtime-deps:6.0-alpine3.13-amd64 AS runtime
+FROM mcr.microsoft.com/dotnet/runtime:7.0.0-alpine3.16-amd64 AS runtime
 
 # Enable globalization as some exercises use it
 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
-RUN apk add --no-cache icu-libs tzdata
+RUN apk add --no-cache icu-libs icu-data-full tzdata
 
 WORKDIR /opt/test-runner
 
 COPY --from=build /opt/test-runner/ .
 COPY --from=build /usr/local/bin/ /usr/local/bin/
 
-COPY run.sh /opt/test-runner/bin/
+COPY run.sh bin/
 
 ENTRYPOINT ["sh", "/opt/test-runner/bin/run.sh"]

bin/run-in-docker.sh

@@ -0,0 +1,44 @@
+#!/usr/bin/env sh
+set -e
+
+# Synopsis:
+# Run the test runner on a solution using the test runner Docker image.
+# The test runner Docker image is built automatically.
+
+# Arguments:
+# $1: exercise slug
+# $2: path to solution folder
+# $3: path to output directory
+
+# Output:
+# Writes the test results to a results.json file in the passed-in output directory.
+# The test results are formatted according to the specifications at https://github.com/exercism/docs/blob/main/building/tooling/test-runners/interface.md
+
+# Example:
+# ./bin/run-in-docker.sh two-fer path/to/solution/folder/ path/to/output/directory/
+
+# If any required arguments is missing, print the usage and exit
+if [ "$#" -lt 3 ]; then
+    echo "usage: ./bin/run-in-docker.sh exercise-slug path/to/solution/folder/ path/to/output/directory/"
+    exit 1
+fi
+
+slug="$1"
+solution_dir=$(realpath "${2%/}")
+output_dir=$(realpath "${3%/}")
+
+# Create the output directory if it doesn't exist
+mkdir -p "${output_dir}"
+
+# Build the Docker image
+docker build --rm -t exercism/csharp-test-runner .
+
+# Run the Docker image using the settings mimicking the production environment
+docker run \
+    --rm \
+    --network none \
+    --read-only \
+    --mount type=bind,src="${solution_dir}",dst=/solution \
+    --mount type=bind,src="${output_dir}",dst=/output \
+    --mount type=tmpfs,dst=/tmp \
+    exercism/csharp-test-runner "${slug}" /solution /output 

bin/run-tests-in-docker.sh

@@ -0,0 +1,29 @@
+#!/usr/bin/env sh
+set -e
+
+# Synopsis:
+# Test the test runner Docker image by running it against a predefined set of 
+# solutions with an expected output.
+# The test runner Docker image is built automatically.
+
+# Output:
+# Outputs the diff of the expected test results against the actual test results
+# generated by the test runner Docker image.
+
+# Example:
+# ./bin/run-tests-in-docker.sh
+
+# Build the Docker image
+docker build --rm -t exercism/csharp-test-runner .
+
+# Run the Docker image using the settings mimicking the production environment
+docker run \
+    --rm \
+    --network none \
+    --read-only \
+    --mount type=bind,src="${PWD}/tests",dst=/opt/test-runner/tests \
+    --mount type=tmpfs,dst=/tmp \
+    --volume "${PWD}/bin/run-tests.sh:/opt/test-runner/bin/run-tests.sh" \
+    --workdir /opt/test-runner \
+    --entrypoint /opt/test-runner/bin/run-tests.sh \
+    exercism/csharp-test-runner

bin/run-tests.sh

@@ -0,0 +1,33 @@
+#!/usr/bin/env sh
+
+# Synopsis:
+# Test the test runner by running it against a predefined set of solutions 
+# with an expected output.
+
+# Output:
+# Outputs the diff of the expected test results against the actual test results
+# generated by the test runner.
+
+# Example:
+# ./bin/run-tests.sh
+
+exit_code=0
+
+# Iterate over all test directories
+for test_dir in tests/*; do
+    test_dir_name=$(basename "${test_dir}")
+    test_dir_path=$(realpath "${test_dir}")
+    results_file_path="${test_dir_path}/results.json"
+    expected_results_file_path="${test_dir_path}/expected_results.json"
+
+    bin/run.sh "${test_dir_name}" "${test_dir_path}" "${test_dir_path}"
+
+    echo "${test_dir_name}: comparing results.json to expected_results.json"
+    diff "${results_file_path}" "${expected_results_file_path}"
+
+    if [ $? -ne 0 ]; then
+        exit_code=1
+    fi
+done
+
+exit ${exit_code}

bin/run.sh

@@ -0,0 +1,28 @@
+#!/usr/bin/env sh
+
+# Synopsis:
+# Run the test runner on a solution.
+
+# Arguments:
+# $1: exercise slug
+# $2: path to solution folder
+# $3: path to output directory
+
+# Output:
+# Writes the test results to a results.json file in the passed-in output directory.
+# The test results are formatted according to the specifications at https://github.com/exercism/docs/blob/main/building/tooling/test-runners/interface.md
+
+# Example:
+# ./bin/run.sh two-fer path/to/solution/folder/ path/to/output/directory/
+
+# If any required arguments is missing, print the usage and exit
+if [ "$#" -lt 3 ]; then
+    echo "usage: ./bin/run.sh exercise-slug path/to/solution/folder/ path/to/output/directory/"
+    exit 1
+fi
+
+if [ -f /opt/test-runner/Exercism.TestRunner.CSharp ]; then
+    /opt/test-runner/Exercism.TestRunner.CSharp $1 $2 $3
+else
+    dotnet run --project ./src/Exercism.TestRunner.CSharp/ $1 $2 $3
+fi

src/Exercism.TestRunner.CSharp/Exercism.TestRunner.CSharp.csproj

@@ -1,12 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <OutputType>Exe</OutputType>
-    <IsTestProject>false</IsTestProject>
-  </PropertyGroup>
-
-  <PropertyGroup>
     <PublishReadyToRun>true</PublishReadyToRun>
   </PropertyGroup>
 

test/Exercism.TestRunner.CSharp.IntegrationTests/Exercism.TestRunner.CSharp.IntegrationTests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
@@ -12,17 +12,17 @@
   </ItemGroup>
 
   <ItemGroup>
-    <SolutionFiles Include="Solutions\**" />
-    <Compile Remove="@(SolutionFiles)" />
+    <TestFiles Include="..\..\tests\**" />
+    <Compile Remove="@(TestFiles)" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Exercism.TestRunner.CSharp\Exercism.TestRunner.CSharp.csproj" />
   </ItemGroup>
 
-  <Target Name="CopySolutions" AfterTargets="Build">
-    <RemoveDir Directories="$(OutputPath)\Solutions" />
-    <Copy SourceFiles="@(SolutionFiles)" DestinationFolder="$(OutputPath)\Solutions\%(RecursiveDir)" SkipUnchangedFiles="true" />
+  <Target Name="CopyTests" AfterTargets="Build">
+    <RemoveDir Directories="$(OutputPath)\tests" />
+    <Copy SourceFiles="@(TestFiles)" DestinationFolder="$(OutputPath)\tests\%(RecursiveDir)" SkipUnchangedFiles="true" />
   </Target>
 
 </Project>