Skip to content

Commit de107b4

Browse files
LiorBanaiLiorBanai
committed
NET 6
1 parent 653991c commit de107b4

File tree

7 files changed

+29
-22
lines changed

7 files changed

+29
-22
lines changed

‎.github/workflows/dotnet-core-desktop.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Install .NET Core
3131
uses: actions/setup-dotnet@v1
3232
with:
33-
dotnet-version: 5.0.202
33+
dotnet-version: 6.0.100
3434

3535
# Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
3636
- name: Setup MSBuild.exe

‎Analogy.LogServer.Clients.Test.Console/Analogy.LogServer.Clients.Test.Console.csproj‎

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net5.0-windows;net48;net471;net472;netcoreapp3.1</TargetFrameworks>
5+
<TargetFrameworks>net6.0-windows;net5.0-windows;net48;net471;net472;netcoreapp3.1</TargetFrameworks>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="2.14.6" />
9-
<PackageReference Include="System.Resources.Extensions" Version="5.0.0" />
8+
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="2.15.1" />
9+
<PackageReference Include="System.Resources.Extensions" Version="6.0.0" />
1010
</ItemGroup>
1111
<ItemGroup>
1212
<ProjectReference Include="..\Analogy.LogServer.Clients\Analogy.LogServer.Clients.csproj" />

‎Analogy.LogServer.Clients/Analogy.LogServer.Clients.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0-windows;net48;net471;net472;netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net6.0-windows;net5.0-windows;net48;net471;net472;netcoreapp3.1</TargetFrameworks>
55
<OutputType>Library</OutputType>
66
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
77
<Authors>Lior Banai</Authors>
@@ -10,7 +10,7 @@
1010
<Copyright>Lior Banai @ 2020</Copyright>
1111
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1212
<PackageIcon>Analogy.gRPC.service.png</PackageIcon>
13-
<Version>0.6.4</Version>
13+
<Version>0.7.0</Version>
1414
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1515
<IncludeSymbols>true</IncludeSymbols>
1616
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -35,19 +35,19 @@
3535
</ItemGroup>
3636

3737
<ItemGroup>
38-
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="2.14.6" />
38+
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="2.15.1" />
3939
<PackageReference Include="Google.Protobuf" Version="3.19.1" />
4040
<PackageReference Include="Grpc.Core" Version="2.41.1" />
4141
<PackageReference Include="Grpc.Net.Client" Version="2.40.0" />
4242
<PackageReference Include="Grpc.Tools" Version="2.41.1">
4343
<PrivateAssets>all</PrivateAssets>
4444
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4545
</PackageReference>
46-
<PackageReference Include="Microsoft.Build.Tasks.Git" Version="1.0.0">
46+
<PackageReference Include="Microsoft.Build.Tasks.Git" Version="1.1.0">
4747
<PrivateAssets>all</PrivateAssets>
4848
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4949
</PackageReference>
50-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
50+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.0">
5151
<PrivateAssets>all</PrivateAssets>
5252
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5353
</PackageReference>

‎Analogy.LogServer.Configurator/Analogy.LogServer.Configurator.csproj‎

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

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFrameworks>net5.0-windows;net472;netcoreapp3.1</TargetFrameworks>
5+
<TargetFrameworks>net6.0-windows;net5.0-windows;net472;netcoreapp3.1</TargetFrameworks>
66
<UseWindowsForms>true</UseWindowsForms>
77
<IsPackable>true</IsPackable>
88
<Authors>Lior Banai</Authors>
@@ -22,17 +22,17 @@
2222
</PropertyGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="2.14.6" />
25+
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="2.15.1" />
2626
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
27-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
27+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.0">
2828
<PrivateAssets>all</PrivateAssets>
2929
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3030
</PackageReference>
31-
<PackageReference Include="Microsoft.Build.Tasks.Git" Version="1.0.0">
31+
<PackageReference Include="Microsoft.Build.Tasks.Git" Version="1.1.0">
3232
<PrivateAssets>all</PrivateAssets>
3333
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3434
</PackageReference>
35-
<PackageReference Include="System.Resources.Extensions" Version="5.0.0" />
35+
<PackageReference Include="System.Resources.Extensions" Version="6.0.0" />
3636
</ItemGroup>
3737

3838
<ItemGroup>

‎Analogy.LogServer.Tests/Analogy.LogServer.Tests.csproj‎

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

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net5.0-windows</TargetFramework>
5+
<TargetFramework>net6.0-windows</TargetFramework>
66
<UseWindowsForms>true</UseWindowsForms>
77
<Copyright>Lior Banai @ 2020</Copyright>
88
<PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -15,8 +15,8 @@
1515
</PropertyGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="2.14.6" />
19-
<PackageReference Include="System.Resources.Extensions" Version="5.0.0" />
18+
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="2.15.1" />
19+
<PackageReference Include="System.Resources.Extensions" Version="6.0.0" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

‎Analogy.LogServer/Analogy.LogServer.csproj‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0-windows;netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net6.0-windows;net5.0-windows;netcoreapp3.1</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
<StartupObject>Analogy.LogServer.Program</StartupObject>
77
<Authors>Lior Banai</Authors>
@@ -19,15 +19,15 @@
1919
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
2020
<EmbedUntrackedSources>true</EmbedUntrackedSources>
2121
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
22-
<Version>0.6.4</Version>
22+
<Version>0.7.0</Version>
2323
<Copyright>Lior Banai @ 2020</Copyright>
2424
</PropertyGroup>
2525
<ItemGroup>
2626
<Protobuf Include="Protos\Analogy.proto" GrpcServices="Server" />
2727
</ItemGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="2.14.6" />
30+
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="2.15.1" />
3131
<PackageReference Include="Grpc.AspNetCore" Version="2.40.0" />
3232
<PackageReference Include="Grpc.Core" Version="2.41.1" />
3333
<PackageReference Include="Microsoft.Build.Tasks.Git" Version="1.0.0">
@@ -62,6 +62,14 @@
6262
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
6363
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
6464
</ItemGroup>
65+
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0-windows' ">
66+
<PackageReference Include="Microsoft.AspNetCore.Hosting.WindowsServices" Version="6.0.0" />
67+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
68+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
69+
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.0" />
70+
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
71+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
72+
</ItemGroup>
6573
<ItemGroup>
6674
<Content Update="appsettings_LogServer.json">
6775
<CopyToOutputDirectory>Always</CopyToOutputDirectory>

‎Analogy.LogServer/Startup.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ public class Startup
2020
public Startup(IConfiguration configuration) => Configuration = configuration;
2121
public void ConfigureServices(IServiceCollection services)
2222
{
23-
services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_3_0).AddNewtonsoftJson(options =>
24-
options.SerializerSettings.ContractResolver = new DefaultContractResolver());
23+
services.AddMvc();
2524
ServiceConfiguration serviceConfiguration = new ServiceConfiguration();
2625
Configuration.Bind("ServiceConfiguration", serviceConfiguration);
2726
services.AddSingleton(serviceConfiguration);

0 commit comments

Comments
 (0)