chore: Update from .NET 7 preview to release. (#1234)

This commit is contained in:
Kamron Batman 2022-11-08 09:46:48 -08:00 committed by GitHub
parent 59dcd24bed
commit 810061db8c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 11 additions and 11 deletions

View file

@ -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

View file

@ -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

View file

@ -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];

View file

@ -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>

View file

@ -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">

View file

@ -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'

View file

@ -2,6 +2,6 @@
"sdk": {
"version": "7.0.0",
"rollForward": "latestMajor",
"allowPrerelease": true
"allowPrerelease": false
}
}
}