Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to dotnet core 2.1 #4

Merged
merged 1 commit into from
Nov 13, 2018
Merged

Upgrade to dotnet core 2.1 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 33 additions & 31 deletions LiGet.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26124.0
MinimumVisualStudioVersion = 15.0.26124.0
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5877067A-8730-4BA0-BCB7-6A14FE930A1A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LiGet", "src\LiGet\LiGet.csproj", "{DBE991B6-6F2D-408B-9936-D5417A4790BA}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LiGet", "src\LiGet\LiGet.csproj", "{DBE991B6-6F2D-408B-9936-D5417A4790BA}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E20D7E1C-E2FE-469C-853D-E05CC22A0D3A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LiGet.Tests", "tests\LiGet.Tests\LiGet.Tests.csproj", "{DE1B3B28-8324-4BF4-AA9C-6CB63C7F2AE7}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LiGet.Tests", "tests\LiGet.Tests\LiGet.Tests.csproj", "{DE1B3B28-8324-4BF4-AA9C-6CB63C7F2AE7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LiGet.App", "src\LiGet.App\LiGet.App.csproj", "{BFCBFAE8-0A89-4FD0-9FC6-19300C57C132}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LiGet.App", "src\LiGet.App\LiGet.App.csproj", "{BFCBFAE8-0A89-4FD0-9FC6-19300C57C132}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -22,50 +21,53 @@ Global
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{DBE991B6-6F2D-408B-9936-D5417A4790BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DBE991B6-6F2D-408B-9936-D5417A4790BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DBE991B6-6F2D-408B-9936-D5417A4790BA}.Debug|x64.ActiveCfg = Debug|x64
{DBE991B6-6F2D-408B-9936-D5417A4790BA}.Debug|x64.Build.0 = Debug|x64
{DBE991B6-6F2D-408B-9936-D5417A4790BA}.Debug|x86.ActiveCfg = Debug|x86
{DBE991B6-6F2D-408B-9936-D5417A4790BA}.Debug|x86.Build.0 = Debug|x86
{DBE991B6-6F2D-408B-9936-D5417A4790BA}.Debug|x64.ActiveCfg = Debug|Any CPU
{DBE991B6-6F2D-408B-9936-D5417A4790BA}.Debug|x64.Build.0 = Debug|Any CPU
{DBE991B6-6F2D-408B-9936-D5417A4790BA}.Debug|x86.ActiveCfg = Debug|Any CPU
{DBE991B6-6F2D-408B-9936-D5417A4790BA}.Debug|x86.Build.0 = Debug|Any CPU
{DBE991B6-6F2D-408B-9936-D5417A4790BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DBE991B6-6F2D-408B-9936-D5417A4790BA}.Release|Any CPU.Build.0 = Release|Any CPU
{DBE991B6-6F2D-408B-9936-D5417A4790BA}.Release|x64.ActiveCfg = Release|x64
{DBE991B6-6F2D-408B-9936-D5417A4790BA}.Release|x64.Build.0 = Release|x64
{DBE991B6-6F2D-408B-9936-D5417A4790BA}.Release|x86.ActiveCfg = Release|x86
{DBE991B6-6F2D-408B-9936-D5417A4790BA}.Release|x86.Build.0 = Release|x86
{DBE991B6-6F2D-408B-9936-D5417A4790BA}.Release|x64.ActiveCfg = Release|Any CPU
{DBE991B6-6F2D-408B-9936-D5417A4790BA}.Release|x64.Build.0 = Release|Any CPU
{DBE991B6-6F2D-408B-9936-D5417A4790BA}.Release|x86.ActiveCfg = Release|Any CPU
{DBE991B6-6F2D-408B-9936-D5417A4790BA}.Release|x86.Build.0 = Release|Any CPU
{DE1B3B28-8324-4BF4-AA9C-6CB63C7F2AE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DE1B3B28-8324-4BF4-AA9C-6CB63C7F2AE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DE1B3B28-8324-4BF4-AA9C-6CB63C7F2AE7}.Debug|x64.ActiveCfg = Debug|x64
{DE1B3B28-8324-4BF4-AA9C-6CB63C7F2AE7}.Debug|x64.Build.0 = Debug|x64
{DE1B3B28-8324-4BF4-AA9C-6CB63C7F2AE7}.Debug|x86.ActiveCfg = Debug|x86
{DE1B3B28-8324-4BF4-AA9C-6CB63C7F2AE7}.Debug|x86.Build.0 = Debug|x86
{DE1B3B28-8324-4BF4-AA9C-6CB63C7F2AE7}.Debug|x64.ActiveCfg = Debug|Any CPU
{DE1B3B28-8324-4BF4-AA9C-6CB63C7F2AE7}.Debug|x64.Build.0 = Debug|Any CPU
{DE1B3B28-8324-4BF4-AA9C-6CB63C7F2AE7}.Debug|x86.ActiveCfg = Debug|Any CPU
{DE1B3B28-8324-4BF4-AA9C-6CB63C7F2AE7}.Debug|x86.Build.0 = Debug|Any CPU
{DE1B3B28-8324-4BF4-AA9C-6CB63C7F2AE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DE1B3B28-8324-4BF4-AA9C-6CB63C7F2AE7}.Release|Any CPU.Build.0 = Release|Any CPU
{DE1B3B28-8324-4BF4-AA9C-6CB63C7F2AE7}.Release|x64.ActiveCfg = Release|x64
{DE1B3B28-8324-4BF4-AA9C-6CB63C7F2AE7}.Release|x64.Build.0 = Release|x64
{DE1B3B28-8324-4BF4-AA9C-6CB63C7F2AE7}.Release|x86.ActiveCfg = Release|x86
{DE1B3B28-8324-4BF4-AA9C-6CB63C7F2AE7}.Release|x86.Build.0 = Release|x86
{DE1B3B28-8324-4BF4-AA9C-6CB63C7F2AE7}.Release|x64.ActiveCfg = Release|Any CPU
{DE1B3B28-8324-4BF4-AA9C-6CB63C7F2AE7}.Release|x64.Build.0 = Release|Any CPU
{DE1B3B28-8324-4BF4-AA9C-6CB63C7F2AE7}.Release|x86.ActiveCfg = Release|Any CPU
{DE1B3B28-8324-4BF4-AA9C-6CB63C7F2AE7}.Release|x86.Build.0 = Release|Any CPU
{BFCBFAE8-0A89-4FD0-9FC6-19300C57C132}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BFCBFAE8-0A89-4FD0-9FC6-19300C57C132}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BFCBFAE8-0A89-4FD0-9FC6-19300C57C132}.Debug|x64.ActiveCfg = Debug|x64
{BFCBFAE8-0A89-4FD0-9FC6-19300C57C132}.Debug|x64.Build.0 = Debug|x64
{BFCBFAE8-0A89-4FD0-9FC6-19300C57C132}.Debug|x86.ActiveCfg = Debug|x86
{BFCBFAE8-0A89-4FD0-9FC6-19300C57C132}.Debug|x86.Build.0 = Debug|x86
{BFCBFAE8-0A89-4FD0-9FC6-19300C57C132}.Debug|x64.ActiveCfg = Debug|Any CPU
{BFCBFAE8-0A89-4FD0-9FC6-19300C57C132}.Debug|x64.Build.0 = Debug|Any CPU
{BFCBFAE8-0A89-4FD0-9FC6-19300C57C132}.Debug|x86.ActiveCfg = Debug|Any CPU
{BFCBFAE8-0A89-4FD0-9FC6-19300C57C132}.Debug|x86.Build.0 = Debug|Any CPU
{BFCBFAE8-0A89-4FD0-9FC6-19300C57C132}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BFCBFAE8-0A89-4FD0-9FC6-19300C57C132}.Release|Any CPU.Build.0 = Release|Any CPU
{BFCBFAE8-0A89-4FD0-9FC6-19300C57C132}.Release|x64.ActiveCfg = Release|x64
{BFCBFAE8-0A89-4FD0-9FC6-19300C57C132}.Release|x64.Build.0 = Release|x64
{BFCBFAE8-0A89-4FD0-9FC6-19300C57C132}.Release|x86.ActiveCfg = Release|x86
{BFCBFAE8-0A89-4FD0-9FC6-19300C57C132}.Release|x86.Build.0 = Release|x86
{BFCBFAE8-0A89-4FD0-9FC6-19300C57C132}.Release|x64.ActiveCfg = Release|Any CPU
{BFCBFAE8-0A89-4FD0-9FC6-19300C57C132}.Release|x64.Build.0 = Release|Any CPU
{BFCBFAE8-0A89-4FD0-9FC6-19300C57C132}.Release|x86.ActiveCfg = Release|Any CPU
{BFCBFAE8-0A89-4FD0-9FC6-19300C57C132}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{DBE991B6-6F2D-408B-9936-D5417A4790BA} = {5877067A-8730-4BA0-BCB7-6A14FE930A1A}
{DE1B3B28-8324-4BF4-AA9C-6CB63C7F2AE7} = {E20D7E1C-E2FE-469C-853D-E05CC22A0D3A}
{BFCBFAE8-0A89-4FD0-9FC6-19300C57C132} = {5877067A-8730-4BA0-BCB7-6A14FE930A1A}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {F7B3FDE3-22A4-4D96-9619-EE32F3ED04D0}
EndGlobalSection
EndGlobal
17 changes: 9 additions & 8 deletions src/LiGet.App/LiGet.App.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>
<ServerGarbageCollection>true</ServerGarbageCollection>
<ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
</PropertyGroup>
Expand All @@ -13,12 +13,13 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="log4net" Version="2.0.8" />
<PackageReference Include="Gelf4Net.UdpAppender" Version="1.0.0.10" />
<PackageReference Include="Nancy" Version="2.0.0-Pre1885" />
<PackageReference Include="Nancy.Bootstrappers.Autofac" Version="2.0.0-Pre486" />
<PackageReference Include="Gelf4Net.UdpAppender" Version="1.0.0.14" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="2.1.3" />
<PackageReference Include="Nancy" Version="2.0.0-clinteastwood" />
<PackageReference Include="Nancy.Bootstrappers.Autofac" Version="2.0.0-clinteastwood" />
<PackageReference Include="Autofac" Version="4.6.2" />
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Owin" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.3" />
<PackageReference Include="Microsoft.AspNetCore.Owin" Version="2.1.1" />
</ItemGroup>
</Project>
10 changes: 5 additions & 5 deletions src/LiGet/LiGet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
Expand All @@ -7,14 +7,14 @@
<ItemGroup>
<PackageReference Include="DBreeze" Version="1.89.0" />
<PackageReference Include="log4net" Version="2.0.8" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Microsoft.AspNetCore.OData.vNext" Version="6.0.2-alpha-rtm" />
<PackageReference Include="Microsoft.OData.Core" Version="7.3.1" />
<PackageReference Include="Microsoft.OData.Edm" Version="7.3.1" />
<PackageReference Include="Microsoft.Spatial" Version="7.3.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.0" />
<PackageReference Include="Nancy" Version="2.0.0-Pre1885" />
<PackageReference Include="Nancy.Bootstrappers.Autofac" Version="2.0.0-Pre486" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.1.1" />
<PackageReference Include="Nancy" Version="2.0.0-clinteastwood" />
<PackageReference Include="Nancy.Bootstrappers.Autofac" Version="2.0.0-clinteastwood" />
<PackageReference Include="Autofac" Version="4.6.2" />
<PackageReference Include="NuGet.CatalogReader" Version="1.5.12" />
<PackageReference Include="NuGet.Packaging" Version="4.4.0" />
Expand Down
21 changes: 12 additions & 9 deletions tests/LiGet.Tests/LiGet.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>
Expand All @@ -17,18 +17,21 @@
<PackageReference Include="NuGet.Packaging.Core" Version="4.4.0" />
<PackageReference Include="NuGet.Protocol" Version="4.4.0" />
<PackageReference Include="log4net" Version="2.0.8" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Autofac" Version="4.6.2" />
<PackageReference Include="Moq" Version="4.7.142" />
<PackageReference Include="xunit" Version="2.3.0" />
<PackageReference Include="Nancy" Version="2.0.0-Pre1885" />
<PackageReference Include="Nancy.Bootstrappers.Autofac" Version="2.0.0-Pre486" />
<PackageReference Include="Moq" Version="4.10.0" />
<PackageReference Include="xunit" Version="2.4.0" />
<PackageReference Include="Nancy" Version="2.0.0-clinteastwood" />
<PackageReference Include="Nancy.Bootstrappers.Autofac" Version="2.0.0-clinteastwood" />
<PackageReference Include="Nancy.Testing" Version="2.0.0-clinteastwood" />
<!-- For testing from CLI using dotnet xunit -->
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0" />
<!-- For testing from VS Code -->
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20171012-09" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

</Project>