Skip to content

Commit e9d2c93

Browse files
authored
Merge pull request #329 from sergey-tihon/netcore31
.NET Core 3.1
2 parents b8727a4 + 22ea0ee commit e9d2c93

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1502
-1286
lines changed

.config/dotnet-tools.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"version": 1,
3+
"isRoot": true,
4+
"tools": {
5+
"paket": {
6+
"version": "5.241.5",
7+
"commands": [
8+
"paket"
9+
]
10+
},
11+
"fake-cli": {
12+
"version": "5.19.0",
13+
"commands": [
14+
"fake"
15+
]
16+
}
17+
}
18+
}

.github/workflows/main.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Build and Test
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
branches:
9+
- master
10+
11+
jobs:
12+
build:
13+
14+
strategy:
15+
fail-fast: false
16+
matrix:
17+
os: [windows-latest, macOS-latest, ubuntu-latest]
18+
dotnet: [3.1.100]
19+
runs-on: ${{ matrix.os }}
20+
21+
steps:
22+
- uses: actions/checkout@v1
23+
24+
- name: Setup .NET Core
25+
# Fix for https://github.com/actions/setup-dotnet/issues/29#issuecomment-548740241
26+
uses: actions/setup-dotnet@bb95ce727fd49ec1a65933419cc7c91747785302
27+
with:
28+
dotnet-version: ${{ matrix.dotnet }}
29+
30+
- name: Build on Windows
31+
if: matrix.os == 'windows-latest'
32+
run: .\build.cmd
33+
34+
- name: Build on Unix
35+
if: matrix.os != 'windows-latest'
36+
run: ./build.sh

.paket/Paket.Restore.targets

Lines changed: 0 additions & 461 deletions
This file was deleted.

.paket/paket.exe

-62.8 KB
Binary file not shown.

.travis.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

README.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ The F# Type Provider SDK is two things:
77

88
2. Documentation and samples on type provider creation
99

10-
[![Build status (Windows)](https://ci.appveyor.com/api/projects/status/y1c6gs2r0ihog1re)](https://ci.appveyor.com/project/mavnn/fsharp-typeproviders-sdk) [![Build Status (MacOS, mono)](https://travis-ci.org/fsprojects/FSharp.TypeProviders.SDK.svg?branch=master)](https://travis-ci.org/fsprojects/FSharp.TypeProviders.SDK)
10+
[![Build Status](https://github.com/fsprojects/FSharp.TypeProviders.SDK/workflows/Build%20and%20Test/badge.svg?branch=master)](https://github.com/fsprojects/FSharp.TypeProviders.SDK/actions?query=branch%3Amaster)
11+
1112

1213
## Getting Started
1314

@@ -20,17 +21,15 @@ The template uses paket to acquire the files of the latest published type provid
2021

2122
cd LemonadeProvider
2223

23-
.paket\paket.exe update
24-
24+
dotnet tool restore
25+
dotnet paket update
2526
dotnet build -c release
2627

2728
dotnet test -c release
2829

2930
The type provider also contains the logic necessary to package the type provider:
3031

31-
.paket\paket.exe pack src\LemonadeProvider.Runtime --version 0.0.1
32-
33-
If you want you can remove the use of paket for the last stage and switch to `dotnet pack` though you'll have to work out how to do that yourself at the moment (it shouldn't be too hard).
32+
dotnet paket pack nuget --version 0.0.1
3433

3534
## The ProvidedTypes API - A Basic Type Provider
3635

@@ -135,7 +134,7 @@ Here is a guide to the steps to perform:
135134

136135
* If the compile-time computations performed by your TPDTC **fundamentally** depend on .NET Framework, then your type provider will not be usable with the .NET SDK toolchain without using [the workaround](https://github.com/Microsoft/visualfsharp/issues/3303))
137136

138-
* If the TPDTC **partially** depends on .NET Framework, then multi-target the TPDTC to `net45;netcoreapp2.0` and use `#if NETCOREAPP2_0`
137+
* If the TPDTC **partially** depends on .NET Framework, then multi-target the TPDTC to `net45;netcoreapp2.0` and use `#if NETCOREAPP3_1`
139138

140139
* If the TPDTC **doesn't** depend on .NET Framework, then target the TPDTC to `netstandard2.0`
141140

RELEASE_NOTES.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
#### 5.0.0
1+
#### 6.0.0 - December 24, 2019
2+
* Template migrated to .NET Core 3.1
3+
4+
#### 5.0.0 - September 17, 2018
25
* Addition of template pack
36
* Many bug fixes
47

appveyor.yml

Lines changed: 0 additions & 8 deletions
This file was deleted.

build.cmd

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
@echo off
22
cls
33

4-
.paket\paket.exe restore
5-
if errorlevel 1 (
6-
exit /b %errorlevel%
7-
)
8-
9-
packages\FAKE\tools\FAKE.exe build.fsx %*
4+
dotnet tool restore
5+
dotnet paket restore
6+
dotnet fake run build.fsx %*

0 commit comments

Comments
 (0)