Skip to content

Commit 8c9cc9b

Browse files
pwelter34pwelter34
committed
update package and framework to .net 6.0
1 parent 65254ef commit 8c9cc9b

File tree

7 files changed

+73
-52
lines changed

7 files changed

+73
-52
lines changed

‎.editorconfig‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# EditorConfig is awesome: https://EditorConfig.org
2+
3+
root = true
4+
5+
# All Files
6+
[*]
7+
charset = utf-8
8+
indent_style = space
9+
indent_size = 4
10+
insert_final_newline = true
11+
trim_trailing_whitespace = true
12+
13+
# XML Configuration Files
14+
[*.{xml,config,props,targets,nuspec,resx,ruleset,vsixmanifest,vsct}]
15+
indent_size = 2
16+
17+
# JSON Files
18+
[*.{json,json5,webmanifest}]
19+
indent_size = 2
20+
21+
# Project Files
22+
[*.{csproj,sqlproj}]
23+
indent_size = 2
24+
25+
# YAML Files
26+
[*.{yml,yaml}]
27+
indent_size = 2
28+
29+
# Markdown Files
30+
[*.md]
31+
trim_trailing_whitespace = false
32+
33+
# Web Files
34+
[*.{htm,html,js,jsm,ts,tsx,css,sass,scss,less,pcss,svg,vue}]
35+
indent_size = 2
36+
37+
# Batch Files
38+
[*.{cmd,bat}]
39+
end_of_line = crlf
40+
41+
# Bash Files
42+
[*.sh]
43+
end_of_line = lf
44+

‎EntityFrameworkCore.Generator.sln‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.28803.452
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.31919.166
55
MinimumVisualStudioVersion = 15.0.26124.0
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityFrameworkCore.Generator.Core", "src\EntityFrameworkCore.Generator.Core\EntityFrameworkCore.Generator.Core.csproj", "{2FAD146E-69AA-4068-91D6-81632A9D3E88}"
77
EndProject

‎appveyor.yml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
version: 3.1.0.{build}
2-
os: Visual Studio 2019
1+
version: 4.0.0.{build}
2+
os: Visual Studio 2022
33

44
environment:
55
ASPNETCORE_ENVIRONMENT: appveyor
@@ -8,9 +8,7 @@ environment:
88

99
init:
1010
- git config --global core.autocrlf input
11-
12-
services:
13-
- mssql2017
11+
- net start MSSQL$SQL2019
1412

1513
dotnet_csproj:
1614
patch: true

‎build/sourcelink.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
10+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
1111
</ItemGroup>
1212
</Project>

‎src/EntityFrameworkCore.Generator.Core/EntityFrameworkCore.Generator.Core.csproj‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,26 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\..\build\common.props" />
33

44
<PropertyGroup>
5-
<TargetFramework>netstandard2.1</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
<RootNamespace>EntityFrameworkCore.Generator</RootNamespace>
7-
</PropertyGroup>
8-
9-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
10-
<NoWarn>1591,EF1001</NoWarn>
11-
</PropertyGroup>
12-
13-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
147
<NoWarn>1591,EF1001</NoWarn>
158
</PropertyGroup>
169

1710
<ItemGroup>
18-
<PackageReference Include="Humanizer" Version="2.11.10" />
19-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.11.0" />
20-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.11.0" />
21-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.11" />
22-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="5.0.0" />
23-
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="5.0.2" />
11+
<PackageReference Include="Humanizer" Version="2.13.14" />
12+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" />
13+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.0.1" />
14+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0" />
15+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.0" />
16+
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.0" />
2417
<PackageReference Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
2518
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
26-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.11" />
27-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.11" />
28-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.11" />
29-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.10" />
30-
<PackageReference Include="Oracle.EntityFrameworkCore" Version="5.21.3" />
19+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0" />
20+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0" />
21+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
22+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.1" />
23+
<PackageReference Include="Oracle.EntityFrameworkCore" Version="5.21.4" />
3124
<PackageReference Include="YamlDotNet" Version="11.2.1" />
3225
</ItemGroup>
3326

‎src/EntityFrameworkCore.Generator/EntityFrameworkCore.Generator.csproj‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,18 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\..\build\common.props" />
33

44
<PropertyGroup>
55
<OutputType>Exe</OutputType>
6-
<TargetFramework>netcoreapp3.1</TargetFramework>
6+
<TargetFramework>net6.0</TargetFramework>
77
<ToolCommandName>efg</ToolCommandName>
88
<PackAsTool>true</PackAsTool>
9-
</PropertyGroup>
10-
11-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
12-
<NoWarn>1591,EF1001</NoWarn>
13-
</PropertyGroup>
14-
15-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
169
<NoWarn>1591,EF1001</NoWarn>
1710
</PropertyGroup>
1811

1912
<ItemGroup>
2013
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="3.1.0" />
21-
<PackageReference Include="Serilog.Extensions.Hosting" Version="4.1.2" />
22-
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
14+
<PackageReference Include="Serilog.Extensions.Hosting" Version="4.2.0" />
15+
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
2316
</ItemGroup>
2417

2518
<ItemGroup>

‎test/EntityFrameworkCore.Generator.Core.Tests/EntityFrameworkCore.Generator.Core.Tests.csproj‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\..\build\common.props" />
33

44
<PropertyGroup>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66

77
<IsPackable>false</IsPackable>
8-
</PropertyGroup>
9-
10-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
11-
<NoWarn>1591,EF1001</NoWarn>
12-
</PropertyGroup>
13-
14-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
158
<NoWarn>1591,EF1001</NoWarn>
169
</PropertyGroup>
1710

@@ -31,10 +24,10 @@
3124
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
3225
</PackageReference>
3326
<PackageReference Include="dbup-sqlserver" Version="4.5.0" />
34-
<PackageReference Include="FluentAssertions" Version="6.1.0" />
35-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="5.0.0" />
36-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
37-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
27+
<PackageReference Include="FluentAssertions" Version="6.2.0" />
28+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.0" />
29+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
30+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
3831
<PackageReference Include="xunit" Version="2.4.1" />
3932
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
4033
<PrivateAssets>all</PrivateAssets>

0 commit comments

Comments
 (0)