Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

.NET 6 Cross platform #341

Merged
merged 136 commits into from
Sep 19, 2022
Merged

.NET 6 Cross platform #341

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
136 commits
Select commit Hold shift + click to select a range
0fc5ccc
Switch to .NET4.8 and new project file format
Rans4ckeR Apr 17, 2022
acfabe4
Update project files
Rans4ckeR Apr 18, 2022
d7e370a
.NET6
Rans4ckeR Apr 18, 2022
22c0307
Fix project constants
Rans4ckeR Apr 18, 2022
81a29c1
Target ARM64
Rans4ckeR Apr 18, 2022
c352fff
Fix Windows version detection
Rans4ckeR Apr 18, 2022
4c1a570
Revert WINXP
Rans4ckeR Apr 18, 2022
cca1306
Merge branch 'develop' of https://github.com/Rans4ckeR/xna-cncnet-cli…
Rans4ckeR Apr 19, 2022
e5a63f2
Merge branch 'develop' of https://github.com/Rans4ckeR/xna-cncnet-cli…
Rans4ckeR Jun 10, 2022
4605059
Set solution platform/configuration/dependencies
Rans4ckeR Jun 10, 2022
df3a17c
Update packages
Rans4ckeR Jun 10, 2022
8984af4
Set solution configuration/platform/frameworks/dependencies
Rans4ckeR Jun 11, 2022
165d8ff
Update build and workflow
Rans4ckeR Jun 11, 2022
7e37245
Update workflow
Rans4ckeR Jun 11, 2022
60985b6
Update workflow
Rans4ckeR Jun 11, 2022
ab1b172
Replace external dlls by packages
Rans4ckeR Jun 11, 2022
93e6897
Set .NET4.8 build PlatformTarget
Rans4ckeR Jun 11, 2022
50b6b9a
Fix DXMainClient CopyResources
Rans4ckeR Jun 11, 2022
b30534e
Fix NET6 browser launch
Rans4ckeR Jun 11, 2022
6511784
Include updater
Rans4ckeR Jun 11, 2022
53151b8
XNA dependencies improvements
Rans4ckeR Jun 12, 2022
dda53e1
Merge branch 'net6' into updater
Rans4ckeR Jun 12, 2022
c15f942
Update build scripts to stop on error
Rans4ckeR Jun 12, 2022
cc42f71
Merge branch 'updater' into net6
Rans4ckeR Jun 12, 2022
10f230f
Update workflow
Rans4ckeR Jun 12, 2022
f2b3903
Merging new Updater
Rans4ckeR Jun 12, 2022
c65cd68
Fix Updater for NET6
Rans4ckeR Jun 12, 2022
ef3b2f9
Add ClientUpdater NuGet package
Rans4ckeR Jun 13, 2022
616f48e
Use UseShellExecute true for launching a browser on all frameworks
Rans4ckeR Jun 13, 2022
772e6c1
Update packages
Rans4ckeR Jun 13, 2022
1af0250
Fix AresXNADebug constants
Rans4ckeR Jun 14, 2022
d87ff42
Set ApplicationIcon
Rans4ckeR Jun 15, 2022
2c0f1b7
Fix Resources.resx
Rans4ckeR Jun 15, 2022
bc885d6
Fix FinalSunSettings compatibility
Rans4ckeR Jun 15, 2022
fdb3e0f
Avoid exceptions during launch for performance and debugging expierence
Rans4ckeR Jun 15, 2022
406d36d
Avoid TunnelHandler exception on parsing tunnel list header
Rans4ckeR Jun 15, 2022
5b3f65f
Fix .NET6 dynamic assembly loading and publishing
Rans4ckeR Jun 16, 2022
dab0730
Update build files to allow debug
Rans4ckeR Jun 17, 2022
8d46715
Merge from develop
Rans4ckeR Jun 18, 2022
77990d3
Merge from develop
Rans4ckeR Jun 18, 2022
ebf6e17
Merge branch 'develop' into net6
Rans4ckeR Jun 18, 2022
81e0cf2
why inside namespace?
frg2089 Jun 18, 2022
480f43e
update msbuild project
frg2089 Jun 18, 2022
e9e02cf
use powershell script
frg2089 Jun 18, 2022
e8d50e4
make Visual Studio Compatible
frg2089 Jun 18, 2022
f6b95cd
add XNA build
frg2089 Jun 18, 2022
57e622f
update build script
frg2089 Jun 18, 2022
493c936
Update build/Framework.props
frg2089 Jun 19, 2022
c53235b
refactor build script
frg2089 Jun 19, 2022
dbfda69
refactor Visual Studio Compatible
frg2089 Jun 19, 2022
7ac16eb
fix error
frg2089 Jun 19, 2022
8f506bf
fix ci
frg2089 Jun 19, 2022
ef6e49d
Use different assembly names for different engines
frg2089 Jun 19, 2022
c3b6ba9
fixed build script
frg2089 Jun 19, 2022
269972c
fixed an error
frg2089 Jun 19, 2022
83a4e56
use dotnet publish
frg2089 Jun 19, 2022
6ac4517
disable build XNA when current platform are not x86
frg2089 Jun 19, 2022
64c15e6
MSBuild AppHostPatcher
frg2089 Jun 19, 2022
9366e8c
update targets
frg2089 Jun 20, 2022
9d8a957
refactor common file script
frg2089 Jun 20, 2022
07ea132
refactor build script
frg2089 Jun 20, 2022
10cfe84
update
frg2089 Jun 20, 2022
dd34864
refactor build script
frg2089 Jun 22, 2022
4f26554
fix encoding error
frg2089 Jun 22, 2022
edc5c57
Update build/AfterPublish.targets
frg2089 Jun 22, 2022
1f2dbf6
Update ClientCore/PlatformShim/EncodingExt.cs
frg2089 Jun 22, 2022
6422a91
Update BuildScripts
frg2089 Jun 22, 2022
5856166
add $Game in output path
frg2089 Jun 22, 2022
3a2dac0
fix CA2200
frg2089 Jun 22, 2022
15b76d7
Merge from develop
Rans4ckeR Jun 22, 2022
e31c0dd
Fix High DPI support
Rans4ckeR Jun 23, 2022
2eae044
Remove previous build script
Rans4ckeR Jun 23, 2022
0d4791d
Fix NOAUDIO localization
Rans4ckeR Jun 23, 2022
c608dcd
Show build details on failure
Rans4ckeR Jun 23, 2022
5165973
Add conditional namespaces
Rans4ckeR Jun 23, 2022
f75011e
Fix .gitignore
Rans4ckeR Jun 23, 2022
987848e
Update TranslationTable loading
Rans4ckeR Jun 23, 2022
445ecbe
Apply review comments
Rans4ckeR Jun 23, 2022
21f83ff
Update README.md
Rans4ckeR Jun 23, 2022
05a05f9
Update README.md
Rans4ckeR Jun 23, 2022
868b147
Improve performance and debugging experience when connected to IRC (#5)
Rans4ckeR Jun 24, 2022
d63255b
Use string.Format()
Rans4ckeR Jun 26, 2022
260b055
Add localization UI:Main:ClientDisconnectedAfterRetries
Rans4ckeR Jul 6, 2022
6426387
Fix cross platform file system compatibility
Rans4ckeR Jun 18, 2022
c5c479a
Update packages with Win API safeguarding. Remove unused Win API code.
Rans4ckeR Jun 20, 2022
a613837
Update FinalSunSettings to use SafePath
Rans4ckeR Jun 22, 2022
a7afadf
Update packages
Rans4ckeR Jun 23, 2022
b4d6a7f
Generate cross platform UniversalGL executable
Rans4ckeR Jun 26, 2022
2c7399b
Restore UniversalGL screen resolution functionality
Rans4ckeR Jun 27, 2022
0ab0f18
Implement ImageSharp extracted map preview
Rans4ckeR Jun 27, 2022
2318438
Improve ImageSharp CreatePreviewBitmapFromImageData
Rans4ckeR Jun 27, 2022
57d590a
Enable cross platform building
Rans4ckeR Jun 27, 2022
461339e
Update PS scripts requirements and readme
Rans4ckeR Jun 28, 2022
d21552f
Update packages
Rans4ckeR Jun 29, 2022
130b5bb
Replaced WindowsIdentity for cross platform alternative
Rans4ckeR Jun 29, 2022
395259f
Add Windows Registry guards for TS
Rans4ckeR Jun 29, 2022
0872dea
Restore MediaPlayer
Rans4ckeR Jun 30, 2022
f014f06
Update packages
Rans4ckeR Jul 13, 2022
6ee1f19
Update packages
Rans4ckeR Jul 24, 2022
28a4d3e
Merge pull request #6 from Rans4ckeR/mono
Rans4ckeR Jul 24, 2022
6dcfab1
Update Rampastring.XNAUI
Rans4ckeR Jul 26, 2022
be281c6
Revert the UI:Command rename for the time being
Metadorius Jul 28, 2022
7645076
Use culture-invariant case conversion for game collection parsing
Starkku Jul 28, 2022
fc1820f
Merge from develop
Rans4ckeR Jul 29, 2022
12bf688
Merge from develop
Rans4ckeR Jul 31, 2022
98e2ca9
Update workflow
Rans4ckeR Aug 2, 2022
17b3d1f
Update DPI config settings
Rans4ckeR Aug 3, 2022
2664331
Use Rampastring.Tools from offical NuGet source
Rans4ckeR Aug 3, 2022
bb21cb8
Update packages, restores WindowManager HasFocus property & GameClosi…
Rans4ckeR Aug 17, 2022
43ef232
Update Rampastring.XNAUI from NuGet
Rans4ckeR Aug 18, 2022
b257a44
Fix map upload
Rans4ckeR Aug 19, 2022
3ede36b
Fix Connection loop
Rans4ckeR Aug 19, 2022
7abccde
LangVersion
Rans4ckeR Aug 25, 2022
0838f6a
Create README.md
Rans4ckeR Sep 9, 2022
1dc10b4
Update README.md
Rans4ckeR Sep 9, 2022
eeb336f
Fix icon variable names
Rans4ckeR Sep 11, 2022
bec3392
Handle review comments
Rans4ckeR Sep 11, 2022
2543164
Add ProcessLauncher
Rans4ckeR Sep 11, 2022
a97c1a6
Handle review comments
Rans4ckeR Sep 13, 2022
1d66db0
Update Migration.md
Rans4ckeR Sep 14, 2022
0925d6b
Update to official CnCNet.ClientUpdater
Rans4ckeR Sep 14, 2022
802b151
Support MainMenuMusic on DesktopGL
Rans4ckeR Sep 15, 2022
6d39cdb
Cross-platform fixes
Rans4ckeR Sep 16, 2022
5eaca10
Fix crash of random map button when map list is empty
Rans4ckeR Sep 16, 2022
dcc1764
Update Migration.md
Rans4ckeR Sep 16, 2022
6ff904f
Cross-platform map load fixes
Rans4ckeR Sep 17, 2022
104aa81
Cross-platform path fixes
Rans4ckeR Sep 17, 2022
5c3256a
Update build (#14)
Rans4ckeR Sep 17, 2022
478f04c
Update Docs/Migration.md
Rans4ckeR Sep 17, 2022
7bbac73
Update Docs/Migration.md
Rans4ckeR Sep 17, 2022
813b5b3
Update Migration.md
Rans4ckeR Sep 17, 2022
b77b0dc
Merge from develop
Rans4ckeR Sep 17, 2022
74b6c48
Allow calling build scripts from any path
Rans4ckeR Sep 17, 2022
6b2bb8b
Fix build output path
Rans4ckeR Sep 17, 2022
5cc282b
Update RemoveSDL target
Rans4ckeR Sep 18, 2022
fe73ec0
refactor build script (#12)
frg2089 Sep 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Target ARM64
  • Loading branch information
@Rans4ckeR
Rans4ckeR committed Apr 18, 2022
commit 81a29c1e925425a024f77270a7c9a8e4d4a6abe3
2 changes: 1 addition & 1 deletion ClientCore/ClientCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<AnalysisLevel>preview-all</AnalysisLevel>
<LangVersion>preview</LangVersion>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
<Platforms>AnyCPU;x64</Platforms>
<Platforms>AnyCPU;x64;ARM64</Platforms>
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
<Configurations>AresDebug;AresRelease;TSDebug;TSRelease;YRDebug;YRRelease</Configurations>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion ClientGUI/ClientGUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<AnalysisLevel>preview-all</AnalysisLevel>
<LangVersion>preview</LangVersion>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
<Platforms>AnyCPU;x64</Platforms>
<Platforms>AnyCPU;x64;ARM64</Platforms>
<Configurations>AresDebug;AresRelease;TSDebug;TSRelease;YRDebug;YRRelease</Configurations>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' == 'AresDebug' Or '$(Configuration)' == 'TSDebug' Or '$(Configuration)' == 'YRDebug'">
Expand Down
2 changes: 1 addition & 1 deletion DTAConfig/DTAConfig.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<AnalysisLevel>preview-all</AnalysisLevel>
<LangVersion>preview</LangVersion>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
<Platforms>AnyCPU;x64</Platforms>
<Platforms>AnyCPU;x64;ARM64</Platforms>
<Configurations>AresDebug;AresRelease;TSDebug;TSRelease;YRDebug;YRRelease</Configurations>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' == 'AresDebug' Or '$(Configuration)' == 'TSDebug' Or '$(Configuration)' == 'YRDebug'">
Expand Down
Loading