From 4f0fb703cc904855336fdfa16d945f872aa9a092 Mon Sep 17 00:00:00 2001
From: Enrico Sada <enrico@sada.io>
Date: Tue, 22 Nov 2016 16:13:26 +0100
Subject: [PATCH 1/5] workaround move Paket.Core in another directory

---
 src/Paket.Core.preview3/Paket.Core.fsproj | 107 ++++++++++++++++++++++
 src/Paket.Core.preview3/paket.references  |  16 ++++
 src/Paket.Core/Paket.Core.preview3.fsproj | 106 ---------------------
 3 files changed, 123 insertions(+), 106 deletions(-)
 create mode 100644 src/Paket.Core.preview3/Paket.Core.fsproj
 create mode 100644 src/Paket.Core.preview3/paket.references
 delete mode 100644 src/Paket.Core/Paket.Core.preview3.fsproj

diff --git a/src/Paket.Core.preview3/Paket.Core.fsproj b/src/Paket.Core.preview3/Paket.Core.fsproj
new file mode 100644
index 0000000000..7ec51f1e4c
--- /dev/null
+++ b/src/Paket.Core.preview3/Paket.Core.fsproj
@@ -0,0 +1,107 @@
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+  <PropertyGroup>
+    <TargetFramework>netstandard1.6</TargetFramework>
+  </PropertyGroup>
+  <PropertyGroup>
+    <Version>1.0.0-preview3</Version>
+    <Authors>Enrico Sada</Authors>
+    <PaketCoreSourcesDir>..\Paket.Core</PaketCoreSourcesDir>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\paket-files\fsharp\FAKE\src\app\FakeLib\Globbing\Globbing.fs">
+      <Paket>True</Paket>
+      <Link>Globbing.fs</Link>
+    </Compile>
+    <Compile Include="..\..\paket-files\fsprojects\FSharp.TypeProviders.StarterPack\src\AssemblyReader.fs">
+      <Paket>True</Paket>
+      <Link>AssemblyReader.fs</Link>
+    </Compile>
+    <Compile Include="$(PaketCoreSourcesDir)\Async.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\AssemblyInfo.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\CustomAssemblyInfo.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\Domain.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\Logging.fsi" />
+    <Compile Include="$(PaketCoreSourcesDir)\Logging.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\Constants.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\Utils.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\SemVer.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\VersionRange.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\Xml.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\GitCommandHelper.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\GitHandling.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\ConfigFile.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\Cache.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\Cultures.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\PackageSources.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\FrameworkHandling.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\PlatformMatching.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\Requirements.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\ModuleResolver.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\RemoteDownload.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\RemoteUpload.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\PackageResolver.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\Nuspec.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\InstallModel.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\ReferencesFile.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\SolutionFile.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\Nuget.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\NuGetV3.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\NuGetV2.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\DependenciesTypes.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\DependenciesFileParser.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\LockFile.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\TemplateFile.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\PackagesConfigFile.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\ProjectFile.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\DependenciesFile.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\LocalFile.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\DependencyChangeDetection.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\GarbageCollection.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\RestoreProcess.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\BindingRedirects.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\NupkgWriter.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\ProcessOptions.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\DependencyModel.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\InstallProcess.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\UpdateProcess.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\RemoveProcess.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\AddProcess.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\PackageMetaData.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\PackageProcess.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\Environment.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\Releases.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\Simplifier.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\VSIntegration.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\NugetConvert.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\FindOutdated.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\FindReferences.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\Why.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\PublicAPI.fs" />
+    <Compile Include="$(PaketCoreSourcesDir)\ScriptGeneration.fs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="$(PaketCoreSourcesDir)\paket.template" />
+    <None Include="$(PaketCoreSourcesDir)\paket.references" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Sdk">
+      <Version>1.0.0-alpha-20161104-2</Version>
+      <PrivateAssets>All</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="FSharp.NET.Sdk">
+      <Version>1.0.0-alpha-*</Version>
+      <PrivateAssets>All</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+  <PropertyGroup>
+    <DefineConstants>$(DefineConstants);DOTNETCORE;NETSTANDARD1_5;NETSTANDARD1_6;USE_HTTP_CLIENT</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <DotNetCliToolReference Include="dotnet-compile-fsc">
+      <Version>1.0.0-preview2-020000</Version>
+    </DotNetCliToolReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
+  <Import Project="..\..\.paket\Paket.Restore.targets" />
+</Project>
\ No newline at end of file
diff --git a/src/Paket.Core.preview3/paket.references b/src/Paket.Core.preview3/paket.references
new file mode 100644
index 0000000000..996a4070d0
--- /dev/null
+++ b/src/Paket.Core.preview3/paket.references
@@ -0,0 +1,16 @@
+Newtonsoft.Json
+FSharp.Core
+Mono.Cecil
+Chessie
+
+System.Diagnostics.TraceSource
+System.Xml.XPath.XmlDocument
+System.Diagnostics.Process
+System.Xml.XDocument
+System.Xml.XPath.XDocument
+System.Security.Cryptography.ProtectedData
+System.Security.Cryptography.Algorithms
+System.Diagnostics.FileVersionInfo
+
+File:Globbing.fs .
+File:AssemblyReader.fs .
diff --git a/src/Paket.Core/Paket.Core.preview3.fsproj b/src/Paket.Core/Paket.Core.preview3.fsproj
deleted file mode 100644
index dd6b3d4d1e..0000000000
--- a/src/Paket.Core/Paket.Core.preview3.fsproj
+++ /dev/null
@@ -1,106 +0,0 @@
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
-  <PropertyGroup>
-    <TargetFramework>netstandard1.6</TargetFramework>
-  </PropertyGroup>
-  <PropertyGroup>
-    <Version>1.0.0-preview3</Version>
-    <Authors>Enrico Sada</Authors>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\..\paket-files\fsharp\FAKE\src\app\FakeLib\Globbing\Globbing.fs">
-      <Paket>True</Paket>
-      <Link>Globbing.fs</Link>
-    </Compile>
-    <Compile Include="..\..\paket-files\fsprojects\FSharp.TypeProviders.StarterPack\src\AssemblyReader.fs">
-      <Paket>True</Paket>
-      <Link>AssemblyReader.fs</Link>
-    </Compile>
-    <Compile Include="Async.fs" />
-    <Compile Include="AssemblyInfo.fs" />
-    <Compile Include="CustomAssemblyInfo.fs" />
-    <Compile Include="Domain.fs" />
-    <Compile Include="Logging.fsi" />
-    <Compile Include="Logging.fs" />
-    <Compile Include="Constants.fs" />
-    <Compile Include="Utils.fs" />
-    <Compile Include="SemVer.fs" />
-    <Compile Include="VersionRange.fs" />
-    <Compile Include="Xml.fs" />
-    <Compile Include="GitCommandHelper.fs" />
-    <Compile Include="GitHandling.fs" />
-    <Compile Include="ConfigFile.fs" />
-    <Compile Include="Cache.fs" />
-    <Compile Include="Cultures.fs" />
-    <Compile Include="PackageSources.fs" />
-    <Compile Include="FrameworkHandling.fs" />
-    <Compile Include="PlatformMatching.fs" />
-    <Compile Include="Requirements.fs" />
-    <Compile Include="ModuleResolver.fs" />
-    <Compile Include="RemoteDownload.fs" />
-    <Compile Include="RemoteUpload.fs" />
-    <Compile Include="PackageResolver.fs" />
-    <Compile Include="Nuspec.fs" />
-    <Compile Include="InstallModel.fs" />
-    <Compile Include="ReferencesFile.fs" />
-    <Compile Include="SolutionFile.fs" />
-    <Compile Include="Nuget.fs" />
-    <Compile Include="NuGetV3.fs" />
-    <Compile Include="NuGetV2.fs" />
-    <Compile Include="DependenciesTypes.fs" />
-    <Compile Include="DependenciesFileParser.fs" />
-    <Compile Include="LockFile.fs" />
-    <Compile Include="TemplateFile.fs" />
-    <Compile Include="PackagesConfigFile.fs" />
-    <Compile Include="ProjectFile.fs" />
-    <Compile Include="DependenciesFile.fs" />
-    <Compile Include="LocalFile.fs" />
-    <Compile Include="DependencyChangeDetection.fs" />
-    <Compile Include="GarbageCollection.fs" />
-    <Compile Include="RestoreProcess.fs" />
-    <Compile Include="BindingRedirects.fs" />
-    <Compile Include="NupkgWriter.fs" />
-    <Compile Include="ProcessOptions.fs" />
-    <Compile Include="DependencyModel.fs" />
-    <Compile Include="InstallProcess.fs" />
-    <Compile Include="UpdateProcess.fs" />
-    <Compile Include="RemoveProcess.fs" />
-    <Compile Include="AddProcess.fs" />
-    <Compile Include="PackageMetaData.fs" />
-    <Compile Include="PackageProcess.fs" />
-    <Compile Include="Environment.fs" />
-    <Compile Include="Releases.fs" />
-    <Compile Include="Simplifier.fs" />
-    <Compile Include="VSIntegration.fs" />
-    <Compile Include="NugetConvert.fs" />
-    <Compile Include="FindOutdated.fs" />
-    <Compile Include="FindReferences.fs" />
-    <Compile Include="Why.fs" />
-    <Compile Include="PublicAPI.fs" />
-    <Compile Include="ScriptGeneration.fs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="paket.template" />
-    <None Include="paket.references" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Sdk">
-      <Version>1.0.0-alpha-20161104-2</Version>
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="FSharp.NET.Sdk">
-      <Version>1.0.0-alpha-*</Version>
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
-  </ItemGroup>
-  <PropertyGroup>
-    <DefineConstants>$(DefineConstants);DOTNETCORE;NETSTANDARD1_5;NETSTANDARD1_6;USE_HTTP_CLIENT</DefineConstants>
-  </PropertyGroup>
-  <ItemGroup>
-    <DotNetCliToolReference Include="dotnet-compile-fsc">
-      <Version>1.0.0-preview2-020000</Version>
-    </DotNetCliToolReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
-  <Import Project="..\..\.paket\Paket.Restore.targets" />
-</Project>
\ No newline at end of file

