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.

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

Preview #2

Open
wants to merge 27 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
cd17a75
Ver 2.2.0-Alpha.1: Use JSON to Save Configuration.
Shiroiame-Kusu Jul 24, 2024
5655ebe
I‘m a idiot.
Shiroiame-Kusu Jul 25, 2024
16ac3e0
Ver 2.2.0-Alpha.2: Show Announcement.
Shiroiame-Kusu Jul 29, 2024
56601b6
Update README.md
Shiroiame-Kusu Jul 29, 2024
6ed1bf0
Update README.md
Shiroiame-Kusu Jul 29, 2024
1f3d9b9
Ver 2.2.0-Alpha.3: Now You Can Change the Themes.
Shiroiame-Kusu Aug 7, 2024
1ba353e
Ver 2.2.0-Alpha.3: Now You Can Change the Themes.
Shiroiame-Kusu Aug 7, 2024
b400726
Still this Version: Added Some Small Features.
Shiroiame-Kusu Aug 8, 2024
746e4c7
Ver 2.2.0-Alpha.5: Add EasterEgg
Shiroiame-Kusu Aug 18, 2024
32cc96d
Ver 2.2.0-Alpha.6: BIG FUCKING TRASH.
Shiroiame-Kusu Sep 8, 2024
703f68e
Ver 2.2.0-Alpha.7: Finished URL Protocol Handler.
Shiroiame-Kusu Sep 10, 2024
7586423
Update
Shiroiame-Kusu Oct 7, 2024
4d6f951
Update
Shiroiame-Kusu Oct 7, 2024
3034c01
Ver 2.3.0-Alpha.1: now it will work properly on api v2
Shiroiame-Kusu Oct 7, 2024
9f6c86f
Ver 2.3.0-Alpha.1: Fix some bugs and optimise
Shiroiame-Kusu Oct 11, 2024
19d95ff
Ver 2.3.0-Alpha.2: Add Delete Feature.
Shiroiame-Kusu Oct 20, 2024
9455edd
Ver 2.3.0-Alpha.3
Shiroiame-Kusu Oct 30, 2024
19b86c4
Ver2.3.0-Alpha.4: Rewrite Login Page.
Shiroiame-Kusu Nov 2, 2024
e96567b
Ver 2.3.0-A5: Fix a OverFlow Exception.
Shiroiame-Kusu Nov 8, 2024
e9111dd
Attempt to Fix #1
Shiroiame-Kusu Dec 2, 2024
7713610
Ver 2.4.0-Alpha.1
Shiroiame-Kusu Dec 25, 2024
adb7938
Update Build.yml
Shiroiame-Kusu Dec 25, 2024
0a7832d
Ver 2.4.0-Alpha.1 Hotfix 1
Shiroiame-Kusu Dec 26, 2024
8070a4e
Ver 2.4.0-Alpha.2: Fixed Avatar Fetching.
Shiroiame-Kusu Dec 26, 2024
394d7d5
Ver 2.4.0-Alpha.2
Shiroiame-Kusu Jan 8, 2025
fcd8f23
Update README.md
Shiroiame-Kusu Jan 15, 2025
bfdd675
Ver 2.4.0-Alpha.3
Shiroiame-Kusu Jan 27, 2025
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
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name: "BUG反馈"
description: LocyanFrp的部分行为不符合预期
description: Kairo的部分行为不符合预期
title: "BUG反馈 <在此处简单描述>"
labels: ["🐛Bug"]

body:
- type: input
id: version
attributes:
label: 当前使用的LocyanFrp版本
label: 当前使用的Kairo版本
description: 设置
validations:
required: true
Expand All @@ -16,7 +16,7 @@ body:
id: expectation
attributes:
label: 你的预期
description: 预期LocyanFrp应该的反应
description: 预期Kairo应该的反应
placeholder: |
1. ...
validations:
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/crash_report.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name: "崩溃反馈"
description: LocyanFrp发生了莫名其妙的崩溃
description: Kairo发生了莫名其妙的崩溃
title: "崩溃反馈 <在此处简单描述报错信息>"
labels: ["❗ 崩溃"]

body:
- type: input
id: version
attributes:
label: 当前使用的LocyanFrp版本
label: 当前使用的Kairo版本
description: 设置
validations:
required: true
Expand Down
37 changes: 17 additions & 20 deletions .github/workflows/Build.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build
name: Build

on:
push:
Expand All @@ -19,53 +19,50 @@ jobs:
- name: Install .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
dotnet-version: 9.0.x

- name: Write Build info
shell: cmd
run: |
cmd /c echo GITHUB ACTION #${{github.run_number}} >${{ github.workspace }}\LoCyanFrpDesktop\buildinfo.info
cmd /c echo %date% %time% >>${{ github.workspace }}\LoCyanFrpDesktop\buildinfo.info
cmd /c echo ${{github.ref}} ${{github.sha}}>>${{ github.workspace }}\LoCyanFrpDesktop\buildinfo.info
cmd /c echo GITHUB ACTION #${{github.run_number}} >${{ github.workspace }}\Kairo\buildinfo.info
cmd /c echo %date% %time% >>${{ github.workspace }}\Kairo\buildinfo.info
cmd /c echo ${{github.ref}} ${{github.sha}}>>${{ github.workspace }}\Kairo\buildinfo.info

- name: DotNet restore
run: dotnet restore

- name: Build the project(Release)
run: dotnet build -p:Configuration=Release "LoCyanFrpDesktop/LoCyanFrpDesktop.csproj"
run: dotnet build -p:Configuration=Release "Kairo/Kairo.csproj"

- name: Build the project(Debug)
run: dotnet build "LoCyanFrpDesktop/LoCyanFrpDesktop.csproj"

