Skip to content

Commit

Permalink
Merge pull request #61 from Titlehhhh/McProtoNet-refactoring
Browse files Browse the repository at this point in the history
McProtoNet-refactoring
  • Loading branch information
Titlehhhh authored Aug 21, 2024
2 parents 737abab + 41fc098 commit 9efde3c
Show file tree
Hide file tree
Showing 1,380 changed files with 8,937,266 additions and 101,253 deletions.
198 changes: 99 additions & 99 deletions .github/workflows/continuous.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@ name: "Build"

on:
push:
branches:
branches:
- master
- release/**
paths-ignore:
- '**/*.md'
- '**/*.gitignore'
- '**/*.gitattributes'
- mhc.svg







jobs:
Libs:
name: Build and deploy NuGet
runs-on: ubuntu-latest
runs-on: ubuntu-latest
env:
FeedzApiKey: ${{ secrets.FEEDZ_TOKEN }}
DOTNET_CLI_TELEMETRY_OPTOUT: 1
Expand All @@ -30,125 +30,125 @@ jobs:
TERM: xterm

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Setup .NET SDK
uses: actions/setup-dotnet@v3
with:
dotnet-version: 8.0.100

- uses: actions/cache@v3
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}
restore-keys: |
${{ runner.os }}-nuget-
- name: set script permissions
run: chmod +x ./build.sh

- name: Run './build.cmd'
if: github.ref == 'refs/heads/master'
run: ./build.sh LibsPush
env:
- uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Setup .NET SDK
uses: actions/setup-dotnet@v3
with:
dotnet-version: 8.0.100

- uses: actions/cache@v3
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}
restore-keys: |
${{ runner.os }}-nuget-
- name: set script permissions
run: chmod +x ./build.sh

- name: Run './build.cmd'
if: github.ref == 'refs/heads/master'
run: ./build.sh LibsPush
env:
NuGetApiKey: ${{ secrets.NUGET_API_KEY }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
build-desktop-app:

name: "Build HolyClient.Desktop"
runs-on: ubuntu-latest
needs: [Libs]
env:
needs: [ Libs ]
env:
DOTNET_CLI_TELEMETRY_OPTOUT: 1
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
DOTNET_NOLOGO: true
DOTNET_GENERATE_ASPNET_CERTIFICATE: false
DOTNET_ADD_GLOBAL_TOOLS_TO_PATH: false
DOTNET_MULTILEVEL_LOOKUP: 0
DOTNET_SYSTEM_CONSOLE_ALLOW_ANSI_COLOR_REDIRECTION: true
TERM: xterm
TERM: xterm
strategy:
matrix:
target: [win-x86, win-x64, linux-x64, linux-arm, linux-arm64, osx-x64, osx-arm64]
target: [ win-x86, win-x64, linux-x64, linux-arm, linux-arm64, osx-x64, osx-arm64 ]
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Setup .NET SDK
uses: actions/setup-dotnet@v3
with:
dotnet-version: 8.0.100
- name: Restore NuGet
uses: actions/cache@v3
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}
restore-keys: |
${{ runner.os }}-nuget-
- name: set script permissions
run: chmod +x ./build.sh

- name: Run './build.cmd'
run: ./build.sh PublishApp -Runtime ${{ matrix.target }}
env:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Setup .NET SDK
uses: actions/setup-dotnet@v3
with:
dotnet-version: 8.0.100

- name: Restore NuGet
uses: actions/cache@v3
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}
restore-keys: |
${{ runner.os }}-nuget-
- name: set script permissions
run: chmod +x ./build.sh

