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

Commit 26baf95

Browse files
danieljsummersdanieljsummers
authored
Merge pull request #2 from danieljsummers/step-1-to-core-2
Migrate to .NET Core 2
2 parents b501b2a + fe8ada7 commit 26baf95

8 files changed

Lines changed: 110 additions & 93 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,4 +252,4 @@ paket-files/
252252
*.sln.iml
253253

254254
# Documentation output
255-
dox/output/
255+
dox/output/

‎src/1-AspNetCore-CSharp/Uno.csproj‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<AssemblyName>Uno</AssemblyName>
5+
<VersionPrefix>1.0.0</VersionPrefix>
6+
<OutputType>Exe</OutputType>
7+
<TargetFramework>netcoreapp2.0</TargetFramework>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<Content Include="appsettings.json" CopyToOutputDirectory="Always" />
12+
</ItemGroup>
13+
14+
<ItemGroup>
15+
<PackageReference Include="Microsoft.AspNetCore.Owin" Version="2.*" />
16+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.*" />
17+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.*" />
18+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.*" />
19+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.*" />
20+
<PackageReference Include="Newtonsoft.Json" Version="10.*" />
21+
<PackageReference Include="RethinkDb.Driver" Version="2.*" />
22+
</ItemGroup>
23+
24+
</Project>

‎src/2-Nancy-CSharp/Dos.csproj‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<AssemblyName>Dos</AssemblyName>
5+
<VersionPrefix>1.0.0</VersionPrefix>
6+
<OutputType>Exe</OutputType>
7+
<TargetFramework>netcoreapp2.0</TargetFramework>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<Content Include="data-config.json" CopyToOutputDirectory="Always" />
12+
</ItemGroup>
13+
14+
<ItemGroup>
15+
<PackageReference Include="Microsoft.AspNetCore.Owin" Version="2.*" />
16+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.*" />
17+
<PackageReference Include="Nancy" Version="2.0.0-*" IncludePrerelease="true" />
18+
<PackageReference Include="Newtonsoft.Json" Version="10.*" />
19+
<PackageReference Include="RethinkDb.Driver" Version="2.*" />
20+
</ItemGroup>
21+
22+
</Project>

‎src/3-Nancy-FSharp/Tres.fsproj‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<AssemblyName>Tres</AssemblyName>
5+
<VersionPrefix>1.0.0</VersionPrefix>
6+
<OutputType>Exe</OutputType>
7+
<TargetFramework>netcoreapp2.0</TargetFramework>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<Compile Include="Extensions.fs" />
12+
<Compile Include="Entities.fs" />
13+
<Compile Include="Data.fs" />
14+
<Compile Include="HomeModule.fs" />
15+
<Compile Include="App.fs" />
16+
</ItemGroup>
17+
18+
<ItemGroup>
19+
<Content Include="data-config.json" CopyToOutputDirectory="Always" />
20+
</ItemGroup>
21+
22+
<ItemGroup>
23+
<PackageReference Include="Microsoft.AspNetCore.Owin" Version="2.*" />
24+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.*" />
25+
<PackageReference Include="Nancy" Version="2.0.0-*" IncludePrerelease="true" />
26+
<PackageReference Include="Newtonsoft.Json" Version="10.*" />
27+
<PackageReference Include="RethinkDb.Driver" Version="2.*" />
28+
</ItemGroup>
29+
30+
</Project>

‎src/3-Nancy-FSharp/project.json‎

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

‎src/4-Freya-FSharp/Data.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ namespace Quatro
22

33
open Chiron
44
open RethinkDb.Driver
5-
open RethinkDb.Driver.Ast
65
open RethinkDb.Driver.Net
76
open System
87

@@ -52,7 +51,6 @@ with
5251
{ Parameters = options }
5352
| _ -> { Parameters = [] }
5453

55-
5654
[<RequireQualifiedAccess>]
5755
module Table =
5856
let Category = "Category"
@@ -62,6 +60,8 @@ module Table =
6260
let User = "User"
6361
let WebLog = "WebLog"
6462

63+
open RethinkDb.Driver.Ast
64+
6565
[<RequireQualifiedAccess>]
6666
module Data =
6767
let establishEnvironment database conn =

‎src/4-Freya-FSharp/Quatro.fsproj‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<AssemblyName>Quatro</AssemblyName>
5+
<VersionPrefix>1.0.0</VersionPrefix>
6+
<OutputType>Exe</OutputType>
7+
<TargetFramework>netcoreapp2.0</TargetFramework>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<Compile Include="Extensions.fs" />
12+
<Compile Include="Dependencies.fs" />
13+
<Compile Include="Entities.fs" />
14+
<Compile Include="Data.fs" />
15+
<Compile Include="App.fs" />
16+
</ItemGroup>
17+
18+
<ItemGroup>
19+
<Content Include="data-config.json" CopyToOutputDirectory="Always" />
20+
</ItemGroup>
21+
22+
<ItemGroup>
23+
<PackageReference Include="Chiron" Version="6.3.0-*" IncludePrerelease="true" />
24+
<PackageReference Include="Freya" Version="4.0.0-alpha-*" IncludePrerelease="true" />
25+
<PackageReference Include="Microsoft.AspNetCore.Owin" Version="2.*" />
26+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.*" />
27+
<PackageReference Include="Newtonsoft.Json" Version="10.*" />
28+
<PackageReference Include="RethinkDb.Driver" Version="2.*" />
29+
</ItemGroup>
30+
31+
</Project>

‎src/4-Freya-FSharp/project.json‎

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

0 commit comments

Comments
 (0)