diff --git a/.github/workflows/buildPR.yml b/.github/workflows/buildPR.yml
index e33aaceeaa..1131a20224 100644
--- a/.github/workflows/buildPR.yml
+++ b/.github/workflows/buildPR.yml
@@ -20,7 +20,7 @@ jobs:
cancel-in-progress: true
strategy:
matrix:
- dotnet-version: ['6.0.x' ]
+ dotnet-version: ['7.0.x' ]
steps:
- uses: actions/checkout@v2
- name: Setup .NET Core SDK ${{ matrix.dotnet-version }}
@@ -49,7 +49,7 @@ jobs:
cancel-in-progress: true
strategy:
matrix:
- dotnet-version: ['6.0.x' ]
+ dotnet-version: ['7.0.x' ]
steps:
- uses: actions/checkout@v2
- name: Setup .NET Core SDK ${{ matrix.dotnet-version }}
@@ -77,7 +77,7 @@ jobs:
cancel-in-progress: true
strategy:
matrix:
- dotnet-version: ['6.0.x' ]
+ dotnet-version: ['7.0.x' ]
steps:
- uses: actions/checkout@v2
- name: Setup .NET Core SDK ${{ matrix.dotnet-version }}
diff --git a/.github/workflows/buildPush.yml b/.github/workflows/buildPush.yml
index 44d6814bda..c8258b07d0 100644
--- a/.github/workflows/buildPush.yml
+++ b/.github/workflows/buildPush.yml
@@ -19,7 +19,7 @@ jobs:
cancel-in-progress: true
strategy:
matrix:
- dotnet-version: ['6.0.x' ]
+ dotnet-version: ['7.0.x' ]
steps:
- uses: actions/checkout@v2
- name: Setup .NET Core SDK ${{ matrix.dotnet-version }}
diff --git a/.github/workflows/generateApi.yml b/.github/workflows/generateApi.yml
index 32e632b515..d59457d627 100644
--- a/.github/workflows/generateApi.yml
+++ b/.github/workflows/generateApi.yml
@@ -19,7 +19,7 @@ jobs:
- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v1.7.2
with:
- dotnet-version: 6.0.x
+ dotnet-version: 7.0.x
- name: Install dotnet-format
run: dotnet tool install --global --version 5.1.250801 dotnet-format
- name: Build CLI
diff --git a/build/docker/cli/Dockerfile b/build/docker/cli/Dockerfile
index 4362af646b..fb3001dd98 100644
--- a/build/docker/cli/Dockerfile
+++ b/build/docker/cli/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0
+FROM mcr.microsoft.com/dotnet/sdk:7.0
# RUN npm install -g json
ADD build/docker/scripts /scripts
diff --git a/build/docker/image.microservice/Dockerfile b/build/docker/image.microservice/Dockerfile
index ef875507c5..2972176376 100644
--- a/build/docker/image.microservice/Dockerfile
+++ b/build/docker/image.microservice/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0
+FROM mcr.microsoft.com/dotnet/sdk:7.0
# RUN npm install -g json
ADD build/docker/scripts /scripts
diff --git a/build/docker/nuget.microservice/Dockerfile b/build/docker/nuget.microservice/Dockerfile
index 1cb3173776..df9c6babb0 100644
--- a/build/docker/nuget.microservice/Dockerfile
+++ b/build/docker/nuget.microservice/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0
+FROM mcr.microsoft.com/dotnet/sdk:7.0
# RUN npm install -g json
ADD build/docker/scripts /scripts
diff --git a/cli/cli/cli.csproj b/cli/cli/cli.csproj
index a12030eb7e..c81453373e 100644
--- a/cli/cli/cli.csproj
+++ b/cli/cli/cli.csproj
@@ -2,7 +2,7 @@
Exe
- net6.0
+ net7.0
enable
disable
@@ -41,12 +41,12 @@
-
-
+
+
-
+
diff --git a/cli/tests/tests.csproj b/cli/tests/tests.csproj
index af0303d390..8309e38ad6 100644
--- a/cli/tests/tests.csproj
+++ b/cli/tests/tests.csproj
@@ -1,14 +1,14 @@
- net6.0
+ net7.0
enable
false
-
+
diff --git a/client/Packages/com.beamable.server/CHANGELOG.md b/client/Packages/com.beamable.server/CHANGELOG.md
index 29c2921e59..0880728de5 100644
--- a/client/Packages/com.beamable.server/CHANGELOG.md
+++ b/client/Packages/com.beamable.server/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## [Unreleased]
+### Changed
+- Microservices use dotnet7
+- Microservices use Newtonsoft 13.0.2
+
## [1.10.0]
### Added
- `[InitializeService]` exposes `IDependencyProvider` as `Provider`, and `[ConfigureServices]` exposes `IDependencyBuilder` as `Builder`
diff --git a/client/Packages/com.beamable.server/Editor/CodeGen/DockerfileGenerator.cs b/client/Packages/com.beamable.server/Editor/CodeGen/DockerfileGenerator.cs
index cb869113a5..7d4f0ebbfe 100644
--- a/client/Packages/com.beamable.server/Editor/CodeGen/DockerfileGenerator.cs
+++ b/client/Packages/com.beamable.server/Editor/CodeGen/DockerfileGenerator.cs
@@ -12,8 +12,8 @@ public class DockerfileGenerator
public MicroserviceConfigurationEntry Config { get; }
private bool DebuggingEnabled = true;
- public const string DOTNET_RUNTIME_DEBUGGING_TOOLS_IMAGE = "mcr.microsoft.com/dotnet/runtime:6.0";
- public const string DOTNET_RUNTIME_IMAGE = "mcr.microsoft.com/dotnet/runtime:6.0-alpine";
+ public const string DOTNET_RUNTIME_DEBUGGING_TOOLS_IMAGE = "mcr.microsoft.com/dotnet/runtime:7.0";
+ public const string DOTNET_RUNTIME_IMAGE = "mcr.microsoft.com/dotnet/runtime:7.0-alpine";
#if BEAMABLE_DEVELOPER
diff --git a/client/Packages/com.beamable.server/Editor/CodeGen/ProjectGenerator.cs b/client/Packages/com.beamable.server/Editor/CodeGen/ProjectGenerator.cs
index db7e5d5655..d0f5243148 100644
--- a/client/Packages/com.beamable.server/Editor/CodeGen/ProjectGenerator.cs
+++ b/client/Packages/com.beamable.server/Editor/CodeGen/ProjectGenerator.cs
@@ -73,7 +73,7 @@ public string GetString()
DB_MICROSERVICE;BEAMABLE_MICROSERVICE;BEAMABLE_IGNORE_MONGO_MOCKS
Exe
- net6.0
+ net7.0
diff --git a/client/Packages/com.beamable.server/Runtime/Common/beamable.server.common.csproj b/client/Packages/com.beamable.server/Runtime/Common/beamable.server.common.csproj
index 52197aa690..6713725f9a 100644
--- a/client/Packages/com.beamable.server/Runtime/Common/beamable.server.common.csproj
+++ b/client/Packages/com.beamable.server/Runtime/Common/beamable.server.common.csproj
@@ -6,7 +6,7 @@
Beamable Team
Beamable
- net6.0
+ net7.0
Beamable.Server.Common
BEAMABLE_IGNORE_MONGO_MOCKS
diff --git a/client/Packages/com.beamable.server/SharedRuntime/beamable.server.csproj b/client/Packages/com.beamable.server/SharedRuntime/beamable.server.csproj
index 60e1bc3c16..4155105ad8 100644
--- a/client/Packages/com.beamable.server/SharedRuntime/beamable.server.csproj
+++ b/client/Packages/com.beamable.server/SharedRuntime/beamable.server.csproj
@@ -6,7 +6,7 @@
Beamable Team
Beamable
- net6.0
+ net7.0
Beamable.Server
BEAMABLE_IGNORE_MONGO_MOCKS
@@ -36,7 +36,7 @@
-
+
diff --git a/client/Packages/com.beamable/Common/beamable.common.csproj b/client/Packages/com.beamable/Common/beamable.common.csproj
index 6dbc4603d7..17746cb47b 100644
--- a/client/Packages/com.beamable/Common/beamable.common.csproj
+++ b/client/Packages/com.beamable/Common/beamable.common.csproj
@@ -7,7 +7,7 @@
Beamable
DB_MICROSERVICE;DISABLE_BEAMABLE_ASYNCMETHODBUILDER;BEAMABLE_ENABLE_UNITY_SERIALIZATION_TYPES
- net6.0
+ net7.0
Beamable.Common
diff --git a/microservice/beamable.tooling.common/beamable.tooling.common.csproj b/microservice/beamable.tooling.common/beamable.tooling.common.csproj
index dddbd821be..889a1a0552 100644
--- a/microservice/beamable.tooling.common/beamable.tooling.common.csproj
+++ b/microservice/beamable.tooling.common/beamable.tooling.common.csproj
@@ -1,13 +1,13 @@
- net6.0
+ net7.0
enable
disable
-
+
diff --git a/microservice/microservice/Dockerfile b/microservice/microservice/Dockerfile
index fd7e61b780..3d849ecd50 100644
--- a/microservice/microservice/Dockerfile
+++ b/microservice/microservice/Dockerfile
@@ -1,5 +1,5 @@
# BUILD AND REPACKAGE DOTNET SDK.
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build-env
RUN dotnet --version
# commit the built sdk version to the base image...
@@ -12,5 +12,7 @@ RUN dotnet restore ./microservice.csproj
COPY . .
RUN dotnet publish ./microservice.csproj -c release -o /app
+# FROM mcr.microsoft.com/dotnet/sdk:7.0
WORKDIR /app
+# COPY --from=build-env /app .
ENTRYPOINT ["dotnet", "/app/microservice.dll"]
diff --git a/microservice/microservice/Microservice.nuspec b/microservice/microservice/Microservice.nuspec
index 8a0ab19ea8..2d77db3a12 100644
--- a/microservice/microservice/Microservice.nuspec
+++ b/microservice/microservice/Microservice.nuspec
@@ -8,26 +8,27 @@
Beamable
This package contains the Beamable Microservice base code.
-
+
-
-
-
-
+
+
+
+
-
+
+
-
-
-
+
+
+
\ No newline at end of file
diff --git a/microservice/microservice/baseImageDocs.xml b/microservice/microservice/baseImageDocs.xml
index eb82d2138c..e7af68b2e4 100644
--- a/microservice/microservice/baseImageDocs.xml
+++ b/microservice/microservice/baseImageDocs.xml
@@ -36,9 +36,24 @@
-
-
-
+
+
+ Set the Action to call when a messages has been received.
+
+ The Action to call.
+
+
+
+
+
+ Terminate the socket in a friendly way.
+
+
+
+
+ By default, rate limiting is on, so if you pass anything to WS_DISABLE_RATE_LIMIT, it'll disable it.
+
+
This class manages our authentication process between this C#MS and our Beamo service. It provides the following properties:
diff --git a/microservice/microservice/microservice.csproj b/microservice/microservice/microservice.csproj
index f49a7bc95d..e5ee09cb1e 100644
--- a/microservice/microservice/microservice.csproj
+++ b/microservice/microservice/microservice.csproj
@@ -12,11 +12,11 @@
DB_MICROSERVICE;DISABLE_BEAMABLE_ASYNCMETHODBUILDER;BEAMABLE_IGNORE_MONGO_MOCKS
- net6.0
+ net7.0
BeamableMicroserviceBase
- 10
+ 11
@@ -40,17 +40,17 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/microservice/microserviceTests/microserviceTests.csproj b/microservice/microserviceTests/microserviceTests.csproj
index 5c3f9d047d..17ef41bebf 100644
--- a/microservice/microserviceTests/microserviceTests.csproj
+++ b/microservice/microserviceTests/microserviceTests.csproj
@@ -7,7 +7,7 @@
Beamable
DB_MICROSERVICE;DISABLE_BEAMABLE_ASYNCMETHODBUILDER
- net6.0
+ net7.0
BeamableMicroserviceBaseTests
10
Library
diff --git a/microservice/unityEngineStubs/unityenginestubs.csproj b/microservice/unityEngineStubs/unityenginestubs.csproj
index a0f0361a4a..d0b29df785 100644
--- a/microservice/unityEngineStubs/unityenginestubs.csproj
+++ b/microservice/unityEngineStubs/unityenginestubs.csproj
@@ -8,11 +8,11 @@
Beamable Team
Beamable
- net6.0
+ net7.0
UnityEngine
-
+