Skip to content

Commit b8635e5

Browse files
AleF83AleF83
committed
chore: upgrade tweek-api to .NET7.0
1 parent d55987a commit b8635e5

File tree

32 files changed

+117
-117
lines changed

32 files changed

+117
-117
lines changed

‎.devcontainer/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ RUN curl -fsSL https://download.docker.com/linux/static/stable/x86_64/docker-19.
2020
RUN sed -i "/plugins=/c\plugins=(docker git golang dotnet)" /home/vscode/.zshrc
2121
RUN curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
2222

23-
### Installing dotnet 5.0
23+
### Installing dotnet 7.0
2424
RUN apt update; \
2525
apt install -y apt-transport-https && \
2626
apt update && \
27-
apt install -y dotnet-sdk-5.0
27+
apt install -y dotnet-sdk-7.0
2828

2929
### Installing golang 1.14
3030
RUN curl -L https://golang.org/dl/go1.14.linux-amd64.tar.gz | sudo tar -xz -C /usr/local

‎.github/workflows/addons.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
jobs:
99
run-context-tests:
1010
runs-on: ubuntu-latest
11-
container: mcr.microsoft.com/dotnet/sdk:5.0
11+
container: mcr.microsoft.com/dotnet/sdk:7.0
1212
env:
1313
DOTNET_CLI_TELEMETRY_OPTOUT: "true"
1414
REDIS_TEST_CONNECTION: "redis:6379"
@@ -23,7 +23,7 @@ jobs:
2323
mongo:
2424
image: mongo:3.6-jessie
2525
steps:
26-
- uses: actions/checkout@v2
26+
- uses: actions/checkout@v3
2727
- name: Test redis driver
2828
working-directory: addons/Context/Tweek.Drivers.Context.Redis.IntegrationTests
2929
run: |

‎.github/workflows/main.yaml

+10-10
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
matrix:
1313
image: ["authoring", "gateway", "publishing", "api", "editor"]
1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v3
1616
- name: Login Docker DH
1717
if: ${{ github.repository == 'soluto/tweek' }}
1818
env:
@@ -27,7 +27,7 @@ jobs:
2727
echo cp -a ${{ matrix.image }}-${{ github.sha }}.tar .github/workflows/
2828
cp -a ${{ matrix.image }}-${{ github.sha }}.tar .github/workflows/
2929
- name: 'Upload Artifact'
30-
uses: actions/upload-artifact@v2
30+
uses: actions/upload-artifact@v3
3131
with:
3232
name: build-images
3333
path: |
@@ -37,9 +37,9 @@ jobs:
3737
needs: ["build-images"]
3838
runs-on: ubuntu-latest
3939
steps:
40-
- uses: actions/checkout@v2
40+
- uses: actions/checkout@v3
4141
- name: Download build images
42-
uses: actions/download-artifact@v2
42+
uses: actions/download-artifact@v3
4343
with:
4444
name: build-images
4545
- name: load images into docker
@@ -50,9 +50,9 @@ jobs:
5050
needs: ["build-images"]
5151
runs-on: ubuntu-latest
5252
steps:
53-
- uses: actions/checkout@v2
53+
- uses: actions/checkout@v3
5454
- name: Download build images
55-
uses: actions/download-artifact@v2
55+
uses: actions/download-artifact@v3
5656
with:
5757
name: build-images
5858
- name: load images into docker
@@ -65,9 +65,9 @@ jobs:
6565
needs: ["build-images"]
6666
runs-on: ubuntu-latest
6767
steps:
68-
- uses: actions/checkout@v2
68+
- uses: actions/checkout@v3
6969
- name: Download build images
70-
uses: actions/download-artifact@v2
70+
uses: actions/download-artifact@v3
7171
with:
7272
name: build-images
7373
- name: load images into docker
@@ -79,7 +79,7 @@ jobs:
7979
runs-on: ubuntu-latest
8080
if: ${{ github.repository == 'soluto/tweek' && !startsWith(github.ref, 'refs/heads/dependabot') }}
8181
steps:
82-
- uses: actions/checkout@v2
82+
- uses: actions/checkout@v3
8383
with:
8484
fetch-depth: 0
8585
- name: Login Docker DH
@@ -89,7 +89,7 @@ jobs:
8989
DOCKERHUB_USER: ${{ secrets.DOCKER_USER }}
9090
run: echo $DOCKERHUB_TOKEN | docker login --username $DOCKERHUB_USER --password-stdin
9191
- name: Download build images
92-
uses: actions/download-artifact@v2
92+
uses: actions/download-artifact@v3
9393
with:
9494
name: build-images
9595
- name: load images into docker

