chore: Update from .NET 7 preview to release. (#1234)
This commit is contained in:
parent
59dcd24bed
commit
810061db8c
7 changed files with 11 additions and 11 deletions
4
.github/workflows/build-test.yml
vendored
4
.github/workflows/build-test.yml
vendored
|
|
@ -24,7 +24,7 @@ jobs:
|
||||||
- name: Setup .NET 7
|
- name: Setup .NET 7
|
||||||
uses: actions/setup-dotnet@v3
|
uses: actions/setup-dotnet@v3
|
||||||
with:
|
with:
|
||||||
dotnet-version: 7.0.100-rc.2.22477.23
|
dotnet-version: 7.0.100
|
||||||
- name: Build
|
- name: Build
|
||||||
run: ./publish.cmd Release
|
run: ./publish.cmd Release
|
||||||
- name: Test
|
- name: Test
|
||||||
|
|
@ -70,7 +70,7 @@ jobs:
|
||||||
- name: Setup .NET 7
|
- name: Setup .NET 7
|
||||||
uses: actions/setup-dotnet@v3
|
uses: actions/setup-dotnet@v3
|
||||||
with:
|
with:
|
||||||
dotnet-version: 7.0.100-rc.2.22477.23
|
dotnet-version: 7.0.100
|
||||||
- name: Build
|
- name: Build
|
||||||
run: ./publish.sh Release
|
run: ./publish.sh Release
|
||||||
- name: Test
|
- name: Test
|
||||||
|
|
|
||||||
2
.github/workflows/create-release.yml
vendored
2
.github/workflows/create-release.yml
vendored
|
|
@ -17,7 +17,7 @@ jobs:
|
||||||
- name: Setup .NET 7
|
- name: Setup .NET 7
|
||||||
uses: actions/setup-dotnet@v3
|
uses: actions/setup-dotnet@v3
|
||||||
with:
|
with:
|
||||||
dotnet-version: 7.0.100-rc.2.22477.23
|
dotnet-version: 7.0.100
|
||||||
- name: Install NGBV
|
- name: Install NGBV
|
||||||
uses: dotnet/nbgv@master
|
uses: dotnet/nbgv@master
|
||||||
id: nbgv
|
id: nbgv
|
||||||
|
|
|
||||||
|
|
@ -191,6 +191,11 @@ public class ExpansionInfo
|
||||||
static ExpansionInfo()
|
static ExpansionInfo()
|
||||||
{
|
{
|
||||||
var path = Path.Combine(Core.BaseDirectory, "Data/expansion.json");
|
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);
|
var expansions = JsonConfig.Deserialize<List<ExpansionConfig>>(path);
|
||||||
|
|
||||||
Table = new ExpansionInfo[expansions.Count];
|
Table = new ExpansionInfo[expansions.Count];
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,6 @@
|
||||||
<AssemblyName>ModernUO</AssemblyName>
|
<AssemblyName>ModernUO</AssemblyName>
|
||||||
<Win32Resource />
|
<Win32Resource />
|
||||||
<Product>ModernUO Server</Product>
|
<Product>ModernUO Server</Product>
|
||||||
<PublishDir>..\..\Distribution</PublishDir>
|
|
||||||
<OutDir>..\..\Distribution</OutDir>
|
<OutDir>..\..\Distribution</OutDir>
|
||||||
<Version>0.0.0</Version>
|
<Version>0.0.0</Version>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
@ -43,7 +42,4 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<AdditionalFiles Include="Migrations/*.v*.json" />
|
<AdditionalFiles Include="Migrations/*.v*.json" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
|
||||||
<Folder Include="Assistants" />
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,6 @@
|
||||||
<RootNamespace>Server</RootNamespace>
|
<RootNamespace>Server</RootNamespace>
|
||||||
<AssemblyName>UOContent</AssemblyName>
|
<AssemblyName>UOContent</AssemblyName>
|
||||||
<Product>ModernUO Content</Product>
|
<Product>ModernUO Content</Product>
|
||||||
<PublishDir>..\..\Distribution\Assemblies</PublishDir>
|
|
||||||
<OutDir>..\..\Distribution\Assemblies</OutDir>
|
<OutDir>..\..\Distribution\Assemblies</OutDir>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<Target Name="CleanPub" AfterTargets="Clean">
|
<Target Name="CleanPub" AfterTargets="Clean">
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ jobs:
|
||||||
displayName: 'Install .NET 7'
|
displayName: 'Install .NET 7'
|
||||||
inputs:
|
inputs:
|
||||||
packageType: sdk
|
packageType: sdk
|
||||||
version: 7.0.100-rc.2.22477.23
|
version: 7.0.100
|
||||||
- task: NuGetAuthenticate@1
|
- task: NuGetAuthenticate@1
|
||||||
- script: ./publish.cmd Release
|
- script: ./publish.cmd Release
|
||||||
displayName: 'Build'
|
displayName: 'Build'
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,6 @@
|
||||||
"sdk": {
|
"sdk": {
|
||||||
"version": "7.0.0",
|
"version": "7.0.0",
|
||||||
"rollForward": "latestMajor",
|
"rollForward": "latestMajor",
|
||||||
"allowPrerelease": true
|
"allowPrerelease": false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue