Skip to content

Fix netcore build with workaround #2036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
forki merged 5 commits into from
Nov 23, 2016
Merged

Fix netcore build with workaround #2036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4f0fb70
workaround move Paket.Core in another directory
enricosada Nov 22, 2016
1008c5d
move Paket fsproj
enricosada Nov 22, 2016
530b036
fix relative paths
enricosada Nov 22, 2016
1620b7d
fix build
enricosada Nov 22, 2016
51754f2
add dotnet dir to PATH
enricosada Nov 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
)

// --------------------------------------------------------------------------------------
Expand Down
107 changes: 107 additions & 0 deletions src/Paket.Core.preview3/Paket.Core.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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="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>
16 changes: 16 additions & 0 deletions src/Paket.Core.preview3/paket.references
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 .
106 changes: 0 additions & 106 deletions src/Paket.Core/Paket.Core.preview3.fsproj
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions src/Paket/Paket.preview3.fsproj → src/Paket.preview3/Paket.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -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>
Expand Down
3 changes: 3 additions & 0 deletions src/Paket.preview3/paket.references
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Argu
FSharp.Core
Chessie