‎TweekApi.Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ COPY ./services/api /src/services/api
66
RUN find /src -type f -not -name "*.csproj" -delete && find /src -type d -empty -delete
77

88
# ---- BUILD & TEST ----
9-
FROM mcr.microsoft.com/dotnet/sdk:5.0 as source
9+
FROM mcr.microsoft.com/dotnet/sdk:7.0 as source
1010
ARG target="Release"
1111
WORKDIR /src
1212
COPY --from=csproj-files /src .
@@ -19,7 +19,7 @@ RUN dotnet build Tweek.sln -c $target && \
1919
cd ./services/api/Tweek.ApiService && dotnet publish Tweek.ApiService.csproj -c $target -o ./obj/Docker/publish
2020

2121
# ---- RELEASE ----
22-
FROM mcr.microsoft.com/dotnet/aspnet:5.0 as release
22+
FROM mcr.microsoft.com/dotnet/aspnet:7.0 as release
2323
ARG target="Release"
2424
WORKDIR /app
2525
EXPOSE 80

‎TweekApiSmokeTest.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:5.0 as source
1+
FROM mcr.microsoft.com/dotnet/sdk:7.0 as source
22

33
RUN apt-get update && \
44
apt-get install -y --no-install-recommends jq && \

‎addons/ApplicationInsights/Tweek.Addons.ApplicationInsights/Tweek.Addons.ApplicationInsights.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netstandard2.1</TargetFramework>
3+
<TargetFramework>net7.0</TargetFramework>
44
</PropertyGroup>
55
<ItemGroup>
66
<ProjectReference Include="..\..\..\core\Tweek.ApiService.Addons\Tweek.ApiService.Addons.csproj" />
77
</ItemGroup>
88
<ItemGroup>
9-
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.17.0" />
9+
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
1010
</ItemGroup>
1111
</Project>

‎addons/Context/Tweek.Drivers.Context.Couchbase.IntegrationTests/Tweek.Drivers.Context.Couchbase.IntegrationTests.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net5.0</TargetFramework>
3+
<TargetFramework>net7.0</TargetFramework>
44
<IsPackable>false</IsPackable>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
8-
<PackageReference Include="xunit" Version="2.4.1" />
9-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
7+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
8+
<PackageReference Include="xunit" Version="2.4.2" />
9+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
1010
</ItemGroup>
1111
<ItemGroup>
1212
<ProjectReference Include="..\Tweek.Drivers.ContextIntegrationTests\Tweek.Drivers.ContextIntegrationTests.csproj" />

‎addons/Context/Tweek.Drivers.Context.Couchbase/Tweek.Drivers.Context.Couchbase.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netstandard2.1</TargetFramework>
3+
<TargetFramework>net7.0</TargetFramework>
44
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
55
<Authors>Soluto</Authors>
66
<Description>Couchbase context driver for Tweek</Description>
@@ -11,10 +11,10 @@
1111
<NuspecFile>$([System.IO.Path]::Combine($(MSBuildProjectDirectory),$(MSBuildProjectName))).nuspec</NuspecFile>
1212
</PropertyGroup>
1313
<ItemGroup>
14-
<PackageReference Include="CouchbaseNetClient" Version="2.7.15" />
14+
<PackageReference Include="CouchbaseNetClient" Version="2.7.27" />
1515
<PackageReference Include="FSharpUtils.Newtonsoft.JsonValue" Version="0.2.6" />
16-
<PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
17-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0" />
16+
<PackageReference Include="System.Collections.Immutable" Version="7.0.0" />
17+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
1818
</ItemGroup>
1919
<ItemGroup>
2020
<ProjectReference Include="..\..\..\core\Tweek.ApiService.Addons\Tweek.ApiService.Addons.csproj" />

‎addons/Context/Tweek.Drivers.Context.Couchbase/Tweek.Drivers.Context.Couchbase.nuspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
<projectUrl>$projectUrl$</projectUrl>
1212
<repository url="$repository$"></repository>
1313
<dependencies>
14-
<group targetFramework=".NETStandard2.1">
14+
<group targetFramework=".net7.0">
1515
<dependency id="NETStandard.Library" version="2.1" exclude="Build,Analyzers" />
1616
</group>
1717
</dependencies>
1818
</metadata>
1919
<files>
20-
<file src="$outputDir$\*.dll" target="lib\netstandard2.1\" />
20+
<file src="$outputDir$\*.dll" target="lib\net7.0\" />
2121
</files>
2222
</package>

