8000 Trying a workaround · DNNCommunity/Dnn.ModuleCreator@b0e661c · GitHub
[go: up one dir, main page]
Skip to content

Commit b0e661c

Browse files
valadasvaladas
committed
Trying a workaround
1 parent 91781d8 commit b0e661c

File tree

1 file changed

+28
-22
lines changed

1 file changed

+28
-22
lines changed

‎build/Build.cs

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
using static Nuke.Common.Tools.Git.GitTasks;
2626
using static Nuke.Common.Tools.MSBuild.MSBuildTasks;
2727
using Nuke.Common.CI;
28+
using System.ComponentModel.Design.Serialization;
2829

2930
[GitHubActions(
3031
name: "Build",
@@ -56,31 +57,30 @@ class Build : NukeBuild
5657

5758

5859
readonly string ModuleName = "Dnn.Modules.ModuleCreator";
59-
readonly IReadOnlyCollection<string> InstallFiles;
60-
readonly IReadOnlyCollection<string> BinaryFiles;
61-
readonly bool IsInDesktopModules;
62-
readonly AbsolutePath ArtifactsDirectory;
63-
readonly AbsolutePath StagingDirectory;
64-
readonly AbsolutePath DeployDirectory;
65-
readonly AbsolutePath DnnModuleInstallDirectory;
60+
IReadOnlyCollection<string> InstallFiles;
61+
IReadOnlyCollection<string> BinaryFiles;
62+
bool IsInDesktopModules;
63+
readonly AbsolutePath ArtifactsDirectory = RootDirectory / "Artifacts";
64+
readonly AbsolutePath StagingDirectory = RootDirectory / "Artifacts" / "Staging";
65+
readonly AbsolutePath DeployDirectory = RootDirectory.Parent / "Admin" / "ModuleCreator";
66+
readonly AbsolutePath DnnModuleInstallDirectory = RootDirectory.Parent.Parent / "Install" / "Module";
6667
string ModuleBranch;
6768

68-
public Build()
69-
{
70-
using (var block = Logger.Block("Info"))
69+
Target SetupVariables => _ => _
70+
.Before(Package)
71+
.Executes(() =>
7172
{
72-
Logger.Normal(Configuration);
73-
}
74-
InstallFiles = GlobFiles(RootDirectory, "*.txt", "*.dnn");
75-
ArtifactsDirectory = RootDirectory / "Artifacts";
76-
StagingDirectory = ArtifactsDirectory / "Staging";
77-
BinaryFiles = GlobFiles(RootDirectory / "bin" / Configuration.ToString(), $"{ModuleName}.dll");
78-
IsInDesktopModules = RootDirectory.Parent.ToString().EndsWith("DesktopModules");
79-
DeployDirectory = IsInDesktopModules ? RootDirectory.Parent / "Admin" / "ModuleCreator" : null;
80-
DnnModuleInstallDirectory = RootDirectory.Parent.Parent / "Install" / "Module";
81-
}
73+
using (var block = Logger.Block("Info"))
74+
{
75+
Logger.Normal(Configuration);
76+
}
77+
InstallFiles = GlobFiles(RootDirectory, "*.txt", "*.dnn");
78+
BinaryFiles = GlobFiles(RootDirectory / "bin" / Configuration.ToString(), $"{ModuleName}.dll");
79+
IsInDesktopModules = RootDirectory.Parent.ToString().EndsWith("DesktopModules");
80+
});
8281

8382
Target Clean => _ => _
83+
.DependsOn(SetupVariables)
8484
.Before(Restore)
8585
.Before(Package)
8686
.Executes(() =>
@@ -89,6 +89,7 @@ public Build()
8989
});
9090

9191
Target Restore => _ => _
92+
.DependsOn(SetupVariables)
9293
.Executes(() =>
9394
{
9495
var project = Solution.GetProject(ModuleName);
@@ -97,6 +98,7 @@ public Build()
9798
});
9899

99100
Target SetManifestVersions => _ => _
101+
.DependsOn(SetupVariables)
100102
.Executes(() =>
101103
{
102104
var manifests = GlobFiles(RootDirectory, "**/*.dnn");
@@ -124,6 +126,7 @@ public Build()
124126
Target TagRelease => _ => _
125127
.OnlyWhenDynamic(() => ModuleBranch == "main" || ModuleBranch.StartsWith("release"))
126128
.OnlyWhenDynamic(() => !string.IsNullOrEmpty(GithubToken))
129+
.DependsOn(SetupVariables)
127130
.DependsOn(SetBranch)
128131
.Executes(() =>
129132
{
@@ -149,6 +152,7 @@ public Build()
149152
});
150153

151154
Target SetBranch => _ => _
155+
.DependsOn(SetupVariables)
152156
.Executes(() =>
153157
{
154158
ModuleBranch = GitRepository.Branch.StartsWith("refs/") ? GitRepository.Branch.Substring(11) : GitRepository.Branch;
@@ -167,7 +171,9 @@ public Build()
167171
.Produces(ArtifactsDirectory / "*.zip")
168172
.Executes(() =>
169173
{
170-
Logger.Normal("Configuration: ", Configuration.ToString());
174+
var configuration = IsLocalBuild ? "Debug" : "Release";
175+
Logger.Normal(IsLocalBuild);
176+
Logger.Normal("Configuration: ", configuration);
171177
EnsureCleanDirectory(StagingDirectory);
172178
Compress(RootDirectory, StagingDirectory / "Resources.zip", f =>
173179
f.Extension == ".ascx" ||
@@ -177,7 +183,7 @@ public Build()
177183
f.Extension == ".css" ||
178184
f.Directory.ToString().Contains("Templates"));
179185

180-
var symbolFiles = GlobFiles(RootDirectory / "bin" / Configuration.ToString(), $"{ModuleName}.pdb");
186+
var symbolFiles = GlobFiles(RootDirectory / "bin" / configuration.ToString(), $"{ModuleName}.pdb");
181187
Logger.Normal("Symbol Files: ", symbolFiles);
182188
Helpers.AddFilesToZip(StagingDirectory / "Symbols.zip", symbolFiles);
183189

0 commit comments

Comments
 (0)
0