paket update

fsprojects · Oct 21, 2017 · d8704d4 · d8704d4
1 parent 784f276
commit d8704d4
Show file tree

Hide file tree

Showing 33 changed files with 4,899 additions and 600 deletions.
diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
@@ -30,7 +30,7 @@
     <DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
   </PropertyGroup>
 
-  <Target Name="PaketRestore" BeforeTargets="_GenerateDotnetCliToolReferenceSpecs;_GenerateProjectRestoreGraphPerFramework;_GenerateRestoreGraphWalkPerFramework;CollectPackageReferences" >
+  <Target Name="PaketRestore" Condition="'$(PaketRestoreDisabled)' != 'True'" BeforeTargets="_GenerateDotnetCliToolReferenceSpecs;_GenerateProjectRestoreGraphPerFramework;_GenerateRestoreGraphWalkPerFramework;CollectPackageReferences" >
 
     <!-- Step 1 Check if lockfile is properly restored -->
     <PropertyGroup>
@@ -84,11 +84,11 @@
     </PropertyGroup>
 
     <!-- Step 3 Restore project specific stuff if required -->
-    <Warning Condition=" '$(PaketRestoreRequired)' == 'true' "  Text="Detected a change ('$(PaketRestoreRequiredReason)') in the project file '$(MSBuildProjectFullPath)', calling paket restore" />
+    <Message Condition=" '$(PaketRestoreRequired)' == 'true' " Importance="low" Text="Detected a change ('$(PaketRestoreRequiredReason)') in the project file '$(MSBuildProjectFullPath)', calling paket restore" />
     <Exec Command='$(PaketCommand) restore --project "$(MSBuildProjectFullPath)"' Condition=" '$(PaketRestoreRequired)' == 'true' " ContinueOnError="false" />
 
     <!-- This shouldn't actually happen, but just to be sure. -->
-    <Error Condition=" !Exists('$(PaketResolvedFilePath)') AND '$(TargetFramework)' != '' " Text="A paket file for the framework '$(TargetFramework)' is missing. Please delete 'paket-files/paket.restore.cached' and call 'paket restore'." />
+    <Error Condition=" !Exists('$(PaketResolvedFilePath)') AND '$(TargetFramework)' != '' AND '$(ResolveNuGetPackages)' != 'False' " Text="Paket file '$(PaketResolvedFilePath)' is missing while restoring $(MSBuildProjectFile). Please delete 'paket-files/paket.restore.cached' and call 'paket restore'." />
 
     <!-- Step 4 forward all msbuild properties (PackageReference, DotNetCliToolReference) to msbuild -->
     <ReadLinesFromFile Condition="Exists('$(PaketResolvedFilePath)')" File="$(PaketResolvedFilePath)" >

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
@@ -84,7 +84,7 @@
         </Reference>
       </ItemGroup>
     </When>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v5.0')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1')">
       <ItemGroup>
         <Reference Include="Machine.Specifications">
           <HintPath>..\..\..\..\..\packages\Machine.Specifications\lib\net45\Machine.Specifications.dll</HintPath>

diff --git a/paket.dependencies b/paket.dependencies
@@ -1,4 +1,4 @@
-version 5.101.0
+version 5.119.7
 content: none
 // just in case we need some special nuget feature again...
 //source https://ci.appveyor.com/nuget/paket

