beamable · cdhanna · Dec 10, 2022 · Dec 10, 2022 · Dec 12, 2022 · Jan 4, 2023
diff --git 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
@@ -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
@@ -19,7 +19,7 @@ jobs:
       - name: Setup .NET Core SDK
         uses: actions/[email protected]
         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
@@ -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
@@ -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
@@ -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
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>
 
@@ -41,12 +41,12 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0-preview.4.22229.4" />
     <PackageReference Include="Microsoft.OpenApi" Version="1.3.2" />
     <PackageReference Include="Microsoft.OpenApi.Readers" Version="1.3.2" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="Serilog" Version="2.10.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+    <PackageReference Include="Serilog" Version="2.12.0" />
     <PackageReference Include="Serilog.Formatting.Compact" Version="1.1.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
     <PackageReference Include="SharpZipLib" Version="1.3.3" />
-    <PackageReference Include="Spectre.Console" Version="0.44.0" />
+    <PackageReference Include="Spectre.Console" Version="0.45.0" />
     <PackageReference Include="System.CodeDom" Version="6.0.0" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta3.22114.1" />
   </ItemGroup>

diff --git a/cli/tests/tests.csproj b/cli/tests/tests.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <Nullable>enable</Nullable>
 
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
         <PackageReference Include="Moq" Version="4.18.1" />
         <PackageReference Include="NUnit" Version="3.13.2" />
         <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />

diff --git 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
@@ -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
@@ -73,7 +73,7 @@ public string GetString()
             <PropertyGroup>
                <DefineConstants>DB_MICROSERVICE;BEAMABLE_MICROSERVICE;BEAMABLE_IGNORE_MONGO_MOCKS</DefineConstants>
                <OutputType>Exe</OutputType>
-               <TargetFramework>net6.0</TargetFramework>
+               <TargetFramework>net7.0</TargetFramework>
             </PropertyGroup>
 
             <PropertyGroup>

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
@@ -6,7 +6,7 @@
         <Authors>Beamable Team</Authors>
         <Company>Beamable</Company>
 
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <AssemblyName>Beamable.Server.Common</AssemblyName>
         <DefineConstants>BEAMABLE_IGNORE_MONGO_MOCKS</DefineConstants>
 

diff --git a/client/Packages/com.beamable.server/SharedRuntime/beamable.server.csproj b/client/Packages/com.beamable.server/SharedRuntime/beamable.server.csproj
@@ -6,7 +6,7 @@
         <Authors>Beamable Team</Authors>
         <Company>Beamable</Company>
 
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <AssemblyName>Beamable.Server</AssemblyName>
         <DefineConstants>
             BEAMABLE_IGNORE_MONGO_MOCKS
@@ -36,7 +36,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="System.CodeDom" Version="6.0.0" />
+      <PackageReference Include="System.CodeDom" Version="7.0.0" />
     </ItemGroup>
 
 </Project>
diff --git a/client/Packages/com.beamable/Common/beamable.common.csproj b/client/Packages/com.beamable/Common/beamable.common.csproj
@@ -7,7 +7,7 @@
         <Company>Beamable</Company>
 
         <DefineConstants>DB_MICROSERVICE;DISABLE_BEAMABLE_ASYNCMETHODBUILDER;BEAMABLE_ENABLE_UNITY_SERIALIZATION_TYPES</DefineConstants>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <AssemblyName>Beamable.Common</AssemblyName>
 
     </PropertyGroup>

diff --git a/microservice/beamable.tooling.common/beamable.tooling.common.csproj b/microservice/beamable.tooling.common/beamable.tooling.common.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>disable</Nullable>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+      <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
     </ItemGroup>
 
     <ItemGroup>

diff --git 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
@@ -8,26 +8,27 @@
         <owners>Beamable</owners>
         <description>This package contains the Beamable Microservice base code.</description>
         <dependencies>
-            <group targetFramework="net6.0" />
+            <group targetFramework="net7.0" />
         </dependencies>
         <dependencies>
             <dependency id="EmbedIO" version="3.4.*" />
             <dependency id="LoxSmoke.DocXml" version="3.4.*" />
