Skip to content
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

[Ready] Make paket build on a clean windows #2664

Merged
merged 5 commits into from
Sep 3, 2017
Merged

[Ready] Make paket build on a clean windows #2664

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
6d343b3
run paket update
0x53A Aug 25, 2017
385a821
Make Paket build on a clean installation:
0x53A Aug 26, 2017
f79116a
Merge branch 'master' into bootstrapping
0x53A Aug 27, 2017
99d915c
update README: add notes about prerequisites
0x53A Aug 27, 2017
2d8be87
Merge remote-tracking branch 'upstream/master' into bootstrapping
0x53A Aug 31, 2017
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: 5 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<Project>
<PropertyGroup>
<TargetFrameworkRootPath>$(MSBuildThisFileDirectory)packages\build\0x53A.ReferenceAssemblies.Paket\tools\framework</TargetFrameworkRootPath>
</PropertyGroup>
</Project>
14 changes: 14 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,20 @@ For more reasons see the [FAQ][10].

- Found a bug or missing a feature? Feed the [issue tracker][4].
- Announcements and related miscellanea through Twitter ([@PaketManager][5])


## Prerequisites

### Windows
- As of https://github.com/fsprojects/Paket/pull/2664, paket now automatically bootstraps all required dependencies and builds on a clean windows installation.

### Linux

- up-to-date Mono (>= 5.0 required, >= 5.2 recommended, just install the latest nightly)
- up-to-date MSBuild (>= 15.0, support for "Directory.Build.props" required)

On most distros, it should be enough to follow [this guide](http://www.mono-project.com/docs/getting-started/install/linux/) and install ``mono-devel``, which contains MSBuild.
Note: if the paket build script fails at ``paket restore`` just rerun it a few times until it succeeds.

## Quick contributing guide

Expand Down
2 changes: 2 additions & 0 deletions build.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@ if errorlevel 1 (
exit /b %errorlevel%
)

set MSBuild=packages\build\RoslynTools.MSBuild\tools\msbuild

packages\build\FAKE\tools\FAKE.exe build.fsx %*
4 changes: 3 additions & 1 deletion build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ then
if [ $exit_code -ne 0 ]; then
exit $exit_code
fi

export MSBuild=packages/build/RoslynTools.MSBuild/tools/msbuild/MSBuild.exe
packages/build/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx
else
mono .paket/paket.exe restore
Expand All @@ -27,6 +27,8 @@ else
fi
exit $exit_code
fi
# Note: the bundled MSBuild crashes hard on linux, so we still rely on the system-installed version
#export MSBuild=packages/build/RoslynTools.MSBuild/tools/msbuild/MSBuild.exe
mono packages/build/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx
fi

243 changes: 231 additions & 12 deletions integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion integrationtests/Paket.IntegrationTests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.DotNet.InternalAbstractions" version="1.0.0" />
<package id="Microsoft.Win32.Registry" version="4.3" />
<package id="Microsoft.Win32.Registry" version="4.4" />
<package id="NUnit3TestAdapter" version="3.8.0" />
<package id="System.ComponentModel.EventBasedAsync" version="4.3.0" />
<package id="System.Diagnostics.Process" version="4.3" />
<package id="System.Security.AccessControl" version="4.4" />
<package id="System.Security.Principal.Windows" version="4.4" />
<package id="System.Xml.XPath" version="4.3" />
<package id="System.Xml.XPath.XmlDocument" version="4.3" />
</packages>
Loading