Skip to content

Commit

Permalink
Fixing packaging
Browse files Browse the repository at this point in the history
  • Loading branch information
haf committed May 15, 2018
1 parent 2a03005 commit 79d171d
Show file tree
Hide file tree
Showing 11 changed files with 113 additions and 15 deletions.
1 change: 1 addition & 0 deletions .gitignore
@@ -1,6 +1,7 @@
paket.exe
.fake/
.idea/
pkg/
bin/
obj/
.DS_Store
Expand Down
3 changes: 3 additions & 0 deletions RELEASE_NOTES.md
@@ -1,3 +1,6 @@
## v6.0.2
* Fix pack script, gen xmldoc files.

## v6.0.1
* Fix release script

Expand Down
27 changes: 19 additions & 8 deletions appveyor.yml
@@ -1,15 +1,26 @@
version: 4.0.{build}
image:
- Visual Studio 2015
- Visual Studio 2017

build_script:
- cmd: gem sources -r https://rubygems.org/
- cmd: gem install bundler --no-ri --no-rdoc --source https://rubygems.org/
- cmd: bundle install
- cmd: bundle exec rake

- cmd: build.cmd --target Pack

init:
- git config --global core.autocrlf input

environment:
matrix:
- arch: "x86"
MSBUILD_PLATFORM: x86
PATH: '%USERPROFILE%\.nuget\packages\libuv\1.10.0\runtimes\win-x86\native;%PATH%'
- arch: "x64"
MSBUILD_PLATFORM: "Any CPU"
PATH: '%USERPROFILE%\.nuget\packages\libuv\1.10.0\runtimes\win-x64\native;%PATH%'

artifacts:
- path: build\pkg\*.nupkg
- path: pkg\*.nupkg

test: off

nuget:
project_feed: true
project_feed: true
6 changes: 4 additions & 2 deletions build.fsx
Expand Up @@ -44,8 +44,8 @@ let inline withWorkDir wd =
let inline dotnetSimple arg = DotNet.Options.lift install.Value arg

let projects =
!! "Logibit.*/*.fsproj"
-- "*.Tests/*.fsproj"
!! "src/**/*.fsproj"
-- "src/*.Tests/*.fsproj"

Target.create "Clean" <| fun _ ->
!! "src/**/bin"
Expand Down Expand Up @@ -137,6 +137,7 @@ Target.create "Release" <| fun _ ->
open Fake.Core.TargetOperators

"CheckEnv"
==> "Push"
==> "Release"

"Clean"
Expand All @@ -146,6 +147,7 @@ open Fake.Core.TargetOperators
==> "Tests"
==> "IntegrationTests"
==> "Pack"
==> "Push"
==> "Release"

Target.runOrDefault "Tests"
17 changes: 17 additions & 0 deletions src/Logibit.Hawk.Suave/AssemblyInfo.fs
@@ -0,0 +1,17 @@
// Auto-Generated by FAKE; do not edit
namespace System
open System.Reflection

[<assembly: AssemblyTitleAttribute("Logibit.Hawk.Suave")>]
[<assembly: AssemblyDescriptionAttribute("A F# implementation of the Hawk authentication protocol. Few dependencies. No cruft.")>]
[<assembly: AssemblyVersionAttribute("6.0.2")>]
[<assembly: AssemblyFileVersionAttribute("6.0.2")>]
[<assembly: AssemblyMetadataAttribute("Commit","9b3fd1")>]
do ()

