Skip to content
This repository was archived by the owner on Apr 3, 2024. It is now read-only.

Commit a622bd8

Browse files
danieljsummersdanieljsummers
committed
Updated dox for v2 step 1
Having issues with Framework 4.8 referencing .NET standard 2.0 DLLs (which should work), so no pages generated yet
1 parent e7e8d83 commit a622bd8

File tree

7 files changed

+1440
-1082
lines changed

7 files changed

+1440
-1082
lines changed

‎.paket/Paket.Restore.targets‎

Lines changed: 461 additions & 0 deletions
Large diffs are not rendered by default.

‎dox/content/step1/dos.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ For this project, we'll make sure our project file is `Dos.csproj`, and modify i
55
[lang=text]
66
<PropertyGroup>
77
<AssemblyName>Dos</AssemblyName>
8-
<VersionPrefix>1.0.0</VersionPrefix>
8+
<VersionPrefix>2.0.0</VersionPrefix>
99
<OutputType>Exe</OutputType>
10-
<TargetFramework>netcoreapp2.0</TargetFramework>
10+
<TargetFramework>netcoreapp2.2</TargetFramework>
1111
</PropertyGroup>
1212

1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.AspNetCore.Owin" Version="2.*" />
1515
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.*" />
16-
<PackageReference Include="Nancy" Version="2.0.0-*" IncludePrerelease="true" />
16+
<PackageReference Include="Nancy" Version="2.*" />
1717
</ItemGroup>
1818