- name: Run './build.cmd'
run: ./build.sh PublishApp -Runtime ${{ matrix.target }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Upload Artifact
uses: actions/upload-artifact@v4
with:
name: HolyClient.Desktop-${{matrix.target}}
path: .artifacts




- name: Upload Artifact
uses: actions/upload-artifact@v4
with:
name: HolyClient.Desktop-${{matrix.target}}
path: .artifacts


CreateRelease:
name: "CreateRelease"
needs: [build-desktop-app]
needs: [ build-desktop-app ]
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup .NET SDK
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.100

- name: Restore NuGet
uses: actions/cache@v3
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}
restore-keys: |
${{ runner.os }}-nuget-
- name: Download All Artifacts
uses: actions/[email protected]
with:
path: .artifacts
pattern: HolyClient.Desktop-*
merge-multiple: true

- name: set script permissions
run: chmod +x ./build.sh

- name: Run './build.cmd'
if: github.ref == 'refs/heads/master'
run: ./build.sh CreateRelease
env:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup .NET SDK
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.100

- name: Restore NuGet
uses: actions/cache@v3
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}
restore-keys: |
${{ runner.os }}-nuget-
- name: Download All Artifacts
uses: actions/[email protected]
with:
path: .artifacts
pattern: HolyClient.Desktop-*
merge-multiple: true


- name: set script permissions
run: chmod +x ./build.sh

- name: Run './build.cmd'
if: github.ref == 'refs/heads/master'
run: ./build.sh CreateRelease
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}







#dotnet.exe publish ~\Minecraft-Holy-Client\Minecraft-Holy-Client\src\Platforms\HolyClient.Desktop\HolyClient.Desktop.csproj --no-restore --no-build /property:DebugType=None /property:DebugSymbols=False /property:PublishProfile=FolderProfile /property:PublishDir=~\Minecraft-Holy-Client\Minecraft-Holy-Client\.artifacts
11 changes: 4 additions & 7 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning" Condition="!Exists('packages.config')">
<PrivateAssets>all</PrivateAssets>
<Version>3.6.133</Version>
</PackageReference>