From 1008c5d0da9e8a29e10f7988affd9652b0b30fb6 Mon Sep 17 00:00:00 2001
From: Enrico Sada <enrico@sada.io>
Date: Tue, 22 Nov 2016 16:15:13 +0100
Subject: [PATCH 2/5] move Paket fsproj

---
 .../Paket.preview3.fsproj => Paket.preview3/Paket.fsproj}      | 0
 src/Paket.preview3/paket.references                            | 3 +++
 2 files changed, 3 insertions(+)
 rename src/{Paket/Paket.preview3.fsproj => Paket.preview3/Paket.fsproj} (100%)
 create mode 100644 src/Paket.preview3/paket.references

diff --git a/src/Paket/Paket.preview3.fsproj b/src/Paket.preview3/Paket.fsproj
similarity index 100%
rename from src/Paket/Paket.preview3.fsproj
rename to src/Paket.preview3/Paket.fsproj
diff --git a/src/Paket.preview3/paket.references b/src/Paket.preview3/paket.references
new file mode 100644
index 0000000000..7170160ced
--- /dev/null
+++ b/src/Paket.preview3/paket.references
@@ -0,0 +1,3 @@
+Argu
+FSharp.Core
+Chessie
\ No newline at end of file

From 530b0369ac4de7a38766f4be82cc480a5f978b96 Mon Sep 17 00:00:00 2001
From: Enrico Sada <enrico@sada.io>
Date: Tue, 22 Nov 2016 16:17:10 +0100
Subject: [PATCH 3/5] fix relative paths

