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

工作流: 编译子模块 #89

Merged
merged 7 commits into from
May 4, 2024
Merged

工作流: 编译子模块 #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dfcdd62
工作流: 子模块 build.yml
Controllerdestiny May 4, 2024
9fd28db
工作流: 子模块 dotnet.yml
Controllerdestiny May 4, 2024
b2ffc51
工作流: 分支编译 dotnet.yml
Controllerdestiny May 4, 2024
70d71c3
更新: SimultaneousUseFix 项目引用
Controllerdestiny May 4, 2024
b88c763
Merge branch 'main' of https://github.com/Controllerdestiny/TShockPlugin
Controllerdestiny May 4, 2024
ca957ae
工作流: 删除编译分支 build.yml
Controllerdestiny May 4, 2024
daf3ea7
Update dotnet.yml
Controllerdestiny May 4, 2024
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
4 changes: 3 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ jobs:

steps:
- uses: actions/checkout@v4

with:
submodules: 'recursive'

- name: Install .NET
uses: actions/setup-dotnet@v3
with:
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/dotnet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,17 @@ name: NET

on:
push:
branches: [ "master","cai" ]
branches: [ "master","cai"]

jobs:
Build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

with:
submodules: 'recursive'

- name: Initialize .NET 6
uses: actions/setup-dotnet@v3
env:
Expand Down
30 changes: 30 additions & 0 deletions Plugin.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShortCommand", "ShortComman
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DTEntryBlock", "DTEntryBlock\DTEntryBlock.csproj", "{1486C0F5-9A7D-4530-B73F-4D1938F0B083}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Plugin", "Yaaiomni\Core\Plugin.csproj", "{E384B4DB-BC07-46B8-97A8-F9A1CDBB20C1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Misc", "Yaaiomni\Misc\Misc.csproj", "{9A5A7344-A47A-4DC4-A23D-56B92B7F051B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SourceGen", "Yaaiomni\SourceGen\SourceGen.csproj", "{C9B00432-3802-489F-B2D1-C27C36B17DA1}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -676,6 +682,30 @@ Global
{1486C0F5-9A7D-4530-B73F-4D1938F0B083}.Release|Any CPU.Build.0 = Release|Any CPU
{1486C0F5-9A7D-4530-B73F-4D1938F0B083}.Release|x64.ActiveCfg = Release|Any CPU
{1486C0F5-9A7D-4530-B73F-4D1938F0B083}.Release|x64.Build.0 = Release|Any CPU
{E384B4DB-BC07-46B8-97A8-F9A1CDBB20C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E384B4DB-BC07-46B8-97A8-F9A1CDBB20C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E384B4DB-BC07-46B8-97A8-F9A1CDBB20C1}.Debug|x64.ActiveCfg = Debug|Any CPU
{E384B4DB-BC07-46B8-97A8-F9A1CDBB20C1}.Debug|x64.Build.0 = Debug|Any CPU
{E384B4DB-BC07-46B8-97A8-F9A1CDBB20C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E384B4DB-BC07-46B8-97A8-F9A1CDBB20C1}.Release|Any CPU.Build.0 = Release|Any CPU
{E384B4DB-BC07-46B8-97A8-F9A1CDBB20C1}.Release|x64.ActiveCfg = Release|Any CPU
{E384B4DB-BC07-46B8-97A8-F9A1CDBB20C1}.Release|x64.Build.0 = Release|Any CPU
{9A5A7344-A47A-4DC4-A23D-56B92B7F051B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9A5A7344-A47A-4DC4-A23D-56B92B7F051B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9A5A7344-A47A-4DC4-A23D-56B92B7F051B}.Debug|x64.ActiveCfg = Debug|Any CPU
{9A5A7344-A47A-4DC4-A23D-56B92B7F051B}.Debug|x64.Build.0 = Debug|Any CPU
{9A5A7344-A47A-4DC4-A23D-56B92B7F051B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9A5A7344-A47A-4DC4-A23D-56B92B7F051B}.Release|Any CPU.Build.0 = Release|Any CPU
{9A5A7344-A47A-4DC4-A23D-56B92B7F051B}.Release|x64.ActiveCfg = Release|Any CPU
{9A5A7344-A47A-4DC4-A23D-56B92B7F051B}.Release|x64.Build.0 = Release|Any CPU
{C9B00432-3802-489F-B2D1-C27C36B17DA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C9B00432-3802-489F-B2D1-C27C36B17DA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C9B00432-3802-489F-B2D1-C27C36B17DA1}.Debug|x64.ActiveCfg = Debug|Any CPU
{C9B00432-3802-489F-B2D1-C27C36B17DA1}.Debug|x64.Build.0 = Debug|Any CPU
{C9B00432-3802-489F-B2D1-C27C36B17DA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C9B00432-3802-489F-B2D1-C27C36B17DA1}.Release|Any CPU.Build.0 = Release|Any CPU
{C9B00432-3802-489F-B2D1-C27C36B17DA1}.Release|x64.ActiveCfg = Release|Any CPU
{C9B00432-3802-489F-B2D1-C27C36B17DA1}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
4 changes: 1 addition & 3 deletions SimultaneousUseFix/SimultaneousUseFix.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
<Import Project="..\template.targets" />

<ItemGroup>
<Reference Include="Chireiden.TShock.Omni">
<HintPath>..\lib\Chireiden.TShock.Omni.dll</HintPath>
</Reference>
<ProjectReference Include="..\Yaaiomni\Core\Plugin.csproj" />
</ItemGroup>

</Project>
Loading