Merge branch 'release/0.7.0'

Author: devlead

.appveyor.yml

@@ -25,4 +25,5 @@ branches:
 #---------------------------------#
 cache:
 - src\packages -> src\**\packages.config
-- tools -> setup.cake
+- tools -> setup.cake
+- tools -> tools\packages.config

.gitignore

@@ -274,7 +274,7 @@ __pycache__/
 *.pyc
 
 # Cake - Uncomment if you are using it
-tools/**
+tools/
 !tools/packages.config
 BuildArtifacts/
 moduletest/

moduletest/test.cake

@@ -19,11 +19,14 @@ Setup(
   context=>{
     file = Context.FileSystem.GetFile("test.cake");
     directory = Context.FileSystem.GetDirectory("tools");
+    var fileSystemType = Context.FileSystem.GetType();
+
     Information(
-        "IFileSystem: {0}\r\n\tIFile: {1}\r\n\tIDirectory: {2}",
-        Context.FileSystem.GetType(),
+        "IFileSystem: {0}\r\n\tIFile: {1}\r\n\tIDirectory: {2}\r\n\tAssembly: {3}",
+        fileSystemType,
         file.GetType(),
-        directory.GetType()
+        directory.GetType(),
+        fileSystemType.Assembly
         );
 
     testPath = Directory("testpath");
@@ -36,7 +39,11 @@ Setup(
   });
 
 Teardown(context=>{
-  DeleteDirectory(testPath, recursive:true);
+   DeleteDirectory(testPath,
+            new DeleteDirectorySettings {
+                Recursive = true,
+                Force = true
+            });
   });
 
 Task("Create-Directory-Structure")
@@ -113,10 +120,10 @@ Task("Move-Folder")
   .Does(() => {
       var source = Context.FileSystem.GetDirectory(moveSourcePath);
       var target = moveDestPath.Combine("target");
-      
+
       Information("Moving {0} to {1}", source, target);
       source.Move(target);
-      
+
       if(!FileExists(target.CombineWithFilePath("marker.txt")))
       {
         throw new Exception("Folder not moved correctly");

moduletest/test.cmd

@@ -2,6 +2,6 @@
 IF NOT EXIST "tools" (md "tools")
 IF NOT EXIST "tools\modules" (md "tools\modules")
 IF NOT EXIST "tools\nuget.exe" (@powershell -NoProfile -ExecutionPolicy Bypass -Command "(New-Object System.Net.WebClient).DownloadFile('https://dist.nuget.org/win-x86-commandline/latest/nuget.exe','tools/nuget.exe')")
-IF NOT EXIST "tools\Cake" (tools\nuget.exe install Cake -ExcludeVersion -OutputDirectory "Tools" -Source https://www.nuget.org/api/v2/)
-IF NOT EXIST "tools\modules\Cake.LongPath.Module" (tools\nuget.exe install Cake.LongPath.Module -PreRelease -ExcludeVersion -OutputDirectory "Tools\Modules" -Source https://www.nuget.org/api/v2/)
+IF NOT EXIST "tools\Cake" (tools\nuget.exe install Cake -ExcludeVersion -OutputDirectory "Tools" -Source https://api.nuget.org/v3/index.json)
+IF NOT EXIST "tools\modules\Cake.LongPath.Module" (tools\nuget.exe install Cake.LongPath.Module -OutputDirectory "Tools\Modules" -Source https://api.nuget.org/v3/index.json)
 tools\Cake\Cake.exe test.cake

moduleusageexample/build.cake

@@ -1,19 +1,49 @@
-var fileSystemType = Context.FileSystem.GetType();
-var file = Context.FileSystem.GetFile("test.cake");
-var directory = Context.FileSystem.GetFile("tools");
-
-if (fileSystemType.ToString()=="Cake.LongPath.Module.LongPathFileSystem")
-{
-    Information("Sucessfully loaded {0}", fileSystemType.Assembly.Location);
-}
-else
-{
-    Error("Failed to load Cake.LongPath.Module");
-}
-
-Information(
-    "IFileSystem: {0}\r\n\tIFile: {1}\r\n\tIDirectory: {2}",
-    Context.FileSystem.GetType(),
-    file.GetType(),
-    directory.GetType()
-    );
+#module nuget:?package=Cake.LongPath.Module
+
+Task("IFileSystem")
+    .Does(() => {
+    var fileSystemType = Context.FileSystem.GetType();
+
+    Information(
+        "IFileSystem: {0}",
+        Context.FileSystem.GetType());
+
+    if (fileSystemType.ToString()=="Cake.LongPath.Module.LongPathFileSystem")
+    {
+        Information("Sucessfully loaded {0}", fileSystemType.Assembly.Location);
+    }
+    else
+    {
+        throw new Exception("Failed to load Cake.LongPath.Module");
+    }
+});
+
+Task("IFile")
+    .IsDependentOn("IFileSystem")
+    .Does(() => {
+    var file = Context.FileSystem.GetFile("build.cake");
+
+    Information(
+        "IFile: {0}\r\n\t{1}",
+        file.GetType(),
+        file.Path);
+});
+
+Task("IDirectory")
+    .IsDependentOn("IFileSystem")
+    .Does(() => {
+    var directory = Context.FileSystem.GetFile("tools");
+
+    Information(
+        "IDirectory: {0}\r\n\t{1}",
+        directory.GetType(),
+        directory.Path);
+});
+
+Task("Default")
+    .IsDependentOn("IFileSystem")
+    .IsDependentOn("IFile")
+    .IsDependentOn("IDirectory");
+
+
+RunTarget("Default");

moduleusageexample/build.cmd

@@ -1,7 +1,5 @@
 @ECHO OFF
 IF NOT EXIST "tools" (md "tools")
-IF NOT EXIST "tools\modules" (md "tools\modules")
 IF NOT EXIST "tools\nuget.exe" (@powershell -NoProfile -ExecutionPolicy Bypass -Command "(New-Object System.Net.WebClient).DownloadFile('https://dist.nuget.org/win-x86-commandline/latest/nuget.exe','tools/nuget.exe')")
 IF NOT EXIST "tools\Cake" (tools\nuget.exe install Cake -ExcludeVersion -OutputDirectory "Tools" -Source https://www.nuget.org/api/v2/)
-IF NOT EXIST "tools\modules\Cake.LongPath.Module" (tools\nuget.exe install Cake.LongPath.Module -PreRelease -ExcludeVersion -OutputDirectory "Tools\Modules" -Source https://www.nuget.org/api/v2/)
-tools\Cake\Cake.exe build.cake
+(tools\Cake\Cake.exe build.cake --bootstrap) && (tools\Cake\Cake.exe build.cake)

setup.cake

@@ -19,4 +19,32 @@ ToolSettings.SetToolSettings(context: Context,
                             testCoverageExcludeByAttribute: "*.ExcludeFromCodeCoverage*",
                             testCoverageExcludeByFile: "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs");
 
-Build.Run();
+Task("Integration-Tests")
+    .IsDependentOn("Build")
+    .IsDependeeOf("Test")
+    .Does(()=> {
+
+    var moduleTestPath = MakeAbsolute(Directory("moduletest"));
+    var moduleToolsPath = moduleTestPath.Combine("tools");
+    var moduleModulesPath = moduleToolsPath.Combine("modules").Combine("Cake.LongPath.Module");
+    var testCakePath = moduleTestPath.CombineWithFilePath("test.cake");
+    var longPathModulePath = BuildParameters.Paths.Directories.PublishedLibraries.Combine("Cake.LongPath.Module");
+
+    if (DirectoryExists(moduleToolsPath))
+    {
+        DeleteDirectory(moduleToolsPath,
+            new DeleteDirectorySettings {
+                Recursive = true,
+                Force = true
+            });
+    }
+
+    EnsureDirectoryExists(moduleToolsPath);
+    EnsureDirectoryExists(moduleModulesPath);
+
+    CopyDirectory(longPathModulePath, moduleModulesPath);
+
+    CakeExecuteScript(testCakePath);
+});
+
+Build.Run();

src/Cake.LongPath.Module/Cake.LongPath.Module.csproj

@@ -64,14 +64,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>IF NOT EXIST "..\..\..\..\moduletest\tools" (md "..\..\..\..\moduletest\tools")
-IF NOT EXIST "..\..\..\..\moduletest\tools\modules" (md "..\..\..\..\moduletest\tools\modules")
-IF NOT EXIST "..\..\..\..\moduletest\tools\nuget.exe" (@powershell -NoProfile -ExecutionPolicy Bypass -Command "(New-Object System.Net.WebClient).DownloadFile('https://dist.nuget.org/win-x86-commandline/latest/nuget.exe','..\..\..\..\moduletest\tools/nuget.exe')")
-IF NOT EXIST "..\..\..\..\moduletest\tools\modules\$(TargetName)" (md "..\..\..\..\moduletest\tools\modules\$(TargetName)")
-XCOPY /Y "Pri.LongPath.*" "..\..\..\..\moduletest\tools\modules\$(TargetName)"
-XCOPY /Y "$(TargetName).*" "..\..\..\..\moduletest\tools\modules\$(TargetName)"
-
-IF NOT EXIST "Cake" (..\..\..\..\moduletest\tools\nuget.exe install Cake -ExcludeVersion -Source https://www.nuget.org/api/v2/)</PostBuildEvent>
+    <PostBuildEvent>
+</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.

src/Cake.LongPath.Module/LongPathDirectory.cs

@@ -26,7 +26,22 @@ internal class LongPathDirectory : IDirectory
         /// <value>The path.</value>
         Path IFileSystemInfo.Path => Path;
 
-        public bool Exists => Directory.Exists;
+        public bool Exists
+        {
+            get
+            {
+                // Workaround until https://github.com/peteraritchie/LongPath/issues/82 is fixed
+                try
+                {
+                    return Directory.Exists;
+                }
+                catch
+                {
+                    return false;
+                }
+            }
+        }
+
         public bool Hidden => (Directory.Attributes & FileAttributes.Hidden) == FileAttributes.Hidden;
 
         /// <summary>