---
 src/Paket.Core.preview3/Paket.Core.fsproj | 2 +-
 src/Paket.preview3/Paket.fsproj           | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Paket.Core.preview3/Paket.Core.fsproj b/src/Paket.Core.preview3/Paket.Core.fsproj
index 7ec51f1e4c..6329a7a331 100644
--- a/src/Paket.Core.preview3/Paket.Core.fsproj
+++ b/src/Paket.Core.preview3/Paket.Core.fsproj
@@ -82,7 +82,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="$(PaketCoreSourcesDir)\paket.template" />
-    <None Include="$(PaketCoreSourcesDir)\paket.references" />
+    <None Include="paket.references" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Sdk">
diff --git a/src/Paket.preview3/Paket.fsproj b/src/Paket.preview3/Paket.fsproj
index 62a848e452..232ce222c3 100644
--- a/src/Paket.preview3/Paket.fsproj
+++ b/src/Paket.preview3/Paket.fsproj
@@ -10,9 +10,9 @@
   </PropertyGroup>
   <!--<Win32Resource>paket.res</Win32Resource>-->
   <ItemGroup>
-    <Compile Include="AssemblyInfo.fs" />
-    <Compile Include="Commands.fs" />
-    <Compile Include="Program.fs" />
+    <Compile Include="..\Paket\AssemblyInfo.fs" />
+    <Compile Include="..\Paket\Commands.fs" />
+    <Compile Include="..\Paket\Program.fs" />
     <!--<Content Include="App.config" />-->
     <None Include="paket.references" />
     <!--<EmbeddedResource Include="embedded\PaketRestoreTask.deps.json" />
