Skip to content

Commit 3b8f92d

Browse files
authored
Merge branch 'FluxpointDev:rewrite' into rewrite
2 parents ddefcaf + e47d1b9 commit 3b8f92d

File tree

393 files changed

+12997
-25132
lines changed

Some content is hidden

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

393 files changed

+12997
-25132
lines changed

.github/workflows/build-macos.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Build-macos
2+
3+
# Controls when the action will run.
4+
on:
5+
# Triggers the workflow on push or pull request events but only for the $default-branch branch
6+
push:
7+
branches: [ $default-branch ]
8+
pull_request:
9+
branches: [ $default-branch ]
10+
11+
# Allows you to run this workflow manually from the Actions tab
12+
workflow_dispatch:
13+
14+
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
15+
jobs:
16+
# This workflow contains a single job called "build"
17+
build:
18+
# The type of runner that the job will run on
19+
runs-on: ubuntu-latest
20+
21+
# Steps represent a sequence of tasks that will be executed as part of the job
22+
steps:
23+
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
24+
- uses: actions/checkout@v2
25+
- uses: actions/setup-dotnet@v1
26+
with:
27+
dotnet-version: '6.0.x' # SDK Version to use; x will use the latest version of the 3.1 channel
28+
29+
- name: Build and package x64 and arm64 version for macOS
30+
run: sh build-macos.sh
31+
32+
- uses: actions/upload-artifact@v2
33+
with:
34+
name: MultiRPC-arm64.app
35+
path: ./macOS Templates/MultiRPC-arm64.app
36+
37+
- uses: actions/upload-artifact@v2
38+
with:
39+
name: MultiRPC-x64.app
40+
path: ./macOS Templates.MultiRPC-x64.app

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,3 +264,7 @@ __pycache__/
264264
*.pyc
265265

266266
MultiRPC.sln.DotSettings
267+
MultiRPC-arm64.app/
268+
MultiRPC-x64.app/
269+
builds/
270+
packages/

.gitmodules

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[submodule "ext/avalonia.gif"]
2+
path = ext/avalonia.gif
3+
url = https://github.com/Azyyyyyy/Avalonia.GIF
4+
[submodule "ext/discord-rpc-csharp"]
5+
path = ext/discord-rpc-csharp
6+
url = https://github.com/Azyyyyyy/discord-rpc-csharp

