Skip to content

Commit

Permalink
Merge pull request #5 from vbfox/modernize
Browse files Browse the repository at this point in the history
Modernize
  • Loading branch information
vbfox authored Apr 17, 2021
2 parents d168c42 + 9a15a0b commit 4273c4d
Show file tree
Hide file tree
Showing 25 changed files with 609 additions and 1,162 deletions.
12 changes: 12 additions & 0 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"version": 1,
"isRoot": true,
"tools": {
"paket": {
"version": "6.0.0-beta9",
"commands": [
"paket"
]
}
}
}
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @vbfox
39 changes: 39 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: CI

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
linux:
runs-on: ubuntu-latest
env:
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
DOTNET_CLI_TELEMETRY_OPTOUT: 1
DOTNET_NOLOGO: 1
PAKET_SKIP_RESTORE_TARGETS: true
steps:
- uses: actions/checkout@v2
- name: Restore packages
run: ./paket.sh restore
- name: Compile build script
run: dotnet build src/BlackFox.ColoredPrintf.Build/BlackFox.ColoredPrintf.Build.fsproj
- name: Build
run: ./build.sh CI
windows:
runs-on: windows-latest
env:
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
DOTNET_CLI_TELEMETRY_OPTOUT: 1
DOTNET_NOLOGO: 1
PAKET_SKIP_RESTORE_TARGETS: true
steps:
- uses: actions/checkout@v2
- name: Restore packages
run: ./paket.cmd restore
- name: Compile build script
run: dotnet build src/BlackFox.ColoredPrintf.Build/BlackFox.ColoredPrintf.Build.fsproj
- name: Build
run: ./build.cmd CI
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -245,3 +245,4 @@ paket-files/
.fake/

.idea/
.ionide/
315 changes: 255 additions & 60 deletions .paket/Paket.Restore.targets

Large diffs are not rendered by default.

9 changes: 0 additions & 9 deletions .travis.yml

This file was deleted.

39 changes: 0 additions & 39 deletions .vsts-ci.yml

This file was deleted.

7 changes: 7 additions & 0 deletions Release Notes.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
### New in 1.0.4

* Make dependency ranges less strict (For `FSharp.Core` 6.x)
* Build with 5.0.201 SDK
* Specify the package license using SPDX
* Embed the package icon

## New in 1.0.3

* Include pdb files in package (With SourceLink)
Expand Down
11 changes: 0 additions & 11 deletions appveyor.yml

This file was deleted.

2 changes: 1 addition & 1 deletion build.cmd
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@echo off

paket.exe restore -s
call ./paket.cmd restore -s
if errorlevel 1 (
exit /b %errorlevel%
)
Expand Down
3 changes: 2 additions & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"sdk": {
"version": "2.1.401"
"version": "5.0.201",
"rollForward": "latestMajor"
}
}
2 changes: 2 additions & 0 deletions paket.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@dotnet tool restore
dotnet paket %*
12 changes: 4 additions & 8 deletions paket.dependencies
Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
version 5.176.6

source https://api.nuget.org/v3/index.json
framework: netcoreapp2.0,netstandard1.6,netstandard2.0,net45
framework: net5.0,netcoreapp2.0,netstandard1.6,netstandard2.0,net45
storage:none

nuget Expecto
nuget Expecto.TestResults
nuget FSharp.Core ~> 4.0
nuget FSharp.Data prerelease

// Build infrastructure
group build
source https://api.nuget.org/v3/index.json
storage: none
framework: netcoreapp2.0
framework: net5.0

nuget FSharp.Core ~> 4.0
nuget BlackFox.Fake.BuildTask

nuget Octokit 0.48 // Fake.Api.GitHub 5.20.4 references 0.48+ but 0.50 has some incompatible Api changes
nuget Fake.Core.Target
nuget Fake.Core.Environment
nuget Fake.Core.Process
Expand All @@ -32,7 +30,5 @@ group build
nuget Fake.DotNet.Testing.Expecto
nuget Fake.DotNet.MsBuild
nuget Fake.DotNet.Paket
nuget Fake.BuildServer.AppVeyor
nuget Fake.BuildServer.Travis
nuget Fake.BuildServer.TeamFoundation
nuget Fake.BuildServer.GitHubActions
nuget Fake.Api.GitHub
Binary file removed paket.exe
Binary file not shown.
Loading

0 comments on commit 4273c4d

Please sign in to comment.