diff --git a/src/app/FAKE/FAKE.fsproj b/src/app/FAKE/FAKE.fsproj
diff --git a/src/app/Fake.Deploy.Lib/Fake.Deploy.Lib.fsproj b/src/app/Fake.Deploy.Lib/Fake.Deploy.Lib.fsproj
diff --git a/src/app/Fake.Deploy/Fake.Deploy.fsproj b/src/app/Fake.Deploy/Fake.Deploy.fsproj
diff --git a/src/app/Fake.Experimental/Fake.Experimental.fsproj b/src/app/Fake.Experimental/Fake.Experimental.fsproj
diff --git a/src/app/Fake.FluentMigrator/Fake.FluentMigrator.fsproj b/src/app/Fake.FluentMigrator/Fake.FluentMigrator.fsproj
diff --git a/src/app/Fake.Gallio/Fake.Gallio.fsproj b/src/app/Fake.Gallio/Fake.Gallio.fsproj
diff --git a/src/app/Fake.IIS/Fake.IIS.fsproj b/src/app/Fake.IIS/Fake.IIS.fsproj
diff --git a/src/app/Fake.SQL/Fake.SQL.fsproj b/src/app/Fake.SQL/Fake.SQL.fsproj
diff --git a/src/app/FakeLib/FakeLib.fsproj b/src/app/FakeLib/FakeLib.fsproj
diff --git a/src/deploy.web/Fake.Deploy.Web.Abstractions/Fake.Deploy.Web.Abstractions.fsproj b/src/deploy.web/Fake.Deploy.Web.Abstractions/Fake.Deploy.Web.Abstractions.fsproj
diff --git a/...deploy.web/Fake.Deploy.Web.DataProviders/Fake.Deploy.Web.File/Fake.Deploy.Web.File.fsproj b/...deploy.web/Fake.Deploy.Web.DataProviders/Fake.Deploy.Web.File/Fake.Deploy.Web.File.fsproj
diff --git a/....web/Fake.Deploy.Web.DataProviders/Fake.Deploy.Web.RavenDb/Fake.Deploy.Web.RavenDb.fsproj b/....web/Fake.Deploy.Web.DataProviders/Fake.Deploy.Web.RavenDb/Fake.Deploy.Web.RavenDb.fsproj
diff --git a/src/deploy.web/Fake.Deploy.Web/Fake.Deploy.Web.fsproj b/src/deploy.web/Fake.Deploy.Web/Fake.Deploy.Web.fsproj
diff --git a/src/test/Fake.Core.IntegrationTests/Fake.Core.IntegrationTests.fsproj b/src/test/Fake.Core.IntegrationTests/Fake.Core.IntegrationTests.fsproj
diff --git a/src/test/FsCheck.Fake/FsCheck.Fake.fsproj b/src/test/FsCheck.Fake/FsCheck.Fake.fsproj
diff --git a/src/test/Test.FAKECore/ProjectTestFiles/CSharpApp.csproj b/src/test/Test.FAKECore/ProjectTestFiles/CSharpApp.csproj
diff --git a/src/test/Test.FAKECore/ProjectTestFiles/FakeLib.fsproj b/src/test/Test.FAKECore/ProjectTestFiles/FakeLib.fsproj
diff --git a/src/test/Test.FAKECore/ProjectTestFiles/FakeLib2.csproj b/src/test/Test.FAKECore/ProjectTestFiles/FakeLib2.csproj
diff --git a/src/test/Test.FAKECore/ProjectTestFiles/FakeLib2.fsproj b/src/test/Test.FAKECore/ProjectTestFiles/FakeLib2.fsproj
diff --git a/src/test/Test.FAKECore/ProjectTestFiles/FakeLib3.csproj b/src/test/Test.FAKECore/ProjectTestFiles/FakeLib3.csproj
diff --git a/src/test/Test.FAKECore/ProjectTestFiles/FakeLib3.fsproj b/src/test/Test.FAKECore/ProjectTestFiles/FakeLib3.fsproj
diff --git a/src/test/Test.FAKECore/ProjectTestFiles/FakeLib4.fsproj b/src/test/Test.FAKECore/ProjectTestFiles/FakeLib4.fsproj
diff --git a/src/test/Test.FAKECore/ProjectTestFiles/FakeLib5.fsproj b/src/test/Test.FAKECore/ProjectTestFiles/FakeLib5.fsproj
diff --git a/src/test/Test.FAKECore/ProjectTestFiles/FakeLib6.fsproj b/src/test/Test.FAKECore/ProjectTestFiles/FakeLib6.fsproj
diff --git a/src/test/Test.FAKECore/Test.FAKECore.csproj b/src/test/Test.FAKECore/Test.FAKECore.csproj
diff --git a/src/test/Test.FAKECore/TestData/fake_no_template.csproj b/src/test/Test.FAKECore/TestData/fake_no_template.csproj
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
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
diff --git a/src/test/Test.Fake.Deploy/Test.Fake.Deploy.csproj b/src/test/Test.Fake.Deploy/Test.Fake.Deploy.csproj
diff --git a/src/test/Test.Git/Test.Git.csproj b/src/test/Test.Git/Test.Git.csproj