Skip to content

Commit

Permalink
refactor: upgrade to netcoreapp30
Browse files Browse the repository at this point in the history
BREAKING CHANGE: Upgrade to .NET Core 3
  • Loading branch information
CumpsD committed Nov 18, 2019
1 parent 3c7a7df commit 6cf4d36
Show file tree
Hide file tree
Showing 10 changed files with 623 additions and 1,320 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
.fake/
.idea/
.ionide/
.paket/

[Pp]ackages/
[Pp]aket-files/
Expand Down
481 changes: 0 additions & 481 deletions .paket/Paket.Restore.targets

This file was deleted.

2 changes: 1 addition & 1 deletion build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
version 5.226.0
framework: netstandard20
source https://api.nuget.org/v3/index.json
nuget Be.Vlaanderen.Basisregisters.Build.Pipeline 2.0.1 //"
nuget Be.Vlaanderen.Basisregisters.Build.Pipeline 3.0.0 //"

#load "packages/Be.Vlaanderen.Basisregisters.Build.Pipeline/Content/build-generic.fsx"

Expand Down
19 changes: 4 additions & 15 deletions paket.dependencies
Original file line number Diff line number Diff line change
@@ -1,32 +1,21 @@
// Only the target frameworks that are used in projects.
// If you change the target framework of the projects then you need to run paket install again.
framework: netstandard20, netcoreapp22, net472
framework: netcoreapp30

// When doing development as a non-employee, uncomment this to use the public NuGet feed
source https://api.nuget.org/v3/index.json

// When doing development as an employee, uncomment this to use the private NuGet proxy
// source https://informatievlaanderen.myget.org/F/nuget-mirror/api/v3/index.json username: "%MYGET_FEED_USER%" password: "%MYGET_FEED_PASS%" authtype: "basic"

// DOTNETCORE ISSUES
nuget Microsoft.NETCore.App 2.2.6
nuget Microsoft.NETCore.DotNetAppHost 2.2.6
nuget Microsoft.NETCore.DotNetHostResolver 2.2.6
nuget Microsoft.NETCore.DotNetHostPolicy 2.2.6
nuget NETStandard.Library 2.0.3

// PRODUCTION STUFF
nuget Microsoft.AspNetCore.Http.Abstractions 2.2.0
nuget Microsoft.AspNetCore.Http 2.2.2

// VBR STUFF
nuget Be.Vlaanderen.Basisregisters.Build.Pipeline ~> 2.0
nuget Be.Vlaanderen.Basisregisters.Build.Pipeline 3.0.0

// TEST STUFF
nuget Microsoft.NET.Test.Sdk 16.2.0
nuget Microsoft.NET.Test.Sdk 16.4.0
nuget xunit 2.4.1
nuget xunit.runner.visualstudio 2.4.1
nuget FluentAssertions 5.7.0
nuget FluentAssertions 5.9.0

// BUILD STUFF
nuget SourceLink.Embed.AllSourceFiles 2.8.3 copy_local: true
Expand Down
1,414 changes: 603 additions & 811 deletions paket.lock

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\packages\Be.Vlaanderen.Basisregisters.Build.Pipeline\Content\Be.Vlaanderen.Basisregisters.Build.Pipeline.Settings.Library.props" />

<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

<Import Project="..\..\.paket\Paket.Restore.targets" />
</Project>
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
Microsoft.AspNetCore.Http.Abstractions

SourceLink.Embed.AllSourceFiles
SourceLink.Copy.PdbFiles
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@ licenseUrl https://opensource.org/licenses/MIT
description Middleware component which adds a the remote IP id as a claim `urn:be:vlaanderen:vbr:ip` for the user on the request context.

dependencies
framework: netstandard20
Microsoft.AspNetCore.Http.Abstractions >= LOCKEDVERSION
framework: netcoreapp30

files
bin\Release\netstandard2.0\Be.Vlaanderen.Basisregisters.AspNetCore.Mvc.Middleware.AddRemoteIpAddress.dll => lib\netstandard2.0
bin\Release\netstandard2.0\Be.Vlaanderen.Basisregisters.AspNetCore.Mvc.Middleware.AddRemoteIpAddress.pdb => lib\netstandard2.0
bin\Release\netcoreapp3.0\Be.Vlaanderen.Basisregisters.AspNetCore.Mvc.Middleware.AddRemoteIpAddress.dll => lib\netcoreapp3.0
bin\Release\netcoreapp3.0\Be.Vlaanderen.Basisregisters.AspNetCore.Mvc.Middleware.AddRemoteIpAddress.pdb => lib\netcoreapp3.0
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\packages\Be.Vlaanderen.Basisregisters.Build.Pipeline\Content\Be.Vlaanderen.Basisregisters.Build.Pipeline.Settings.Test.props" />

<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Be.Vlaanderen.Basisregisters.AspNetCore.Mvc.Middleware.AddRemoteIpAddress\Be.Vlaanderen.Basisregisters.AspNetCore.Mvc.Middleware.AddRemoteIpAddress.csproj" />
</ItemGroup>

<Import Project="..\..\.paket\Paket.Restore.targets" />
</Project>
</Project>
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
Microsoft.NETCore.App
Microsoft.AspNetCore.Http

xunit
xunit.runner.visualstudio
Microsoft.NET.Test.Sdk
FluentAssertions
FluentAssertions

0 comments on commit 6cf4d36

Please sign in to comment.