-            <dependency id="Microsoft.Extensions.DependencyInjection" version="6.0.0-preview.6.21352.12" />
-            <dependency id="Microsoft.OpenApi" version="1.2.*" />
-            <dependency id="Newtonsoft.Json" version="12.0.*" />
-            <dependency id="Serilog" version="2.10.*" />
+            <dependency id="Microsoft.Extensions.DependencyInjection" version="7.0.0" />
+            <dependency id="Microsoft.OpenApi" version="1.4.*" />
+            <dependency id="Newtonsoft.Json" version="13.0.*" />
+            <dependency id="Serilog" version="2.12.*" />
             <dependency id="Serilog.Formatting.Compact" version="1.1.*" />
-            <dependency id="Serilog.Sinks.Console" version="3.1.*" />
+            <dependency id="Serilog.Sinks.Console" version="4.1.*" />
             <dependency id="System.CommandLine" version="2.0.0-beta3.22114.*" />
             <dependency id="System.ServiceModel.Primitives" version="4.8.*" />
             <dependency id="MongoDB.Driver" version="2.15.*" />
+            <dependency id="System.Threading.RateLimiting" version="7.0.0" />
         </dependencies>
 
     </metadata>
     <files>
-        <file src="bin\Release\net6.0\Beamable.*.dll" target="lib\net6.0" />
-        <file src="bin\Release\net6.0\BeamableMicroserviceBase.dll" target="lib\net6.0" />
-        <file src="bin\Release\net6.0\UnityEngine.dll" target="lib\net6.0" />
+        <file src="bin\Release\net7.0\Beamable.*.dll" target="lib\net7.0" />
+        <file src="bin\Release\net7.0\BeamableMicroserviceBase.dll" target="lib\net7.0" />
+        <file src="bin\Release\net7.0\UnityEngine.dll" target="lib\net7.0" />
     </files>
 </package>
diff --git a/microservice/microservice/baseImageDocs.xml b/microservice/microservice/baseImageDocs.xml
diff --git a/microservice/microservice/microservice.csproj b/microservice/microservice/microservice.csproj
@@ -12,11 +12,11 @@
 
     <DefineConstants>DB_MICROSERVICE;DISABLE_BEAMABLE_ASYNCMETHODBUILDER;BEAMABLE_IGNORE_MONGO_MOCKS</DefineConstants>
 
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 
     <AssemblyName>BeamableMicroserviceBase</AssemblyName>
 
-    <LangVersion>10</LangVersion>
+    <LangVersion>11</LangVersion>
 
 
 
@@ -40,17 +40,17 @@
 
     <PackageReference Include="LoxSmoke.DocXml" Version="3.4.*" />
 
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0-preview.6.21352.12" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
 
-    <PackageReference Include="Microsoft.OpenApi" Version="1.2.*" />
+    <PackageReference Include="Microsoft.OpenApi" Version="1.4.5" />
 
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.*" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
 
-    <PackageReference Include="Serilog" Version="2.10.*" />
+    <PackageReference Include="Serilog" Version="2.12.0" />
 
     <PackageReference Include="Serilog.Formatting.Compact" Version="1.1.*" />
 
-    <PackageReference Include="Serilog.Sinks.Console" Version="3.1.*" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
 
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta3.22114.*" />
 

diff --git a/microservice/microserviceTests/microserviceTests.csproj b/microservice/microserviceTests/microserviceTests.csproj
@@ -7,7 +7,7 @@
         <Company>Beamable</Company>
 
         <DefineConstants>DB_MICROSERVICE;DISABLE_BEAMABLE_ASYNCMETHODBUILDER</DefineConstants>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <AssemblyName>BeamableMicroserviceBaseTests</AssemblyName>
         <LangVersion>10</LangVersion>
         <OutputType>Library</OutputType>

diff --git a/microservice/unityEngineStubs/unityenginestubs.csproj b/microservice/unityEngineStubs/unityenginestubs.csproj
@@ -8,11 +8,11 @@
       <Authors>Beamable Team</Authors>
       <Company>Beamable</Company>
 
-      <TargetFramework>net6.0</TargetFramework>
+      <TargetFramework>net7.0</TargetFramework>
       <AssemblyName>UnityEngine</AssemblyName>
    </PropertyGroup>
    <ItemGroup>
-     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
+     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
    </ItemGroup>
 
 </Project>