diff --git a/FAKE.sln b/FAKE.sln index 90973d2bf07..fd0f5593b59 100644 --- a/FAKE.sln +++ b/FAKE.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.30501.0 +# Visual Studio Express 2013 for Windows Desktop +VisualStudioVersion = 12.0.30723.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{B672725B-9594-4D87-A377-349FE7E0B3B9}" ProjectSection(SolutionItems) = preProject diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index b6b1aad1405..94c22707945 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,12 @@ +#### 3.7.5 - 22.10.2014 +* Feature/list targets in command line - http://fsharp.github.io/FAKE/specifictargets.html + +#### 3.7.4 - 22.10.2014 +* Use priority list for nuget.exe selection - https://github.com/fsharp/FAKE/issues/572 + +#### 3.7.2 - 20.10.2014 +* Use latest FSharp.Formatting + #### 3.7.1 - 16.10.2014 * BUGFIX: RoundhouseHelper was setting an incorrect switch for CommandTimoutAdmin - https://github.com/fsharp/FAKE/pull/566 diff --git a/Samples/ContinuousDeploymentWebsite/src/test/Fake_WebSite.Tests/Fake_WebSite.Tests.csproj b/Samples/ContinuousDeploymentWebsite/src/test/Fake_WebSite.Tests/Fake_WebSite.Tests.csproj index 54887d88809..535fe7dc85d 100644 --- a/Samples/ContinuousDeploymentWebsite/src/test/Fake_WebSite.Tests/Fake_WebSite.Tests.csproj +++ b/Samples/ContinuousDeploymentWebsite/src/test/Fake_WebSite.Tests/Fake_WebSite.Tests.csproj @@ -61,74 +61,68 @@ --> - - - - ..\..\..\..\..\packages\Machine.Specifications\lib\net20\Machine.Specifications.dll - True - True - - - - - - - ..\..\..\..\..\packages\Machine.Specifications\lib\net20\Machine.Specifications.dll - True - True - - - - - - - ..\..\..\..\..\packages\Machine.Specifications\lib\net20\Machine.Specifications.dll - True - True - - - - - - - ..\..\..\..\..\packages\Machine.Specifications\lib\net40\Machine.Specifications.Clr4.dll - True - True - - - ..\..\..\..\..\packages\Machine.Specifications\lib\net40\Machine.Specifications.dll - True - True - - - - - - - ..\..\..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.Clr4.dll - True - True - - - ..\..\..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.dll - True - True - - - - - - - ..\..\..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.Clr4.dll - True - True - - - ..\..\..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.dll - True - True - - + + + + + + + + + + ..\..\..\..\..\packages\Machine.Specifications\lib\net20\Machine.Specifications.dll + True + True + + + + + + + ..\..\..\..\..\packages\Machine.Specifications\lib\net20\Machine.Specifications.dll + True + True + + + + + + + ..\..\..\..\..\packages\Machine.Specifications\lib\net20\Machine.Specifications.dll + True + True + + + + + + + ..\..\..\..\..\packages\Machine.Specifications\lib\net40\Machine.Specifications.Clr4.dll + True + True + + + ..\..\..\..\..\packages\Machine.Specifications\lib\net40\Machine.Specifications.dll + True + True + + + + + + + ..\..\..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.Clr4.dll + True + True + + + ..\..\..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.dll + True + True + + + + \ No newline at end of file diff --git a/help/specifictargets.md b/help/specifictargets.md index 870c66cb417..08d187310e1 100644 --- a/help/specifictargets.md +++ b/help/specifictargets.md @@ -1,5 +1,13 @@ # Running targets in "FAKE - F# Make" +## Listing targets +Before running any specific target it is useful to know all the targets that are available in a build script. +FAKE can list all the avaiable targets including the dependencies by running the following command: + +* Fake.exe *YourBuildScript* -lt + +The option *-lt* stands for "list targets". It is an abbreviation of the option *--listTargets*. + ## Running specific targets FAKE has a special param "target" which can be used to run specific targets in a build. We assume the following build script: @@ -61,4 +69,4 @@ These targets will be executed only after a build failure but have to be activat ) // Activate BuildFailureTarget somewhere during build - ActivateBuildFailureTarget "ReportErrorViaMail" \ No newline at end of file + ActivateBuildFailureTarget "ReportErrorViaMail" diff --git a/paket.dependencies b/paket.dependencies index f566ea47a8d..269c6946541 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -18,7 +18,6 @@ nuget Nancy.Viewengines.Razor nuget Newtonsoft.Json nuget SSH.NET nuget Microsoft.Web.Administration -nuget FSharp.Compiler.Service nuget Microsoft.Web.Xdt nuget Mono.Cecil nuget Nuget.Core diff --git a/paket.lock b/paket.lock index 95941e3e5b5..5878ceff6ce 100644 --- a/paket.lock +++ b/paket.lock @@ -4,14 +4,14 @@ NUGET bootstrap (3.2.0) jQuery (>= 1.9.0) CsQuery (1.3.4) - FAKE (3.5.12) + FAKE (3.7.1) FsCheck (0.9.4.0) FsCheck.Xunit (0.4.1.0) FsCheck (>= 0) xunit (>= 1.9.2, < 3.0) - FSharp.Compiler.Service (0.0.62) - FSharp.Formatting (2.4.33) - FSharp.Compiler.Service (>= 0.0.62) + FSharp.Compiler.Service (0.0.67) + FSharp.Formatting (2.4.34) + FSharp.Compiler.Service (0.0.67) Microsoft.AspNet.Razor (2.0.30506.0) RazorEngine (3.3.0) jQuery (2.1.1) @@ -47,8 +47,8 @@ NUGET Microsoft.AspNet.Razor (>= 2.0.30506) Nancy (>= 0) Newtonsoft.Json (6.0.5) - NuGet.CommandLine (2.8.2) - Nuget.Core (2.8.2) + NuGet.CommandLine (2.8.3) + Nuget.Core (2.8.3) Microsoft.Web.Xdt (>= 2.1.0) RavenDB.Client (2.5.2935) Microsoft.CompilerServices.AsyncTargetingPack (>= 0) diff --git a/src/app/FAKE/AssemblyInfo.fs b/src/app/FAKE/AssemblyInfo.fs index b1d421237b9..6c70d330d75 100644 --- a/src/app/FAKE/AssemblyInfo.fs +++ b/src/app/FAKE/AssemblyInfo.fs @@ -5,10 +5,10 @@ open System.Runtime.InteropServices [] [] [] -[] -[] -[] +[] +[] +[] do () module internal AssemblyVersionInformation = - let [] Version = "3.7.1" + let [] Version = "3.7.5" diff --git a/src/app/FAKE/Cli.fs b/src/app/FAKE/Cli.fs index f767d4a22b5..ded7f41a59f 100644 --- a/src/app/FAKE/Cli.fs +++ b/src/app/FAKE/Cli.fs @@ -44,6 +44,7 @@ let printUsage () = scriptPath: Optional. Path to your FAKE build script. If not specified, FAKE will use the first .fsx file in the working directory and fail if none exists. targetName: Optional. Name of the target you wish to run. This will override the target you specifed to run in the build script. + When targetName is equal --listTargets or -lt FAKE will list the targets with their dependencies. Options: %s" (UnionArgParser.Create().Usage()) diff --git a/src/app/FAKE/FAKE.fsproj b/src/app/FAKE/FAKE.fsproj index 51e972c9c5c..ebf5df0092e 100644 --- a/src/app/FAKE/FAKE.fsproj +++ b/src/app/FAKE/FAKE.fsproj @@ -96,50 +96,42 @@ --> - - - - ..\..\..\packages\UnionArgParser\lib\net35\UnionArgParser.dll - True - True - - - - - - - ..\..\..\packages\UnionArgParser\lib\net35\UnionArgParser.dll - True - True - - - - - - - ..\..\..\packages\UnionArgParser\lib\net40\UnionArgParser.dll - True - True - - - - - - - ..\..\..\packages\UnionArgParser\lib\net40\UnionArgParser.dll - True - True - - - - - - - ..\..\..\packages\UnionArgParser\lib\net40\UnionArgParser.dll - True - True - - + + + + + + + + + + + + ..\..\..\packages\UnionArgParser\lib\net35\UnionArgParser.dll + True + True + + + + + + + ..\..\..\packages\UnionArgParser\lib\net35\UnionArgParser.dll + True + True + + + + + + + ..\..\..\packages\UnionArgParser\lib\net40\UnionArgParser.dll + True + True + + + + \ No newline at end of file diff --git a/src/app/Fake.Deploy.Lib/AssemblyInfo.fs b/src/app/Fake.Deploy.Lib/AssemblyInfo.fs index 37194db3d79..73cef08a1ba 100644 --- a/src/app/Fake.Deploy.Lib/AssemblyInfo.fs +++ b/src/app/Fake.Deploy.Lib/AssemblyInfo.fs @@ -5,10 +5,10 @@ open System.Runtime.InteropServices [] [] [] -[] -[] -[] +[] +[] +[] do () module internal AssemblyVersionInformation = - let [] Version = "3.7.1" + let [] Version = "3.7.5" diff --git a/src/app/Fake.Deploy.Lib/Fake.Deploy.Lib.fsproj b/src/app/Fake.Deploy.Lib/Fake.Deploy.Lib.fsproj index 7c3091f4c2f..75410a9357e 100644 --- a/src/app/Fake.Deploy.Lib/Fake.Deploy.Lib.fsproj +++ b/src/app/Fake.Deploy.Lib/Fake.Deploy.Lib.fsproj @@ -82,61 +82,82 @@ --> - - - - ..\..\..\packages\Newtonsoft.Json\lib\net20\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\..\packages\Newtonsoft.Json\lib\net40\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll - True - True - - - - + + + + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net20\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net40\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll + True + True + + + + + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll + True + True + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll @@ -145,25 +166,7 @@ - - - - ..\..\..\packages\Newtonsoft.Json\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll - True - True - - - - + ..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll @@ -172,7 +175,7 @@ - + ..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll @@ -183,52 +186,44 @@ - - - - ..\..\..\packages\SSH.NET\lib\net35\Renci.SshNet.dll - True - True - - - - - - - ..\..\..\packages\SSH.NET\lib\net35\Renci.SshNet.dll - True - True - - - - - - - ..\..\..\packages\SSH.NET\lib\net40\Renci.SshNet.dll - True - True - - - - - - - ..\..\..\packages\SSH.NET\lib\net40\Renci.SshNet.dll - True - True - - - - - - - ..\..\..\packages\SSH.NET\lib\net40\Renci.SshNet.dll - True - True - - - - + + + + + + + + + + + + ..\..\..\packages\SSH.NET\lib\net35\Renci.SshNet.dll + True + True + + + + + + + ..\..\..\packages\SSH.NET\lib\net35\Renci.SshNet.dll + True + True + + + + + + + ..\..\..\packages\SSH.NET\lib\net40\Renci.SshNet.dll + True + True + + + + + + ..\..\..\packages\SSH.NET\lib\wp8\Renci.SshNet.WindowsPhone.dll @@ -237,7 +232,7 @@ - + ..\..\..\packages\SSH.NET\lib\sl50\Renci.SshNet.Silverlight.dll diff --git a/src/app/Fake.Deploy/AssemblyInfo.fs b/src/app/Fake.Deploy/AssemblyInfo.fs index 9e6138f5ab0..c098e087ec2 100644 --- a/src/app/Fake.Deploy/AssemblyInfo.fs +++ b/src/app/Fake.Deploy/AssemblyInfo.fs @@ -5,10 +5,10 @@ open System.Runtime.InteropServices [] [] [] -[] -[] -[] +[] +[] +[] do () module internal AssemblyVersionInformation = - let [] Version = "3.7.1" + let [] Version = "3.7.5" diff --git a/src/app/Fake.Deploy/Fake.Deploy.fsproj b/src/app/Fake.Deploy/Fake.Deploy.fsproj index 0103fc90002..a75da00cb30 100644 --- a/src/app/Fake.Deploy/Fake.Deploy.fsproj +++ b/src/app/Fake.Deploy/Fake.Deploy.fsproj @@ -98,195 +98,182 @@ --> - - - - ..\..\..\packages\Nancy\lib\net40\Nancy.dll - True - True - - - - - - - ..\..\..\packages\Nancy\lib\net40\Nancy.dll - True - True - - - - - - - ..\..\..\packages\Nancy\lib\net40\Nancy.dll - True - True - - + + + + + + + + + + + + + + + + ..\..\..\packages\Nancy\lib\net40\Nancy.dll + True + True + + + + - - - - ..\..\..\packages\Nancy.Authentication.Stateless\lib\net40\Nancy.Authentication.Stateless.dll - True - True - - - - - - - ..\..\..\packages\Nancy.Authentication.Stateless\lib\net40\Nancy.Authentication.Stateless.dll - True - True - - - - - - - ..\..\..\packages\Nancy.Authentication.Stateless\lib\net40\Nancy.Authentication.Stateless.dll - True - True - - + + + + + + + + + + + + + + + + ..\..\..\packages\Nancy.Authentication.Stateless\lib\net40\Nancy.Authentication.Stateless.dll + True + True + + + + - - - - ..\..\..\packages\Nancy.Hosting.Self\lib\net40\Nancy.Hosting.Self.dll - True - True - - - - - - - ..\..\..\packages\Nancy.Hosting.Self\lib\net40\Nancy.Hosting.Self.dll - True - True - - - - - - - ..\..\..\packages\Nancy.Hosting.Self\lib\net40\Nancy.Hosting.Self.dll - True - True - - + + + + + + + + + + + + + + + + ..\..\..\packages\Nancy.Hosting.Self\lib\net40\Nancy.Hosting.Self.dll + True + True + + + + - - - - ..\..\..\packages\Nancy.Serialization.JsonNet\lib\net40\Nancy.Serialization.JsonNet.dll - True - True - - - - - - - ..\..\..\packages\Nancy.Serialization.JsonNet\lib\net40\Nancy.Serialization.JsonNet.dll - True - True - - - - - - - ..\..\..\packages\Nancy.Serialization.JsonNet\lib\net40\Nancy.Serialization.JsonNet.dll - True - True - - + + + + + + + + + + + + + + + + ..\..\..\packages\Nancy.Serialization.JsonNet\lib\net40\Nancy.Serialization.JsonNet.dll + True + True + + + + - - - - ..\..\..\packages\Newtonsoft.Json\lib\net20\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\..\packages\Newtonsoft.Json\lib\net40\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll - True - True - - + + + + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net20\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net40\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll + True + True + + + + - - - - ..\..\..\packages\Newtonsoft.Json\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll - True - True - - + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll + True + True + + + + - + ..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll @@ -295,7 +282,7 @@ - + ..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll @@ -304,7 +291,7 @@ - + ..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll @@ -315,52 +302,44 @@ - - - - ..\..\..\packages\SSH.NET\lib\net35\Renci.SshNet.dll - True - True - - - - - - - ..\..\..\packages\SSH.NET\lib\net35\Renci.SshNet.dll - True - True - - - - - - - ..\..\..\packages\SSH.NET\lib\net40\Renci.SshNet.dll - True - True - - - - - - - ..\..\..\packages\SSH.NET\lib\net40\Renci.SshNet.dll - True - True - - - - - - - ..\..\..\packages\SSH.NET\lib\net40\Renci.SshNet.dll - True - True - - + + + + + + + + + + + + ..\..\..\packages\SSH.NET\lib\net35\Renci.SshNet.dll + True + True + + + + + + + ..\..\..\packages\SSH.NET\lib\net35\Renci.SshNet.dll + True + True + + + + + + + ..\..\..\packages\SSH.NET\lib\net40\Renci.SshNet.dll + True + True + + + + - + ..\..\..\packages\SSH.NET\lib\wp8\Renci.SshNet.WindowsPhone.dll @@ -369,7 +348,7 @@ - + ..\..\..\packages\SSH.NET\lib\sl50\Renci.SshNet.Silverlight.dll diff --git a/src/app/Fake.Experimental/AssemblyInfo.fs b/src/app/Fake.Experimental/AssemblyInfo.fs index 32e00a95dee..213fb1dcbe2 100644 --- a/src/app/Fake.Experimental/AssemblyInfo.fs +++ b/src/app/Fake.Experimental/AssemblyInfo.fs @@ -5,10 +5,10 @@ open System.Runtime.InteropServices [] [] [] -[] -[] -[] +[] +[] +[] do () module internal AssemblyVersionInformation = - let [] Version = "3.7.1" + let [] Version = "3.7.5" diff --git a/src/app/Fake.IIS/Fake.IIS.fsproj b/src/app/Fake.IIS/Fake.IIS.fsproj index fcd02d49941..05cf1e47305 100644 --- a/src/app/Fake.IIS/Fake.IIS.fsproj +++ b/src/app/Fake.IIS/Fake.IIS.fsproj @@ -80,59 +80,22 @@ --> - - - - ..\..\..\packages\Microsoft.Web.Administration\lib\net20\Microsoft.Web.Administration.dll - True - True - - - - - - - ..\..\..\packages\Microsoft.Web.Administration\lib\net20\Microsoft.Web.Administration.dll - True - True - - - - - - - ..\..\..\packages\Microsoft.Web.Administration\lib\net20\Microsoft.Web.Administration.dll - True - True - - - - - - - ..\..\..\packages\Microsoft.Web.Administration\lib\net20\Microsoft.Web.Administration.dll - True - True - - - - - - - ..\..\..\packages\Microsoft.Web.Administration\lib\net20\Microsoft.Web.Administration.dll - True - True - - - - - - - ..\..\..\packages\Microsoft.Web.Administration\lib\net20\Microsoft.Web.Administration.dll - True - True - - + + + + + + + + + + ..\..\..\packages\Microsoft.Web.Administration\lib\net20\Microsoft.Web.Administration.dll + True + True + + + + \ No newline at end of file diff --git a/src/app/Fake.SQL/AssemblyInfo.fs b/src/app/Fake.SQL/AssemblyInfo.fs index 73bb3fe346b..84ab7cbde16 100644 --- a/src/app/Fake.SQL/AssemblyInfo.fs +++ b/src/app/Fake.SQL/AssemblyInfo.fs @@ -5,10 +5,10 @@ open System.Runtime.InteropServices [] [] [] -[] -[] -[] +[] +[] +[] do () module internal AssemblyVersionInformation = - let [] Version = "3.7.1" + let [] Version = "3.7.5" diff --git a/src/app/FakeLib/AssemblyInfo.fs b/src/app/FakeLib/AssemblyInfo.fs index 7087ba2e4a6..b813e430e84 100644 --- a/src/app/FakeLib/AssemblyInfo.fs +++ b/src/app/FakeLib/AssemblyInfo.fs @@ -7,10 +7,10 @@ open System.Runtime.InteropServices [] [] [] -[] -[] -[] +[] +[] +[] do () module internal AssemblyVersionInformation = - let [] Version = "3.7.1" + let [] Version = "3.7.5" diff --git a/src/app/FakeLib/FakeLib.fsproj b/src/app/FakeLib/FakeLib.fsproj index 4dcd94e5b26..b22decc8827 100644 --- a/src/app/FakeLib/FakeLib.fsproj +++ b/src/app/FakeLib/FakeLib.fsproj @@ -143,6 +143,7 @@ + @@ -181,240 +182,186 @@ --> - - - - ..\..\..\packages\FSharp.Compiler.Service\lib\net40\FSharp.Compiler.Service.dll - True - True - - - - - - - ..\..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll - True - True - - - - - - - ..\..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll - True - True - - + + + + + + + + + + + + + + + + ..\..\..\packages\FSharp.Compiler.Service\lib\net40\FSharp.Compiler.Service.dll + True + True + + + + + + + ..\..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll + True + True + + + + - - - - ..\..\..\packages\Microsoft.Web.Xdt\lib\net40\Microsoft.Web.XmlTransform.dll - True - True - - - - - - - ..\..\..\packages\Microsoft.Web.Xdt\lib\net40\Microsoft.Web.XmlTransform.dll - True - True - - - - - - - ..\..\..\packages\Microsoft.Web.Xdt\lib\net40\Microsoft.Web.XmlTransform.dll - True - True - - + + + + + + + + + + + + + + + + ..\..\..\packages\Microsoft.Web.Xdt\lib\net40\Microsoft.Web.XmlTransform.dll + True + True + + + + - - - - ..\..\..\packages\Mono.Cecil\lib\net20\Mono.Cecil.Mdb.dll - True - True - - - ..\..\..\packages\Mono.Cecil\lib\net20\Mono.Cecil.Pdb.dll - True - True - - - ..\..\..\packages\Mono.Cecil\lib\net20\Mono.Cecil.dll - True - True - - - - - - - ..\..\..\packages\Mono.Cecil\lib\net35\Mono.Cecil.Mdb.dll - True - True - - - ..\..\..\packages\Mono.Cecil\lib\net35\Mono.Cecil.Pdb.dll - True - True - - - ..\..\..\packages\Mono.Cecil\lib\net35\Mono.Cecil.Rocks.dll - True - True - - - ..\..\..\packages\Mono.Cecil\lib\net35\Mono.Cecil.dll - True - True - - - - - - - ..\..\..\packages\Mono.Cecil\lib\net35\Mono.Cecil.Mdb.dll - True - True - - - ..\..\..\packages\Mono.Cecil\lib\net35\Mono.Cecil.Pdb.dll - True - True - - - ..\..\..\packages\Mono.Cecil\lib\net35\Mono.Cecil.Rocks.dll - True - True - - - ..\..\..\packages\Mono.Cecil\lib\net35\Mono.Cecil.dll - True - True - - - - - - - ..\..\..\packages\Mono.Cecil\lib\net40\Mono.Cecil.Mdb.dll - True - True - - - ..\..\..\packages\Mono.Cecil\lib\net40\Mono.Cecil.Pdb.dll - True - True - - - ..\..\..\packages\Mono.Cecil\lib\net40\Mono.Cecil.Rocks.dll - True - True - - - ..\..\..\packages\Mono.Cecil\lib\net40\Mono.Cecil.dll - True - True - - - - - - - ..\..\..\packages\Mono.Cecil\lib\net40\Mono.Cecil.Mdb.dll - True - True - - - ..\..\..\packages\Mono.Cecil\lib\net40\Mono.Cecil.Pdb.dll - True - True - - - ..\..\..\packages\Mono.Cecil\lib\net40\Mono.Cecil.Rocks.dll - True - True - - - ..\..\..\packages\Mono.Cecil\lib\net40\Mono.Cecil.dll - True - True - - - - - - - ..\..\..\packages\Mono.Cecil\lib\net40\Mono.Cecil.Mdb.dll - True - True - - - ..\..\..\packages\Mono.Cecil\lib\net40\Mono.Cecil.Pdb.dll - True - True - - - ..\..\..\packages\Mono.Cecil\lib\net40\Mono.Cecil.Rocks.dll - True - True - - - ..\..\..\packages\Mono.Cecil\lib\net40\Mono.Cecil.dll - True - True - - + + + + + + + + + + ..\..\..\packages\Mono.Cecil\lib\net20\Mono.Cecil.Mdb.dll + True + True + + + ..\..\..\packages\Mono.Cecil\lib\net20\Mono.Cecil.Pdb.dll + True + True + + + ..\..\..\packages\Mono.Cecil\lib\net20\Mono.Cecil.dll + True + True + + + + + + + ..\..\..\packages\Mono.Cecil\lib\net35\Mono.Cecil.Mdb.dll + True + True + + + ..\..\..\packages\Mono.Cecil\lib\net35\Mono.Cecil.Pdb.dll + True + True + + + ..\..\..\packages\Mono.Cecil\lib\net35\Mono.Cecil.Rocks.dll + True + True + + + ..\..\..\packages\Mono.Cecil\lib\net35\Mono.Cecil.dll + True + True + + + + + + + ..\..\..\packages\Mono.Cecil\lib\net35\Mono.Cecil.Mdb.dll + True + True + + + ..\..\..\packages\Mono.Cecil\lib\net35\Mono.Cecil.Pdb.dll + True + True + + + ..\..\..\packages\Mono.Cecil\lib\net35\Mono.Cecil.Rocks.dll + True + True + + + ..\..\..\packages\Mono.Cecil\lib\net35\Mono.Cecil.dll + True + True + + + + + + + ..\..\..\packages\Mono.Cecil\lib\net40\Mono.Cecil.Mdb.dll + True + True + + + ..\..\..\packages\Mono.Cecil\lib\net40\Mono.Cecil.Pdb.dll + True + True + + + ..\..\..\packages\Mono.Cecil\lib\net40\Mono.Cecil.Rocks.dll + True + True + + + ..\..\..\packages\Mono.Cecil\lib\net40\Mono.Cecil.dll + True + True + + + + - - - - ..\..\..\packages\Nuget.Core\lib\net40-Client\NuGet.Core.dll - True - True - - - - - - - ..\..\..\packages\Nuget.Core\lib\net40-Client\NuGet.Core.dll - True - True - - - - - - - ..\..\..\packages\Nuget.Core\lib\net40-Client\NuGet.Core.dll - True - True - - - - - - - ..\..\..\packages\Nuget.Core\lib\net40-Client\NuGet.Core.dll - True - True - - + + + + + + + + + + + + + + ..\..\..\packages\Nuget.Core\lib\net40-Client\NuGet.Core.dll + True + True + + + + diff --git a/src/app/FakeLib/RestorePackageHelper.fs b/src/app/FakeLib/RestorePackageHelper.fs index c4459470c2e..b1b7e4276e4 100644 --- a/src/app/FakeLib/RestorePackageHelper.fs +++ b/src/app/FakeLib/RestorePackageHelper.fs @@ -4,11 +4,25 @@ module Fake.RestorePackageHelper open System -open System.IO /// Looks for a tool in all subfolders - returns the tool file name. let findNuget defaultPath = try + let priorityList = + [currentDirectory @@ "tools" @@ "NuGet" + currentDirectory @@ ".nuget" + currentDirectory @@ "packages" @@ "NuGet.Commandline" @@ "tools" + currentDirectory @@ "packages" @@ "Nuget.Commandline" @@ "tools"] + + let exeNames = ["nuget.exe"; "NuGet.exe"; "Nuget.exe"] + + let priorityPaths = + seq { for path in priorityList do + for name in exeNames do + let fi = fileInfo(path @@ name) + if fi.Exists then yield fi.FullName } + if not <| Seq.isEmpty priorityPaths then Seq.head priorityPaths else + let tools = !! ("./**/" @@ "nuget.exe") if Seq.isEmpty tools then let tools = !! ("./**/" @@ "NuGet.exe") diff --git a/src/app/FakeLib/TargetHelper.fs b/src/app/FakeLib/TargetHelper.fs index 77987701fa9..91abc90101e 100644 --- a/src/app/FakeLib/TargetHelper.fs +++ b/src/app/FakeLib/TargetHelper.fs @@ -307,9 +307,12 @@ let listTargets() = tracefn " - %s %s" target.Name (if target.Description <> null then " - " + target.Description else "") tracefn " Depends on: %A" target.Dependencies) +// Instead of the target can be used the list dependencies graph parameter. +let doesTargetMeansListTargets target = target = "--listTargets" || target = "-lt" + /// Runs a target and its dependencies. let run targetName = - if isListMode then listTargets() else + if doesTargetMeansListTargets targetName then listTargets() else if LastDescription <> null then failwithf "You set a task description (%A) but didn't specify a task." LastDescription let rec runTarget targetName = try diff --git a/src/app/FakeLib/XDTHelper.fs b/src/app/FakeLib/XDTHelper.fs new file mode 100644 index 00000000000..14aa7989597 --- /dev/null +++ b/src/app/FakeLib/XDTHelper.fs @@ -0,0 +1,87 @@ +/// Contains functions used to transform config (or any XML) files using Microsoft's XML Document Transformations. +module Fake.XDTHelper + +open System +open System.IO +open System.Xml +open Microsoft.Web.XmlTransform + +/// Integrates XDT logging into FAKE logging. +type FakeXmlTransformationLogger() = + interface IXmlTransformationLogger with + member x.EndSection(message, messageArgs) = + postMessage <| LogMessage(String.Format(message, messageArgs), true) + postMessage <| CloseTag("XDT") + member x.EndSection(``type``, message, messageArgs) = + match ``type`` with + | MessageType.Verbose -> + postMessage <| TraceMessage(String.Format(message, messageArgs), true) + postMessage <| CloseTag("XDT") + | _ -> + postMessage <| LogMessage(String.Format(message, messageArgs), true) + postMessage <| CloseTag("XDT") + member x.LogError(message, messageArgs) = + postMessage <| ErrorMessage(String.Format(message, messageArgs)) + member x.LogError(file, message, messageArgs) = + postMessage <| ErrorMessage(sprintf "File: %s" file) + postMessage <| ErrorMessage(String.Format(message, messageArgs)) + member x.LogError(file, lineNumber, linePosition, message, messageArgs) = + postMessage <| ErrorMessage(sprintf "File: %s:%d:%d" file lineNumber linePosition) + postMessage <| ErrorMessage(String.Format(message, messageArgs)) + member x.LogErrorFromException(ex) = + postMessage <| ErrorMessage(string ex) + member x.LogErrorFromException(ex, file) = + postMessage <| ErrorMessage(sprintf "File: %s" file) + postMessage <| ErrorMessage(string ex) + member x.LogErrorFromException(ex, file, lineNumber, linePosition) = + postMessage <| ErrorMessage(sprintf "File: %s:%d:%d" file lineNumber linePosition) + postMessage <| ErrorMessage(string ex) + member x.LogMessage(message, messageArgs) = + postMessage <| LogMessage(String.Format(message, messageArgs), true) + member x.LogMessage(``type``, message, messageArgs) = + match ``type`` with + | MessageType.Verbose -> postMessage <| TraceMessage(String.Format(message, messageArgs), true) + | _ -> postMessage <| LogMessage(String.Format(message, messageArgs), true) + member x.LogWarning(message, messageArgs) = + postMessage <| ImportantMessage(String.Format(message, messageArgs)) + member x.LogWarning(file, message, messageArgs) = + postMessage <| ImportantMessage(sprintf "File: %s" file) + postMessage <| ImportantMessage(String.Format(message, messageArgs)) + member x.LogWarning(file, lineNumber, linePosition, message, messageArgs) = + postMessage <| ImportantMessage(sprintf "File: %s:%d:%d" file lineNumber linePosition) + postMessage <| ImportantMessage(String.Format(message, messageArgs)) + member x.StartSection(message, messageArgs) = + postMessage <| OpenTag("XDT","StartSection") + postMessage <| LogMessage(String.Format(message, messageArgs), true) + member x.StartSection(``type``, message, messageArgs) = + match ``type`` with + | MessageType.Verbose -> + postMessage <| OpenTag("XDT","StartSectionVerbose") + postMessage <| TraceMessage(String.Format(message, messageArgs), true) + | _ -> + postMessage <| OpenTag("XDT","StartSectionNormal") + postMessage <| LogMessage(String.Format(message, messageArgs), true) + +/// Reads XML file (typically a config file), makes changes according to XDT transform syntax, saves result. +let TransformFile (inXmlFile:string) (transformFile:string) (outXmlFile:string) = + if not <| File.Exists inXmlFile then postMessage <| ErrorMessage(sprintf "XML file %s does not exist." inXmlFile) + if not <| File.Exists transformFile then postMessage <| ImportantMessage(sprintf "XML Document Transform file %s does not exist." transformFile) + use xdtStream = new FileStream(Path.GetFullPath transformFile, FileMode.Open, FileAccess.Read) + let fakeLogger = new FakeXmlTransformationLogger() + use xdt = new XmlTransformation(xdtStream, fakeLogger) + let xml = new XmlDocument() + xml.Load(Path.GetFullPath inXmlFile) + if not <| xdt.Apply(xml) then new InvalidOperationException(sprintf "Unable to transform %s with %s." inXmlFile transformFile) |> raise + xml.Save(outXmlFile) + +/// Modifies an XML file in place using an XDT file named by inserting a .configName in between the filename and .extension. +let TransformFileWithConfigName (configName:string) (xmlFile:string) = + let xdt = Path.ChangeExtension(xmlFile, configName + (Path.GetExtension(xmlFile))) + if File.Exists xdt then + TransformFile xmlFile xdt xmlFile + else + postMessage <| ImportantMessage(sprintf "No %s config file found for '%s'. Skipping." configName xmlFile) + +/// Modifies XML files in place using an XDT file named by inserting a .configName in between each filename and .extension. +let TransformFilesWithConfigName (configName:string) (files:FileIncludes) = + Seq.iter (TransformFileWithConfigName configName) files diff --git a/src/deploy.web/Fake.Deploy.Web.DataProviders/Fake.Deploy.Web.File/Fake.Deploy.Web.File.fsproj b/src/deploy.web/Fake.Deploy.Web.DataProviders/Fake.Deploy.Web.File/Fake.Deploy.Web.File.fsproj index c39634c4b54..937874922ff 100644 --- a/src/deploy.web/Fake.Deploy.Web.DataProviders/Fake.Deploy.Web.File/Fake.Deploy.Web.File.fsproj +++ b/src/deploy.web/Fake.Deploy.Web.DataProviders/Fake.Deploy.Web.File/Fake.Deploy.Web.File.fsproj @@ -80,79 +80,82 @@ --> - - - - ..\..\..\..\packages\Newtonsoft.Json\lib\net20\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\..\..\packages\Newtonsoft.Json\lib\net40\Newtonsoft.Json.dll - True - True - - + + + + + + + + + + ..\..\..\..\packages\Newtonsoft.Json\lib\net20\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\..\packages\Newtonsoft.Json\lib\net40\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll + True + True + + + + - - - - ..\..\..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\..\..\packages\Newtonsoft.Json\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll - True - True - - + + + + + + ..\..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\..\packages\Newtonsoft.Json\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll + True + True + + + + - + ..\..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll @@ -161,7 +164,7 @@ - + ..\..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll @@ -170,7 +173,7 @@ - + ..\..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll diff --git a/src/deploy.web/Fake.Deploy.Web.DataProviders/Fake.Deploy.Web.RavenDb/Fake.Deploy.Web.RavenDb.fsproj b/src/deploy.web/Fake.Deploy.Web.DataProviders/Fake.Deploy.Web.RavenDb/Fake.Deploy.Web.RavenDb.fsproj index c74e30eba7d..0c628371481 100644 --- a/src/deploy.web/Fake.Deploy.Web.DataProviders/Fake.Deploy.Web.RavenDb/Fake.Deploy.Web.RavenDb.fsproj +++ b/src/deploy.web/Fake.Deploy.Web.DataProviders/Fake.Deploy.Web.RavenDb/Fake.Deploy.Web.RavenDb.fsproj @@ -83,34 +83,39 @@ --> - - - - ..\..\..\..\packages\Microsoft.CompilerServices.AsyncTargetingPack\lib\net40\Microsoft.CompilerServices.AsyncTargetingPack.Net4.dll - True - True - - - - - - - ..\..\..\..\packages\Microsoft.CompilerServices.AsyncTargetingPack\lib\net45\Microsoft.CompilerServices.AsyncTargetingPack.Net45.dll - True - True - - + + + + + + + + + + + + + + + + ..\..\..\..\packages\Microsoft.CompilerServices.AsyncTargetingPack\lib\net40\Microsoft.CompilerServices.AsyncTargetingPack.Net4.dll + True + True + + + + + + + ..\..\..\..\packages\Microsoft.CompilerServices.AsyncTargetingPack\lib\net45\Microsoft.CompilerServices.AsyncTargetingPack.Net45.dll + True + True + + + + - - - - ..\..\..\..\packages\Microsoft.CompilerServices.AsyncTargetingPack\lib\net45\Microsoft.CompilerServices.AsyncTargetingPack.Net45.dll - True - True - - - - + ..\..\..\..\packages\Microsoft.CompilerServices.AsyncTargetingPack\lib\sl50\Microsoft.CompilerServices.AsyncTargetingPack.Silverlight5.dll @@ -121,52 +126,52 @@ - - - - ..\..\..\..\packages\RavenDB.Client\lib\net40\Raven.Abstractions.dll - True - True - - - ..\..\..\..\packages\RavenDB.Client\lib\net40\Raven.Client.Lightweight.dll - True - True - - - True - - - - - - - ..\..\..\..\packages\RavenDB.Client\lib\net45\Raven.Abstractions.dll - True - True - - - ..\..\..\..\packages\RavenDB.Client\lib\net45\Raven.Client.Lightweight.dll - True - True - - - - - - - ..\..\..\..\packages\RavenDB.Client\lib\net45\Raven.Abstractions.dll - True - True - - - ..\..\..\..\packages\RavenDB.Client\lib\net45\Raven.Client.Lightweight.dll - True - True - - + + + + + + + + + + + + + + + + ..\..\..\..\packages\RavenDB.Client\lib\net40\Raven.Abstractions.dll + True + True + + + ..\..\..\..\packages\RavenDB.Client\lib\net40\Raven.Client.Lightweight.dll + True + True + + + True + + + + + + + ..\..\..\..\packages\RavenDB.Client\lib\net45\Raven.Abstractions.dll + True + True + + + ..\..\..\..\packages\RavenDB.Client\lib\net45\Raven.Client.Lightweight.dll + True + True + + + + - + ..\..\..\..\packages\RavenDB.Client\lib\sl50\Raven.Client.Silverlight.dll diff --git a/src/deploy.web/Fake.Deploy.Web/AssemblyInfo.fs b/src/deploy.web/Fake.Deploy.Web/AssemblyInfo.fs index 3fa2715cc3b..f7b87d697ca 100644 --- a/src/deploy.web/Fake.Deploy.Web/AssemblyInfo.fs +++ b/src/deploy.web/Fake.Deploy.Web/AssemblyInfo.fs @@ -5,10 +5,10 @@ open System.Runtime.InteropServices [] [] [] -[] -[] -[] +[] +[] +[] do () module internal AssemblyVersionInformation = - let [] Version = "3.7.1" + let [] Version = "3.7.5" diff --git a/src/deploy.web/Fake.Deploy.Web/Fake.Deploy.Web.fsproj b/src/deploy.web/Fake.Deploy.Web/Fake.Deploy.Web.fsproj index ccaffcfd88d..cc3f9b54be7 100644 --- a/src/deploy.web/Fake.Deploy.Web/Fake.Deploy.Web.fsproj +++ b/src/deploy.web/Fake.Deploy.Web/Fake.Deploy.Web.fsproj @@ -303,280 +303,269 @@ --> - - - - ..\..\..\packages\log4net\lib\net20-full\log4net.dll - True - True - - - - - - - ..\..\..\packages\log4net\lib\net35-full\log4net.dll - True - True - - - - - - - ..\..\..\packages\log4net\lib\net40-client\log4net.dll - True - True - - - - - - - ..\..\..\packages\log4net\lib\net40-full\log4net.dll - True - True - - - - - - - ..\..\..\packages\log4net\lib\net40-full\log4net.dll - True - True - - - - - - - ..\..\..\packages\log4net\lib\net40-full\log4net.dll - True - True - - + - - - - ..\..\..\packages\Microsoft.AspNet.Razor\lib\net40\System.Web.Razor.dll - True - True - - - - - - - ..\..\..\packages\Microsoft.AspNet.Razor\lib\net40\System.Web.Razor.dll - True - True - - - - - - - ..\..\..\packages\Microsoft.AspNet.Razor\lib\net40\System.Web.Razor.dll - True - True - - + - - - - ..\..\..\packages\Nancy\lib\net40\Nancy.dll - True - True - - - - - - - ..\..\..\packages\Nancy\lib\net40\Nancy.dll - True - True - - - - - - - ..\..\..\packages\Nancy\lib\net40\Nancy.dll - True - True - - + - - - - ..\..\..\packages\Nancy.Authentication.Forms\lib\net40\Nancy.Authentication.Forms.dll - True - True - - - - - - - ..\..\..\packages\Nancy.Authentication.Forms\lib\net40\Nancy.Authentication.Forms.dll - True - True - - - - - - - ..\..\..\packages\Nancy.Authentication.Forms\lib\net40\Nancy.Authentication.Forms.dll - True - True - - + - - - - ..\..\..\packages\Nancy.Hosting.Aspnet\lib\net40\Nancy.Hosting.Aspnet.dll - True - True - - - - - - - ..\..\..\packages\Nancy.Hosting.Aspnet\lib\net40\Nancy.Hosting.Aspnet.dll - True - True - - - - - - - ..\..\..\packages\Nancy.Hosting.Aspnet\lib\net40\Nancy.Hosting.Aspnet.dll - True - True - - + + + + + + + + + + ..\..\..\packages\log4net\lib\net20-full\log4net.dll + True + True + + + + + + + ..\..\..\packages\log4net\lib\net35-full\log4net.dll + True + True + + + + + + + ..\..\..\packages\log4net\lib\net40-client\log4net.dll + True + True + + + + + + + ..\..\..\packages\log4net\lib\net40-full\log4net.dll + True + True + + + + - - - - ..\..\..\packages\Nancy.Viewengines.Razor\lib\net40\Nancy.ViewEngines.Razor.dll - True - True - - - - - - - ..\..\..\packages\Nancy.Viewengines.Razor\lib\net40\Nancy.ViewEngines.Razor.dll - True - True - - - - - - - ..\..\..\packages\Nancy.Viewengines.Razor\lib\net40\Nancy.ViewEngines.Razor.dll - True - True - - + + + + + + + + + + + + + + + + ..\..\..\packages\Microsoft.AspNet.Razor\lib\net40\System.Web.Razor.dll + True + True + + + + - - - - ..\..\..\packages\Newtonsoft.Json\lib\net20\Newtonsoft.Json.dll - True - True - - + + + + + + + + + + + + + + + + ..\..\..\packages\Nancy\lib\net40\Nancy.dll + True + True + + + + - - - - ..\..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\..\packages\Newtonsoft.Json\lib\net40\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll - True - True - - + + + + + + + + + + + + + + + + + + ..\..\..\packages\Nancy.Authentication.Forms\lib\net40\Nancy.Authentication.Forms.dll + True + True + + + + - - - - ..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll - True - True - - + + + + + + + + + + + + + + + + + + ..\..\..\packages\Nancy.Hosting.Aspnet\lib\net40\Nancy.Hosting.Aspnet.dll + True + True + + + + - - - - ..\..\..\packages\Newtonsoft.Json\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll - True - True - - + + + + + + + + + + + + + + + + + + ..\..\..\packages\Nancy.Viewengines.Razor\lib\net40\Nancy.ViewEngines.Razor.dll + True + True + + + + - + + + + + + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net20\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net40\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll + True + True + + + + + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll + True + True + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll @@ -585,7 +574,7 @@ - + ..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll @@ -594,7 +583,7 @@ - + ..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll @@ -605,32 +594,32 @@ - - - - ..\..\..\packages\System.Web.Razor.Unofficial\lib\net40\System.Web.Razor.Unofficial.dll - True - True - - - - - - - ..\..\..\packages\System.Web.Razor.Unofficial\lib\net40\System.Web.Razor.Unofficial.dll - True - True - - + + + + + + + + + + + + + + + + ..\..\..\packages\System.Web.Razor.Unofficial\lib\net40\System.Web.Razor.Unofficial.dll + True + True + + + + - - - - ..\..\..\packages\System.Web.Razor.Unofficial\lib\net40\System.Web.Razor.Unofficial.dll - True - True - - + + + \ No newline at end of file diff --git a/src/test/FsCheck.Fake/FsCheck.Fake.fsproj b/src/test/FsCheck.Fake/FsCheck.Fake.fsproj index db91b03d8c4..a22349042bd 100644 --- a/src/test/FsCheck.Fake/FsCheck.Fake.fsproj +++ b/src/test/FsCheck.Fake/FsCheck.Fake.fsproj @@ -75,135 +75,68 @@ - - - - ..\..\..\packages\FsCheck\lib\net40-Client\FsCheck.dll - True - True - - - - - - - ..\..\..\packages\FsCheck\lib\net40-Client\FsCheck.dll - True - True - - - - - - - ..\..\..\packages\FsCheck\lib\net40-Client\FsCheck.dll - True - True - - - - - - - ..\..\..\packages\FsCheck\lib\net40-Client\FsCheck.dll - True - True - - + + + + + + + + + + + + + + ..\..\..\packages\FsCheck\lib\net40-Client\FsCheck.dll + True + True + + + + - - - - ..\..\..\packages\FsCheck.Xunit\lib\net40-Client\FsCheck.Xunit.dll - True - True - - - - - - - ..\..\..\packages\FsCheck.Xunit\lib\net40-Client\FsCheck.Xunit.dll - True - True - - - - - - - ..\..\..\packages\FsCheck.Xunit\lib\net40-Client\FsCheck.Xunit.dll - True - True - - - - - - - ..\..\..\packages\FsCheck.Xunit\lib\net40-Client\FsCheck.Xunit.dll - True - True - - + + + + + + + + + + + + + + ..\..\..\packages\FsCheck.Xunit\lib\net40-Client\FsCheck.Xunit.dll + True + True + + + + - - - - ..\..\..\packages\xunit\lib\net20\xunit.dll - True - True - - - - - - - ..\..\..\packages\xunit\lib\net20\xunit.dll - True - True - - - - - - - ..\..\..\packages\xunit\lib\net20\xunit.dll - True - True - - - - - - - ..\..\..\packages\xunit\lib\net20\xunit.dll - True - True - - - - - - - ..\..\..\packages\xunit\lib\net20\xunit.dll - True - True - - - - - - - ..\..\..\packages\xunit\lib\net20\xunit.dll - True - True - - + + + + + + + + + + ..\..\..\packages\xunit\lib\net20\xunit.dll + True + True + + + + \ No newline at end of file diff --git a/src/test/Test.FAKECore/Test.FAKECore.csproj b/src/test/Test.FAKECore/Test.FAKECore.csproj index f1167d8bafd..45618db475b 100644 --- a/src/test/Test.FAKECore/Test.FAKECore.csproj +++ b/src/test/Test.FAKECore/Test.FAKECore.csproj @@ -115,6 +115,7 @@ + @@ -347,6 +348,18 @@ Always + + Always + + + Always + + + Always + + + Always + @@ -367,197 +380,171 @@ --> - - - - ..\..\..\packages\Machine.Specifications\lib\net20\Machine.Specifications.dll - True - True - - - - - - - ..\..\..\packages\Machine.Specifications\lib\net20\Machine.Specifications.dll - True - True - - - - - - - ..\..\..\packages\Machine.Specifications\lib\net20\Machine.Specifications.dll - True - True - - - - - - - ..\..\..\packages\Machine.Specifications\lib\net40\Machine.Specifications.Clr4.dll - True - True - - - ..\..\..\packages\Machine.Specifications\lib\net40\Machine.Specifications.dll - True - True - - - - - - - ..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.Clr4.dll - True - True - - - ..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.dll - True - True - - - - - - - ..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.Clr4.dll - True - True - - - ..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.dll - True - True - - + + + + + + + + + + ..\..\..\packages\Machine.Specifications\lib\net20\Machine.Specifications.dll + True + True + + + + + + + ..\..\..\packages\Machine.Specifications\lib\net20\Machine.Specifications.dll + True + True + + + + + + + ..\..\..\packages\Machine.Specifications\lib\net20\Machine.Specifications.dll + True + True + + + + + + + ..\..\..\packages\Machine.Specifications\lib\net40\Machine.Specifications.Clr4.dll + True + True + + + ..\..\..\packages\Machine.Specifications\lib\net40\Machine.Specifications.dll + True + True + + + + + + + ..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.Clr4.dll + True + True + + + ..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.dll + True + True + + + + - - - - ..\..\..\packages\Machine.Specifications.Should\lib\net20\Machine.Specifications.Should.dll - True - True - - - - - - - ..\..\..\packages\Machine.Specifications.Should\lib\net20\Machine.Specifications.Should.dll - True - True - - - - - - - ..\..\..\packages\Machine.Specifications.Should\lib\net20\Machine.Specifications.Should.dll - True - True - - - - - - - ..\..\..\packages\Machine.Specifications.Should\lib\net40\Machine.Specifications.Should.dll - True - True - - - - - - - ..\..\..\packages\Machine.Specifications.Should\lib\net45\Machine.Specifications.Should.dll - True - True - - - - - - - ..\..\..\packages\Machine.Specifications.Should\lib\net45\Machine.Specifications.Should.dll - True - True - - + + + + + + + + + + ..\..\..\packages\Machine.Specifications.Should\lib\net20\Machine.Specifications.Should.dll + True + True + + + + + + + ..\..\..\packages\Machine.Specifications.Should\lib\net20\Machine.Specifications.Should.dll + True + True + + + + + + + ..\..\..\packages\Machine.Specifications.Should\lib\net20\Machine.Specifications.Should.dll + True + True + + + + + + + ..\..\..\packages\Machine.Specifications.Should\lib\net40\Machine.Specifications.Should.dll + True + True + + + + + + + ..\..\..\packages\Machine.Specifications.Should\lib\net45\Machine.Specifications.Should.dll + True + True + + + + - - - - ..\..\..\packages\Microsoft.Web.Xdt\lib\net40\Microsoft.Web.XmlTransform.dll - True - True - - - - - - - ..\..\..\packages\Microsoft.Web.Xdt\lib\net40\Microsoft.Web.XmlTransform.dll - True - True - - - - - - - ..\..\..\packages\Microsoft.Web.Xdt\lib\net40\Microsoft.Web.XmlTransform.dll - True - True - - + + + + + + + + + + + + + + + + ..\..\..\packages\Microsoft.Web.Xdt\lib\net40\Microsoft.Web.XmlTransform.dll + True + True + + + + - - - - ..\..\..\packages\Nuget.Core\lib\net40-Client\NuGet.Core.dll - True - True - - - - - - - ..\..\..\packages\Nuget.Core\lib\net40-Client\NuGet.Core.dll - True - True - - - - - - - ..\..\..\packages\Nuget.Core\lib\net40-Client\NuGet.Core.dll - True - True - - - - - - - ..\..\..\packages\Nuget.Core\lib\net40-Client\NuGet.Core.dll - True - True - - + + + + + + + + + + + + + + ..\..\..\packages\Nuget.Core\lib\net40-Client\NuGet.Core.dll + True + True + + + + \ No newline at end of file diff --git a/src/test/Test.FAKECore/TestData/web.config b/src/test/Test.FAKECore/TestData/web.config new file mode 100644 index 00000000000..d50d95e9ece --- /dev/null +++ b/src/test/Test.FAKECore/TestData/web.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/test/Test.FAKECore/TestData/web.original.config b/src/test/Test.FAKECore/TestData/web.original.config new file mode 100644 index 00000000000..d50d95e9ece --- /dev/null +++ b/src/test/Test.FAKECore/TestData/web.original.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/test/Test.FAKECore/TestData/web.test.config b/src/test/Test.FAKECore/TestData/web.test.config new file mode 100644 index 00000000000..e806ca75094 --- /dev/null +++ b/src/test/Test.FAKECore/TestData/web.test.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/test/Test.FAKECore/TestData/web.transformed.config b/src/test/Test.FAKECore/TestData/web.transformed.config new file mode 100644 index 00000000000..1960eb4634c --- /dev/null +++ b/src/test/Test.FAKECore/TestData/web.transformed.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/test/Test.FAKECore/XdtSpecs.cs b/src/test/Test.FAKECore/XdtSpecs.cs new file mode 100644 index 00000000000..a9ffdcb9a8d --- /dev/null +++ b/src/test/Test.FAKECore/XdtSpecs.cs @@ -0,0 +1,51 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using Fake; +using Machine.Specifications; +using Microsoft.FSharp.Collections; + +namespace Test.FAKECore.XDTHandling +{ + public class when_transforming_file_explicitly + { + static string TransformedFile; + + Cleanup after = () => File.Delete(@"TestData\web.new.config"); + + Establish context = () => TransformedFile = StringHelper.ReadFileAsString(@"TestData\web.transformed.config"); + + Because of = () => XDTHelper.TransformFile(@"TestData\web.config", @"TestData\web.test.config", @"TestData\web.new.config"); + + It should_equal_the_transformed_file = () => StringHelper.ReadFileAsString(@"TestData\web.new.config").ShouldEqual(TransformedFile); + } + + public class when_transforming_file_with_config_name + { + static string TransformedFile; + + Cleanup after = () => File.Copy(@"TestData\web.original.config", @"TestData\web.config", true); + + Establish context = () => TransformedFile = StringHelper.ReadFileAsString(@"TestData\web.transformed.config"); + + Because of = () => XDTHelper.TransformFileWithConfigName("test", @"TestData\web.config"); + + It should_equal_the_transformed_file = () => StringHelper.ReadFileAsString(@"TestData\web.config").ShouldEqual(TransformedFile); + } + + public class when_transforming_files_with_config_name + { + static string TransformedFile; + + Cleanup after = () => File.Copy(@"TestData\web.original.config", @"TestData\web.config", true); + + Establish context = () => TransformedFile = StringHelper.ReadFileAsString(@"TestData\web.transformed.config"); + + Because of = () => XDTHelper.TransformFilesWithConfigName("test", new FileSystem.FileIncludes("TestData", + new FSharpList("web.config", FSharpList.Empty), FSharpList.Empty)); + + It should_equal_the_transformed_file = () => StringHelper.ReadFileAsString(@"TestData\web.config").ShouldEqual(TransformedFile); + } +} diff --git a/src/test/Test.Fake.Deploy.Web.File/Test.Fake.Deploy.Web.File.fsproj b/src/test/Test.Fake.Deploy.Web.File/Test.Fake.Deploy.Web.File.fsproj index 9601952f871..8fc889a9361 100644 --- a/src/test/Test.Fake.Deploy.Web.File/Test.Fake.Deploy.Web.File.fsproj +++ b/src/test/Test.Fake.Deploy.Web.File/Test.Fake.Deploy.Web.File.fsproj @@ -75,115 +75,41 @@ --> - - - - ..\..\..\packages\xunit\lib\net20\xunit.dll - True - True - - - - - - - ..\..\..\packages\xunit\lib\net20\xunit.dll - True - True - - - - - - - ..\..\..\packages\xunit\lib\net20\xunit.dll - True - True - - - - - - - ..\..\..\packages\xunit\lib\net20\xunit.dll - True - True - - - - - - - ..\..\..\packages\xunit\lib\net20\xunit.dll - True - True - - - - - - - ..\..\..\packages\xunit\lib\net20\xunit.dll - True - True - - + + + + + + + + + + ..\..\..\packages\xunit\lib\net20\xunit.dll + True + True + + + + - - - - ..\..\..\packages\xunit.extensions\lib\net20\xunit.extensions.dll - True - True - - - - - - - ..\..\..\packages\xunit.extensions\lib\net20\xunit.extensions.dll - True - True - - - - - - - ..\..\..\packages\xunit.extensions\lib\net20\xunit.extensions.dll - True - True - - - - - - - ..\..\..\packages\xunit.extensions\lib\net20\xunit.extensions.dll - True - True - - - - - - - ..\..\..\packages\xunit.extensions\lib\net20\xunit.extensions.dll - True - True - - - - - - - ..\..\..\packages\xunit.extensions\lib\net20\xunit.extensions.dll - True - True - - + + + + + + + + + + ..\..\..\packages\xunit.extensions\lib\net20\xunit.extensions.dll + True + True + + + + \ No newline at end of file diff --git a/src/test/Test.Fake.Deploy.Web/Test.Fake.Deploy.Web.fsproj b/src/test/Test.Fake.Deploy.Web/Test.Fake.Deploy.Web.fsproj index 88d66e1e2e1..50e922d5600 100644 --- a/src/test/Test.Fake.Deploy.Web/Test.Fake.Deploy.Web.fsproj +++ b/src/test/Test.Fake.Deploy.Web/Test.Fake.Deploy.Web.fsproj @@ -89,224 +89,207 @@ --> - - - - ..\..\..\packages\CsQuery\lib\net40\CsQuery.dll - True - True - - - - - - - ..\..\..\packages\CsQuery\lib\net40\CsQuery.dll - True - True - - - - - - - ..\..\..\packages\CsQuery\lib\net40\CsQuery.dll - True - True - - + + + + + + + + + + + + + + + + ..\..\..\packages\CsQuery\lib\net40\CsQuery.dll + True + True + + + + - - - - ..\..\..\packages\Nancy\lib\net40\Nancy.dll - True - True - - - - - - - ..\..\..\packages\Nancy\lib\net40\Nancy.dll - True - True - - - - - - - ..\..\..\packages\Nancy\lib\net40\Nancy.dll - True - True - - + + + + + + + + + + + + + + + + ..\..\..\packages\Nancy\lib\net40\Nancy.dll + True + True + + + + - - - - ..\..\..\packages\Nancy.Testing\lib\net40\Nancy.Testing.dll - True - True - - - - - - - ..\..\..\packages\Nancy.Testing\lib\net40\Nancy.Testing.dll - True - True - - - - - - - ..\..\..\packages\Nancy.Testing\lib\net40\Nancy.Testing.dll - True - True - - + + + + + + + + + + + + + + + + ..\..\..\packages\Nancy.Testing\lib\net40\Nancy.Testing.dll + True + True + + + + - - - - ..\..\..\packages\Nancy.Viewengines.Razor\lib\net40\Nancy.ViewEngines.Razor.dll - True - True - - - - - - - ..\..\..\packages\Nancy.Viewengines.Razor\lib\net40\Nancy.ViewEngines.Razor.dll - True - True - - - - - - - ..\..\..\packages\Nancy.Viewengines.Razor\lib\net40\Nancy.ViewEngines.Razor.dll - True - True - - + + + + + + + + + + + + + + + + ..\..\..\packages\Nancy.Viewengines.Razor\lib\net40\Nancy.ViewEngines.Razor.dll + True + True + + + + - - - - ..\..\..\packages\Microsoft.AspNet.Razor\lib\net40\System.Web.Razor.dll - True - True - - - - - - - ..\..\..\packages\Microsoft.AspNet.Razor\lib\net40\System.Web.Razor.dll - True - True - - - - - - - ..\..\..\packages\Microsoft.AspNet.Razor\lib\net40\System.Web.Razor.dll - True - True - - + + + + + + + + + + + + + + + + ..\..\..\packages\Microsoft.AspNet.Razor\lib\net40\System.Web.Razor.dll + True + True + + + + - - - - ..\..\..\packages\Newtonsoft.Json\lib\net20\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\..\packages\Newtonsoft.Json\lib\net40\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\..\packages\Newtonsoft.Json\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll - True - True - - - - + + + + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net20\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net40\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll + True + True + + + + + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll + True + True + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll @@ -315,7 +298,7 @@ - + ..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll @@ -324,7 +307,7 @@ - + ..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll @@ -335,88 +318,47 @@ - - - - ..\..\..\packages\System.Web.Razor.Unofficial\lib\net40\System.Web.Razor.Unofficial.dll - True - True - - - - - - - ..\..\..\packages\System.Web.Razor.Unofficial\lib\net40\System.Web.Razor.Unofficial.dll - True - True - - - - - - - ..\..\..\packages\System.Web.Razor.Unofficial\lib\net40\System.Web.Razor.Unofficial.dll - True - True - - + + + + + + + + + + + + + + + + ..\..\..\packages\System.Web.Razor.Unofficial\lib\net40\System.Web.Razor.Unofficial.dll + True + True + + + + - - - - ..\..\..\packages\xunit\lib\net20\xunit.dll - True - True - - - - - - - ..\..\..\packages\xunit\lib\net20\xunit.dll - True - True - - - - - - - ..\..\..\packages\xunit\lib\net20\xunit.dll - True - True - - - - - - - ..\..\..\packages\xunit\lib\net20\xunit.dll - True - True - - - - - - - ..\..\..\packages\xunit\lib\net20\xunit.dll - True - True - - - - - - - ..\..\..\packages\xunit\lib\net20\xunit.dll - True - True - - + + + + + + + + + + ..\..\..\packages\xunit\lib\net20\xunit.dll + True + True + + + + \ No newline at end of file diff --git a/src/test/Test.Fake.Deploy/Test.Fake.Deploy.csproj b/src/test/Test.Fake.Deploy/Test.Fake.Deploy.csproj index 46700e05da5..4f95aa734fd 100644 --- a/src/test/Test.Fake.Deploy/Test.Fake.Deploy.csproj +++ b/src/test/Test.Fake.Deploy/Test.Fake.Deploy.csproj @@ -134,275 +134,277 @@ --> - - - - ..\..\..\packages\CsQuery\lib\net40\CsQuery.dll - True - True - - - - - - - ..\..\..\packages\CsQuery\lib\net40\CsQuery.dll - True - True - - - - - - - ..\..\..\packages\CsQuery\lib\net40\CsQuery.dll - True - True - - + + + + + + + + + + + + + + + + ..\..\..\packages\CsQuery\lib\net40\CsQuery.dll + True + True + + + + - - - - ..\..\..\packages\Machine.Specifications\lib\net20\Machine.Specifications.dll - True - True - - - - - - - ..\..\..\packages\Machine.Specifications\lib\net20\Machine.Specifications.dll - True - True - - - - - - - ..\..\..\packages\Machine.Specifications\lib\net20\Machine.Specifications.dll - True - True - - - - - - - ..\..\..\packages\Machine.Specifications\lib\net40\Machine.Specifications.Clr4.dll - True - True - - - ..\..\..\packages\Machine.Specifications\lib\net40\Machine.Specifications.dll - True - True - - - - - - - ..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.Clr4.dll - True - True - - - ..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.dll - True - True - - - - - - - ..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.Clr4.dll - True - True - - - ..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.dll - True - True - - + + + + + + + + + + ..\..\..\packages\Machine.Specifications\lib\net20\Machine.Specifications.dll + True + True + + + + + + + ..\..\..\packages\Machine.Specifications\lib\net20\Machine.Specifications.dll + True + True + + + + + + + ..\..\..\packages\Machine.Specifications\lib\net20\Machine.Specifications.dll + True + True + + + + + + + ..\..\..\packages\Machine.Specifications\lib\net40\Machine.Specifications.Clr4.dll + True + True + + + ..\..\..\packages\Machine.Specifications\lib\net40\Machine.Specifications.dll + True + True + + + + + + + ..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.Clr4.dll + True + True + + + ..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.dll + True + True + + + + - - - - ..\..\..\packages\Machine.Specifications.Should\lib\net20\Machine.Specifications.Should.dll - True - True - - - - - - - ..\..\..\packages\Machine.Specifications.Should\lib\net20\Machine.Specifications.Should.dll - True - True - - - - - - - ..\..\..\packages\Machine.Specifications.Should\lib\net20\Machine.Specifications.Should.dll - True - True - - - - - - - ..\..\..\packages\Machine.Specifications.Should\lib\net40\Machine.Specifications.Should.dll - True - True - - - - - - - ..\..\..\packages\Machine.Specifications.Should\lib\net45\Machine.Specifications.Should.dll - True - True - - - - - - - ..\..\..\packages\Machine.Specifications.Should\lib\net45\Machine.Specifications.Should.dll - True - True - - + + + + + + + + + + ..\..\..\packages\Machine.Specifications.Should\lib\net20\Machine.Specifications.Should.dll + True + True + + + + + + + ..\..\..\packages\Machine.Specifications.Should\lib\net20\Machine.Specifications.Should.dll + True + True + + + + + + + ..\..\..\packages\Machine.Specifications.Should\lib\net20\Machine.Specifications.Should.dll + True + True + + + + + + + ..\..\..\packages\Machine.Specifications.Should\lib\net40\Machine.Specifications.Should.dll + True + True + + + + + + + ..\..\..\packages\Machine.Specifications.Should\lib\net45\Machine.Specifications.Should.dll + True + True + + + + - - - - ..\..\..\packages\Nancy\lib\net40\Nancy.dll - True - True - - - - - - - ..\..\..\packages\Nancy\lib\net40\Nancy.dll - True - True - - - - - - - ..\..\..\packages\Nancy\lib\net40\Nancy.dll - True - True - - + + + + + + + + + + + + + + + + ..\..\..\packages\Nancy\lib\net40\Nancy.dll + True + True + + + + - - - - ..\..\..\packages\Nancy.Testing\lib\net40\Nancy.Testing.dll - True - True - - - - - - - ..\..\..\packages\Nancy.Testing\lib\net40\Nancy.Testing.dll - True - True - - - - - - - ..\..\..\packages\Nancy.Testing\lib\net40\Nancy.Testing.dll - True - True - - + + + + + + + + + + + + + + + + ..\..\..\packages\Nancy.Testing\lib\net40\Nancy.Testing.dll + True + True + + + + - - - - ..\..\..\packages\Newtonsoft.Json\lib\net20\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\..\packages\Newtonsoft.Json\lib\net40\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll - True - True - - - - - - - ..\..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll - True - True - - - - + + + + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net20\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net40\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll + True + True + + + + + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll + True + True + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll @@ -411,16 +413,7 @@ - - - - ..\..\..\packages\Newtonsoft.Json\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll - True - True - - - - + ..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll @@ -429,16 +422,7 @@ - - - - ..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll - True - True - - - - + ..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll @@ -449,52 +433,44 @@ - - - - ..\..\..\packages\SSH.NET\lib\net35\Renci.SshNet.dll - True - True - - - - - - - ..\..\..\packages\SSH.NET\lib\net35\Renci.SshNet.dll - True - True - - - - - - - ..\..\..\packages\SSH.NET\lib\net40\Renci.SshNet.dll - True - True - - - - - - - ..\..\..\packages\SSH.NET\lib\net40\Renci.SshNet.dll - True - True - - - - - - - ..\..\..\packages\SSH.NET\lib\net40\Renci.SshNet.dll - True - True - - - - + + + + + + + + + + + + ..\..\..\packages\SSH.NET\lib\net35\Renci.SshNet.dll + True + True + + + + + + + ..\..\..\packages\SSH.NET\lib\net35\Renci.SshNet.dll + True + True + + + + + + + ..\..\..\packages\SSH.NET\lib\net40\Renci.SshNet.dll + True + True + + + + + + ..\..\..\packages\SSH.NET\lib\wp8\Renci.SshNet.WindowsPhone.dll @@ -503,7 +479,7 @@ - + ..\..\..\packages\SSH.NET\lib\sl50\Renci.SshNet.Silverlight.dll diff --git a/src/test/Test.Git/Test.Git.csproj b/src/test/Test.Git/Test.Git.csproj index 134db88bf30..bed2925f89d 100644 --- a/src/test/Test.Git/Test.Git.csproj +++ b/src/test/Test.Git/Test.Git.csproj @@ -80,130 +80,123 @@ --> - - - - ..\..\..\packages\Machine.Specifications\lib\net20\Machine.Specifications.dll - True - True - - - - - - - ..\..\..\packages\Machine.Specifications\lib\net20\Machine.Specifications.dll - True - True - - - - - - - ..\..\..\packages\Machine.Specifications\lib\net20\Machine.Specifications.dll - True - True - - - - - - - ..\..\..\packages\Machine.Specifications\lib\net40\Machine.Specifications.Clr4.dll - True - True - - - ..\..\..\packages\Machine.Specifications\lib\net40\Machine.Specifications.dll - True - True - - - - - - - ..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.Clr4.dll - True - True - - - ..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.dll - True - True - - - - - - - ..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.Clr4.dll - True - True - - - ..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.dll - True - True - - + + + + + + + + + + ..\..\..\packages\Machine.Specifications\lib\net20\Machine.Specifications.dll + True + True + + + + + + + ..\..\..\packages\Machine.Specifications\lib\net20\Machine.Specifications.dll + True + True + + + + + + + ..\..\..\packages\Machine.Specifications\lib\net20\Machine.Specifications.dll + True + True + + + + + + + ..\..\..\packages\Machine.Specifications\lib\net40\Machine.Specifications.Clr4.dll + True + True + + + ..\..\..\packages\Machine.Specifications\lib\net40\Machine.Specifications.dll + True + True + + + + + + + ..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.Clr4.dll + True + True + + + ..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.dll + True + True + + + + - - - - ..\..\..\packages\Machine.Specifications.Should\lib\net20\Machine.Specifications.Should.dll - True - True - - - - - - - ..\..\..\packages\Machine.Specifications.Should\lib\net20\Machine.Specifications.Should.dll - True - True - - - - - - - ..\..\..\packages\Machine.Specifications.Should\lib\net20\Machine.Specifications.Should.dll - True - True - - - - - - - ..\..\..\packages\Machine.Specifications.Should\lib\net40\Machine.Specifications.Should.dll - True - True - - - - - - - ..\..\..\packages\Machine.Specifications.Should\lib\net45\Machine.Specifications.Should.dll - True - True - - - - - - - ..\..\..\packages\Machine.Specifications.Should\lib\net45\Machine.Specifications.Should.dll - True - True - - + + + + + + + + + + ..\..\..\packages\Machine.Specifications.Should\lib\net20\Machine.Specifications.Should.dll + True + True + + + + + + + ..\..\..\packages\Machine.Specifications.Should\lib\net20\Machine.Specifications.Should.dll + True + True + + + + + + + ..\..\..\packages\Machine.Specifications.Should\lib\net20\Machine.Specifications.Should.dll + True + True + + + + + + + ..\..\..\packages\Machine.Specifications.Should\lib\net40\Machine.Specifications.Should.dll + True + True + + + + + + + ..\..\..\packages\Machine.Specifications.Should\lib\net45\Machine.Specifications.Should.dll + True + True + + + + \ No newline at end of file