Skip to content

Commit b789a88

Browse files
jeannsebold6666jeannsebold6666
committed
first commit
1 parent 0b616db commit b789a88

File tree

439 files changed

+15697
-12014
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

439 files changed

+15697
-12014
lines changed

‎.github/workflows/build-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ jobs:
3636
git config --global url."https://".insteadOf git://
3737
git submodule update --init --recursive
3838
39-
- name: Setup .NET 7
39+
- name: Setup .NET 8
4040
uses: actions/setup-dotnet@v3
4141
with:
42-
dotnet-version: 7.0.x
42+
dotnet-version: 8.0.x
4343
include-prerelease: true
4444

4545
- name: Restore

‎.github/workflows/deploy.yml

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,31 @@ name: Deploy
22

33
on:
44
workflow_dispatch:
5+
<<<<<<< HEAD
56
workflow_run:
67
branches: [dev_dust765_x_tazuo]
78
workflows: [Build-Test]
89
types:
910
- completed
1011

12+
=======
13+
# workflow_run:
14+
# branches: [main]
15+
# workflows: [Build-Test]
16+
# types:
17+
# - completed
18+
>>>>>>> classicuo/main
1119

1220
env:
13-
CUO_ASSEMBLY_VERSION: '0.1.11.${{ github.run_number }}'
14-
CUO_OUTPUT_PATH: '../../bin/dist'
21+
CUO_ASSEMBLY_VERSION: "1.1.0.${{ github.run_number }}"
22+
CUO_OUTPUT_PATH: "../../bin/dist"
1523
CUO_PROJECT_PATH: "src/ClassicUO.Client/ClassicUO.Client.csproj"
24+
<<<<<<< HEAD
1625
CUO_ZIP_NAME: "ClassicUO-dev-dust765-x-tazuo.zip"
26+
=======
27+
BOOT_PROJECT_PATH: "src/ClassicUO.Bootstrap/src/ClassicUO.Bootstrap.csproj"
28+
TARGET_FRAMEWORK: net8.0
29+
>>>>>>> classicuo/main
1730

1831
DOTNET_NOLOGO: false
1932
DOTNET_CLI_TELEMETRY_OPTOUT: 1
@@ -24,9 +37,19 @@ jobs:
2437
build:
2538
if: ${{ github.event.workflow_run.conclusion == 'success' }} || github.event_name == 'workflow_dispatch' }}
2639
runs-on: ${{ matrix.os }}
40+
41+
env:
42+
CUO_ZIP_NAME: "ClassicUO-${{ matrix.target }}-release.zip"
43+
2744
strategy:
2845
matrix:
29-
os: [ ubuntu-latest ]
46+
include:
47+
- os: windows-latest
48+
target: win-x64
49+
- os: ubuntu-latest
50+
target: linux-x64
51+
- os: macos-latest
52+
target: osx-x64
3053

3154
steps:
3255
- uses: actions/checkout@v3

‎ClassicUO.licenseheader

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extensions: .cs
22
#region license
3-
// Copyright (c) 2021, andreakarasho
3+
// Copyright (c) 2024, andreakarasho
44
// All rights reserved.
55
//
66
// Redistribution and use in source and binary forms, with or without

‎ClassicUO.sln