1919
Nancy strives to provide a Super-Duper-Happy-Path (SDHP), where all you have to do is follow their conventions, and everything will "just work." (You can also configure every aspect of it; it's only opinionated in its defaults.) One of these conventions is that the controllers inherit from `NancyModule`, and when they do, no further configuration is required. So, we create the `Modules` directory, and add `HomeModule.cs`, which looks like this:

‎dox/content/step1/quatro.fsx‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
(*** hide ***)
2-
#r "../../../packages/Freya.Core/lib/net452/Freya.Core.dll"
3-
#r "../../../packages/Freya.Machines.Http/lib/net452/Freya.Machines.Http.dll"
4-
#r "../../../packages/Freya.Routers.Uri.Template/lib/net452/Freya.Routers.Uri.Template.dll"
5-
#r "../../../packages/Freya.Types.Uri.Template/lib/net452/Freya.Types.Uri.Template.dll"
6-
#r "../../../packages/Microsoft.AspNetCore.Hosting/lib/net451/Microsoft.AspNetCore.Hosting.dll"
7-
#r "../../../packages/Microsoft.AspNetCore.Hosting.Abstractions/lib/net451/Microsoft.AspNetCore.Hosting.Abstractions.dll"
8-
#r "../../../packages/Microsoft.AspNetCore.Http.Abstractions/lib/net451/Microsoft.AspNetCore.Http.Abstractions.dll"
9-
#r "../../../packages/Microsoft.AspNetCore.Owin/lib/net451/Microsoft.AspNetCore.Owin.dll"
10-
#r "../../../packages/Microsoft.AspNetCore.Server.Kestrel/lib/net451/Microsoft.AspNetCore.Server.Kestrel.dll"
2+
#r "netstandard.dll"
3+
#r "../../../packages/Freya.Core/lib/netstandard2.0/Freya.Core.dll"
4+
#r "../../../packages/Freya.Machines.Http/lib/netstandard2.0/Freya.Machines.Http.dll"
5+
#r "../../../packages/Freya.Routers.Uri.Template/lib/netstandard2.0/Freya.Routers.Uri.Template.dll"
6+
#r "../../../packages/Freya.Types.Uri.Template/lib/netstandard2.0/Freya.Types.Uri.Template.dll"
7+
#r "../../../packages/Microsoft.AspNetCore.Hosting/lib/netstandard2.0/Microsoft.AspNetCore.Hosting.dll"
8+
#r "../../../packages/Microsoft.AspNetCore.Hosting.Abstractions/lib/netstandard2.0/Microsoft.AspNetCore.Hosting.Abstractions.dll"
9+
#r "../../../packages/Microsoft.AspNetCore.Http.Abstractions/lib/netstandard2.0/Microsoft.AspNetCore.Http.Abstractions.dll"
10+
#r "../../../packages/Microsoft.AspNetCore.Owin/lib/netstandard2.0/Microsoft.AspNetCore.Owin.dll"
11+
#r "../../../packages/Microsoft.AspNetCore.Server.Kestrel/lib/netstandard2.0/Microsoft.AspNetCore.Server.Kestrel.dll"
1112

1213
(**
1314
### Quatro - Step 1
@@ -18,7 +19,7 @@ one for Nancy:
1819
1920
[lang=text]
2021
<ItemGroup>
21-
<PackageReference Include="Freya" Version="4.0.0-alpha-*" IncludePrerelease="true" />
22+
<PackageReference Include="Freya" Version="4.*" />
2223
<PackageReference Include="Microsoft.AspNetCore.Owin" Version="2.*" />
2324
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.*" />
2425
</ItemGroup>
@@ -49,6 +50,7 @@ HTTP machine to a URL route pattern.
4950
Continuing on...
5051
*)
5152
module App =
53+
5254
let hello =
5355
freya {
5456
return Represent.text "Hello World from Freya"
@@ -71,7 +73,7 @@ Still within `module App =`...
7173
*)
7274
type Startup () =
7375
member __.Configure (app : IApplicationBuilder) =
74-
let freyaOwin = OwinMidFunc.ofFreya (UriTemplateRouter.Freya router)
76+
let freyaOwin = OwinMidFunc.ofFreya router
7577
app.UseOwin (fun p -> p.Invoke freyaOwin) |> ignore
7678

7779
[<EntryPoint>]

‎dox/content/step1/tres.fsx‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
(*** hide ***)
2-
#r "../../../packages/Nancy/lib/net452/Nancy.dll"
3-
#r "../../../packages/Microsoft.AspNetCore.Hosting/lib/net451/Microsoft.AspNetCore.Hosting.dll"
4-
#r "../../../packages/Microsoft.AspNetCore.Hosting.Abstractions/lib/net451/Microsoft.AspNetCore.Hosting.Abstractions.dll"
5-
#r "../../../packages/Microsoft.AspNetCore.Http.Abstractions/lib/net451/Microsoft.AspNetCore.Http.Abstractions.dll"
6-
#r "../../../packages/Microsoft.AspNetCore.Owin/lib/net451/Microsoft.AspNetCore.Owin.dll"
7-
#r "../../../packages/Microsoft.AspNetCore.Server.Kestrel/lib/net451/Microsoft.AspNetCore.Server.Kestrel.dll"
2+
#r "../../../packages/Nancy/lib/netstandard2.0/Nancy.dll"
3+
#r "../../../packages/Microsoft.AspNetCore.Hosting/lib/netstandard2.0/Microsoft.AspNetCore.Hosting.dll"
4+
#r "../../../packages/Microsoft.AspNetCore.Hosting.Abstractions/lib/netstandard2.0/Microsoft.AspNetCore.Hosting.Abstractions.dll"
5+
#r "../../../packages/Microsoft.AspNetCore.Http.Abstractions/lib/netstandard2.0/Microsoft.AspNetCore.Http.Abstractions.dll"
6+
#r "../../../packages/Microsoft.AspNetCore.Owin/lib/netstandard2.0/Microsoft.AspNetCore.Owin.dll"
7+
#r "../../../packages/Microsoft.AspNetCore.Server.Kestrel/lib/netstandard2.0/Microsoft.AspNetCore.Server.Kestrel.dll"
88

99
(**
1010
### Tres - Step 1
@@ -46,11 +46,10 @@ namespace Tres
4646

4747
open Microsoft.AspNetCore.Builder
4848
open Microsoft.AspNetCore.Hosting
49-
open Nancy
5049
open Nancy.Owin
5150

5251
type Startup() =
53-
member this.Configure (app : IApplicationBuilder) =
52+
member __.Configure (app : IApplicationBuilder) =
5453
app.UseOwin (fun x -> x.UseNancy (fun x -> ()) |> ignore) |> ignore
5554

5655
module App =

‎dox/content/step1/uno.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ To start, we'll make sure the `.csproj` file is named `Uno.csproj`. Then, under
1010
[lang=text]
1111
<PropertyGroup>
1212
<AssemblyName>Uno</AssemblyName>
13-
<VersionPrefix>1.0.0</VersionPrefix>
13+
<VersionPrefix>2.0.0</VersionPrefix>
1414
<OutputType>Exe</OutputType>
15-
<TargetFramework>netcoreapp2.0</TargetFramework>
15+
<TargetFramework>netcoreapp2.2</TargetFramework>
1616
</PropertyGroup>
1717

1818
Then, we'll add a new section, `ItemGroup`, and two dependencies:

‎paket.dependencies‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ source https://nuget.org/api/v2
33
nuget FSharp.Core redirects: force
44

55
nuget Chiron
6-
nuget FAKE
7-
nuget Freya >= 3.0.0-rc01
6+
nuget FAKE < 5.0.0
7+
nuget Freya >= 4.0.0
88
nuget FSharp.Formatting
99
nuget Microsoft.AspNetCore.Owin
1010
nuget Microsoft.AspNetCore.Server.Kestrel
11-
nuget Nancy >= 2.0-barneyrubble
11+
nuget Nancy >= 2.0.0
1212
nuget RethinkDb.Driver

0 commit comments

Comments
 (0)