From 19f60cb9a99bd9f62c694ef01d779d9b80f8d730 Mon Sep 17 00:00:00 2001
From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com>
Date: Thu, 16 May 2024 20:37:19 +0300
Subject: [PATCH] =?UTF-8?q?Revert=20"=D0=9C=D0=BE=D0=B6=D0=B5=D1=82=20?=
 =?UTF-8?q?=D0=BE=D1=82=D0=BA=D0=B0=D1=82=20=D0=B4=D0=BE=207=3F"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build-docfx.yml        | 2 +-
 .github/workflows/build-map-renderer.yml | 2 +-
 .github/workflows/build-test-debug.yml   | 2 +-
 .github/workflows/publish.yml            | 2 +-
 .github/workflows/test-packaging.yml     | 2 +-
 .github/workflows/yaml-linter.yml        | 2 +-
 Directory.Packages.props                 | 5 +++--
 7 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build-docfx.yml b/.github/workflows/build-docfx.yml
index 1c4b543743d..6293cab3ea3 100644
--- a/.github/workflows/build-docfx.yml
+++ b/.github/workflows/build-docfx.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.204
 
     - name: Install dependencies
       run: dotnet restore
diff --git a/.github/workflows/build-map-renderer.yml b/.github/workflows/build-map-renderer.yml
index e921bd2558c..a90ce095b0e 100644
--- a/.github/workflows/build-map-renderer.yml
+++ b/.github/workflows/build-map-renderer.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v3.2.0
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.204
 
       - name: Install dependencies
         run: dotnet restore
diff --git a/.github/workflows/build-test-debug.yml b/.github/workflows/build-test-debug.yml
index a34e937b170..686159387d8 100644
--- a/.github/workflows/build-test-debug.yml
+++ b/.github/workflows/build-test-debug.yml
@@ -36,7 +36,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.204
 
     - name: Install dependencies
       run: dotnet restore
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index efe5ec43046..e5d9b4ef153 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -38,7 +38,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.204
 
     - name: Get Engine Tag
       run: |
diff --git a/.github/workflows/test-packaging.yml b/.github/workflows/test-packaging.yml
index edb34a82f93..5cf55674907 100644
--- a/.github/workflows/test-packaging.yml
+++ b/.github/workflows/test-packaging.yml
@@ -51,7 +51,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v3.2.0
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.204
 
       - name: Install dependencies
         run: dotnet restore
diff --git a/.github/workflows/yaml-linter.yml b/.github/workflows/yaml-linter.yml
index 254384acff0..81c89793cc0 100644
--- a/.github/workflows/yaml-linter.yml
+++ b/.github/workflows/yaml-linter.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v3.2.0
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.204
       - name: Install dependencies
         run: dotnet restore
       - name: Build
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 4a68f377d35..63ab2329539 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -1,7 +1,9 @@
 <Project>
   <Import Project="RobustToolbox/Directory.Packages.props" />
   <ItemGroup>
-    <!-- Remove EF Core packages from Robust. They're only used by Robust.Benchmarks anyways. -->
+    <!--
+    Remove EF Core packages from Robust. They're only used by Robust.Benchmarks anyways.
+    -->
     <PackageVersion Remove="Npgsql.EntityFrameworkCore.PostgreSQL" />
     <PackageVersion Remove="Microsoft.EntityFrameworkCore.Design" />
     <PackageVersion Include="CsvHelper" Version="30.0.1" />
@@ -15,7 +17,6 @@
     <PackageVersion Include="Microsoft.Build.Framework" Version="17.8.3" />
     <PackageVersion Include="Mono.Cecil" Version="0.11.5" />
     <PackageVersion Include="Pidgin" Version="2.5.0" />
-    <PackageVersion Include="System.Reflection.Emit" Version="4.3.0" />
   </ItemGroup>
   <PropertyGroup>
     <!--