From 810061db8caade46676aa8106deb2efe7f003402 Mon Sep 17 00:00:00 2001
From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com>
Date: Tue, 8 Nov 2022 09:46:48 -0800
Subject: [PATCH] chore: Update from .NET 7 preview to release. (#1234)

---
 .github/workflows/build-test.yml     | 4 ++--
 .github/workflows/create-release.yml | 2 +-
 Projects/Server/ExpansionInfo.cs     | 5 +++++
 Projects/Server/Server.csproj        | 4 ----
 Projects/UOContent/UOContent.csproj  | 1 -
 azure-pipelines.yml                  | 2 +-
 global.json                          | 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 73974245d..9a3b0c6f6 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -24,7 +24,7 @@ jobs:
     - name: Setup .NET 7
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.100-rc.2.22477.23
+        dotnet-version: 7.0.100
     - name: Build
       run: ./publish.cmd Release
     - name: Test
@@ -70,7 +70,7 @@ jobs:
       - name: Setup .NET 7
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 7.0.100-rc.2.22477.23
+          dotnet-version: 7.0.100
       - name: Build
         run: ./publish.sh Release
       - name: Test
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index c0128dcbf..6707bca3c 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -17,7 +17,7 @@ jobs:
     - name: Setup .NET 7
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.100-rc.2.22477.23
+        dotnet-version: 7.0.100
     - name: Install NGBV
       uses: dotnet/nbgv@master
       id: nbgv
diff --git a/Projects/Server/ExpansionInfo.cs b/Projects/Server/ExpansionInfo.cs
index 671c2e716..519931bd1 100644
--- a/Projects/Server/ExpansionInfo.cs
+++ b/Projects/Server/ExpansionInfo.cs
@@ -191,6 +191,11 @@ public class ExpansionInfo
     static ExpansionInfo()
     {
         var path = Path.Combine(Core.BaseDirectory, "Data/expansion.json");
+        if (!File.Exists(path))
+        {
+            throw new FileNotFoundException($"Expansion file '{path}' could not be found.");
+        }
+
         var expansions = JsonConfig.Deserialize<List<ExpansionConfig>>(path);
 
         Table = new ExpansionInfo[expansions.Count];
diff --git a/Projects/Server/Server.csproj b/Projects/Server/Server.csproj
index 953eb269a..9391b947e 100755
--- a/Projects/Server/Server.csproj
+++ b/Projects/Server/Server.csproj
@@ -7,7 +7,6 @@
         <AssemblyName>ModernUO</AssemblyName>
         <Win32Resource />
         <Product>ModernUO Server</Product>
-        <PublishDir>..\..\Distribution</PublishDir>
         <OutDir>..\..\Distribution</OutDir>
         <Version>0.0.0</Version>
     </PropertyGroup>
@@ -43,7 +42,4 @@
     <ItemGroup>
         <AdditionalFiles Include="Migrations/*.v*.json" />
     </ItemGroup>
-    <ItemGroup>
-      <Folder Include="Assistants" />
-    </ItemGroup>
 </Project>
diff --git a/Projects/UOContent/UOContent.csproj b/Projects/UOContent/UOContent.csproj
index 1ef0dbf8a..bdaf66dd4 100755
--- a/Projects/UOContent/UOContent.csproj
+++ b/Projects/UOContent/UOContent.csproj
@@ -4,7 +4,6 @@
         <RootNamespace>Server</RootNamespace>
         <AssemblyName>UOContent</AssemblyName>
         <Product>ModernUO Content</Product>
-        <PublishDir>..\..\Distribution\Assemblies</PublishDir>
         <OutDir>..\..\Distribution\Assemblies</OutDir>
     </PropertyGroup>
     <Target Name="CleanPub" AfterTargets="Clean">
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 7ed6ea4d2..7f4ad8f55 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -18,7 +18,7 @@ jobs:
     displayName: 'Install .NET 7'
     inputs:
       packageType: sdk
-      version: 7.0.100-rc.2.22477.23
+      version: 7.0.100
   - task: NuGetAuthenticate@1
   - script: ./publish.cmd Release
     displayName: 'Build'
diff --git a/global.json b/global.json
index 7cd6a1f4f..08f229ce0 100644
--- a/global.json
+++ b/global.json
@@ -2,6 +2,6 @@
   "sdk": {
     "version": "7.0.0",
     "rollForward": "latestMajor",
-    "allowPrerelease": true
+    "allowPrerelease": false
   }
-}
\ No newline at end of file
+}