diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index c5901fd2c..e87920564 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -20,11 +20,11 @@ RUN curl -fsSL https://download.docker.com/linux/static/stable/x86_64/docker-19. RUN sed -i "/plugins=/c\plugins=(docker git golang dotnet)" /home/vscode/.zshrc RUN curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash -### Installing dotnet 5.0 +### Installing dotnet 7.0 RUN apt update; \ apt install -y apt-transport-https && \ apt update && \ - apt install -y dotnet-sdk-5.0 + apt install -y dotnet-sdk-7.0 ### Installing golang 1.14 RUN curl -L https://golang.org/dl/go1.14.linux-amd64.tar.gz | sudo tar -xz -C /usr/local diff --git a/.github/workflows/addons.yaml b/.github/workflows/addons.yaml index 728eb78c6..593e2bc57 100644 --- a/.github/workflows/addons.yaml +++ b/.github/workflows/addons.yaml @@ -8,7 +8,7 @@ on: jobs: run-context-tests: runs-on: ubuntu-latest - container: mcr.microsoft.com/dotnet/sdk:5.0 + container: mcr.microsoft.com/dotnet/sdk:7.0 env: DOTNET_CLI_TELEMETRY_OPTOUT: "true" REDIS_TEST_CONNECTION: "redis:6379" @@ -23,7 +23,7 @@ jobs: mongo: image: mongo:3.6-jessie steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Test redis driver working-directory: addons/Context/Tweek.Drivers.Context.Redis.IntegrationTests run: | diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index bbb0b43b9..d8f3f5b84 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -12,7 +12,7 @@ jobs: matrix: image: ["authoring", "gateway", "publishing", "api", "editor"] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Login Docker DH if: ${{ github.repository == 'soluto/tweek' }} env: @@ -27,7 +27,7 @@ jobs: echo cp -a ${{ matrix.image }}-${{ github.sha }}.tar .github/workflows/ cp -a ${{ matrix.image }}-${{ github.sha }}.tar .github/workflows/ - name: 'Upload Artifact' - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: build-images path: | @@ -37,9 +37,9 @@ jobs: needs: ["build-images"] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Download build images - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: build-images - name: load images into docker @@ -50,9 +50,9 @@ jobs: needs: ["build-images"] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Download build images - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: build-images - name: load images into docker @@ -65,9 +65,9 @@ jobs: needs: ["build-images"] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Download build images - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: build-images - name: load images into docker @@ -79,7 +79,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.repository == 'soluto/tweek' && !startsWith(github.ref, 'refs/heads/dependabot') }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 - name: Login Docker DH @@ -89,7 +89,7 @@ jobs: DOCKERHUB_USER: ${{ secrets.DOCKER_USER }} run: echo $DOCKERHUB_TOKEN | docker login --username $DOCKERHUB_USER --password-stdin - name: Download build images - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: build-images - name: load images into docker diff --git a/TweekApi.Dockerfile b/TweekApi.Dockerfile index 6140cf0a7..9ed1408f9 100644 --- a/TweekApi.Dockerfile +++ b/TweekApi.Dockerfile @@ -6,7 +6,7 @@ COPY ./services/api /src/services/api RUN find /src -type f -not -name "*.csproj" -delete && find /src -type d -empty -delete # ---- BUILD & TEST ---- -FROM mcr.microsoft.com/dotnet/sdk:5.0 as source +FROM mcr.microsoft.com/dotnet/sdk:7.0 as source ARG target="Release" WORKDIR /src COPY --from=csproj-files /src . @@ -19,7 +19,7 @@ RUN dotnet build Tweek.sln -c $target && \ cd ./services/api/Tweek.ApiService && dotnet publish Tweek.ApiService.csproj -c $target -o ./obj/Docker/publish # ---- RELEASE ---- -FROM mcr.microsoft.com/dotnet/aspnet:5.0 as release +FROM mcr.microsoft.com/dotnet/aspnet:7.0 as release ARG target="Release" WORKDIR /app EXPOSE 80 diff --git a/TweekApiSmokeTest.Dockerfile b/TweekApiSmokeTest.Dockerfile index 734c876a7..091fa3dbe 100644 --- a/TweekApiSmokeTest.Dockerfile +++ b/TweekApiSmokeTest.Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:5.0 as source +FROM mcr.microsoft.com/dotnet/sdk:7.0 as source RUN apt-get update && \ apt-get install -y --no-install-recommends jq && \ diff --git a/addons/ApplicationInsights/Tweek.Addons.ApplicationInsights/Tweek.Addons.ApplicationInsights.csproj b/addons/ApplicationInsights/Tweek.Addons.ApplicationInsights/Tweek.Addons.ApplicationInsights.csproj index 31457c3cb..476e8b89a 100644 --- a/addons/ApplicationInsights/Tweek.Addons.ApplicationInsights/Tweek.Addons.ApplicationInsights.csproj +++ b/addons/ApplicationInsights/Tweek.Addons.ApplicationInsights/Tweek.Addons.ApplicationInsights.csproj @@ -1,11 +1,11 @@  - netstandard2.1 + net7.0 - + diff --git a/addons/Context/Tweek.Drivers.Context.Couchbase.IntegrationTests/Tweek.Drivers.Context.Couchbase.IntegrationTests.csproj b/addons/Context/Tweek.Drivers.Context.Couchbase.IntegrationTests/Tweek.Drivers.Context.Couchbase.IntegrationTests.csproj index aaca02a77..fb4e9161d 100644 --- a/addons/Context/Tweek.Drivers.Context.Couchbase.IntegrationTests/Tweek.Drivers.Context.Couchbase.IntegrationTests.csproj +++ b/addons/Context/Tweek.Drivers.Context.Couchbase.IntegrationTests/Tweek.Drivers.Context.Couchbase.IntegrationTests.csproj @@ -1,12 +1,12 @@  - net5.0 + net7.0 false - - - + + + diff --git a/addons/Context/Tweek.Drivers.Context.Couchbase/Tweek.Drivers.Context.Couchbase.csproj b/addons/Context/Tweek.Drivers.Context.Couchbase/Tweek.Drivers.Context.Couchbase.csproj index 4534cd3e0..30d4aa6e1 100644 --- a/addons/Context/Tweek.Drivers.Context.Couchbase/Tweek.Drivers.Context.Couchbase.csproj +++ b/addons/Context/Tweek.Drivers.Context.Couchbase/Tweek.Drivers.Context.Couchbase.csproj @@ -1,6 +1,6 @@  - netstandard2.1 + net7.0 True Soluto Couchbase context driver for Tweek @@ -11,10 +11,10 @@ $([System.IO.Path]::Combine($(MSBuildProjectDirectory),$(MSBuildProjectName))).nuspec - + - - + + diff --git a/addons/Context/Tweek.Drivers.Context.Couchbase/Tweek.Drivers.Context.Couchbase.nuspec b/addons/Context/Tweek.Drivers.Context.Couchbase/Tweek.Drivers.Context.Couchbase.nuspec index f5fd13fad..99e01ab99 100644 --- a/addons/Context/Tweek.Drivers.Context.Couchbase/Tweek.Drivers.Context.Couchbase.nuspec +++ b/addons/Context/Tweek.Drivers.Context.Couchbase/Tweek.Drivers.Context.Couchbase.nuspec @@ -11,12 +11,12 @@ $projectUrl$ - + - + diff --git a/addons/Context/Tweek.Drivers.Context.InMemory.Tests/Tweek.Drivers.Context.InMemory.Tests.csproj b/addons/Context/Tweek.Drivers.Context.InMemory.Tests/Tweek.Drivers.Context.InMemory.Tests.csproj index b553a3b08..2585fedb4 100644 --- a/addons/Context/Tweek.Drivers.Context.InMemory.Tests/Tweek.Drivers.Context.InMemory.Tests.csproj +++ b/addons/Context/Tweek.Drivers.Context.InMemory.Tests/Tweek.Drivers.Context.InMemory.Tests.csproj @@ -1,16 +1,16 @@ - netcoreapp3.1 + net7.0 false - - - - + + + + diff --git a/addons/Context/Tweek.Drivers.Context.InMemory/Tweek.Drivers.Context.InMemory.csproj b/addons/Context/Tweek.Drivers.Context.InMemory/Tweek.Drivers.Context.InMemory.csproj index ba334668d..0c6416294 100644 --- a/addons/Context/Tweek.Drivers.Context.InMemory/Tweek.Drivers.Context.InMemory.csproj +++ b/addons/Context/Tweek.Drivers.Context.InMemory/Tweek.Drivers.Context.InMemory.csproj @@ -1,6 +1,6 @@  - netstandard2.1 + net7.0 True Soluto In Memory context driver for Tweek @@ -11,7 +11,7 @@ - + diff --git a/addons/Context/Tweek.Drivers.Context.MongoDb.IntegrationTests/Tweek.Drivers.Context.MongoDb.IntegrationTests.csproj b/addons/Context/Tweek.Drivers.Context.MongoDb.IntegrationTests/Tweek.Drivers.Context.MongoDb.IntegrationTests.csproj index f13f83d35..f197231b8 100644 --- a/addons/Context/Tweek.Drivers.Context.MongoDb.IntegrationTests/Tweek.Drivers.Context.MongoDb.IntegrationTests.csproj +++ b/addons/Context/Tweek.Drivers.Context.MongoDb.IntegrationTests/Tweek.Drivers.Context.MongoDb.IntegrationTests.csproj @@ -1,12 +1,12 @@  - net5.0 + net7.0 false - - - + + + diff --git a/addons/Context/Tweek.Drivers.Context.MongoDb/Tweek.Drivers.Context.MongoDb.csproj b/addons/Context/Tweek.Drivers.Context.MongoDb/Tweek.Drivers.Context.MongoDb.csproj index 7423dd36d..4f430f9b3 100644 --- a/addons/Context/Tweek.Drivers.Context.MongoDb/Tweek.Drivers.Context.MongoDb.csproj +++ b/addons/Context/Tweek.Drivers.Context.MongoDb/Tweek.Drivers.Context.MongoDb.csproj @@ -1,6 +1,6 @@  - netstandard2.1 + net7.0 True Soluto MongoDB context driver for Tweek @@ -12,8 +12,8 @@ - - + + diff --git a/addons/Context/Tweek.Drivers.Context.MongoDb/Tweek.Drivers.Context.MongoDb.nuspec b/addons/Context/Tweek.Drivers.Context.MongoDb/Tweek.Drivers.Context.MongoDb.nuspec index cfb97a3b7..30079e654 100644 --- a/addons/Context/Tweek.Drivers.Context.MongoDb/Tweek.Drivers.Context.MongoDb.nuspec +++ b/addons/Context/Tweek.Drivers.Context.MongoDb/Tweek.Drivers.Context.MongoDb.nuspec @@ -11,13 +11,13 @@ $projectUrl$ - + - + diff --git a/addons/Context/Tweek.Drivers.Context.Redis.IntegrationTests/Tweek.Drivers.Context.Redis.IntegrationTests.csproj b/addons/Context/Tweek.Drivers.Context.Redis.IntegrationTests/Tweek.Drivers.Context.Redis.IntegrationTests.csproj index ef77c3f85..bf3b381e9 100644 --- a/addons/Context/Tweek.Drivers.Context.Redis.IntegrationTests/Tweek.Drivers.Context.Redis.IntegrationTests.csproj +++ b/addons/Context/Tweek.Drivers.Context.Redis.IntegrationTests/Tweek.Drivers.Context.Redis.IntegrationTests.csproj @@ -1,12 +1,12 @@  - net5.0 + net7.0 false - - - + + + diff --git a/addons/Context/Tweek.Drivers.Context.Redis/Tweek.Drivers.Context.Redis.csproj b/addons/Context/Tweek.Drivers.Context.Redis/Tweek.Drivers.Context.Redis.csproj index a5095cf98..550ea86f7 100644 --- a/addons/Context/Tweek.Drivers.Context.Redis/Tweek.Drivers.Context.Redis.csproj +++ b/addons/Context/Tweek.Drivers.Context.Redis/Tweek.Drivers.Context.Redis.csproj @@ -1,6 +1,6 @@  - netstandard2.1 + net7.0 True Soluto Redis context driver for Tweek @@ -12,8 +12,8 @@ - - + + diff --git a/addons/Context/Tweek.Drivers.Context.Redis/Tweek.Drivers.Context.Redis.nuspec b/addons/Context/Tweek.Drivers.Context.Redis/Tweek.Drivers.Context.Redis.nuspec index cfb97a3b7..30079e654 100644 --- a/addons/Context/Tweek.Drivers.Context.Redis/Tweek.Drivers.Context.Redis.nuspec +++ b/addons/Context/Tweek.Drivers.Context.Redis/Tweek.Drivers.Context.Redis.nuspec @@ -11,13 +11,13 @@ $projectUrl$ - + - + diff --git a/addons/Context/Tweek.Drivers.ContextIntegrationTests/Tweek.Drivers.ContextIntegrationTests.csproj b/addons/Context/Tweek.Drivers.ContextIntegrationTests/Tweek.Drivers.ContextIntegrationTests.csproj index af868e751..51c68177e 100644 --- a/addons/Context/Tweek.Drivers.ContextIntegrationTests/Tweek.Drivers.ContextIntegrationTests.csproj +++ b/addons/Context/Tweek.Drivers.ContextIntegrationTests/Tweek.Drivers.ContextIntegrationTests.csproj @@ -1,7 +1,7 @@  - netstandard2.1 + net7.0 True Soluto Context drivers integration tests for Tweek @@ -14,7 +14,7 @@ - + diff --git a/addons/Rules/Tweek.Drivers.Rules.FileSystem/Tweek.Drivers.Rules.FileSystem.csproj b/addons/Rules/Tweek.Drivers.Rules.FileSystem/Tweek.Drivers.Rules.FileSystem.csproj index 9dc658dbf..7ca63a595 100644 --- a/addons/Rules/Tweek.Drivers.Rules.FileSystem/Tweek.Drivers.Rules.FileSystem.csproj +++ b/addons/Rules/Tweek.Drivers.Rules.FileSystem/Tweek.Drivers.Rules.FileSystem.csproj @@ -1,9 +1,9 @@ - netstandard2.1 + net7.0 - + diff --git a/addons/Rules/Tweek.Drivers.Rules.Minio/Tweek.Drivers.Rules.Minio.csproj b/addons/Rules/Tweek.Drivers.Rules.Minio/Tweek.Drivers.Rules.Minio.csproj index 5bcb47e84..3c3c1ff63 100644 --- a/addons/Rules/Tweek.Drivers.Rules.Minio/Tweek.Drivers.Rules.Minio.csproj +++ b/addons/Rules/Tweek.Drivers.Rules.Minio/Tweek.Drivers.Rules.Minio.csproj @@ -1,10 +1,10 @@  - netstandard2.1 + net7.0 - - + + diff --git a/core/Engine/Tweek.Engine.Core/Tweek.Engine.Core.csproj b/core/Engine/Tweek.Engine.Core/Tweek.Engine.Core.csproj index cffe06a2a..ccaacbe95 100644 --- a/core/Engine/Tweek.Engine.Core/Tweek.Engine.Core.csproj +++ b/core/Engine/Tweek.Engine.Core/Tweek.Engine.Core.csproj @@ -1,11 +1,11 @@  - netstandard2.1 + net7.0 1591, 1701, 1702, 1998 - + diff --git a/core/Engine/Tweek.Engine.DataTypes/Tweek.Engine.DataTypes.csproj b/core/Engine/Tweek.Engine.DataTypes/Tweek.Engine.DataTypes.csproj index 50b69b23e..e013f5f01 100644 --- a/core/Engine/Tweek.Engine.DataTypes/Tweek.Engine.DataTypes.csproj +++ b/core/Engine/Tweek.Engine.DataTypes/Tweek.Engine.DataTypes.csproj @@ -1,6 +1,6 @@  - netstandard2.1 + net7.0 diff --git a/core/Engine/Tweek.Engine.Drivers/Tweek.Engine.Drivers.csproj b/core/Engine/Tweek.Engine.Drivers/Tweek.Engine.Drivers.csproj index d15528eea..227562aa7 100644 --- a/core/Engine/Tweek.Engine.Drivers/Tweek.Engine.Drivers.csproj +++ b/core/Engine/Tweek.Engine.Drivers/Tweek.Engine.Drivers.csproj @@ -1,6 +1,6 @@  - netstandard2.1 + net7.0 @@ -8,8 +8,8 @@ - - + + \ No newline at end of file diff --git a/core/Engine/Tweek.Engine.Tests/Tweek.Engine.Tests.csproj b/core/Engine/Tweek.Engine.Tests/Tweek.Engine.Tests.csproj index e631793e2..2f693e450 100644 --- a/core/Engine/Tweek.Engine.Tests/Tweek.Engine.Tests.csproj +++ b/core/Engine/Tweek.Engine.Tests/Tweek.Engine.Tests.csproj @@ -1,17 +1,17 @@  - net5.0 + net7.0 1591, 1701, 1702, 1998 - - + + - + - - + + diff --git a/core/Engine/Tweek.Engine/Tweek.Engine.csproj b/core/Engine/Tweek.Engine/Tweek.Engine.csproj index 707c4931a..060f0132d 100644 --- a/core/Engine/Tweek.Engine/Tweek.Engine.csproj +++ b/core/Engine/Tweek.Engine/Tweek.Engine.csproj @@ -1,10 +1,10 @@  - netstandard2.1 + net7.0 - + diff --git a/core/JPad/Tweek.JPad.Utils/Tweek.JPad.Utils.csproj b/core/JPad/Tweek.JPad.Utils/Tweek.JPad.Utils.csproj index 2b604f891..a8edaef78 100644 --- a/core/JPad/Tweek.JPad.Utils/Tweek.JPad.Utils.csproj +++ b/core/JPad/Tweek.JPad.Utils/Tweek.JPad.Utils.csproj @@ -1,9 +1,9 @@  - netstandard2.1 + net7.0 - + diff --git a/core/Tweek.ApiService.Addons/Tweek.ApiService.Addons.csproj b/core/Tweek.ApiService.Addons/Tweek.ApiService.Addons.csproj index edf8f6980..9c9c5849d 100644 --- a/core/Tweek.ApiService.Addons/Tweek.ApiService.Addons.csproj +++ b/core/Tweek.ApiService.Addons/Tweek.ApiService.Addons.csproj @@ -1,6 +1,6 @@  - netstandard2.1 + net7.0 True Soluto Package for Tweek Api addon development @@ -11,14 +11,14 @@ $([System.IO.Path]::Combine($(MSBuildProjectDirectory),$(MSBuildProjectName))).nuspec - + - + - - - - + + + + diff --git a/core/Utils/JsonValueConverter.Tests/JsonValueConverter.Tests.csproj b/core/Utils/JsonValueConverter.Tests/JsonValueConverter.Tests.csproj index 92566e6aa..80b936f25 100644 --- a/core/Utils/JsonValueConverter.Tests/JsonValueConverter.Tests.csproj +++ b/core/Utils/JsonValueConverter.Tests/JsonValueConverter.Tests.csproj @@ -1,13 +1,13 @@  - net5.0 + net7.0 - - - - + + + + diff --git a/core/Utils/JsonValueConverter/JsonValueConverter.csproj b/core/Utils/JsonValueConverter/JsonValueConverter.csproj index 968a2740b..05151042f 100644 --- a/core/Utils/JsonValueConverter/JsonValueConverter.csproj +++ b/core/Utils/JsonValueConverter/JsonValueConverter.csproj @@ -1,9 +1,9 @@  - netstandard2.1 + net7.0 - + \ No newline at end of file diff --git a/services/api/Tweek.ApiService.SmokeTests/Tweek.ApiService.SmokeTests.csproj b/services/api/Tweek.ApiService.SmokeTests/Tweek.ApiService.SmokeTests.csproj index 673e60924..8ed3a7781 100644 --- a/services/api/Tweek.ApiService.SmokeTests/Tweek.ApiService.SmokeTests.csproj +++ b/services/api/Tweek.ApiService.SmokeTests/Tweek.ApiService.SmokeTests.csproj @@ -1,15 +1,15 @@  - net5.0 + net7.0 - - - + + + - - + + diff --git a/services/api/Tweek.ApiService.Tests/Tweek.ApiService.Tests.csproj b/services/api/Tweek.ApiService.Tests/Tweek.ApiService.Tests.csproj index e09d2e769..0568e79d8 100644 --- a/services/api/Tweek.ApiService.Tests/Tweek.ApiService.Tests.csproj +++ b/services/api/Tweek.ApiService.Tests/Tweek.ApiService.Tests.csproj @@ -1,13 +1,13 @@  - net5.0 + net7.0 false - - - - + + + + diff --git a/services/api/Tweek.ApiService/Tweek.ApiService.csproj b/services/api/Tweek.ApiService/Tweek.ApiService.csproj index 6d5a2b2f7..1bcb61027 100644 --- a/services/api/Tweek.ApiService/Tweek.ApiService.csproj +++ b/services/api/Tweek.ApiService/Tweek.ApiService.csproj @@ -1,7 +1,7 @@  - net5.0 - 1.0.0-rc14 + net7.0 + 1.0.0-rc15 ..\..\..\deployments\docker-compose.dcproj true 1591, 1701, 1702, 1998 @@ -11,21 +11,21 @@ - - - - - + + + + + - - - - - + + + + + - - - + + +