- name: Upload LocyanFrp(Release,dotnet6-windows)
- name: Upload Kairo(Release,dotnet9-windows)
uses: actions/upload-artifact@v4
with:
name: LoCyanFrpDesktop_dotnet6
path: ${{ github.workspace }}\LoCyanFrpDesktop\bin\Release\net6.0-windows
name: Kairo_dotnet9
path: ${{ github.workspace }}\Kairo\bin\Release\net9.0-windows
if-no-files-found: ignore

- name: Build the project(Publish)
run: |
dotnet clean
dotnet publish "LoCyanFrpDesktop/LoCyanFrpDesktop.csproj" -f net6.0-windows --no-self-contained -p:PublishSingleFile=true -p:RuntimeIdentifier=win-x64 -p:IncludeContentInSingleFile=true
dotnet publish "Kairo/Kairo.csproj" -f net9.0-windows --no-self-contained -p:PublishSingleFile=true -p:RuntimeIdentifier=win-x64 -p:IncludeContentInSingleFile=true

- name: Upload LocyanFrp(Publish)
- name: Upload Kairo(Publish)
uses: actions/upload-artifact@v4
with:
name: LoCyanFrpDesktop_dotnet6_publish
path: ${{ github.workspace }}\LoCyanFrpDesktop\bin\Debug\net6.0-windows\win-x64\publish
name: Kairo_dotnet9_publish
path: ${{ github.workspace }}\Kairo\bin\Debug\net9.0-windows\win-x64\publish
if-no-files-found: ignore

- name: Build the project(Publish,Single File)
run: |
dotnet clean
dotnet publish "LoCyanFrpDesktop/LoCyanFrpDesktop.csproj" -f net6.0-windows -r win-x64 -p:PublishSingleFile=true -p:RuntimeIdentifier=win-x64 -p:IncludeContentInSingleFile=true -p:Configuration=Release --sc -p:IncludeAllContentForSelfExtract=true -p:EnableCompressionInSingleFile=true
dotnet publish "Kairo/Kairo.csproj" -f net9.0-windows -r win-x64 -p:PublishSingleFile=true -p:RuntimeIdentifier=win-x64 -p:IncludeContentInSingleFile=true -p:Configuration=Release --sc -p:IncludeAllContentForSelfExtract=true -p:EnableCompressionInSingleFile=true

- name: Upload LocyanFrp(Publish,Single File)
- name: Upload Kairo(Publish,Single File)
uses: actions/upload-artifact@v4
with:
name: LoCyanFrpDesktop_dotnet6_publish_SingleFile
path: ${{ github.workspace }}\LoCyanFrpDesktop\bin\Release\net6.0-windows\win-x64\publish
name: Kairo_dotnet9_publish_SingleFile
path: ${{ github.workspace }}\Kairo\bin\Release\net9.0-windows\win-x64\publish
if-no-files-found: ignore


2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -361,4 +361,4 @@ MigrationBackup/

# Fody - auto-generated XML schema
FodyWeavers.xsd
/LoCyanFrpDesktop/Output
/Kairo/Output
13 changes: 13 additions & 0 deletions .idea/.idea.Kairo/.idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .idea/.idea.Kairo/.idea/encodings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/.idea.Kairo/.idea/indexLayout.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/.idea.Kairo/.idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions LoCyanFrpDesktop-Impl.sln → Kairo.sln
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.6.33829.357
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LoCyanFrpDesktop", "LoCyanFrpDesktop\LoCyanFrpDesktop.csproj", "{D1D59A31-105D-4B83-A49D-B9F761336995}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kairo", "Kairo\Kairo.csproj", "{D1D59A31-105D-4B83-A49D-B9F761336995}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Updater", "Updater\Updater.csproj", "{1C846730-8BC3-49D4-8786-106AF8C4D160}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LoCyanFrp", "LoCyanFrp", "{0301C876-91BE-4AE9-92C9-254EBFA8B940}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{7A9FD3C3-52EE-4162-B97A-6F7EB2F1821C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{642C59C0-F62F-4AD8-9951-1625AED50385}"
Expand Down Expand Up @@ -37,8 +35,6 @@ Global
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{1C846730-8BC3-49D4-8786-106AF8C4D160} = {7A9FD3C3-52EE-4162-B97A-6F7EB2F1821C}
{7A9FD3C3-52EE-4162-B97A-6F7EB2F1821C} = {0301C876-91BE-4AE9-92C9-254EBFA8B940}
{E4C25792-97C8-4E61-B0B3-57E3ED793DC5} = {0301C876-91BE-4AE9-92C9-254EBFA8B940}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {632713F8-B531-4B56-80C3-38FD07E244FA}
Expand Down
6 changes: 3 additions & 3 deletions LoCyanFrpDesktop/App.config → Kairo/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="LoCyanFrpDesktop.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="Kairo.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
<userSettings>
<LoCyanFrpDesktop.Properties.Settings>
<Kairo.Properties.Settings>
<setting name="LoginToken" serializeAs="String">
<value>null</value>
</setting>
Expand All @@ -28,6 +28,6 @@
<setting name="DebugMode" serializeAs="String">
<value>False</value>
</setting>
</LoCyanFrpDesktop.Properties.Settings>
</Kairo.Properties.Settings>
</userSettings>
</configuration>
4 changes: 2 additions & 2 deletions LoCyanFrpDesktop/App.xaml → Kairo/App.xaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Application x:Class="LoCyanFrpDesktop.App"
<Application x:Class="Kairo.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:LoCyanFrpDesktop"
xmlns:local="clr-namespace:Kairo"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
StartupUri="MainWindow.xaml">
<Application.Resources>
Expand Down
Loading