Lines changed: 101 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
44
VisualStudioVersion = 17.4.33205.214
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{36371756-8DDA-41A4-BB9A-B7651459ADC1}"
7-
ProjectSection(SolutionItems) = preProject
8-
README.md = README.md
9-
EndProjectSection
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8EAF9583-DC5B-46DC-A01E-47B00A1C862E}"
107
EndProject
118
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{FD7202D2-B96B-4425-8C61-F0D5254A06F7}"
129
ProjectSection(SolutionItems) = preProject
@@ -51,68 +48,119 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "settings", "settings", "{21
5148
.editorconfig = .editorconfig
5249
ClassicUO.licenseheader = ClassicUO.licenseheader
5350
ClassicUO.sln.DotSettings = ClassicUO.sln.DotSettings
54-
Directory.Build.props = Directory.Build.props
55-
FNA.Settings.props = FNA.Settings.props
51+
src\Directory.Build.props = src\Directory.Build.props
5652
EndProjectSection
5753
EndProject
5854
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{B766E918-7350-473A-B28D-63C344385924}"
5955
EndProject
6056
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassicUO.UnitTests", "tests\ClassicUO.UnitTests\ClassicUO.UnitTests.csproj", "{85972CEA-4AB1-45DC-922C-00C4E17764B5}"
6157
EndProject
62-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FNA.Core", "external\FNA\FNA.Core.csproj", "{3F9AB6CE-3AD1-40B6-B2AA-C4D82F76258F}"
58+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "external", "external", "{FA5D7AB8-3570-4E55-95B0-35BA6842FEE3}"
6359
EndProject
64-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassicUO.Client", "src\ClassicUO.Client\ClassicUO.Client.csproj", "{D7EE32B0-ED1C-4263-B017-6C3EC74FD731}"
60+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP3Sharp", "external\MP3Sharp\MP3Sharp\MP3Sharp.csproj", "{5AF00B6D-70C2-4CB0-A5D8-41F488F0DDF2}"
6561
EndProject
66-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassicUO.Assets", "src\ClassicUO.Assets\ClassicUO.Assets.csproj", "{DDF690A2-7588-44BC-8E2E-9080C746A49C}"
62+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassicUO.Assets", "src\ClassicUO.Assets\ClassicUO.Assets.csproj", "{4B2C7249-9728-451B-8C9C-F73A164703B6}"
6763
EndProject
68-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassicUO.Utility", "src\ClassicUO.Utility\ClassicUO.Utility.csproj", "{6B932930-D24C-43BB-8877-85B4F3F7A57B}"
64+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassicUO.Client", "src\ClassicUO.Client\ClassicUO.Client.csproj", "{63A88323-2F8B-4CF1-AA17-C1372ACCA187}"
6965
EndProject
70-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "external", "external", "{FA5D7AB8-3570-4E55-95B0-35BA6842FEE3}"
66+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassicUO.IO", "src\ClassicUO.IO\ClassicUO.IO.csproj", "{EE30483B-AC0F-46C1-AAF5-A5DE2B187084}"
7167
EndProject
72-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassicUO.Renderer", "src\ClassicUO.Renderer\ClassicUO.Renderer.csproj", "{535BE739-1314-4F8D-B24B-06890DDD3B8D}"
68+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassicUO.Renderer", "src\ClassicUO.Renderer\ClassicUO.Renderer.csproj", "{CE54D5D2-068A-4456-9720-2AF0688D9E7F}"
7369
EndProject
74-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassicUO.IO", "src\ClassicUO.IO\ClassicUO.IO.csproj", "{69C1A629-F519-4F5A-85D5-4E0317CD267F}"
70+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassicUO.Utility", "src\ClassicUO.Utility\ClassicUO.Utility.csproj", "{9B748316-24DC-40AA-A39D-476EF83DF96C}"
7571
EndProject
76-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP3Sharp", "external\MP3Sharp\MP3Sharp\MP3Sharp.csproj", "{5AF00B6D-70C2-4CB0-A5D8-41F488F0DDF2}"
72+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FNA.Core", "external\FNA\FNA.Core.csproj", "{A6DCFCE5-192B-4AE1-B228-206D37A0021C}"
73+
EndProject
74+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassicUO.Bootstrap", "src\ClassicUO.Bootstrap\src\ClassicUO.Bootstrap.csproj", "{8974A04C-8360-4225-ABDD-0C56555F676D}"
7775
EndProject
7876
Global
7977
GlobalSection(SolutionConfigurationPlatforms) = preSolution
78+
Debug|Any CPU = Debug|Any CPU
8079
Debug|x64 = Debug|x64
80+
Release|Any CPU = Release|Any CPU
8181
Release|x64 = Release|x64
8282
EndGlobalSection
8383
GlobalSection(ProjectConfigurationPlatforms) = postSolution
84-
{6F193271-70B3-48EC-9CE5-B8EE1A5CA89E}.Debug|x64.ActiveCfg = Debug|x64
85-
{6F193271-70B3-48EC-9CE5-B8EE1A5CA89E}.Release|x64.ActiveCfg = Release|x64
86-
{85972CEA-4AB1-45DC-922C-00C4E17764B5}.Debug|x64.ActiveCfg = Debug|x64
87-
{85972CEA-4AB1-45DC-922C-00C4E17764B5}.Release|x64.ActiveCfg = Release|x64
88-
{3F9AB6CE-3AD1-40B6-B2AA-C4D82F76258F}.Debug|x64.ActiveCfg = Debug|x64
89-
{3F9AB6CE-3AD1-40B6-B2AA-C4D82F76258F}.Debug|x64.Build.0 = Debug|x64
90-
{3F9AB6CE-3AD1-40B6-B2AA-C4D82F76258F}.Release|x64.ActiveCfg = Release|x64
91-
{3F9AB6CE-3AD1-40B6-B2AA-C4D82F76258F}.Release|x64.Build.0 = Release|x64
92-
{D7EE32B0-ED1C-4263-B017-6C3EC74FD731}.Debug|x64.ActiveCfg = Debug|x64
93-
{D7EE32B0-ED1C-4263-B017-6C3EC74FD731}.Debug|x64.Build.0 = Debug|x64
94-
{D7EE32B0-ED1C-4263-B017-6C3EC74FD731}.Release|x64.ActiveCfg = Release|x64
95-
{D7EE32B0-ED1C-4263-B017-6C3EC74FD731}.Release|x64.Build.0 = Release|x64
96-
{DDF690A2-7588-44BC-8E2E-9080C746A49C}.Debug|x64.ActiveCfg = Debug|x64
97-
{DDF690A2-7588-44BC-8E2E-9080C746A49C}.Debug|x64.Build.0 = Debug|x64
98-
{DDF690A2-7588-44BC-8E2E-9080C746A49C}.Release|x64.ActiveCfg = Release|x64
99-
{DDF690A2-7588-44BC-8E2E-9080C746A49C}.Release|x64.Build.0 = Release|x64
100-
{6B932930-D24C-43BB-8877-85B4F3F7A57B}.Debug|x64.ActiveCfg = Debug|x64
101-
{6B932930-D24C-43BB-8877-85B4F3F7A57B}.Debug|x64.Build.0 = Debug|x64
102-
{6B932930-D24C-43BB-8877-85B4F3F7A57B}.Release|x64.ActiveCfg = Release|x64
103-
{6B932930-D24C-43BB-8877-85B4F3F7A57B}.Release|x64.Build.0 = Release|x64
104-
{535BE739-1314-4F8D-B24B-06890DDD3B8D}.Debug|x64.ActiveCfg = Debug|x64
105-
{535BE739-1314-4F8D-B24B-06890DDD3B8D}.Debug|x64.Build.0 = Debug|x64
106-
{535BE739-1314-4F8D-B24B-06890DDD3B8D}.Release|x64.ActiveCfg = Release|x64
107-
{535BE739-1314-4F8D-B24B-06890DDD3B8D}.Release|x64.Build.0 = Release|x64
108-
{69C1A629-F519-4F5A-85D5-4E0317CD267F}.Debug|x64.ActiveCfg = Debug|x64
109-
{69C1A629-F519-4F5A-85D5-4E0317CD267F}.Debug|x64.Build.0 = Debug|x64
110-
{69C1A629-F519-4F5A-85D5-4E0317CD267F}.Release|x64.ActiveCfg = Release|x64
111-
{69C1A629-F519-4F5A-85D5-4E0317CD267F}.Release|x64.Build.0 = Release|x64
112-
{5AF00B6D-70C2-4CB0-A5D8-41F488F0DDF2}.Debug|x64.ActiveCfg = Debug|x64
113-
{5AF00B6D-70C2-4CB0-A5D8-41F488F0DDF2}.Debug|x64.Build.0 = Debug|x64
114-
{5AF00B6D-70C2-4CB0-A5D8-41F488F0DDF2}.Release|x64.ActiveCfg = Release|x64
115-
{5AF00B6D-70C2-4CB0-A5D8-41F488F0DDF2}.Release|x64.Build.0 = Release|x64
84+
{6F193271-70B3-48EC-9CE5-B8EE1A5CA89E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
85+
{6F193271-70B3-48EC-9CE5-B8EE1A5CA89E}.Debug|Any CPU.Build.0 = Debug|Any CPU
86+
{6F193271-70B3-48EC-9CE5-B8EE1A5CA89E}.Debug|x64.ActiveCfg = Debug|Any CPU
87+
{6F193271-70B3-48EC-9CE5-B8EE1A5CA89E}.Debug|x64.Build.0 = Debug|Any CPU
88+
{6F193271-70B3-48EC-9CE5-B8EE1A5CA89E}.Release|Any CPU.ActiveCfg = Release|Any CPU
89+
{6F193271-70B3-48EC-9CE5-B8EE1A5CA89E}.Release|Any CPU.Build.0 = Release|Any CPU
90+
{6F193271-70B3-48EC-9CE5-B8EE1A5CA89E}.Release|x64.ActiveCfg = Release|Any CPU
91+
{6F193271-70B3-48EC-9CE5-B8EE1A5CA89E}.Release|x64.Build.0 = Release|Any CPU
92+
{85972CEA-4AB1-45DC-922C-00C4E17764B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
93+
{85972CEA-4AB1-45DC-922C-00C4E17764B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
94+
{85972CEA-4AB1-45DC-922C-00C4E17764B5}.Debug|x64.ActiveCfg = Debug|Any CPU
95+
{85972CEA-4AB1-45DC-922C-00C4E17764B5}.Debug|x64.Build.0 = Debug|Any CPU
96+
{85972CEA-4AB1-45DC-922C-00C4E17764B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
97+
{85972CEA-4AB1-45DC-922C-00C4E17764B5}.Release|Any CPU.Build.0 = Release|Any CPU
98+
{85972CEA-4AB1-45DC-922C-00C4E17764B5}.Release|x64.ActiveCfg = Release|Any CPU
99+
{85972CEA-4AB1-45DC-922C-00C4E17764B5}.Release|x64.Build.0 = Release|Any CPU
100+
{5AF00B6D-70C2-4CB0-A5D8-41F488F0DDF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
101+
{5AF00B6D-70C2-4CB0-A5D8-41F488F0DDF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
102+
{5AF00B6D-70C2-4CB0-A5D8-41F488F0DDF2}.Debug|x64.ActiveCfg = Debug|Any CPU
103+
{5AF00B6D-70C2-4CB0-A5D8-41F488F0DDF2}.Debug|x64.Build.0 = Debug|Any CPU
104+
{5AF00B6D-70C2-4CB0-A5D8-41F488F0DDF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
105+
{5AF00B6D-70C2-4CB0-A5D8-41F488F0DDF2}.Release|Any CPU.Build.0 = Release|Any CPU
106+
{5AF00B6D-70C2-4CB0-A5D8-41F488F0DDF2}.Release|x64.ActiveCfg = Release|Any CPU
107+
{5AF00B6D-70C2-4CB0-A5D8-41F488F0DDF2}.Release|x64.Build.0 = Release|Any CPU
108+
{4B2C7249-9728-451B-8C9C-F73A164703B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
109+
{4B2C7249-9728-451B-8C9C-F73A164703B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
110+
{4B2C7249-9728-451B-8C9C-F73A164703B6}.Debug|x64.ActiveCfg = Debug|Any CPU
111+
{4B2C7249-9728-451B-8C9C-F73A164703B6}.Debug|x64.Build.0 = Debug|Any CPU
112+
{4B2C7249-9728-451B-8C9C-F73A164703B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
113+
{4B2C7249-9728-451B-8C9C-F73A164703B6}.Release|Any CPU.Build.0 = Release|Any CPU
114+
{4B2C7249-9728-451B-8C9C-F73A164703B6}.Release|x64.ActiveCfg = Release|Any CPU
115+
{4B2C7249-9728-451B-8C9C-F73A164703B6}.Release|x64.Build.0 = Release|Any CPU
116+
{63A88323-2F8B-4CF1-AA17-C1372ACCA187}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
117+
{63A88323-2F8B-4CF1-AA17-C1372ACCA187}.Debug|Any CPU.Build.0 = Debug|Any CPU
118+
{63A88323-2F8B-4CF1-AA17-C1372ACCA187}.Debug|x64.ActiveCfg = Debug|Any CPU
119+
{63A88323-2F8B-4CF1-AA17-C1372ACCA187}.Debug|x64.Build.0 = Debug|Any CPU
120+
{63A88323-2F8B-4CF1-AA17-C1372ACCA187}.Release|Any CPU.ActiveCfg = Release|Any CPU
121+
{63A88323-2F8B-4CF1-AA17-C1372ACCA187}.Release|Any CPU.Build.0 = Release|Any CPU
122+
{63A88323-2F8B-4CF1-AA17-C1372ACCA187}.Release|x64.ActiveCfg = Release|Any CPU
123+
{63A88323-2F8B-4CF1-AA17-C1372ACCA187}.Release|x64.Build.0 = Release|Any CPU
124+
{EE30483B-AC0F-46C1-AAF5-A5DE2B187084}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
125+
{EE30483B-AC0F-46C1-AAF5-A5DE2B187084}.Debug|Any CPU.Build.0 = Debug|Any CPU
126+
{EE30483B-AC0F-46C1-AAF5-A5DE2B187084}.Debug|x64.ActiveCfg = Debug|Any CPU
127+
{EE30483B-AC0F-46C1-AAF5-A5DE2B187084}.Debug|x64.Build.0 = Debug|Any CPU
128+
{EE30483B-AC0F-46C1-AAF5-A5DE2B187084}.Release|Any CPU.ActiveCfg = Release|Any CPU
129+
{EE30483B-AC0F-46C1-AAF5-A5DE2B187084}.Release|Any CPU.Build.0 = Release|Any CPU
130+
{EE30483B-AC0F-46C1-AAF5-A5DE2B187084}.Release|x64.ActiveCfg = Release|Any CPU
131+
{EE30483B-AC0F-46C1-AAF5-A5DE2B187084}.Release|x64.Build.0 = Release|Any CPU
132+
{CE54D5D2-068A-4456-9720-2AF0688D9E7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
133+
{CE54D5D2-068A-4456-9720-2AF0688D9E7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
134+
{CE54D5D2-068A-4456-9720-2AF0688D9E7F}.Debug|x64.ActiveCfg = Debug|Any CPU
135+
{CE54D5D2-068A-4456-9720-2AF0688D9E7F}.Debug|x64.Build.0 = Debug|Any CPU
136+
{CE54D5D2-068A-4456-9720-2AF0688D9E7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
137+
{CE54D5D2-068A-4456-9720-2AF0688D9E7F}.Release|Any CPU.Build.0 = Release|Any CPU
138+
{CE54D5D2-068A-4456-9720-2AF0688D9E7F}.Release|x64.ActiveCfg = Release|Any CPU
139+
{CE54D5D2-068A-4456-9720-2AF0688D9E7F}.Release|x64.Build.0 = Release|Any CPU
140+
{9B748316-24DC-40AA-A39D-476EF83DF96C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
141+
{9B748316-24DC-40AA-A39D-476EF83DF96C}.Debug|Any CPU.Build.0 = Debug|Any CPU
142+
{9B748316-24DC-40AA-A39D-476EF83DF96C}.Debug|x64.ActiveCfg = Debug|Any CPU
143+
{9B748316-24DC-40AA-A39D-476EF83DF96C}.Debug|x64.Build.0 = Debug|Any CPU
144+
{9B748316-24DC-40AA-A39D-476EF83DF96C}.Release|Any CPU.ActiveCfg = Release|Any CPU
145+
{9B748316-24DC-40AA-A39D-476EF83DF96C}.Release|Any CPU.Build.0 = Release|Any CPU
146+
{9B748316-24DC-40AA-A39D-476EF83DF96C}.Release|x64.ActiveCfg = Release|Any CPU
147+
{9B748316-24DC-40AA-A39D-476EF83DF96C}.Release|x64.Build.0 = Release|Any CPU
148+
{A6DCFCE5-192B-4AE1-B228-206D37A0021C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
149+
{A6DCFCE5-192B-4AE1-B228-206D37A0021C}.Debug|Any CPU.Build.0 = Debug|Any CPU
150+
{A6DCFCE5-192B-4AE1-B228-206D37A0021C}.Debug|x64.ActiveCfg = Debug|Any CPU
151+
{A6DCFCE5-192B-4AE1-B228-206D37A0021C}.Debug|x64.Build.0 = Debug|Any CPU
152+
{A6DCFCE5-192B-4AE1-B228-206D37A0021C}.Release|Any CPU.ActiveCfg = Release|Any CPU
153+
{A6DCFCE5-192B-4AE1-B228-206D37A0021C}.Release|Any CPU.Build.0 = Release|Any CPU
154+
{A6DCFCE5-192B-4AE1-B228-206D37A0021C}.Release|x64.ActiveCfg = Release|Any CPU
155+
{A6DCFCE5-192B-4AE1-B228-206D37A0021C}.Release|x64.Build.0 = Release|Any CPU
156+
{8974A04C-8360-4225-ABDD-0C56555F676D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
157+
{8974A04C-8360-4225-ABDD-0C56555F676D}.Debug|Any CPU.Build.0 = Debug|Any CPU
158+
{8974A04C-8360-4225-ABDD-0C56555F676D}.Debug|x64.ActiveCfg = Debug|Any CPU
159+
{8974A04C-8360-4225-ABDD-0C56555F676D}.Debug|x64.Build.0 = Debug|Any CPU
160+
{8974A04C-8360-4225-ABDD-0C56555F676D}.Release|Any CPU.ActiveCfg = Release|Any CPU
161+
{8974A04C-8360-4225-ABDD-0C56555F676D}.Release|Any CPU.Build.0 = Release|Any CPU
162+
{8974A04C-8360-4225-ABDD-0C56555F676D}.Release|x64.ActiveCfg = Release|Any CPU
163+
{8974A04C-8360-4225-ABDD-0C56555F676D}.Release|x64.Build.0 = Release|Any CPU
116164
EndGlobalSection
117165
GlobalSection(SolutionProperties) = preSolution
118166
HideSolutionNode = FALSE
@@ -121,13 +169,14 @@ Global
121169
{6F193271-70B3-48EC-9CE5-B8EE1A5CA89E} = {D5E764E7-2719-4937-AC10-0D2D789A1134}
122170
{D7DD340F-1EE2-4F8A-AA3E-A8FC76098AD6} = {D5E764E7-2719-4937-AC10-0D2D789A1134}
123171
{85972CEA-4AB1-45DC-922C-00C4E17764B5} = {B766E918-7350-473A-B28D-63C344385924}
124-
{3F9AB6CE-3AD1-40B6-B2AA-C4D82F76258F} = {FA5D7AB8-3570-4E55-95B0-35BA6842FEE3}
125-
{D7EE32B0-ED1C-4263-B017-6C3EC74FD731} = {36371756-8DDA-41A4-BB9A-B7651459ADC1}
126-
{DDF690A2-7588-44BC-8E2E-9080C746A49C} = {36371756-8DDA-41A4-BB9A-B7651459ADC1}
127-
{6B932930-D24C-43BB-8877-85B4F3F7A57B} = {36371756-8DDA-41A4-BB9A-B7651459ADC1}
128-
{535BE739-1314-4F8D-B24B-06890DDD3B8D} = {36371756-8DDA-41A4-BB9A-B7651459ADC1}
129-
{69C1A629-F519-4F5A-85D5-4E0317CD267F} = {36371756-8DDA-41A4-BB9A-B7651459ADC1}
130172
{5AF00B6D-70C2-4CB0-A5D8-41F488F0DDF2} = {FA5D7AB8-3570-4E55-95B0-35BA6842FEE3}
173+
{4B2C7249-9728-451B-8C9C-F73A164703B6} = {8EAF9583-DC5B-46DC-A01E-47B00A1C862E}
174+
{63A88323-2F8B-4CF1-AA17-C1372ACCA187} = {8EAF9583-DC5B-46DC-A01E-47B00A1C862E}
175+
{EE30483B-AC0F-46C1-AAF5-A5DE2B187084} = {8EAF9583-DC5B-46DC-A01E-47B00A1C862E}
176+
{CE54D5D2-068A-4456-9720-2AF0688D9E7F} = {8EAF9583-DC5B-46DC-A01E-47B00A1C862E}
177+
{9B748316-24DC-40AA-A39D-476EF83DF96C} = {8EAF9583-DC5B-46DC-A01E-47B00A1C862E}
178+
{A6DCFCE5-192B-4AE1-B228-206D37A0021C} = {FA5D7AB8-3570-4E55-95B0-35BA6842FEE3}
179+
{8974A04C-8360-4225-ABDD-0C56555F676D} = {8EAF9583-DC5B-46DC-A01E-47B00A1C862E}
131180
EndGlobalSection
132181
GlobalSection(ExtensibilityGlobals) = postSolution
133182
SolutionGuid = {0A99E91A-ADAB-45C3-8170-2656140F6EFA}

‎FNA.Settings.props

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎README.md

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1160,22 +1160,19 @@ ClassicUO is natively cross platform and supports:
11601160
| Browser | [Play!](https://play.classicuo.org) |
11611161
| Windows x64 | [Download](https://www.classicuo.eu/launcher/win-x64/ClassicUOLauncher-win-x64-release.zip) |
11621162
| Linux x64 | [Download](https://www.classicuo.eu/launcher/linux-x64/ClassicUOLauncher-linux-x64-release.zip) |
1163-
| macOS | [Download](https://www.classicuo.eu/launcher/osx/ClassicUOLauncher-osx-x64-release.zip) |
1163+
| macOS x64 | [Download](https://www.classicuo.eu/launcher/osx/ClassicUOLauncher-osx-x64-release.zip) |
11641164

11651165
Or visit the [ClassicUO Website](https://www.classicuo.eu/)
11661166

1167-
# How to build the project
1168-
1169-
Clone repository with:
1167+
# How to generate a release build
11701168
```
1171-
git config --global url."https://".insteadOf git://
11721169
git clone --recursive https://github.com/ClassicUO/ClassicUO.git
1170+
cd ClassicUO/scripts
1171+
bash build-naot.sh
11731172
```
1174-
1175-
Build the project:
1176-
```
1177-
dotnet build -c Release
1178-
```
1173+
Binaries available in `bin/dist` folder
1174+
> [!WARNING]
1175+
> To execute .sh scripts on Windows, use Git Bash which can be installed with Git itself: https://git-scm.com/download/win
11791176
11801177
# Contribute
11811178
Everyone is welcome to contribute! The GitHub issues and project tracker are kept up to date with tasks that need work.
@@ -1194,4 +1191,4 @@ Backend:
11941191
This work is released under the BSD 4 license. This project does not distribute any copyrighted game assets. In order to run this client you'll need to legally obtain a copy of the Ultima Online Classic Client.
11951192
Using a custom client to connect to official UO servers is strictly forbidden. We do not assume any responsibility of the usage of this client.
11961193

1197-
Ultima Online(R) © 2022 Electronic Arts Inc. All Rights Reserved.
1194+
Ultima Online(R) © 2024 Electronic Arts Inc. All Rights Reserved.

‎external/FNA

Submodule FNA updated 321 files

‎external/MP3Sharp

‎external/lib64/libFAudio.so.0

13.3 KB
Binary file not shown.

‎external/lib64/libFNA3D.so.0

120 KB
Binary file not shown.

‎external/lib64/libSDL2-2.0.so.0

451 KB
Binary file not shown.

‎external/lib64/libtheorafile.so

4.04 KB
Binary file not shown.

‎external/osx/libFAudio.0.dylib

14 KB
Binary file not shown.

‎external/osx/libFNA3D.0.dylib

-62.2 KB
Binary file not shown.

‎external/osx/libMoltenVK.dylib

503 KB
Binary file not shown.

‎external/osx/libSDL2-2.0.0.dylib

275 KB
Binary file not shown.

‎external/osx/libtheorafile.dylib

56 Bytes
Binary file not shown.

‎external/osx/libvulkan.1.dylib

620 KB
Binary file not shown.

‎external/x64/FAudio.dll

33.2 KB
Binary file not shown.

‎external/x64/FNA3D.dll

22.5 KB
Binary file not shown.

‎external/x64/SDL2.dll

869 KB
Binary file not shown.

‎external/x64/libtheorafile.dll

547 Bytes
Binary file not shown.

‎external/x64/vcruntime140.dll

-99.5 KB
Binary file not shown.

‎scripts/build-naot.sh

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#!/bin/bash
2+
3+
set -e
4+
5+
# Define paths and project details
6+
bootstrap_project="../src/ClassicUO.Bootstrap/src/ClassicUO.Bootstrap.csproj"
7+
client_project="../src/ClassicUO.Client"
8+
output_directory="../bin/dist"
9+
target=""
10+
11+
# Determine the platform
12+
platform=$(uname -s)
13+
14+
# Build for the appropriate platform
15+
case $platform in
16+
Linux)
17+
# Add Linux-specific build commands here
18+
target="linux-x64"
19+
;;
20+
Darwin)
21+
# Add macOS-specific build commands here
22+
target="osx-x64"
23+
;;
24+
MINGW* | CYGWIN*)
25+
# Add Windows-specific build commands here
26+
target="win-x64"
27+
;;
28+
*)
29+
echo "Unsupported platform: $platform"
30+
exit 1
31+
;;
32+
esac
33+
34+
35+
dotnet publish "$bootstrap_project" -c Release -o "$output_directory"
36+
dotnet publish "$client_project" -c Release -f net8.0 -p:PublishAot=true -p:TargetFrameworks=net8.0 -p:NativeLib=Shared -p:OutputType=Library -r $target -o "$output_directory"

‎scripts/build.cmd

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)