</ItemGroup>
<ItemGroup>
<AvaloniaVersion>11.0.11</AvaloniaVersion>
<FluentAvaloniaVersion>2.0.5</FluentAvaloniaVersion>
</ItemGroup>
</Project>
72 changes: 63 additions & 9 deletions HolyClient.sln
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.6.33723.286
VisualStudioVersion = 17.10.34607.79
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CoreLibs", "CoreLibs", "{00CC44BE-C0E1-44BB-AC5D-EB0656140923}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "McProtoNet", "McProtoNet", "{E8DD8BFD-216D-4435-B9F8-E34C03D29FF9}"
ProjectSection(SolutionItems) = preProject
src\McProtoNet\Directory.Build.props = src\McProtoNet\Directory.Build.props
src\McProtoNet\Directory.Build.targets = src\McProtoNet\Directory.Build.targets
src\McProtoNet\Directory.Packages.props = src\McProtoNet\Directory.Packages.props
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platfroms", "Platfroms", "{B2F7D8DD-5C70-465C-BE7A-DB2C49DE143F}"
Expand Down Expand Up @@ -46,14 +45,34 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HolyClient", "src\HolyClien
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestStressTestBehavior", "src\Samples\StressTest\TestStressTestBehavior\TestStressTestBehavior.csproj", "{03F81ECB-149C-4BCE-8C5A-76C35EDB03CF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "McProtoNet.Core", "src\McProtoNet\McProtoNet.Core\McProtoNet.Core.csproj", "{B4BE7CC0-F0A5-4EF7-A539-AFDBD1414281}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ProxyLib", "ProxyLib", "{7A62B32A-20C2-4187-8C0E-71E7EBB2204C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuickProxyNet", "src\QuickProxyNet\QuickProxyNet.csproj", "{061F3DDC-1CF0-40CD-9DD8-697B95F782F1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_build", "build\_build.csproj", "{6D56912F-F95F-498D-806A-C0235801020A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{94507341-EE19-4C7A-8C97-1906CB80A567}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "McProtoNet.Benchmark", "src\McProtoNet\McProtoNet.Benchmark\McProtoNet.Benchmark.csproj", "{B20035DA-21E0-4BFA-B31A-B0D8A520D117}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SourceGenerator", "src\McProtoNet\SourceGenerator\SourceGenerator.csproj", "{1826F0CF-C719-457B-9D88-F9C05C433B36}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Experimental", "Experimental", "{4092C92C-F03E-42C5-8A86-FF8A172EF7F8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExperimentalApp", "src\Experimental\ExperimentalApp\ExperimentalApp.csproj", "{B5F00CDF-A417-4C47-A3CB-547CAD451816}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "McProtoNet.Protocol", "src\McProtoNet\McProtoNet.Protocol\McProtoNet.Protocol.csproj", "{59B24766-4950-4A48-BD1D-05F140D9B911}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sandbox", "Sandbox", "{0F7BA8C4-5BDB-4810-9312-EDC17D450259}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sandbox", "src\Sandbox\Sandbox.csproj", "{CAD26A2F-C6A0-4914-86CE-EA7932BA2A59}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "McProtoNet.Serialization", "src\McProtoNet\McProtoNet.Serialization\McProtoNet.Serialization.csproj", "{B6144ABE-E679-4B15-9585-440B0718F87C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "McProtoNet.Abstractions", "src\McProtoNet\McProtoNet.Abstractions\McProtoNet.Abstractions.csproj", "{CC58A1F6-715A-4AB3-BA23-B9ECE14E4E45}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SourceGeneratorFS", "src\McProtoNet\SourceGeneratorFS\SourceGeneratorFS.fsproj", "{EDA5EB9B-676E-47D4-9714-367C9BD13C69}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -116,16 +135,44 @@ Global
{03F81ECB-149C-4BCE-8C5A-76C35EDB03CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{03F81ECB-149C-4BCE-8C5A-76C35EDB03CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{03F81ECB-149C-4BCE-8C5A-76C35EDB03CF}.Release|Any CPU.Build.0 = Release|Any CPU
{B4BE7CC0-F0A5-4EF7-A539-AFDBD1414281}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B4BE7CC0-F0A5-4EF7-A539-AFDBD1414281}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B4BE7CC0-F0A5-4EF7-A539-AFDBD1414281}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B4BE7CC0-F0A5-4EF7-A539-AFDBD1414281}.Release|Any CPU.Build.0 = Release|Any CPU
{061F3DDC-1CF0-40CD-9DD8-697B95F782F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{061F3DDC-1CF0-40CD-9DD8-697B95F782F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{061F3DDC-1CF0-40CD-9DD8-697B95F782F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{061F3DDC-1CF0-40CD-9DD8-697B95F782F1}.Release|Any CPU.Build.0 = Release|Any CPU
{6D56912F-F95F-498D-806A-C0235801020A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6D56912F-F95F-498D-806A-C0235801020A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B20035DA-21E0-4BFA-B31A-B0D8A520D117}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B20035DA-21E0-4BFA-B31A-B0D8A520D117}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B20035DA-21E0-4BFA-B31A-B0D8A520D117}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B20035DA-21E0-4BFA-B31A-B0D8A520D117}.Release|Any CPU.Build.0 = Release|Any CPU
{1826F0CF-C719-457B-9D88-F9C05C433B36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1826F0CF-C719-457B-9D88-F9C05C433B36}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1826F0CF-C719-457B-9D88-F9C05C433B36}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1826F0CF-C719-457B-9D88-F9C05C433B36}.Release|Any CPU.Build.0 = Release|Any CPU
{B5F00CDF-A417-4C47-A3CB-547CAD451816}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B5F00CDF-A417-4C47-A3CB-547CAD451816}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B5F00CDF-A417-4C47-A3CB-547CAD451816}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B5F00CDF-A417-4C47-A3CB-547CAD451816}.Release|Any CPU.Build.0 = Release|Any CPU
{59B24766-4950-4A48-BD1D-05F140D9B911}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{59B24766-4950-4A48-BD1D-05F140D9B911}.Debug|Any CPU.Build.0 = Debug|Any CPU
{59B24766-4950-4A48-BD1D-05F140D9B911}.Release|Any CPU.ActiveCfg = Release|Any CPU
{59B24766-4950-4A48-BD1D-05F140D9B911}.Release|Any CPU.Build.0 = Release|Any CPU
{CAD26A2F-C6A0-4914-86CE-EA7932BA2A59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CAD26A2F-C6A0-4914-86CE-EA7932BA2A59}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CAD26A2F-C6A0-4914-86CE-EA7932BA2A59}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CAD26A2F-C6A0-4914-86CE-EA7932BA2A59}.Release|Any CPU.Build.0 = Release|Any CPU
{B6144ABE-E679-4B15-9585-440B0718F87C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B6144ABE-E679-4B15-9585-440B0718F87C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B6144ABE-E679-4B15-9585-440B0718F87C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B6144ABE-E679-4B15-9585-440B0718F87C}.Release|Any CPU.Build.0 = Release|Any CPU
{CC58A1F6-715A-4AB3-BA23-B9ECE14E4E45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CC58A1F6-715A-4AB3-BA23-B9ECE14E4E45}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CC58A1F6-715A-4AB3-BA23-B9ECE14E4E45}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CC58A1F6-715A-4AB3-BA23-B9ECE14E4E45}.Release|Any CPU.Build.0 = Release|Any CPU
{EDA5EB9B-676E-47D4-9714-367C9BD13C69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EDA5EB9B-676E-47D4-9714-367C9BD13C69}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EDA5EB9B-676E-47D4-9714-367C9BD13C69}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EDA5EB9B-676E-47D4-9714-367C9BD13C69}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -145,8 +192,15 @@ Global
{60380B8C-3AA8-4CAC-8440-7633FA077713} = {B2F7D8DD-5C70-465C-BE7A-DB2C49DE143F}
{343A6B87-FEBF-4F8A-8D3E-C4C7A7D2D331} = {65E9511B-0764-4C58-BE26-490B1C8BE05F}
{03F81ECB-149C-4BCE-8C5A-76C35EDB03CF} = {6C340C87-C6DD-4E7D-B0FE-C9C6B63CB9F5}
{B4BE7CC0-F0A5-4EF7-A539-AFDBD1414281} = {E8DD8BFD-216D-4435-B9F8-E34C03D29FF9}
{061F3DDC-1CF0-40CD-9DD8-697B95F782F1} = {7A62B32A-20C2-4187-8C0E-71E7EBB2204C}
{B20035DA-21E0-4BFA-B31A-B0D8A520D117} = {E8DD8BFD-216D-4435-B9F8-E34C03D29FF9}
{1826F0CF-C719-457B-9D88-F9C05C433B36} = {E8DD8BFD-216D-4435-B9F8-E34C03D29FF9}
{B5F00CDF-A417-4C47-A3CB-547CAD451816} = {4092C92C-F03E-42C5-8A86-FF8A172EF7F8}
{59B24766-4950-4A48-BD1D-05F140D9B911} = {E8DD8BFD-216D-4435-B9F8-E34C03D29FF9}
{CAD26A2F-C6A0-4914-86CE-EA7932BA2A59} = {0F7BA8C4-5BDB-4810-9312-EDC17D450259}
{B6144ABE-E679-4B15-9585-440B0718F87C} = {E8DD8BFD-216D-4435-B9F8-E34C03D29FF9}
{CC58A1F6-715A-4AB3-BA23-B9ECE14E4E45} = {E8DD8BFD-216D-4435-B9F8-E34C03D29FF9}
{EDA5EB9B-676E-47D4-9714-367C9BD13C69} = {E8DD8BFD-216D-4435-B9F8-E34C03D29FF9}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {41AEE66A-568B-4B2B-A50B-5AC57D067A07}
Expand Down
7 changes: 0 additions & 7 deletions NuGet.config

This file was deleted.

Loading

0 comments on commit 9efde3c

Please sign in to comment.