Some changes to choco package (files in root of package, etc.)

Wyamio · Jan 9, 2018 · a13c644 · a13c644
1 parent 5e452f2
commit a13c644
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/build.cake b/build.cake
@@ -49,7 +49,7 @@ var version = releaseNotes.Version.ToString();
 var semVersion = version + (isLocal ? string.Empty : string.Concat("-build-", buildNumber));
 
 var buildDir = Directory("./src/clients/Wyam/bin") + Directory(configuration);
-var buildResultDir = Directory("./build") + Directory(semVersion);
+var buildResultDir = Directory("./build");
 var nugetRoot = buildResultDir + Directory("nuget");
 var chocoRoot = buildResultDir + Directory("choco");
 var binDir = buildResultDir + Directory("bin");
@@ -282,13 +282,13 @@ Task("Create-Tools-Package")
     });
 
 Task("Create-Chocolatey-Package")
-    .IsDependentOn("Build")
+    .IsDependentOn("Copy-Files")
     .Does(() => {
-        var nuspecFile = GetFiles("./nuspec/chocolatey/**/*.nuspec").FirstOrDefault();
+        var nuspecFile = GetFiles("./src/clients/Chocolatey/*.nuspec").FirstOrDefault();
         ChocolateyPack(nuspecFile, new ChocolateyPackSettings {
             Version = semVersion,
-            OutputDirectory = string.Format("./build/{0}/choco", semVersion),
-            WorkingDirectory = string.Format("./build/{0}", semVersion)
+            OutputDirectory = "./build/choco",
+            WorkingDirectory = "./build"
         });
     });
 

diff --git a/nuspec/chocolatey/VERIFICATION.TXT → src/clients/Chocolatey/VERIFICATION.TXT b/nuspec/chocolatey/VERIFICATION.TXT → src/clients/Chocolatey/VERIFICATION.TXT
diff --git a/nuspec/chocolatey/wyam.nuspec → src/clients/Chocolatey/wyam.nuspec b/nuspec/chocolatey/wyam.nuspec → src/clients/Chocolatey/wyam.nuspec
@@ -21,8 +21,7 @@ All release notes for Wyam can be found on the GitHub site - https://github.com/
     <tags>Wyam Static StaticContent StaticSite Blog BlogEngine</tags>
   </metadata>
   <files>
-    <file src="..\..\build\**\bin\*" target="tools"/>
-    <file src="..\..\LICENSE" target="LICENSE"/>
+    <file src="..\..\..\build\bin\**\*" target="/"/>
     <file src="VERIFICATION.txt" target="VERIFICATION.txt"/>
   </files>
 </package>