module internal AssemblyVersionInformation =
let [<Literal>] AssemblyTitle = "Logibit.Hawk.Suave"
let [<Literal>] AssemblyDescription = "A F# implementation of the Hawk authentication protocol. Few dependencies. No cruft."
let [<Literal>] AssemblyVersion = "6.0.2"
let [<Literal>] AssemblyFileVersion = "6.0.2"
let [<Literal>] AssemblyMetadata_Commit = "9b3fd1"
1 change: 1 addition & 0 deletions src/Logibit.Hawk.Suave/Logibit.Hawk.Suave.fsproj
Expand Up @@ -3,6 +3,7 @@
<PropertyGroup>
<AssemblyName>Logibit.Hawk.Suave</AssemblyName>
<TargetFrameworks>net471;netstandard2.0</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
<ItemGroup>
<Compile Include="AssemblyInfo.fs" Condition="Exists('AssemblyInfo.fs')" />
Expand Down
25 changes: 25 additions & 0 deletions src/Logibit.Hawk.Suave/paket.template
@@ -0,0 +1,25 @@
type project
id Hawk.Suave
authors Henrik Feldt
owners Henrik Feldt
description A F# implementation of the Hawk authentication protocol. Few dependencies. No cruft.
licenseUrl https://opensource.org/licenses/Apache-2.0
iconUrl https://raw.githubusercontent.com/logibit/Logibit.Hawk/master/tools/hawk.png
includePdb true
files
bin/Release/net471/Logibit.Hawk.Suave.dll => lib/net471
bin/Release/net471/Logibit.Hawk.Suave.xml => lib/net471
bin/Release/net471/Logibit.Hawk.Suave.pdb => lib/net471
bin/Release/netstandard2.0/Logibit.Hawk.Suave.dll => lib/netstandard2.0
bin/Release/netstandard2.0/Logibit.Hawk.Suave.xml => lib/netstandard2.0
bin/Release/netstandard2.0/Logibit.Hawk.Suave.pdb => lib/netstandard2.0
dependencies
framework: net471
NodaTime ~> 2
Suave ~> 2.4
FSharp.Core ~> 4
framework: netstandard20
NodaTime ~> 2
Suave ~> 2.4
FSharp.Core ~> 4

21 changes: 16 additions & 5 deletions src/Logibit.Hawk/AssemblyInfo.fs
@@ -1,6 +1,17 @@
namespace Logibit.Hawk
open System.Runtime.CompilerServices
// Auto-Generated by FAKE; do not edit
namespace System
open System.Reflection

[<InternalsVisibleTo "Logibit.Hawk.Tests">]
[<InternalsVisibleTo "Logibit.Hawk.Suave">]
()
[<assembly: AssemblyTitleAttribute("Logibit.Hawk")>]
[<assembly: AssemblyDescriptionAttribute("A F# implementation of the Hawk authentication protocol. Few dependencies. No cruft.")>]
[<assembly: AssemblyVersionAttribute("6.0.2")>]
[<assembly: AssemblyFileVersionAttribute("6.0.2")>]
[<assembly: AssemblyMetadataAttribute("Commit","9b3fd1")>]
do ()

module internal AssemblyVersionInformation =
let [<Literal>] AssemblyTitle = "Logibit.Hawk"
let [<Literal>] AssemblyDescription = "A F# implementation of the Hawk authentication protocol. Few dependencies. No cruft."
let [<Literal>] AssemblyVersion = "6.0.2"
let [<Literal>] AssemblyFileVersion = "6.0.2"
let [<Literal>] AssemblyMetadata_Commit = "9b3fd1"
1 change: 1 addition & 0 deletions src/Logibit.Hawk/Logibit.Hawk.fsproj
Expand Up @@ -3,6 +3,7 @@
<PropertyGroup>
<AssemblyName>Logibit.Hawk</AssemblyName>
<TargetFrameworks>net471;netstandard2.0</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
<ItemGroup>
<Compile Include="AssemblyInfo.fs" Condition="Exists('AssemblyInfo.fs')" />
Expand Down
4 changes: 4 additions & 0 deletions src/Logibit.Hawk/Prelude.fs
@@ -1,6 +1,10 @@
[<AutoOpen>]
module internal Logibit.Hawk.Prelude

open System.Runtime.CompilerServices
[<assembly: InternalsVisibleTo("Logibit.Hawk.Tests")>]
do ()

module Hoek =

let parseContentType = function
Expand Down
22 changes: 22 additions & 0 deletions src/Logibit.Hawk/paket.template
@@ -0,0 +1,22 @@
type project
id Hawk
authors Henrik Feldt
owners Henrik Feldt
description A F# implementation of the Hawk authentication protocol. Few dependencies. No cruft.
licenseUrl https://opensource.org/licenses/Apache-2.0
iconUrl https://raw.githubusercontent.com/logibit/Logibit.Hawk/master/tools/hawk.png
includePdb true
files
bin/Release/net471/Logibit.Hawk.dll => lib/net471
bin/Release/net471/Logibit.Hawk.xml => lib/net471
bin/Release/net471/Logibit.Hawk.pdb => lib/net471
bin/Release/netstandard2.0/Logibit.Hawk.dll => lib/netstandard2.0
bin/Release/netstandard2.0/Logibit.Hawk.xml => lib/netstandard2.0
bin/Release/netstandard2.0/Logibit.Hawk.pdb => lib/netstandard2.0
dependencies
framework: net471
NodaTime ~> 2
FSharp.Core ~> 4
framework: netstandard20
NodaTime ~> 2
FSharp.Core ~> 4

0 comments on commit 79d171d

Please sign in to comment.