Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/addons.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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: |
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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: |
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions TweekApi.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion TweekApiSmokeTest.Dockerfile
Original file line number Diff line number Diff line change
@@ -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 && \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\core\Tweek.ApiService.Addons\Tweek.ApiService.Addons.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.17.0" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Tweek.Drivers.ContextIntegrationTests\Tweek.Drivers.ContextIntegrationTests.csproj" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Authors>Soluto</Authors>
<Description>Couchbase context driver for Tweek</Description>
Expand All @@ -11,10 +11,10 @@
<NuspecFile>$([System.IO.Path]::Combine($(MSBuildProjectDirectory),$(MSBuildProjectName))).nuspec</NuspecFile>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="CouchbaseNetClient" Version="2.7.15" />
<PackageReference Include="CouchbaseNetClient" Version="2.7.27" />
<PackageReference Include="FSharpUtils.Newtonsoft.JsonValue" Version="0.2.6" />
<PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0" />
<PackageReference Include="System.Collections.Immutable" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\core\Tweek.ApiService.Addons\Tweek.ApiService.Addons.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
<projectUrl>$projectUrl$</projectUrl>
<repository url="$repository$"></repository>
<dependencies>
<group targetFramework=".NETStandard2.1">
<group targetFramework=".net7.0">
<dependency id="NETStandard.Library" version="2.1" exclude="Build,Analyzers" />
</group>
</dependencies>
</metadata>
<files>
<file src="$outputDir$\*.dll" target="lib\netstandard2.1\" />
<file src="$outputDir$\*.dll" target="lib\net7.0\" />
</files>
</package>
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net7.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="xunit" Version="2.4.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
<PackageReference Include="coverlet.collector" Version="1.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
<PackageReference Include="coverlet.collector" Version="3.2.0" />
<PackageReference Include="FSharpUtils.Newtonsoft.JsonValue" Version="0.2.6" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Authors>Soluto</Authors>
<Description>In Memory context driver for Tweek</Description>
Expand All @@ -11,7 +11,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="FSharpUtils.Newtonsoft.JsonValue" Version="0.2.6" />
<PackageReference Include="System.Collections.Immutable" Version="1.7.1" />
<PackageReference Include="System.Collections.Immutable" Version="7.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\core\Tweek.ApiService.Addons\Tweek.ApiService.Addons.csproj" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Tweek.Drivers.Context.MongoDb\Tweek.Drivers.Context.MongoDb.csproj" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Authors>Soluto</Authors>
<Description>MongoDB context driver for Tweek</Description>
Expand All @@ -12,8 +12,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="FSharpUtils.Newtonsoft.JsonValue" Version="0.2.6" />
<PackageReference Include="MongoDB.Driver" Version="2.12.2" />
<PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
<PackageReference Include="MongoDB.Driver" Version="2.18.0" />
<PackageReference Include="System.Collections.Immutable" Version="7.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\core\Tweek.ApiService.Addons\Tweek.ApiService.Addons.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
<projectUrl>$projectUrl$</projectUrl>
<repository url="$repository$"></repository>
<dependencies>
<group targetFramework=".NETStandard2.1">
<group targetFramework=".net7.0">
<dependency id="NETStandard.Library" version="2.1" exclude="Build,Analyzers" />
</group>
</dependencies>
</metadata>
<files>
<file src="$outputDir$\*.dll" target="lib\netstandard2.1\" />
<file src="$outputDir$\*.dll" target="lib\net7.0\" />
</files>
</package>

Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Tweek.Drivers.Context.Redis\Tweek.Drivers.Context.Redis.csproj" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Authors>Soluto</Authors>
<Description>Redis context driver for Tweek</Description>
Expand All @@ -12,8 +12,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="FSharpUtils.Newtonsoft.JsonValue" Version="0.2.6" />
<PackageReference Include="StackExchange.Redis" Version="2.2.4" />
<PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
<PackageReference Include="StackExchange.Redis" Version="2.6.86" />
<PackageReference Include="System.Collections.Immutable" Version="7.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\core\Tweek.ApiService.Addons\Tweek.ApiService.Addons.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
<projectUrl>$projectUrl$</projectUrl>
<repository url="$repository$"></repository>
<dependencies>
<group targetFramework=".NETStandard2.1">
<group targetFramework=".net7.0">
<dependency id="NETStandard.Library" version="2.1" exclude="Build,Analyzers" />
</group>
</dependencies>
</metadata>
<files>
<file src="$outputDir$\*.dll" target="lib\netstandard2.1\" />
<file src="$outputDir$\*.dll" target="lib\net7.0\" />
</files>
</package>

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Authors>Soluto</Authors>
<Description>Context drivers integration tests for Tweek</Description>
Expand All @@ -14,7 +14,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit" Version="2.4.2" />
</ItemGroup>

<Target Name="SetNuspecProperties" BeforeTargets="GenerateNuspec">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\core\Engine\Tweek.Engine.Drivers\Tweek.Engine.Drivers.csproj" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Minio" Version="3.1.13" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Minio" Version="4.0.6" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\core\Engine\Tweek.Engine.Drivers\Tweek.Engine.Drivers.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions core/Engine/Tweek.Engine.Core/Tweek.Engine.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<NoWarn>1591, 1701, 1702, 1998</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="FSharpUtils.Newtonsoft.JsonValue" Version="0.2.6" />
<PackageReference Include="LanguageExt.Core" Version="3.4.15" />
<PackageReference Include="LanguageExt.Core" Version="4.4.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Tweek.Engine.DataTypes\Tweek.Engine.DataTypes.csproj" />
Expand Down
Loading