Skip to content
This repository was archived by the owner on Mar 19, 2025. It is now read-only.

Commit 4e1038f

Browse files
+ beta2
1 parent f1e7eb6 commit 4e1038f

File tree

3 files changed

+28
-14
lines changed

3 files changed

+28
-14
lines changed

Build/build.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
"defaultNuGetPackagesDirectory": "./build-artifact-nuget-packages",
55
"defaultChocolateyPackagesDirectory": "./build-artifact-cli-packages",
66
"defaultNuspecVersion": "0.1.0",
7-
8-
"defaultDocsBuildEnabled" : false,
9-
"defaultDocsViewFolder" : "",
7+
8+
"defaultDocsBuildEnabled": false,
9+
"defaultDocsViewFolder": "",
10+
"defaultDocsSamplesFolder": "",
1011
"defaultDocsRepoFolder" : "",
1112
"defaultDocsBranch" : "",
1213
"defaultDocsFileExtensions" : [
@@ -21,7 +22,7 @@
2122
"customNuspecs": [
2223
{
2324
"Id": "SubPointSolutions.CakeBuildTools",
24-
"Version": "0.1.0-beta1",
25+
"Version": "0.1.0-beta2",
2526
"Dependencies": [ ],
2627
"LicenseUrl": "https://github.com/SubPointSolutions/CakeBuildTools/licence",
2728
"ProjectUrl": "https://github.com/SubPointSolutions/CakeBuildTools",

SubPointSolutions.CakeBuildTools/Scripts/SubPointSolutions.CakeBuild.Core.cake

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -857,7 +857,7 @@ var defaultActionDocsMerge = Task("Action-Docs-Merge")
857857
if(String.IsNullOrEmpty(defaultDocsViewFolder))
858858
throw new Exception("defaultDocsViewFolder is null or empty. Update json config");
859859

860-
var defaultDocsRepoFolder = (string)jsonConfig["defaultDocsRepoFolder"];
860+
var defaultDocsRepoFolder = (string)jsonConfig["defaultDocsRepoFolder"];
861861
if(String.IsNullOrEmpty(defaultDocsRepoFolder))
862862
throw new Exception("defaultDocsRepoFolder is null or empty. Update json config");
863863

@@ -885,6 +885,7 @@ var defaultActionDocsMerge = Task("Action-Docs-Merge")
885885
var docsRepoUrl = @"https://github.com/SubPointSolutions/subpointsolutions-docs";
886886

887887
var dstDocsPath = string.Format(@"{0}/subpointsolutions-docs/SubPointSolutions.Docs/Views", docsRepoFolder);
888+
var dstDocsSamplesPath = string.Format(@"{0}/subpointsolutions-docs/SubPointSolutions.Docs/SampleFiles", docsRepoFolder);
888889

889890
var docsEnvironmentVars = new [] {
890891
"ci.docs.username",
@@ -964,6 +965,15 @@ var defaultActionDocsMerge = Task("Action-Docs-Merge")
964965
mergeCmd.Add(string.Format("cd '{0}'", docsRepoFolder));
965966
mergeCmd.Add(string.Format("copy-item '{0}' '{1}' -Recurse -Force", srcDocsPath, dstDocsPath));
966967

968+
// copying samples
969+
var defaultDocsSampleFilesFolder = (string)jsonConfig["defaultDocsSampleFilesFolder"];
970+
971+
if(!String.IsNullOrEmpty(defaultDocsSampleFilesFolder))
972+
{
973+
var defaultDocsSampleFilesFolderFullPath = System.IO.Path.GetFullPath(System.IO.Path.Combine(defaultSolutionDirectory,defaultDocsSampleFilesFolder));
974+
mergeCmd.Add(string.Format("copy-item '{0}' '{1}' -Recurse -Force", defaultDocsSampleFilesFolderFullPath, dstDocsSamplesPath));
975+
}
976+
967977
foreach(var defaultDocsFileExtension in defaultDocsFileExtensions) {
968978
Verbose(String.Format(" - adding extension:[{0}]",defaultDocsFileExtension));
969979
mergeCmd.Add(string.Format("git add {0} -f", defaultDocsFileExtension));

SubPointSolutions.CakeBuildTools/Scripts/build-template.json

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,30 @@
44
"defaultNuGetPackagesDirectory": "./build-artifact-nuget-packages",
55
"defaultChocolateyPackagesDirectory": "./build-artifact-cli-packages",
66
"defaultNuspecVersion": "0.1.0",
7-
8-
"defaultDocsViewFolder" : "SubPointSolutions.Docs/Views/SPMeta2-VS",
9-
"defaultDocsRepoFolder" : "m2-vs",
10-
"defaultDocsBranch" : "wyam-dev",
11-
"defaultDocsFileExtensions" : [
7+
8+
"defaultDocsViewFolder": "SubPointSolutions.Docs/Views/SPMeta2-VS",
9+
"defaultDocsRepoFolder": "m2-vs",
10+
"defaultDocsAdditionalFolders": [
11+
12+
],
13+
"defaultDocsBranch": "wyam-dev",
14+
"defaultDocsFileExtensions": [
1215
"*.md",
1316
"*.cs",
1417
"*.cshtml"
1518
],
16-
19+
1720
"defaultTestCategories": [
1821
"CI.Core"
1922
],
2023
"customNuspecs": [
21-
24+
2225
],
2326
"customChocolateySpecs": [
24-
27+
2528
],
2629
"defaultTestAssemblyPaths": [
27-
30+
2831
],
2932
"defaultBuildDirs": [ ],
3033
"defaultEnvironmentVariables": [ ]

0 commit comments

Comments
 (0)