-
-
Notifications
You must be signed in to change notification settings - Fork 157
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Feat/#161 aspnetcore2.0
- Loading branch information
Showing
51 changed files
with
374 additions
and
420 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| <Project> | ||
|
|
||
| <PropertyGroup> | ||
| <NetStandardVersion>netstandard2.0</NetStandardVersion> | ||
| <AspNetCoreVersion>2.0.1</AspNetCoreVersion> | ||
| <EFCoreVersion>2.0.1</EFCoreVersion> | ||
| <MicrosoftLoggingVersion>2.0.0</MicrosoftLoggingVersion> | ||
| <MicrosoftConfigurationVersion>2.0.0</MicrosoftConfigurationVersion> | ||
| <TuplesVersion>4.4.0</TuplesVersion> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- Test Project Dependencies --> | ||
| <PropertyGroup> | ||
| <NetCoreAppVersion>netcoreapp2.0</NetCoreAppVersion> | ||
| <MicrosoftOptionsVersion>2.0.0</MicrosoftOptionsVersion> | ||
| <NpgsqlPostgreSQLVersion>2.0.0</NpgsqlPostgreSQLVersion> | ||
| <NpgsqlVersion>3.2.6</NpgsqlVersion> | ||
| <EFCoreToolsVersion>2.0.1</EFCoreToolsVersion> | ||
| <TestSdkVersion>15.3.0-preview-20170427-09</TestSdkVersion> | ||
| <TestHostVersion>1.1.2</TestHostVersion> | ||
| <XUnitVersion>2.3.0-beta3-build3705</XUnitVersion> | ||
| <BogusVersion>15.0.3</BogusVersion> | ||
| <MoqVersion>4.7.99</MoqVersion> | ||
| </PropertyGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 14 additions & 17 deletions
31
src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,37 +1,34 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>netcoreapp1.0</TargetFramework> | ||
| <TargetFramework>$(NetCoreAppVersion)</TargetFramework> | ||
| <PreserveCompilationContext>true</PreserveCompilationContext> | ||
| <AssemblyName>JsonApiDotNetCoreExample</AssemblyName> | ||
| <OutputType>Exe</OutputType> | ||
| <PackageId>JsonApiDotNetCoreExample</PackageId> | ||
| <RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion> | ||
| <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="../../JsonApiDotNetCore/JsonApiDotNetCore.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.2" /> | ||
| <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.2" /> | ||
| <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="1.1.2" /> | ||
| <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.2" /> | ||
| <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="1.1.2" /> | ||
| <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" /> | ||
| <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.2" /> | ||
| <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" /> | ||
| <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" /> | ||
| <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="1.1.1" /> | ||
| <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="1.1.2" /> | ||
| <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="1.1.0" /> | ||
| <PackageReference Include="DotNetCoreDocs" Version="0.4.0" /> | ||
| <PackageReference Include="Microsoft.AspNetCore" Version="$(AspNetCoreVersion)" /> | ||
| <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftConfigurationVersion)" /> | ||
| <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="$(MicrosoftConfigurationVersion)" /> | ||
| <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftConfigurationVersion)" /> | ||
| <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftConfigurationVersion)" /> | ||
| <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftLoggingVersion)" /> | ||
| <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftLoggingVersion)" /> | ||
| <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftLoggingVersion)" /> | ||
| <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftOptionsVersion)" /> | ||
| <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="$(EFCoreToolsVersion)" /> | ||
| <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="$(EFCoreToolsVersion)" /> | ||
| <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlPostgreSQLVersion)" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="1.0.0" /> | ||
| <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="$(EFCoreToolsVersion)" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,18 @@ | ||
| using System.IO; | ||
| using Microsoft.AspNetCore; | ||
| using Microsoft.AspNetCore.Hosting; | ||
| using Microsoft.Extensions.Configuration; | ||
|
|
||
| namespace JsonApiDotNetCoreExample | ||
| { | ||
| public class Program | ||
| { | ||
| public static void Main(string[] args) | ||
| { | ||
| var config = new ConfigurationBuilder() | ||
| .AddCommandLine(args) | ||
| .AddEnvironmentVariables(prefix: "ASPNETCORE_") | ||
| .Build(); | ||
| BuildWebHost(args).Run(); | ||
| } | ||
|
|
||
| var host = new WebHostBuilder() | ||
| .UseConfiguration(config) | ||
| .UseKestrel() | ||
| .UseContentRoot(Directory.GetCurrentDirectory()) | ||
| public static IWebHost BuildWebHost(string[] args) => | ||
| WebHost.CreateDefaultBuilder(args) | ||
| .UseStartup<Startup>() | ||
| .Build(); | ||
|
|
||
| host.Run(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.