From de486207b3483ec2d3734627fc505ddece3c2291 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Sat, 17 Dec 2022 14:15:58 +0100
Subject: [PATCH] .NET 7 (#3582)

---
 .github/workflows/build-docfx.yml                | 16 ++++++++--------
 .github/workflows/build-test.yml                 |  4 ++--
 .github/workflows/codeql-analysis.yml            |  2 +-
 .github/workflows/publish-client.yml             |  2 +-
 .github/workflows/test-content.yml               |  2 +-
 MSBuild/Robust.Engine.props                      |  4 ++--
 MSBuild/Robust.Properties.targets                |  2 +-
 RELEASE-NOTES.md                                 |  1 +
 .../Robust.Client.WebView.csproj                 |  1 -
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build-docfx.yml b/.github/workflows/build-docfx.yml
index a60942687..4a6d20cd2 100644
--- a/.github/workflows/build-docfx.yml
+++ b/.github/workflows/build-docfx.yml
@@ -6,7 +6,7 @@ on:
 jobs:
   docfx:
    runs-on: ubuntu-latest
-   steps: 
+   steps:
     - uses: actions/checkout@v2
       with:
         submodules: true
@@ -14,21 +14,21 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
-        
+        dotnet-version: 7.0.x
+
     - name: Install dependencies
       run: dotnet restore
-      
+
     - name: Build Project
       run: dotnet build --no-restore /p:WarningsAsErrors=nullable
 
     - name: Build DocFX
-      uses: nikeee/docfx-action@v1.0.0      
+      uses: nikeee/docfx-action@v1.0.0
       with:
         args: Robust.Docfx/docfx.json
-    
+
     - name: Publish Docfx Documentation on GitHub Pages
       uses: maxheld83/ghpages@master
       env:
-        BUILD_DIR: Robust.Docfx/_robust-site 
-        GH_PAT: ${{ secrets.GH_PAT }} 
+        BUILD_DIR: Robust.Docfx/_robust-site
+        GH_PAT: ${{ secrets.GH_PAT }}
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 32a1b2a38..1cc816438 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -22,12 +22,12 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
     - name: Install dependencies
       run: dotnet restore
     - name: Build
       run: dotnet build --no-restore /p:WarningsAsErrors=nullable
     - name: Test Engine
       run: dotnet test --no-build Robust.UnitTesting/Robust.UnitTesting.csproj -- NUnit.ConsoleOut=0
- 
+
 
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 9cae6b28b..6754bfeb6 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -42,7 +42,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.100
+        dotnet-version: 7.0.x
 
     - name: Build
       run: dotnet build
diff --git a/.github/workflows/publish-client.yml b/.github/workflows/publish-client.yml
index 4e3b3a574..5ee49051a 100644
--- a/.github/workflows/publish-client.yml
+++ b/.github/workflows/publish-client.yml
@@ -23,7 +23,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.100
+        dotnet-version: 7.0.x
 
     - name: Package client
       run: Tools/package_client_build.py -p windows mac linux
diff --git a/.github/workflows/test-content.yml b/.github/workflows/test-content.yml
index b9069ac60..921cb3346 100644
--- a/.github/workflows/test-content.yml
+++ b/.github/workflows/test-content.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.100
+        dotnet-version: 7.0.x
     - name: Disable submodule autoupdate
       run: touch BuildChecker/DISABLE_SUBMODULE_AUTOUPDATE
 
diff --git a/MSBuild/Robust.Engine.props b/MSBuild/Robust.Engine.props
index f3617bac4..df84b725f 100644
--- a/MSBuild/Robust.Engine.props
+++ b/MSBuild/Robust.Engine.props
@@ -1,8 +1,8 @@
 <Project>
     <!-- Engine-specific properties. Content should not use this file. -->
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
-        <LangVersion>10</LangVersion>
+        <TargetFramework>net7.0</TargetFramework>
+        <LangVersion>11</LangVersion>
         <Nullable>enable</Nullable>
         <WarningsAsErrors>nullable</WarningsAsErrors>
     </PropertyGroup>
diff --git a/MSBuild/Robust.Properties.targets b/MSBuild/Robust.Properties.targets
index dffa1872a..cdabdf612 100644
--- a/MSBuild/Robust.Properties.targets
+++ b/MSBuild/Robust.Properties.targets
@@ -31,7 +31,7 @@
     <TargetOS Condition="'$(TargetOS)' == ''">$(ActualOS)</TargetOS>
     <Python>python3</Python>
     <Python Condition="'$(ActualOS)' == 'Windows'">py -3</Python>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <EnableClientScripting>True</EnableClientScripting>
     <!-- Client scripting is disabled on full release builds for security and size reasons. -->
     <EnableClientScripting Condition="'$(FullRelease)' == 'True'">False</EnableClientScripting>
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 50bb87b9c..ecf5b63aa 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -36,6 +36,7 @@ END TEMPLATE-->
 ### Breaking changes
 
 * The entity lookup flag `LookupFlags.Anchored` has been replaced with `LookupFlags.Static`.
+* We are now using **.NET 7**.
 
 ### New features
 
diff --git a/Robust.Client.WebView/Robust.Client.WebView.csproj b/Robust.Client.WebView/Robust.Client.WebView.csproj
index 5a0a053f6..efe69183a 100644
--- a/Robust.Client.WebView/Robust.Client.WebView.csproj
+++ b/Robust.Client.WebView/Robust.Client.WebView.csproj
@@ -3,7 +3,6 @@
   <Import Project="..\MSBuild\Robust.Engine.props" />
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputType>WinExe</OutputType>
   </PropertyGroup>