diff --git a/.github/workflows/createrelease.yml b/.github/workflows/createrelease.yml index 7b9cfd7..b1d7a67 100644 --- a/.github/workflows/createrelease.yml +++ b/.github/workflows/createrelease.yml @@ -19,6 +19,12 @@ jobs: id: get_version run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//} + - name: Install NET 7 + uses: actions/setup-dotnet@v2 + with: + dotnet-version: '7.0.x' + + - name: Restore Nuget Packages run: dotnet restore CallbackHandler.sln --source https://api.nuget.org/v3/index.json --source https://www.myget.org/F/transactionprocessing/api/v3/index.json diff --git a/.github/workflows/nightlybuild.yml b/.github/workflows/nightlybuild.yml index 7b76588..951e5af 100644 --- a/.github/workflows/nightlybuild.yml +++ b/.github/workflows/nightlybuild.yml @@ -16,6 +16,11 @@ jobs: steps: - uses: actions/checkout@v2.3.4 + - name: Install NET 7 + uses: actions/setup-dotnet@v2 + with: + dotnet-version: '7.0.x' + - name: Set Up Variables run: echo "action_url=$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" >> $GITHUB_ENV diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 967e284..70e645a 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -16,6 +16,11 @@ jobs: steps: - uses: actions/checkout@v2.3.4 + - name: Install NET 7 + uses: actions/setup-dotnet@v2 + with: + dotnet-version: '7.0.x' + - name: Restore Nuget Packages run: dotnet restore CallbackHandler.sln --source https://api.nuget.org/v3/index.json --source https://www.myget.org/F/transactionprocessing/api/v3/index.json diff --git a/.github/workflows/pushtomain.yml b/.github/workflows/pushtomain.yml index 9e9ee5d..690f90f 100644 --- a/.github/workflows/pushtomain.yml +++ b/.github/workflows/pushtomain.yml @@ -18,6 +18,11 @@ jobs: - uses: actions/checkout@v2.3.4 with: fetch-depth: 0 + + - name: Install NET 7 + uses: actions/setup-dotnet@v2 + with: + dotnet-version: '7.0.x' - name: Restore Nuget Packages run: dotnet restore CallbackHandler.sln --source https://api.nuget.org/v3/index.json --source https://www.myget.org/F/transactionprocessing/api/v3/index.json diff --git a/CallbackHander.Testing/CallbackHander.Testing.csproj b/CallbackHander.Testing/CallbackHander.Testing.csproj index cc76215..3d17604 100644 --- a/CallbackHander.Testing/CallbackHander.Testing.csproj +++ b/CallbackHander.Testing/CallbackHander.Testing.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 None false diff --git a/CallbackHandler.BusinessLogic.Tests/CallbackHandler.BusinessLogic.Tests.csproj b/CallbackHandler.BusinessLogic.Tests/CallbackHandler.BusinessLogic.Tests.csproj index f04cab1..aabe68a 100644 --- a/CallbackHandler.BusinessLogic.Tests/CallbackHandler.BusinessLogic.Tests.csproj +++ b/CallbackHandler.BusinessLogic.Tests/CallbackHandler.BusinessLogic.Tests.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 None false @@ -9,7 +9,7 @@ - + diff --git a/CallbackHandler.BusinessLogic/CallbackHandler.BusinessLogic.csproj b/CallbackHandler.BusinessLogic/CallbackHandler.BusinessLogic.csproj index bca5ff5..44c2ced 100644 --- a/CallbackHandler.BusinessLogic/CallbackHandler.BusinessLogic.csproj +++ b/CallbackHandler.BusinessLogic/CallbackHandler.BusinessLogic.csproj @@ -1,13 +1,13 @@  - net6.0 + net7.0 - - - - + + + + diff --git a/CallbackHandler.CallbackMessage.DomainEvents/CallbackHandler.CallbackMessage.DomainEvents.csproj b/CallbackHandler.CallbackMessage.DomainEvents/CallbackHandler.CallbackMessage.DomainEvents.csproj index 466ff70..5b459da 100644 --- a/CallbackHandler.CallbackMessage.DomainEvents/CallbackHandler.CallbackMessage.DomainEvents.csproj +++ b/CallbackHandler.CallbackMessage.DomainEvents/CallbackHandler.CallbackMessage.DomainEvents.csproj @@ -1,10 +1,10 @@  - net6.0 + net7.0 - - + + \ No newline at end of file diff --git a/CallbackHandler.CallbackMessageAggregate.Tests/CallbackHandler.CallbackMessageAggregate.Tests.csproj b/CallbackHandler.CallbackMessageAggregate.Tests/CallbackHandler.CallbackMessageAggregate.Tests.csproj index 4ff1b59..2ed5456 100644 --- a/CallbackHandler.CallbackMessageAggregate.Tests/CallbackHandler.CallbackMessageAggregate.Tests.csproj +++ b/CallbackHandler.CallbackMessageAggregate.Tests/CallbackHandler.CallbackMessageAggregate.Tests.csproj @@ -1,14 +1,14 @@  - net6.0 + net7.0 None false - + diff --git a/CallbackHandler.CallbackMessageAggregate/CallbackHandler.CallbackMessageAggregate.csproj b/CallbackHandler.CallbackMessageAggregate/CallbackHandler.CallbackMessageAggregate.csproj index 3261600..add84a9 100644 --- a/CallbackHandler.CallbackMessageAggregate/CallbackHandler.CallbackMessageAggregate.csproj +++ b/CallbackHandler.CallbackMessageAggregate/CallbackHandler.CallbackMessageAggregate.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 @@ -9,9 +9,9 @@ - - - - + + + + \ No newline at end of file diff --git a/CallbackHandler.DataTransferObjects/CallbackHandler.DataTransferObjects.csproj b/CallbackHandler.DataTransferObjects/CallbackHandler.DataTransferObjects.csproj index ea14bbb..41b184e 100644 --- a/CallbackHandler.DataTransferObjects/CallbackHandler.DataTransferObjects.csproj +++ b/CallbackHandler.DataTransferObjects/CallbackHandler.DataTransferObjects.csproj @@ -1,7 +1,7 @@ - net6.0;netstandard2.0 + net7.0;netstandard2.0 diff --git a/CallbackHandler.Tests/CallbackHandler.Tests.csproj b/CallbackHandler.Tests/CallbackHandler.Tests.csproj index 4ec3aed..a65e15d 100644 --- a/CallbackHandler.Tests/CallbackHandler.Tests.csproj +++ b/CallbackHandler.Tests/CallbackHandler.Tests.csproj @@ -1,14 +1,15 @@ - + - net6.0 + net7.0 false - + + diff --git a/CallbackHandler/CallbackHandler.csproj b/CallbackHandler/CallbackHandler.csproj index f3b1c3b..a779c3e 100644 --- a/CallbackHandler/CallbackHandler.csproj +++ b/CallbackHandler/CallbackHandler.csproj @@ -1,18 +1,18 @@  - net6.0 + net7.0 Linux - + - + - + diff --git a/CallbackHandler/Dockerfile b/CallbackHandler/Dockerfile index 277beb5..61b1164 100644 --- a/CallbackHandler/Dockerfile +++ b/CallbackHandler/Dockerfile @@ -1,8 +1,8 @@ -FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build WORKDIR /src COPY ["CallbackHandler/NuGet.Config", "."] COPY ["CallbackHandler/CallbackHandler.csproj", "CallbackHandler/"] diff --git a/CallbackHandler/Dockerfilewindows b/CallbackHandler/Dockerfilewindows index 39ddac2..6bffdb8 100644 --- a/CallbackHandler/Dockerfilewindows +++ b/CallbackHandler/Dockerfilewindows @@ -2,7 +2,7 @@ FROM stuartferguson/txnprocbasewindows AS base USER ContainerAdministrator WORKDIR /app -FROM mcr.microsoft.com/dotnet/sdk:6.0-windowsservercore-ltsc2019 AS build +FROM mcr.microsoft.com/dotnet/sdk:7.0-windowsservercore-ltsc2019 AS build WORKDIR /src COPY ["CallbackHandler/NuGet.Config", "."] COPY ["CallbackHandler/CallbackHandler.csproj", "CallbackHandler/"] diff --git a/CallbackHandlers.Models/CallbackHandlers.Models.csproj b/CallbackHandlers.Models/CallbackHandlers.Models.csproj index efc79fa..f788247 100644 --- a/CallbackHandlers.Models/CallbackHandlers.Models.csproj +++ b/CallbackHandlers.Models/CallbackHandlers.Models.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0