Skip to content

Commit 29a850f

Browse files
toddlangtoddlang
committed
Updating to .net core 6 preview 7
1 parent 4f2ae3d commit 29a850f

File tree

16 files changed

+56
-56
lines changed

16 files changed

+56
-56
lines changed

‎.editorconfig

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ tab_width = 4
66
trim_trailing_whitespace = true
77
insert_final_newline = true
88
max_line_length = off
9-
guidelines = 80
10-
charset = utf-8
9+
guidelines = 80
1110

1211
# C# specific settings:
1312
# https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference
@@ -50,6 +49,8 @@ dotnet_style_prefer_conditional_expression_over_return = true:
5049
dotnet_style_coalesce_expression = true:suggestion # default
5150
dotnet_style_null_propagation = true:suggestion # default
5251

52+
dotnet_diagnostic.IDE0090.severity = none # Use new(...)
53+
5354
csharp_style_var_for_built_in_types = false:suggestion
5455
csharp_style_var_when_type_is_apparent = false:none
5556
csharp_style_var_elsewhere = false:suggestion

‎Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<LangVersion>9.0</LangVersion>
3+
<LangVersion>10.0</LangVersion>
44
<Nullable>disable</Nullable>
55
</PropertyGroup>
66
<PropertyGroup>

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
Provides a full-text search of the commits contained in the LMS repo.
55

66
### Requirements
7-
* [.Net Core 5.0](https://dotnet.microsoft.com/download/dotnet/5.0)
7+
* [.Net Core 6.0](https://dotnet.microsoft.com/download/dotnet/6.0)
88
* [Blazor](https://docs.microsoft.com/en-us/aspnet/core/blazor/get-started?view=aspnetcore-3.1&tabs=visual-studio)
9-
* [Visual Studio 16.8 Preview 4 or later](https://visualstudio.microsoft.com/vs/preview/)
9+
* [Visual Studio 2022 Preview 3 or later](https://visualstudio.microsoft.com/vs/preview/)
1010

1111
If you plan on locally hosting the server, you will need the IIS hosting bundle
12-
* [IIS Hosting Bundle](https://dotnet.microsoft.com/download/dotnet/thank-you/runtime-aspnetcore-5.0.0-rc.2-windows-hosting-bundle-installer)
12+
* [IIS Hosting Bundle](https://dotnet.microsoft.com/permalink/dotnetcore-current-windows-runtime-bundle-installer)
1313

1414
### Optional
1515
* SqlServer with Full-Text Search installed

‎src/GitSearch2.Client/GitSearch2.Client.csproj

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66

77
<PropertyGroup>
88
<DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
99
</PropertyGroup>
10-
10+
1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.1" />
13-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.1" PrivateAssets="all" />
14-
<PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.2.0-preview3.20168.3" />
12+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0-preview.7.21378.6" />
13+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0-preview.7.21378.6" PrivateAssets="all" />
1514
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
1615
</ItemGroup>
1716

‎src/GitSearch2.Client/Program.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public static async Task Main( string[] args ) {
1616
builder.Services.AddSingleton<IGitQueryService, GitQueryService>();
1717

1818
builder.RootComponents.Add<App>( "app" );
19-
builder.Services.AddSingleton(
19+
builder.Services.AddSingleton(sp =>
2020
new HttpClient {
2121
BaseAddress = new Uri( builder.HostEnvironment.BaseAddress )
2222
}

‎src/GitSearch2.Indexer/GitSearch2.Indexer.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net5.0</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>
99
<PackageReference Include="CommandLineParser" Version="2.8.0" />
1010
<PackageReference Include="LibGit2Sharp" Version="0.26.2" />
11-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
11+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0-preview.7.21377.19" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎src/GitSearch2.Repository.SqlServer/GitSearch2.Repository.SqlServer.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
9-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
8+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0-preview.7.21377.19" />
9+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0-preview.7.21377.19" />
1010
<PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
1111
</ItemGroup>
1212

‎src/GitSearch2.Repository.Sqlite/GitSearch2.Repository.Sqlite.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.1" />
9-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
10-
<PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0" />
11-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
8+
<PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.0-preview.7.21378.4" />
9+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0-preview.7.21377.19" />
10+
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0-preview.7.21377.19" />
11+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0-preview.7.21377.19" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎src/GitSearch2.Repository/GitSearch2.Repository.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
8+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0-preview.7.21377.19" />
99
</ItemGroup>
1010

1111
<ItemGroup>

‎src/GitSearch2.Server/GitSearch2.Server.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="5.0.1" />
9-
<PackageReference Include="Serilog.AspNetCore" Version="3.4.1-dev-00188" />
8+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.0-preview.7.21378.6" />
9+
<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
1010
<PackageReference Include="Serilog.Extensions.Logging.File" Version="2.0.0" />
1111
</ItemGroup>
1212

‎src/GitSearch2.Shared/GitSearch2.Shared.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
8+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0-preview.7.21377.19" />
99
</ItemGroup>
1010

1111
</Project>

‎test/GitSearch2.Indexer.Tests/GitSearch2.Indexer.Tests.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Moq" Version="4.15.2" />
10-
<PackageReference Include="nunit" Version="3.12.0" />
11-
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0-beta.1">
9+
<PackageReference Include="Moq" Version="4.16.1" />
10+
<PackageReference Include="nunit" Version="3.13.2" />
11+
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0">
1212
<PrivateAssets>all</PrivateAssets>
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1414
</PackageReference>
15-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201123-03" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎test/GitSearch2.Repository.SqlServer.Tests/GitSearch2.Repository.SqlServer.Tests.csproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
10-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
11-
<PackageReference Include="Moq" Version="4.15.2" />
12-
<PackageReference Include="nunit" Version="3.12.0" />
13-
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0-beta.1">
9+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0-preview.7.21377.19" />
10+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0-preview.7.21377.19" />
11+
<PackageReference Include="Moq" Version="4.16.1" />
12+
<PackageReference Include="nunit" Version="3.13.2" />
13+
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0">
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
</PackageReference>
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201123-03" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎test/GitSearch2.Repository.Tests/GitSearch2.Repository.Tests.csproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
10-
<PackageReference Include="Moq" Version="4.15.2" />
11-
<PackageReference Include="nunit" Version="3.12.0" />
12-
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0-beta.1">
9+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0-preview.7.21377.19" />
10+
<PackageReference Include="Moq" Version="4.16.1" />
11+
<PackageReference Include="nunit" Version="3.13.2" />
12+
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
</PackageReference>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201123-03" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
1717
</ItemGroup>
1818

1919
<ItemGroup>

‎test/GitSearch2.Server.Tests/GitSearch2.Server.Tests.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Moq" Version="4.15.2" />
10-
<PackageReference Include="nunit" Version="3.12.0" />
11-
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0-beta.1">
9+
<PackageReference Include="Moq" Version="4.16.1" />
10+
<PackageReference Include="nunit" Version="3.13.2" />
11+
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0">
1212
<PrivateAssets>all</PrivateAssets>
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1414
</PackageReference>
15-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201123-03" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎test/GitSearch2.Shared.Tests/GitSearch2.Shared.Tests.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="nunit" Version="3.12.0" />
10-
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0-beta.1">
9+
<PackageReference Include="nunit" Version="3.13.2" />
10+
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0">
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201123-03" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

0 commit comments

Comments
 (0)