diff --git a/.editorconfig b/.editorconfig index 1cdb95b612..3499a1f7a6 100644 --- a/.editorconfig +++ b/.editorconfig @@ -22,8 +22,4 @@ dotnet_naming_symbols.private_fields.applicable_kinds = field dotnet_naming_symbols.private_fields.applicable_accessibilities = private dotnet_naming_style.prefix_underscore.capitalization = camel_case -dotnet_naming_style.prefix_underscore.required_prefix = _ -[*.cs] - -# CS0659: Type overrides Object.Equals(object o) but does not override Object.GetHashCode() -dotnet_diagnostic.CS0659.severity = silent +dotnet_naming_style.prefix_underscore.required_prefix = _ \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props index 61e8771fc0..5b447710fc 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,21 +1,16 @@ - netcoreapp2.1 + netcoreapp2.2 netstandard2.0 - - 2.* - - 2.* - 2.* - 2.* - - 2.* - 2.* - + 2.2.* + 2.2.* + 2.2.* + 2.2.* + 2.2.* + 2.2.* 4.0.0 2.1.0 - 4.5.0 @@ -26,5 +21,4 @@ 22.1.2 4.8.3 - - + \ No newline at end of file diff --git a/src/Examples/GettingStarted/Program.cs b/src/Examples/GettingStarted/Program.cs index 04523dcf9c..7da77fd0fa 100644 --- a/src/Examples/GettingStarted/Program.cs +++ b/src/Examples/GettingStarted/Program.cs @@ -10,17 +10,16 @@ namespace GettingStarted { - - - public class Program - { - public static void Main(string[] args) - { - CreateWebHostBuilder(args).Build().Run(); - } - public static IWebHostBuilder CreateWebHostBuilder(string[] args) => - WebHost.CreateDefaultBuilder(args) - .UseStartup() - .UseUrls("http://localhost:5001"); + public class Program + { + public static void Main(string[] args) + { + CreateWebHostBuilder(args).Build().Run(); + } + + public static IWebHostBuilder CreateWebHostBuilder(string[] args) => + WebHost.CreateDefaultBuilder(args) + .UseStartup() + .UseUrls("http://localhost:5001"); } -} +} \ No newline at end of file diff --git a/src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj b/src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj index 92f1bf4fa0..b3d9610ed5 100644 --- a/src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj +++ b/src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj @@ -5,6 +5,7 @@ JsonApiDotNetCoreExample Exe JsonApiDotNetCoreExample + InProcess diff --git a/src/Examples/JsonApiDotNetCoreExample/web.config b/src/Examples/JsonApiDotNetCoreExample/web.config index a8d6672758..50d0b02786 100644 --- a/src/Examples/JsonApiDotNetCoreExample/web.config +++ b/src/Examples/JsonApiDotNetCoreExample/web.config @@ -7,7 +7,7 @@ - + diff --git a/src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj b/src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj index efdaa68e5b..86825c5621 100755 --- a/src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj +++ b/src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj @@ -1,6 +1,7 @@ - + $(NetCoreAppVersion) + InProcess diff --git a/src/Examples/ReportsExample/ReportsExample.csproj b/src/Examples/ReportsExample/ReportsExample.csproj index 24c01b9a8d..50e64df8f6 100644 --- a/src/Examples/ReportsExample/ReportsExample.csproj +++ b/src/Examples/ReportsExample/ReportsExample.csproj @@ -1,6 +1,7 @@ $(NetCoreAppVersion) + InProcess diff --git a/test/DiscoveryTests/DiscoveryTests.csproj b/test/DiscoveryTests/DiscoveryTests.csproj index c1c13846a3..d4458df6dd 100644 --- a/test/DiscoveryTests/DiscoveryTests.csproj +++ b/test/DiscoveryTests/DiscoveryTests.csproj @@ -15,5 +15,4 @@ - \ No newline at end of file