‎addons/Context/Tweek.Drivers.Context.InMemory.Tests/Tweek.Drivers.Context.InMemory.Tests.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
11-
<PackageReference Include="xunit" Version="2.4.0" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
13-
<PackageReference Include="coverlet.collector" Version="1.2.0" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
11+
<PackageReference Include="xunit" Version="2.4.2" />
12+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
13+
<PackageReference Include="coverlet.collector" Version="3.2.0" />
1414
<PackageReference Include="FSharpUtils.Newtonsoft.JsonValue" Version="0.2.6" />
1515
</ItemGroup>
1616

‎addons/Context/Tweek.Drivers.Context.InMemory/Tweek.Drivers.Context.InMemory.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
22
<PropertyGroup>
3-
<TargetFramework>netstandard2.1</TargetFramework>
3+
<TargetFramework>net7.0</TargetFramework>
44
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
55
<Authors>Soluto</Authors>
66
<Description>In Memory context driver for Tweek</Description>
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212
<ItemGroup>
1313
<PackageReference Include="FSharpUtils.Newtonsoft.JsonValue" Version="0.2.6" />
14-
<PackageReference Include="System.Collections.Immutable" Version="1.7.1" />
14+
<PackageReference Include="System.Collections.Immutable" Version="7.0.0" />
1515
</ItemGroup>
1616
<ItemGroup>
1717
<ProjectReference Include="..\..\..\core\Tweek.ApiService.Addons\Tweek.ApiService.Addons.csproj" />

‎addons/Context/Tweek.Drivers.Context.MongoDb.IntegrationTests/Tweek.Drivers.Context.MongoDb.IntegrationTests.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net5.0</TargetFramework>
3+
<TargetFramework>net7.0</TargetFramework>
44
<IsPackable>false</IsPackable>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
8-
<PackageReference Include="xunit" Version="2.4.1" />
9-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
7+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
8+
<PackageReference Include="xunit" Version="2.4.2" />
9+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
1010
</ItemGroup>
1111
<ItemGroup>
1212
<ProjectReference Include="..\Tweek.Drivers.Context.MongoDb\Tweek.Drivers.Context.MongoDb.csproj" />

‎addons/Context/Tweek.Drivers.Context.MongoDb/Tweek.Drivers.Context.MongoDb.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netstandard2.1</TargetFramework>
3+
<TargetFramework>net7.0</TargetFramework>
44
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
55
<Authors>Soluto</Authors>
66
<Description>MongoDB context driver for Tweek</Description>
@@ -12,8 +12,8 @@
1212
</PropertyGroup>
1313
<ItemGroup>
1414
<PackageReference Include="FSharpUtils.Newtonsoft.JsonValue" Version="0.2.6" />
15-
<PackageReference Include="MongoDB.Driver" Version="2.12.2" />
16-
<PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
15+
<PackageReference Include="MongoDB.Driver" Version="2.18.0" />
16+
<PackageReference Include="System.Collections.Immutable" Version="7.0.0" />
1717
</ItemGroup>
1818
<ItemGroup>
1919
<ProjectReference Include="..\..\..\core\Tweek.ApiService.Addons\Tweek.ApiService.Addons.csproj" />

‎addons/Context/Tweek.Drivers.Context.MongoDb/Tweek.Drivers.Context.MongoDb.nuspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
<projectUrl>$projectUrl$</projectUrl>
1212
<repository url="$repository$"></repository>
1313
<dependencies>
14-
<group targetFramework=".NETStandard2.1">
14+
<group targetFramework=".net7.0">
1515
<dependency id="NETStandard.Library" version="2.1" exclude="Build,Analyzers" />
1616
</group>
1717
</dependencies>
1818
</metadata>
1919
<files>
20-
<file src="$outputDir$\*.dll" target="lib\netstandard2.1\" />
20+
<file src="$outputDir$\*.dll" target="lib\net7.0\" />
2121
</files>
2222
</package>
2323