MultiRPC.UWP.sln

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.32014.148
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "MultiRPC.UWP.Package", "src\MultiRPC.UWP\MultiRPC.UWP.Package.wapproj", "{452579BF-FF89-46FD-953D-E9D02D71EFDD}"
7+
EndProject
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MultiRPC.SourceGen", "src\MultiRPC.SourceGen\MultiRPC.SourceGen.csproj", "{919C3FE7-14E4-48D5-A119-690827FD04B7}"
9+
EndProject
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvaloniaGif", "ext\avalonia.gif\AvaloniaGif\AvaloniaGif.csproj", "{C89E50F1-7914-4E4C-AAAA-3D66E1FE851B}"
11+
EndProject
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MultiRPC.UWP", "src\MultiRPC\MultiRPC.UWP.csproj", "{7383A470-2747-4914-AD9A-97A39BB6BD5C}"
13+
EndProject
14+
Global
15+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
16+
Debug|Any CPU = Debug|Any CPU
17+
Debug|ARM = Debug|ARM
18+
Debug|ARM64 = Debug|ARM64
19+
Debug|x64 = Debug|x64
20+
Debug|x86 = Debug|x86
21+
Release|Any CPU = Release|Any CPU
22+
Release|ARM = Release|ARM
23+
Release|ARM64 = Release|ARM64
24+
Release|x64 = Release|x64
25+
Release|x86 = Release|x86
26+
EndGlobalSection
27+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
28+
{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
29+
{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
30+
{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
31+
{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Debug|ARM.ActiveCfg = Debug|ARM
32+
{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Debug|ARM.Build.0 = Debug|ARM
33+
{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Debug|ARM.Deploy.0 = Debug|ARM
34+
{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Debug|ARM64.ActiveCfg = Debug|ARM64
35+
{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Debug|ARM64.Build.0 = Debug|ARM64
36+
{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Debug|ARM64.Deploy.0 = Debug|ARM64
37+
{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Debug|x64.ActiveCfg = Debug|x64
38+
{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Debug|x64.Build.0 = Debug|x64
39+
{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Debug|x64.Deploy.0 = Debug|x64
40+
{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Debug|x86.ActiveCfg = Debug|x86
41+
{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Debug|x86.Build.0 = Debug|x86
42+
{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Debug|x86.Deploy.0 = Debug|x86
43+
{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
44+
{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Release|Any CPU.Build.0 = Release|Any CPU
45+
{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Release|Any CPU.Deploy.0 = Release|Any CPU
46+
{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Release|ARM.ActiveCfg = Release|ARM
47+
{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Release|ARM.Build.0 = Release|ARM
48+
{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Release|ARM.Deploy.0 = Release|ARM
49+
{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Release|ARM64.ActiveCfg = Release|ARM64
50+
{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Release|ARM64.Build.0 = Release|ARM64
51+
{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Release|ARM64.Deploy.0 = Release|ARM64
52+
{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Release|x64.ActiveCfg = Release|x64
53+
{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Release|x64.Build.0 = Release|x64
54+
{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Release|x64.Deploy.0 = Release|x64
55+
{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Release|x86.ActiveCfg = Release|x86
56+
{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Release|x86.Build.0 = Release|x86
57+
{452579BF-FF89-46FD-953D-E9D02D71EFDD}.Release|x86.Deploy.0 = Release|x86
58+
{919C3FE7-14E4-48D5-A119-690827FD04B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
59+
{919C3FE7-14E4-48D5-A119-690827FD04B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
60+
{919C3FE7-14E4-48D5-A119-690827FD04B7}.Debug|ARM.ActiveCfg = Debug|Any CPU
61+
{919C3FE7-14E4-48D5-A119-690827FD04B7}.Debug|ARM.Build.0 = Debug|Any CPU
62+
{919C3FE7-14E4-48D5-A119-690827FD04B7}.Debug|ARM64.ActiveCfg = Debug|Any CPU
63+
{919C3FE7-14E4-48D5-A119-690827FD04B7}.Debug|ARM64.Build.0 = Debug|Any CPU
64+
{919C3FE7-14E4-48D5-A119-690827FD04B7}.Debug|x64.ActiveCfg = Debug|Any CPU
65+
{919C3FE7-14E4-48D5-A119-690827FD04B7}.Debug|x64.Build.0 = Debug|Any CPU
66+
{919C3FE7-14E4-48D5-A119-690827FD04B7}.Debug|x86.ActiveCfg = Debug|Any CPU
67+
{919C3FE7-14E4-48D5-A119-690827FD04B7}.Debug|x86.Build.0 = Debug|Any CPU
68+
{919C3FE7-14E4-48D5-A119-690827FD04B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
69+
{919C3FE7-14E4-48D5-A119-690827FD04B7}.Release|Any CPU.Build.0 = Release|Any CPU
70+
{919C3FE7-14E4-48D5-A119-690827FD04B7}.Release|ARM.ActiveCfg = Release|Any CPU
71+
{919C3FE7-14E4-48D5-A119-690827FD04B7}.Release|ARM.Build.0 = Release|Any CPU
72+
{919C3FE7-14E4-48D5-A119-690827FD04B7}.Release|ARM64.ActiveCfg = Release|Any CPU
73+
{919C3FE7-14E4-48D5-A119-690827FD04B7}.Release|ARM64.Build.0 = Release|Any CPU
74+
{919C3FE7-14E4-48D5-A119-690827FD04B7}.Release|x64.ActiveCfg = Release|Any CPU
75+
{919C3FE7-14E4-48D5-A119-690827FD04B7}.Release|x64.Build.0 = Release|Any CPU
76+
{919C3FE7-14E4-48D5-A119-690827FD04B7}.Release|x86.ActiveCfg = Release|Any CPU
77+
{919C3FE7-14E4-48D5-A119-690827FD04B7}.Release|x86.Build.0 = Release|Any CPU
78+
{C89E50F1-7914-4E4C-AAAA-3D66E1FE851B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
79+
{C89E50F1-7914-4E4C-AAAA-3D66E1FE851B}.Debug|Any CPU.Build.0 = Debug|Any CPU
80+
{C89E50F1-7914-4E4C-AAAA-3D66E1FE851B}.Debug|ARM.ActiveCfg = Debug|Any CPU
81+
{C89E50F1-7914-4E4C-AAAA-3D66E1FE851B}.Debug|ARM.Build.0 = Debug|Any CPU
82+
{C89E50F1-7914-4E4C-AAAA-3D66E1FE851B}.Debug|ARM64.ActiveCfg = Debug|Any CPU
83+
{C89E50F1-7914-4E4C-AAAA-3D66E1FE851B}.Debug|ARM64.Build.0 = Debug|Any CPU
84+
{C89E50F1-7914-4E4C-AAAA-3D66E1FE851B}.Debug|x64.ActiveCfg = Debug|Any CPU
85+
{C89E50F1-7914-4E4C-AAAA-3D66E1FE851B}.Debug|x64.Build.0 = Debug|Any CPU
86+
{C89E50F1-7914-4E4C-AAAA-3D66E1FE851B}.Debug|x86.ActiveCfg = Debug|Any CPU
87+
{C89E50F1-7914-4E4C-AAAA-3D66E1FE851B}.Debug|x86.Build.0 = Debug|Any CPU
88+
{C89E50F1-7914-4E4C-AAAA-3D66E1FE851B}.Release|Any CPU.ActiveCfg = Release|Any CPU
89+
{C89E50F1-7914-4E4C-AAAA-3D66E1FE851B}.Release|Any CPU.Build.0 = Release|Any CPU
90+
{C89E50F1-7914-4E4C-AAAA-3D66E1FE851B}.Release|ARM.ActiveCfg = Release|Any CPU
91+
{C89E50F1-7914-4E4C-AAAA-3D66E1FE851B}.Release|ARM.Build.0 = Release|Any CPU
92+
{C89E50F1-7914-4E4C-AAAA-3D66E1FE851B}.Release|ARM64.ActiveCfg = Release|Any CPU
93+
{C89E50F1-7914-4E4C-AAAA-3D66E1FE851B}.Release|ARM64.Build.0 = Release|Any CPU
94+
{C89E50F1-7914-4E4C-AAAA-3D66E1FE851B}.Release|x64.ActiveCfg = Release|Any CPU
95+
{C89E50F1-7914-4E4C-AAAA-3D66E1FE851B}.Release|x64.Build.0 = Release|Any CPU
96+
{C89E50F1-7914-4E4C-AAAA-3D66E1FE851B}.Release|x86.ActiveCfg = Release|Any CPU
97+
{C89E50F1-7914-4E4C-AAAA-3D66E1FE851B}.Release|x86.Build.0 = Release|Any CPU
98+
{7383A470-2747-4914-AD9A-97A39BB6BD5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
99+
{7383A470-2747-4914-AD9A-97A39BB6BD5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
100+
{7383A470-2747-4914-AD9A-97A39BB6BD5C}.Debug|ARM.ActiveCfg = Debug|Any CPU
101+
{7383A470-2747-4914-AD9A-97A39BB6BD5C}.Debug|ARM.Build.0 = Debug|Any CPU
102+
{7383A470-2747-4914-AD9A-97A39BB6BD5C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
103+
{7383A470-2747-4914-AD9A-97A39BB6BD5C}.Debug|ARM64.Build.0 = Debug|Any CPU
104+
{7383A470-2747-4914-AD9A-97A39BB6BD5C}.Debug|x64.ActiveCfg = Debug|Any CPU
105+
{7383A470-2747-4914-AD9A-97A39BB6BD5C}.Debug|x64.Build.0 = Debug|Any CPU
106+
{7383A470-2747-4914-AD9A-97A39BB6BD5C}.Debug|x86.ActiveCfg = Debug|Any CPU
107+
{7383A470-2747-4914-AD9A-97A39BB6BD5C}.Debug|x86.Build.0 = Debug|Any CPU
108+
{7383A470-2747-4914-AD9A-97A39BB6BD5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
109+
{7383A470-2747-4914-AD9A-97A39BB6BD5C}.Release|Any CPU.Build.0 = Release|Any CPU
110+
{7383A470-2747-4914-AD9A-97A39BB6BD5C}.Release|ARM.ActiveCfg = Release|Any CPU
111+
{7383A470-2747-4914-AD9A-97A39BB6BD5C}.Release|ARM.Build.0 = Release|Any CPU
112+
{7383A470-2747-4914-AD9A-97A39BB6BD5C}.Release|ARM64.ActiveCfg = Release|Any CPU
113+
{7383A470-2747-4914-AD9A-97A39BB6BD5C}.Release|ARM64.Build.0 = Release|Any CPU
114+
{7383A470-2747-4914-AD9A-97A39BB6BD5C}.Release|x64.ActiveCfg = Release|Any CPU
115+
{7383A470-2747-4914-AD9A-97A39BB6BD5C}.Release|x64.Build.0 = Release|Any CPU
116+
{7383A470-2747-4914-AD9A-97A39BB6BD5C}.Release|x86.ActiveCfg = Release|Any CPU
117+
{7383A470-2747-4914-AD9A-97A39BB6BD5C}.Release|x86.Build.0 = Release|Any CPU
118+
EndGlobalSection
119+
GlobalSection(SolutionProperties) = preSolution
120+
HideSolutionNode = FALSE
121+
EndGlobalSection
122+
GlobalSection(ExtensibilityGlobals) = postSolution
123+
SolutionGuid = {ACAF7B9A-8030-4F2C-B374-6C90E3E416BF}
124+
EndGlobalSection
125+
EndGlobal

MultiRPC.sln

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,49 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.29201.188
4+
VisualStudioVersion = 16.0.31727.386
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultiRPC", "MultiRPC\MultiRPC.csproj", "{9EA9E3C8-C1A4-4A26-84BD-543789EE437D}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultiRPC", "src\MultiRPC\MultiRPC.csproj", "{FE7EF71E-A0F3-4A23-8125-738FE77797E2}"
77
EndProject
8-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MultiRPCCore", "MultiRPC\MultiRPCCore.csproj", "{8641E29E-5DD4-45A5-A159-7C4A103E40D3}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvaloniaGif", "ext\avalonia.gif\AvaloniaGif\AvaloniaGif.csproj", "{D4EBB986-EDAC-4C0B-AB58-70E4A5C7D2A4}"
9+
EndProject
10+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ext", "ext", "{B7AAF9E7-1C1E-4376-BAF6-D2FCA8B39CDF}"
11+
EndProject
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultiRPC.SourceGen", "src\MultiRPC.SourceGen\MultiRPC.SourceGen.csproj", "{3369169D-31C0-4A74-A5A9-F2BB1EA80705}"
13+
EndProject
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscordRPC", "ext\discord-rpc-csharp\DiscordRPC\DiscordRPC.csproj", "{46073C54-E149-457D-9E6B-993A780E6AE8}"
915
EndProject
1016
Global
1117
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1218
Debug|Any CPU = Debug|Any CPU
1319
Release|Any CPU = Release|Any CPU
1420
EndGlobalSection
1521
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16-
{9EA9E3C8-C1A4-4A26-84BD-543789EE437D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
17-
{9EA9E3C8-C1A4-4A26-84BD-543789EE437D}.Debug|Any CPU.Build.0 = Debug|Any CPU
18-
{9EA9E3C8-C1A4-4A26-84BD-543789EE437D}.Release|Any CPU.ActiveCfg = Release|Any CPU
19-
{9EA9E3C8-C1A4-4A26-84BD-543789EE437D}.Release|Any CPU.Build.0 = Release|Any CPU
20-
{8641E29E-5DD4-45A5-A159-7C4A103E40D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21-
{8641E29E-5DD4-45A5-A159-7C4A103E40D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
22-
{8641E29E-5DD4-45A5-A159-7C4A103E40D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
23-
{8641E29E-5DD4-45A5-A159-7C4A103E40D3}.Release|Any CPU.Build.0 = Release|Any CPU
22+
{FE7EF71E-A0F3-4A23-8125-738FE77797E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
23+
{FE7EF71E-A0F3-4A23-8125-738FE77797E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
24+
{FE7EF71E-A0F3-4A23-8125-738FE77797E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
25+
{FE7EF71E-A0F3-4A23-8125-738FE77797E2}.Release|Any CPU.Build.0 = Release|Any CPU
26+
{D4EBB986-EDAC-4C0B-AB58-70E4A5C7D2A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27+
{D4EBB986-EDAC-4C0B-AB58-70E4A5C7D2A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
28+
{D4EBB986-EDAC-4C0B-AB58-70E4A5C7D2A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
29+
{D4EBB986-EDAC-4C0B-AB58-70E4A5C7D2A4}.Release|Any CPU.Build.0 = Release|Any CPU
30+
{3369169D-31C0-4A74-A5A9-F2BB1EA80705}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
31+
{3369169D-31C0-4A74-A5A9-F2BB1EA80705}.Debug|Any CPU.Build.0 = Debug|Any CPU
32+
{3369169D-31C0-4A74-A5A9-F2BB1EA80705}.Release|Any CPU.ActiveCfg = Release|Any CPU
33+
{3369169D-31C0-4A74-A5A9-F2BB1EA80705}.Release|Any CPU.Build.0 = Release|Any CPU
34+
{46073C54-E149-457D-9E6B-993A780E6AE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
35+
{46073C54-E149-457D-9E6B-993A780E6AE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
36+
{46073C54-E149-457D-9E6B-993A780E6AE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
37+
{46073C54-E149-457D-9E6B-993A780E6AE8}.Release|Any CPU.Build.0 = Release|Any CPU
2438
EndGlobalSection
2539
GlobalSection(SolutionProperties) = preSolution
2640
HideSolutionNode = FALSE
2741
EndGlobalSection
2842
GlobalSection(ExtensibilityGlobals) = postSolution
29-
SolutionGuid = {5FEA78DE-0EAB-4673-B5C1-989FD3E64C39}
43+
SolutionGuid = {CD6F52B4-E174-4EB3-BAF8-90EFDDB47450}
44+
EndGlobalSection
45+
GlobalSection(NestedProjects) = preSolution
46+
{D4EBB986-EDAC-4C0B-AB58-70E4A5C7D2A4} = {B7AAF9E7-1C1E-4376-BAF6-D2FCA8B39CDF}
47+
{46073C54-E149-457D-9E6B-993A780E6AE8} = {B7AAF9E7-1C1E-4376-BAF6-D2FCA8B39CDF}
3048
EndGlobalSection
3149
EndGlobal

MultiRPC/App.config

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

0 commit comments

Comments
 (0)