diff --git a/.github/workflows/dotnet-build.yml b/.github/workflows/dotnet-build.yml index debf937..2b32ece 100644 --- a/.github/workflows/dotnet-build.yml +++ b/.github/workflows/dotnet-build.yml @@ -7,15 +7,15 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup dotnet - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v4 with: - dotnet-version: 6.0.x # SDK Version to use. + dotnet-version: 8.0.x # SDK Version to use. - name: Cache Nuget packages - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.nuget/packages # Look to see if there is a cache hit for the corresponding requirements file diff --git a/README.md b/README.md index 1eeba5e..24cf3fe 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ Set up the `libdigidocpp` library as follows: 1. Install the _libdigidocpp-3.17.1.msi_ package or higher. The installation packages are available from [https://github.com/open-eid/libdigidocpp/releases](https://github.com/open-eid/libdigidocpp/releases). 2. Copy the C# source files from the `libdigidocpp` installation folder `include\digidocpp_csharp` to the `src\WebEid.AspNetCore.Example\DigiDoc` folder. -3. Copy all files from either the `x64` subfolder of the `libdigidocpp` installation folder to the example application build output folder `bin\...\net60` (after building, see next step). When building custom applications, choose `x64` if your application is 64-bit and `x86` if it is 32-bit. +3. Copy all files from either the `x64` subfolder of the `libdigidocpp` installation folder to the example application build output folder `bin\...\net8.0` (after building, see next step). When building custom applications, choose `x64` if your application is 64-bit and `x86` if it is 32-bit. 4. When running in the `Development` profile, create an empty file named `EE_T.xml` for TSL cache as described in the [_Using test TSL lists_](https://github.com/open-eid/libdigidocpp/wiki/Using-test-TSL-lists#preconditions) section of the `libdigidocpp` wiki. #### For Ubuntu Linux @@ -79,7 +79,7 @@ Set up the `libdigidocpp` library as follows: 1. Install the _libdigidocpp-3.17.1.pkg_ package or higher. The installation packages are available from [https://github.com/open-eid/libdigidocpp/releases](https://github.com/open-eid/libdigidocpp/releases). 2. Copy the C# source files from `/Library/libdigidocpp/include/digidocpp_csharp` directory to `src/WebEid.AspNetCore.Example/DigiDoc` directory. -3. Go to `src/WebEid.AspNetCore.Example/bin/.../net60` directory and create symbolic link to `/Library/libdigidocpp/lib/libdigidoc_csharp.dylib` library: +3. Go to `src/WebEid.AspNetCore.Example/bin/.../net8.0` directory and create symbolic link to `/Library/libdigidocpp/lib/libdigidoc_csharp.dylib` library: ```cmd ln -s /Library/libdigidocpp/lib/libdigidoc_csharp.dylib ``` diff --git a/src/.dockerignore b/src/.dockerignore index 19c9155..50e2413 100644 --- a/src/.dockerignore +++ b/src/.dockerignore @@ -24,4 +24,4 @@ LICENSE README.md -!WebEid.AspNetCore.Example/bin/Release/net6.0/publish/ +!WebEid.AspNetCore.Example/bin/Release/net8.0/publish/ diff --git a/src/Dockerfile b/src/Dockerfile index 8c8a127..33b8ad1 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -1,5 +1,5 @@ -# We're using .NET 6 now, but when we migrate to .NET 8 in the future, we should use chiseled images. -FROM mcr.microsoft.com/dotnet/aspnet:6.0-jammy +# In the future, we should use chiseled images. +FROM mcr.microsoft.com/dotnet/aspnet:8.0-jammy WORKDIR /app @@ -13,7 +13,7 @@ RUN echo "deb [signed-by=/usr/share/keyrings/ria-repository.gpg] https://install apt-get clean && \ rm -rf /var/lib/apt/lists -COPY ./WebEid.AspNetCore.Example/bin/Release/net6.0/publish/ . +COPY ./WebEid.AspNetCore.Example/bin/Release/net8.0/publish/ . ENV ASPNETCORE_ENVIRONMENT=Production diff --git a/src/WebEid.AspNetCore.Example/WebEid.AspNetCore.Example.csproj b/src/WebEid.AspNetCore.Example/WebEid.AspNetCore.Example.csproj index ceaae77..fd43bc6 100644 --- a/src/WebEid.AspNetCore.Example/WebEid.AspNetCore.Example.csproj +++ b/src/WebEid.AspNetCore.Example/WebEid.AspNetCore.Example.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 aspnet-web_eid_asp_dotnet_example-3FF31439-FDC0-4164-B154-03E005FE96CD WebEid.AspNetCore.Example false @@ -11,14 +11,14 @@ - - - - - - - - + + + + + + + +