‎addons/Context/Tweek.Drivers.Context.Redis.IntegrationTests/Tweek.Drivers.Context.Redis.IntegrationTests.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net5.0</TargetFramework>
3+
<TargetFramework>net7.0</TargetFramework>
44
<IsPackable>false</IsPackable>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
8-
<PackageReference Include="xunit" Version="2.4.1" />
9-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
7+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
8+
<PackageReference Include="xunit" Version="2.4.2" />
9+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
1010
</ItemGroup>
1111
<ItemGroup>
1212
<ProjectReference Include="..\Tweek.Drivers.Context.Redis\Tweek.Drivers.Context.Redis.csproj" />

‎addons/Context/Tweek.Drivers.Context.Redis/Tweek.Drivers.Context.Redis.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netstandard2.1</TargetFramework>
3+
<TargetFramework>net7.0</TargetFramework>
44
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
55
<Authors>Soluto</Authors>
66
<Description>Redis context driver for Tweek</Description>
@@ -12,8 +12,8 @@
1212
</PropertyGroup>
1313
<ItemGroup>
1414
<PackageReference Include="FSharpUtils.Newtonsoft.JsonValue" Version="0.2.6" />
15-
<PackageReference Include="StackExchange.Redis" Version="2.2.4" />
16-
<PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
15+
<PackageReference Include="StackExchange.Redis" Version="2.6.86" />
16+
<PackageReference Include="System.Collections.Immutable" Version="7.0.0" />
1717
</ItemGroup>
1818
<ItemGroup>
1919
<ProjectReference Include="..\..\..\core\Tweek.ApiService.Addons\Tweek.ApiService.Addons.csproj" />

‎addons/Context/Tweek.Drivers.Context.Redis/Tweek.Drivers.Context.Redis.nuspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
<projectUrl>$projectUrl$</projectUrl>
1212
<repository url="$repository$"></repository>
1313
<dependencies>
14-
<group targetFramework=".NETStandard2.1">
14+
<group targetFramework=".net7.0">
1515
<dependency id="NETStandard.Library" version="2.1" exclude="Build,Analyzers" />
1616
</group>
1717
</dependencies>
1818
</metadata>
1919
<files>
20-
<file src="$outputDir$\*.dll" target="lib\netstandard2.1\" />
20+
<file src="$outputDir$\*.dll" target="lib\net7.0\" />
2121
</files>
2222
</package>
2323

‎addons/Context/Tweek.Drivers.ContextIntegrationTests/Tweek.Drivers.ContextIntegrationTests.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.1</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
66
<Authors>Soluto</Authors>
77
<Description>Context drivers integration tests for Tweek</Description>
@@ -14,7 +14,7 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="xunit" Version="2.4.1" />
17+
<PackageReference Include="xunit" Version="2.4.2" />
1818
</ItemGroup>
1919

2020
<Target Name="SetNuspecProperties" BeforeTargets="GenerateNuspec">

‎addons/Rules/Tweek.Drivers.Rules.FileSystem/Tweek.Drivers.Rules.FileSystem.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netstandard2.1</TargetFramework>
3+
<TargetFramework>net7.0</TargetFramework>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
6+
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
77
</ItemGroup>
88
<ItemGroup>
99
<ProjectReference Include="..\..\..\core\Engine\Tweek.Engine.Drivers\Tweek.Engine.Drivers.csproj" />

‎addons/Rules/Tweek.Drivers.Rules.Minio/Tweek.Drivers.Rules.Minio.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netstandard2.1</TargetFramework>
3+
<TargetFramework>net7.0</TargetFramework>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageReference Include="Minio" Version="3.1.13" />
7-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
6+
<PackageReference Include="Minio" Version="4.0.6" />
7+
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
88
</ItemGroup>
99
<ItemGroup>
1010
<ProjectReference Include="..\..\..\core\Engine\Tweek.Engine.Drivers\Tweek.Engine.Drivers.csproj" />

‎core/Engine/Tweek.Engine.Core/Tweek.Engine.Core.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netstandard2.1</TargetFramework>
3+
<TargetFramework>net7.0</TargetFramework>
44
<NoWarn>1591, 1701, 1702, 1998</NoWarn>
55
</PropertyGroup>
66
<ItemGroup>
77
<PackageReference Include="FSharpUtils.Newtonsoft.JsonValue" Version="0.2.6" />
8-
<PackageReference Include="LanguageExt.Core" Version="3.4.15" />
8+
<PackageReference Include="LanguageExt.Core" Version="4.4.0" />
99
</ItemGroup>
1010
<ItemGroup>
1111
<ProjectReference Include="..\Tweek.Engine.DataTypes\Tweek.Engine.DataTypes.csproj" />

0 commit comments

Comments
 (0)