*修复安装器错误

MakesYT · Jan 20, 2025 · 75319ff · 75319ff
1 parent 56f7a13
commit 75319ff
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/ModernInstaller b/ModernInstaller
diff --git a/NodifyM.Avalonia b/NodifyM.Avalonia
diff --git a/build/Build.cs b/build/Build.cs
@@ -7,6 +7,7 @@
 using System.Text;
 using Nuke.Common;
 using Nuke.Common.CI.GitHubActions;
+using Nuke.Common.Execution;
 using Nuke.Common.Git;
 using Nuke.Common.IO;
 using Nuke.Common.ProjectModel;
@@ -51,7 +52,7 @@ class Build : NukeBuild
                 .SetProjectFile(AvaloniaProject.Path)
                 .SetRuntime("win-x64"));
             DotNetRestore(c => new DotNetRestoreSettings()
-                .SetProjectFile("KitopiaEx")
+                .SetProjectFile( RootDirectory/"KitopiaEx"/"KitopiaEx.csproj")
                 .SetRuntime("win-x64"));
         });
 
@@ -60,7 +61,7 @@ class Build : NukeBuild
         .Executes(() =>
         {
             DotNetBuild(c => new DotNetBuildSettings()
-                .SetProjectFile("KitopiaEx")
+                .SetProjectFile( RootDirectory/"KitopiaEx"/"KitopiaEx.csproj")
                 .SetOutputDirectory(RootDirectory / "buildTest" / "plugins" / "KitopiaEx")
                 .SetRuntime("win-x64"));
             DotNetBuild(c => new DotNetBuildSettings()
@@ -159,6 +160,7 @@ class Build : NukeBuild
 
     Target PackDebug => _ => _
         .OnlyWhenDynamic(() => FinishedTargets.Contains(CreateRelease))
+        .DependsOn(CreateRelease)
         .After(CreateRelease)
         .Executes(() =>
         {
@@ -182,6 +184,7 @@ class Build : NukeBuild
     Target Pack => _ => _
         .OnlyWhenDynamic(() => FinishedTargets.Contains(CreateRelease))
         .After(CreateRelease)
+        .DependsOn(CreateRelease)
         .Executes(() =>
             {
                 var rootDirectory = RootDirectory / "Publish";
@@ -228,6 +231,7 @@ class Build : NukeBuild
     Target PackSelf => _ => _
         .OnlyWhenDynamic(() => FinishedTargets.Contains(CreateRelease))
         .After(CreateRelease)
+        .DependsOn(CreateRelease)
         .Executes(() =>
             {
                 var rootDirectory_self = RootDirectory / "Publish_SelfContained";
@@ -345,6 +349,7 @@ class Build : NukeBuild
         .OnlyWhenDynamic(() => FinishedTargets.Contains(CreateRelease))
         .OnlyWhenDynamic(() => FinishedTargets.Contains(BuildNativeInstaller))
         .After(CreateRelease)
+        .DependsOn(CreateRelease)
         .DependsOn(BuildNativeInstaller)
         .Executes((() =>
         {
+6 −0		ModernInstaller/ModernInstaller.csproj
+11 −2		ModernInstaller/ViewModels/MainWindowViewModel.cs
+6 −1		NodifyM.Avalonia.Example/MainWindow.axaml
+15 −5		NodifyM.Avalonia.Example/MainWindowViewModel.cs
+14 −0		NodifyM.Avalonia/Controls/BaseNode.axaml.cs
+3 −3		NodifyM.Avalonia/NodifyM.Avalonia.csproj
+2 −0		NodifyM.Avalonia/ViewModelBase/ConnectorViewModelBase.cs
+2 −2		NodifyM.Avalonia/ViewModelBase/NodeViewModelBase.cs
+5 −0		README.md