@@ -33,7 +33,7 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Paket.Core\Paket.Core.preview3.fsproj">
+    <ProjectReference Include="..\Paket.Core.preview3\Paket.Core.fsproj">
       <Name>Paket.Core.preview3</Name>
     </ProjectReference>
   </ItemGroup>

From 1620b7d472127d42ebdaae8eb629096c68002e67 Mon Sep 17 00:00:00 2001
From: Enrico Sada <enrico@sada.io>
Date: Tue, 22 Nov 2016 16:52:31 +0100
Subject: [PATCH 4/5] fix build

---
 build.fsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.fsx b/build.fsx
index 67a0bed5ca..537f735756 100644
--- a/build.fsx
+++ b/build.fsx
@@ -65,7 +65,7 @@ let dotnetcliVersion = "1.0.0-preview3-004056"
 
 let dotnetCliPath = DirectoryInfo "./dotnetcore"
 
-let netcoreFiles = !! "src/**/*.preview?.fsproj" |> Seq.toList
+let netcoreFiles = !! "src/**.preview?/*.fsproj" |> Seq.toList
 
 // --------------------------------------------------------------------------------------
 // END TODO: The rest of the file includes standard build steps

From 51754f2c092fea891ab96411d6a2deee2990cb16 Mon Sep 17 00:00:00 2001
From: Enrico Sada <enrico@sada.io>
Date: Tue, 22 Nov 2016 18:31:11 +0100
Subject: [PATCH 5/5] add dotnet dir to PATH

---
 build.fsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build.fsx b/build.fsx
index 537f735756..2b2d20fac7 100644
--- a/build.fsx
+++ b/build.fsx
@@ -157,6 +157,9 @@ Target "InstallDotNetCore" (fun _ ->
         webclient.DownloadFile(downloadPath, localPath)
 
         System.IO.Compression.ZipFile.ExtractToDirectory(localPath, dotnetCliPath.FullName)
+
+    let oldPath = System.Environment.GetEnvironmentVariable("PATH")
+    System.Environment.SetEnvironmentVariable("PATH", sprintf "%s%s%s" dotnetCliPath.FullName (System.IO.Path.PathSeparator.ToString()) oldPath)
 )
 
 // --------------------------------------------------------------------------------------