Skip to content

.NET core 2.1 -> 2.2 #594

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

Merged
merged 7 commits into from
Oct 23, 2019
Merged

.NET core 2.1 -> 2.2 #594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
24a2ef3
merge: merge into correct email:
wisepotato Oct 23, 2019
adf845b
Merge branch 'feat/upgrade-2.2' into feat/upgrade-2.2-real
wisepotato Oct 23, 2019
4124aa9
feat: upgrade to 2.2
wisepotato Oct 23, 2019
fb6aa66
chore: merge fixes
wisepotato Oct 23, 2019
17f0c8c
chore: spacing fix
wisepotato Oct 23, 2019
10ea6cb
chore: revert silencing error
wisepotato Oct 23, 2019
0a4e322
chore: small spacing fix
wisepotato Oct 23, 2019
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
6 changes: 1 addition & 5 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = _
22 changes: 8 additions & 14 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,16 @@
<Project>

<PropertyGroup>
<NetCoreAppVersion>netcoreapp2.1</NetCoreAppVersion>
<NetCoreAppVersion>netcoreapp2.2</NetCoreAppVersion>
<NetStandardVersion>netstandard2.0</NetStandardVersion>

<AspNetCoreVersion>2.*</AspNetCoreVersion>

<MicrosoftLoggingVersion>2.*</MicrosoftLoggingVersion>
<MicrosoftConfigurationVersion>2.*</MicrosoftConfigurationVersion>
<MicrosoftOptionsVersion>2.*</MicrosoftOptionsVersion>

<EFCoreVersion>2.*</EFCoreVersion>
<EFCoreToolsVersion>2.*</EFCoreToolsVersion>

<AspNetCoreVersion>2.2.*</AspNetCoreVersion>
<MicrosoftLoggingVersion>2.2.*</MicrosoftLoggingVersion>
<MicrosoftConfigurationVersion>2.2.*</MicrosoftConfigurationVersion>
<MicrosoftOptionsVersion>2.2.*</MicrosoftOptionsVersion>
<EFCoreVersion>2.2.*</EFCoreVersion>
<EFCoreToolsVersion>2.2.*</EFCoreToolsVersion>
<NpgsqlVersion>4.0.0</NpgsqlVersion>
<NpgsqlPostgreSQLVersion>2.1.0</NpgsqlPostgreSQLVersion>

<TuplesVersion>4.5.0</TuplesVersion>
</PropertyGroup>

Expand All @@ -26,5 +21,4 @@
<BogusVersion>22.1.2</BogusVersion>
<MoqVersion>4.8.3</MoqVersion>
</PropertyGroup>

</Project>
</Project>
25 changes: 12 additions & 13 deletions src/Examples/GettingStarted/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Startup>()
.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<Startup>()
.UseUrls("http://localhost:5001");
}
}
}
1 change: 1 addition & 0 deletions src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<AssemblyName>JsonApiDotNetCoreExample</AssemblyName>
<OutputType>Exe</OutputType>
<PackageId>JsonApiDotNetCoreExample</PackageId>
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Examples/JsonApiDotNetCoreExample/web.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<system.webServer>
<handlers>
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified"/>
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified"/>
</handlers>
<aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false"/>
</system.webServer>
Expand Down
3 changes: 2 additions & 1 deletion src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>$(NetCoreAppVersion)</TargetFramework>
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/Examples/ReportsExample/ReportsExample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>$(NetCoreAppVersion)</TargetFramework>
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion test/DiscoveryTests/DiscoveryTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@
<PackageReference Include="xunit" Version="$(XUnitVersion)" />
<PackageReference Include="Moq" Version="$(MoqVersion)" />
</ItemGroup>

</Project>