Skip to content

Commit 8a26a2d

Browse files
wisepotatomaurei
authored andcommitted
.NET core 2.1 -> 2.2 (#594)
* merge: merge into correct email: * feat: upgrade to 2.2 * chore: spacing fix * chore: revert silencing error * chore: small spacing fix
1 parent b6fccd3 commit 8a26a2d

File tree

8 files changed

+26
-35
lines changed

8 files changed

+26
-35
lines changed

.editorconfig

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,4 @@ dotnet_naming_symbols.private_fields.applicable_kinds = field
2222
dotnet_naming_symbols.private_fields.applicable_accessibilities = private
2323

2424
dotnet_naming_style.prefix_underscore.capitalization = camel_case
25-
dotnet_naming_style.prefix_underscore.required_prefix = _
26-
[*.cs]
27-
28-
# CS0659: Type overrides Object.Equals(object o) but does not override Object.GetHashCode()
29-
dotnet_diagnostic.CS0659.severity = silent
25+
dotnet_naming_style.prefix_underscore.required_prefix = _

Directory.Build.props

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
11
<Project>
22

33
<PropertyGroup>
4-
<NetCoreAppVersion>netcoreapp2.1</NetCoreAppVersion>
4+
<NetCoreAppVersion>netcoreapp2.2</NetCoreAppVersion>
55
<NetStandardVersion>netstandard2.0</NetStandardVersion>
6-
7-
<AspNetCoreVersion>2.*</AspNetCoreVersion>
8-
9-
<MicrosoftLoggingVersion>2.*</MicrosoftLoggingVersion>
10-
<MicrosoftConfigurationVersion>2.*</MicrosoftConfigurationVersion>
11-
<MicrosoftOptionsVersion>2.*</MicrosoftOptionsVersion>
12-
13-
<EFCoreVersion>2.*</EFCoreVersion>
14-
<EFCoreToolsVersion>2.*</EFCoreToolsVersion>
15-
6+
<AspNetCoreVersion>2.2.*</AspNetCoreVersion>
7+
<MicrosoftLoggingVersion>2.2.*</MicrosoftLoggingVersion>
8+
<MicrosoftConfigurationVersion>2.2.*</MicrosoftConfigurationVersion>
9+
<MicrosoftOptionsVersion>2.2.*</MicrosoftOptionsVersion>
10+
<EFCoreVersion>2.2.*</EFCoreVersion>
11+
<EFCoreToolsVersion>2.2.*</EFCoreToolsVersion>
1612
<NpgsqlVersion>4.0.0</NpgsqlVersion>
1713
<NpgsqlPostgreSQLVersion>2.1.0</NpgsqlPostgreSQLVersion>
18-
1914
<TuplesVersion>4.5.0</TuplesVersion>
2015
</PropertyGroup>
2116

@@ -26,5 +21,4 @@
2621
<BogusVersion>22.1.2</BogusVersion>
2722
<MoqVersion>4.8.3</MoqVersion>
2823
</PropertyGroup>
29-
30-
</Project>
24+
</Project>

src/Examples/GettingStarted/Program.cs

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,16 @@
1010

1111
namespace GettingStarted
1212
{
13-
14-
15-
public class Program
16-
{
17-
public static void Main(string[] args)
18-
{
19-
CreateWebHostBuilder(args).Build().Run();
20-
}
21-
public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
22-
WebHost.CreateDefaultBuilder(args)
23-
.UseStartup<Startup>()
24-
.UseUrls("http://localhost:5001");
13+
public class Program
14+
{
15+
public static void Main(string[] args)
16+
{
17+
CreateWebHostBuilder(args).Build().Run();
18+
}
19+
20+
public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
21+
WebHost.CreateDefaultBuilder(args)
22+
.UseStartup<Startup>()
23+
.UseUrls("http://localhost:5001");
2524
}
26-
}
25+
}

src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<AssemblyName>JsonApiDotNetCoreExample</AssemblyName>
66
<OutputType>Exe</OutputType>
77
<PackageId>JsonApiDotNetCoreExample</PackageId>
8+
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
89
</PropertyGroup>
910

1011
<ItemGroup>

src/Examples/JsonApiDotNetCoreExample/web.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<system.webServer>
99
<handlers>
10-
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified"/>
10+
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified"/>
1111
</handlers>
1212
<aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false"/>
1313
</system.webServer>

src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
33
<TargetFramework>$(NetCoreAppVersion)</TargetFramework>
4+
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
45
</PropertyGroup>
56

67
<ItemGroup>

src/Examples/ReportsExample/ReportsExample.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
33
<TargetFramework>$(NetCoreAppVersion)</TargetFramework>
4+
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
45
</PropertyGroup>
56

67
<ItemGroup>

test/DiscoveryTests/DiscoveryTests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,4 @@
1515
<PackageReference Include="xunit" Version="$(XUnitVersion)" />
1616
<PackageReference Include="Moq" Version="$(MoqVersion)" />
1717
</ItemGroup>
18-
1918
</Project>

0 commit comments

Comments
 (0)