Skip to content

Commit

Permalink
Merge branch 'release/next' into add_support_for_publish_profiles
Browse files Browse the repository at this point in the history
  • Loading branch information
matthid authored Dec 16, 2019
2 parents a38c157 + 8b0bc01 commit 513052a
Show file tree
Hide file tree
Showing 498 changed files with 13,401 additions and 96,719 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
command: |
apt-get update
apt-get install -y libunwind8 libicu52 unzip wget git
wget https://github.com/fsharp/FAKE/releases/download/5.12.6/fake-dotnetcore-linux-x64.zip -O /tmp/fake-dotnetcore-linux-x64.zip
wget https://github.com/fsharp/FAKE/releases/download/5.16.0/fake-dotnetcore-linux-x64.zip -O /tmp/fake-dotnetcore-linux-x64.zip
mkdir fake-dotnetcore
unzip /tmp/fake-dotnetcore-linux-x64.zip -d fake-dotnetcore || echo unzip returned $?
chmod +x $PWD/fake-dotnetcore/fake
Expand Down
24 changes: 24 additions & 0 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"version": 1,
"isRoot": true,
"tools": {
"dotnet-deb": {
"version": "0.1.153",
"commands": [
"dotnet-deb"
]
},
"paket": {
"version": "6.0.0-alpha006",
"commands": [
"paket"
]
},
"fake-cli": {
"version": "5.18.3",
"commands": [
"fake"
]
}
}
}
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ Feel free to open the PR and ask for help
- [ ] (if new module) the module has been linked from the "Modules" menu, edit `help/templates/template.cshtml`, linking to the API-reference is fine.
- [ ] (if new module) the module is in the correct namespace
- [ ] (if new module) the module is added to Fake.sln (`dotnet sln Fake.sln add src/app/Fake.*/Fake.*.fsproj`)
- [ ] Fake 5 [API guideline](https://fake.build/contributing.html#API-Design) is honored
- [ ] Fake 5 [API guideline](https://fake.build/contributing.html#API-Design-Guidelines) is honored
13 changes: 13 additions & 0 deletions .github/workflows/greetings.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Greetings

on: [pull_request, issues]

jobs:
greeting:
runs-on: ubuntu-latest
steps:
- uses: actions/first-interaction@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
issue-message: 'Welcome to the FAKE community! Thank you so much for creating your first issue and therefore improving the project!'
pr-message: 'Welcome to the FAKE community! Thank you so much for directly helping to improve FAKE! You are now in good company and we hope this only the first in a long list of contributions :)'
23 changes: 23 additions & 0 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Mark stale issues and pull requests

on:
schedule:
- cron: "0 0 * * *"

jobs:
stale:

runs-on: ubuntu-latest

steps:
- uses: actions/stale@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: 'There has not been any activity in this issue for the last 3 months so it will be closed in 14 days if there is no activity.'
stale-pr-message: 'There has not been any activity in this pull request for the last 3 months so it will be closed in 14 days if there is no activity.'
exempt-issue-label: 'skip-stale'
exempt-pr-label: 'skip-stale'
stale-issue-label: 'stale'
stale-pr-label: 'stale'
days-before-stale: 90
days-before-close: 14
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,13 @@ tools/RazorEngine
!tools/FAKE/tools/FakeLib.dll
!tools/FAKE/tools/FakeLib.pdb
.gitignore
!integrationtests/.gitignore
_NCrunch_FAKE/
tools/FSharp.Compiler.Service
tools/FSharp.Formatting.CommandTool/
tools/SourceLink.Fake
.ionide/
/integrationtests/*/temp
/.vscode/settings.json
/temp

release.cmd
Expand All @@ -73,7 +74,6 @@ paket-files/
mytemp
Samples/WebNpmGrunt/node_modules
.fake
!/integrationtests/*/before/.fake
project.lock.json

#src/app/*/any
Expand Down
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ do_build:
- "echo 'Package: *\nPin: origin \"archive.debian.org\"\nPin-Priority: 500' | tee -a /etc/apt/preferences.d/10-archive-pin"
- apt-get update
- apt-get install -y libunwind8 libicu52 unzip wget git
- wget https://github.com/fsharp/FAKE/releases/download/5.12.6/fake-dotnetcore-linux-x64.zip -O /tmp/fake-dotnetcore-linux-x64.zip
- wget https://github.com/fsharp/FAKE/releases/download/5.18.3/fake-dotnetcore-linux-x64.zip -O /tmp/fake-dotnetcore-linux-x64.zip
- mkdir fake-dotnetcore
- unzip -n /tmp/fake-dotnetcore-linux-x64.zip -d fake-dotnetcore || echo unzip returned $?
- chmod +x $PWD/fake-dotnetcore/fake
Expand Down
178 changes: 112 additions & 66 deletions .paket/Paket.Restore.targets

Large diffs are not rendered by default.

Binary file removed .paket/paket.exe
Binary file not shown.
6 changes: 0 additions & 6 deletions .paket/paket.exe.config

This file was deleted.

9 changes: 5 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: csharp
sudo: required
dist: xenial # Ubuntu 16.04

dotnet : 2.1.505
dotnet: 3.1.100

addons:
apt:
Expand All @@ -19,7 +19,7 @@ before_install:
#- sudo dpkg -i packages-microsoft-prod.deb
#- sudo apt-get install apt-transport-https -y
#- sudo apt-get update -y
#- sudo apt-get install dotnet-sdk-2.1=2.1.505* -y
#- sudo apt-get install dotnet-sdk-2.1=2.1.508* -y

env:
- FAKE_DETAILED_ERRORS=true HOME=/home/travis APPDATA=/home/travis LocalAppData=/home/travis
Expand All @@ -28,8 +28,9 @@ env:
mono:
- 5.18.1

script:
- dotnet build build.proj /nologo /verbosity:minimal /p:Parallel=true
script:
- dotnet tool restore
- dotnet fake build

branches:
except:
Expand Down
23 changes: 23 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,29 @@
"stopAtEntry": false,
"internalConsoleOptions": "openOnSessionStart"
},
{
"name": "Debug IntegrationTest",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "dotnet:build:fake-netcore.fsproj",
"program": "${workspaceRoot}/src/app/Fake.netcore/bin/Debug/netcoreapp2.1/fake.dll",
"args": [
"run",
"--nocache",
"--fsiargs",
"--debug:portable --optimize-",
"integrationtests/core-reference-fake-core-targets/temp/reference_fake-targets.fsx",
"--write-info",
"test.json"
],
"cwd": "${workspaceRoot}",
"env": {
"COMPlus_JitNoInline": "1"
},
"console": "internalConsole",
"stopAtEntry": false,
"internalConsoleOptions": "openOnSessionStart"
},
{
"name": "Run Specific Test",
"type": "coreclr",
Expand Down
2 changes: 0 additions & 2 deletions .vscode/settings.json

This file was deleted.

31 changes: 30 additions & 1 deletion Fake.sln
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,10 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.ILMerge", "src\
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.Xdt", "src\app\Fake.DotNet.Xdt\Fake.DotNet.Xdt.fsproj", "{32A8D516-30FA-4DD2-BDA3-F8532CE642D1}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.Testing.Coverlet", "src\app\Fake.DotNet.Testing.Coverlet\Fake.DotNet.Testing.Coverlet.fsproj", "{664A121E-17A2-453E-BC2E-1C59A67875D2}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fake.ExpectoSupport", "src\test\Fake.ExpectoSupport\Fake.ExpectoSupport.fsproj", "{D063FC91-8F84-406D-AA48-9E946B7E4323}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -958,7 +962,6 @@ Global
{9E26B2AE-856A-42B6-9670-8766919F7D25}.Release|x86.ActiveCfg = Release|Any CPU
{9E26B2AE-856A-42B6-9670-8766919F7D25}.Release|x86.Build.0 = Release|Any CPU
{29B66A06-1A45-4D65-AC31-7D746449E5D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{29B66A06-1A45-4D65-AC31-7D746449E5D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{29B66A06-1A45-4D65-AC31-7D746449E5D6}.Debug|x64.ActiveCfg = Debug|Any CPU
{29B66A06-1A45-4D65-AC31-7D746449E5D6}.Debug|x64.Build.0 = Debug|Any CPU
{29B66A06-1A45-4D65-AC31-7D746449E5D6}.Debug|x86.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -1113,6 +1116,30 @@ Global
{32A8D516-30FA-4DD2-BDA3-F8532CE642D1}.Release|x64.Build.0 = Release|Any CPU
{32A8D516-30FA-4DD2-BDA3-F8532CE642D1}.Release|x86.ActiveCfg = Release|Any CPU
{32A8D516-30FA-4DD2-BDA3-F8532CE642D1}.Release|x86.Build.0 = Release|Any CPU
{664A121E-17A2-453E-BC2E-1C59A67875D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{664A121E-17A2-453E-BC2E-1C59A67875D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{664A121E-17A2-453E-BC2E-1C59A67875D2}.Debug|x64.ActiveCfg = Debug|Any CPU
{664A121E-17A2-453E-BC2E-1C59A67875D2}.Debug|x64.Build.0 = Debug|Any CPU
{664A121E-17A2-453E-BC2E-1C59A67875D2}.Debug|x86.ActiveCfg = Debug|Any CPU
{664A121E-17A2-453E-BC2E-1C59A67875D2}.Debug|x86.Build.0 = Debug|Any CPU
{664A121E-17A2-453E-BC2E-1C59A67875D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{664A121E-17A2-453E-BC2E-1C59A67875D2}.Release|Any CPU.Build.0 = Release|Any CPU
{664A121E-17A2-453E-BC2E-1C59A67875D2}.Release|x64.ActiveCfg = Release|Any CPU
{664A121E-17A2-453E-BC2E-1C59A67875D2}.Release|x64.Build.0 = Release|Any CPU
{664A121E-17A2-453E-BC2E-1C59A67875D2}.Release|x86.ActiveCfg = Release|Any CPU
{664A121E-17A2-453E-BC2E-1C59A67875D2}.Release|x86.Build.0 = Release|Any CPU
{D063FC91-8F84-406D-AA48-9E946B7E4323}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D063FC91-8F84-406D-AA48-9E946B7E4323}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D063FC91-8F84-406D-AA48-9E946B7E4323}.Debug|x64.ActiveCfg = Debug|Any CPU
{D063FC91-8F84-406D-AA48-9E946B7E4323}.Debug|x64.Build.0 = Debug|Any CPU
{D063FC91-8F84-406D-AA48-9E946B7E4323}.Debug|x86.ActiveCfg = Debug|Any CPU
{D063FC91-8F84-406D-AA48-9E946B7E4323}.Debug|x86.Build.0 = Debug|Any CPU
{D063FC91-8F84-406D-AA48-9E946B7E4323}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D063FC91-8F84-406D-AA48-9E946B7E4323}.Release|Any CPU.Build.0 = Release|Any CPU
{D063FC91-8F84-406D-AA48-9E946B7E4323}.Release|x64.ActiveCfg = Release|Any CPU
{D063FC91-8F84-406D-AA48-9E946B7E4323}.Release|x64.Build.0 = Release|Any CPU
{D063FC91-8F84-406D-AA48-9E946B7E4323}.Release|x86.ActiveCfg = Release|Any CPU
{D063FC91-8F84-406D-AA48-9E946B7E4323}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -1197,6 +1224,8 @@ Global
{69E4C443-11D6-41BC-920C-ED9D7B36DDCA} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
{D15BF11A-0426-4053-B6EC-C38B86849240} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
{32A8D516-30FA-4DD2-BDA3-F8532CE642D1} = {901F162F-8925-4390-89C5-9EE2C343F744}
{664A121E-17A2-453E-BC2E-1C59A67875D2} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
{D063FC91-8F84-406D-AA48-9E946B7E4323} = {CCAC5CAB-03C8-4C11-ADBE-A0D05F6A4F18}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {058A0C5E-2216-4306-8AFB-0AE28320C26A}
Expand Down
9 changes: 3 additions & 6 deletions README.markdown → README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# FAKE - F# Make

[![Join the chat at https://gitter.im/fsharp/FAKE](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/fsharp/FAKE?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Azure Pipelines build status](https://dev.azure.com/fakebuild/FSProjects/_apis/build/status/FAKE-CI?branchName=release/next)](https://dev.azure.com/fakebuild/FSProjects/_build/latest?definitionId=1&branchName=release/next)
[![Travis build status](https://travis-ci.org/fsharp/FAKE.png)](https://travis-ci.org/fsharp/FAKE)
[![AppVeyor build status](https://ci.appveyor.com/api/projects/status/lk1dfo1qi99ri78f)](https://ci.appveyor.com/project/matthid/fake-6w516)

"FAKE - F# Make" is a cross platform build automation system. Due to its integration
in F#, all benefits of the .NET Framework and functional programming can be used, including
Expand All @@ -16,10 +19,6 @@ See the [project home page](https://fake.build/) for tutorials and [API document
* Quick: Download and install the [Dotnet SDK](https://www.microsoft.com/net/learn/get-started) and run `dotnet build build.proj`
* Fake5: Install FAKE 5 (for example via `choco install fake -pre`) and run `fake build`

[![Azure Pipelines build status](https://dev.azure.com/fakebuild/FSProjects/_apis/build/status/FAKE-CI?branchName=release/next)](https://dev.azure.com/fakebuild/FSProjects/_build/latest?definitionId=1&branchName=release/next)
[![Travis build status](https://travis-ci.org/fsharp/FAKE.png)](https://travis-ci.org/fsharp/FAKE)
[![AppVeyor build status](https://ci.appveyor.com/api/projects/status/lk1dfo1qi99ri78f)](https://ci.appveyor.com/project/SteffenForkmann/fake) [![CircleCI build status](https://circleci.com/gh/fsharp/FAKE.svg?style=shield&circle-token=:circle-token)](https://circleci.com/gh/fsharp/FAKE) [![Gitlab CI build status](https://gitlab.com/matthid/FAKE/badges/release/next/build.svg)](https://gitlab.com/matthid/FAKE)

> Note: The build of the "legacy" parts (FAKE 4) will most likely fail
>
> - when you are on linux and do not have mono installed
Expand All @@ -30,8 +29,6 @@ See the [project home page](https://fake.build/) for tutorials and [API document
Make sure to have long path enabled: https://superuser.com/questions/1119883/windows-10-enable-ntfs-long-paths-policy-option-missing
Otherwise the test-suite will fail (However, the compilation should work)

[![Issue Stats](http://www.issuestats.com/github/fsharp/FAKE/badge/pr)](http://www.issuestats.com/github/fsharp/FAKE) [![Issue Stats](http://www.issuestats.com/github/fsharp/FAKE/badge/issue)](http://www.issuestats.com/github/fsharp/FAKE)

[![NuGet Badge](https://buildstats.info/nuget/FAKE)](https://www.nuget.org/packages/FAKE)
[![NuGet Badge](https://buildstats.info/nuget/Fake.Core.Target)](https://www.nuget.org/packages/Fake.Core.Target) [![NuGet Badge](https://buildstats.info/nuget/Fake.Core.Context)](https://www.nuget.org/packages/Fake.Core.Context)

Expand Down
Loading

0 comments on commit 513052a

Please sign in to comment.