Skip to content

Commit

Permalink
Update netcoreapp to 3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
andrew-at-octopus committed Aug 30, 2021
1 parent d4ba489 commit 739946f
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ Task("PublishLinuxTests")
DotNetCorePublish("./source/Halibut.Tests/Halibut.Tests.csproj", new DotNetCorePublishSettings
{
Configuration = configuration,
Framework = "netcoreapp2.2",
Framework = "netcoreapp3.1",
Runtime = "linux-x64",
OutputDirectory = new DirectoryPath($"{artifactsDir}publish/linux-x64")
});
Expand Down
2 changes: 1 addition & 1 deletion source/Halibut.SampleClient/Halibut.SampleClient.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Serilog" Version="2.3.0" />
<PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="Serilog.Sinks.ColoredConsole" Version="2.0.0" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions source/Halibut.SampleLoadTest/Halibut.SampleLoadTest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<VersionPrefix>0.0.0</VersionPrefix>
<TargetFrameworks>net45;netcoreapp2.0</TargetFrameworks>
<TargetFrameworks>net45;netcoreapp3.1</TargetFrameworks>
<AssemblyName>Halibut.SampleLoadTest</AssemblyName>
<OutputType>Exe</OutputType>
<PackageId>Halibut.SampleLoadTest</PackageId>
Expand All @@ -18,7 +18,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Serilog" Version="2.3.0" />
<PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="Serilog.Sinks.ColoredConsole" Version="2.0.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion source/Halibut.SamplePolling/Halibut.SamplePolling.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion source/Halibut.SampleServer/Halibut.SampleServer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Serilog" Version="2.3.0" />
<PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="Serilog.Sinks.ColoredConsole" Version="2.0.0" />
</ItemGroup>

Expand Down
8 changes: 4 additions & 4 deletions source/Halibut.Tests/Halibut.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
</PropertyGroup>
<PropertyGroup Condition="!$([MSBuild]::IsOSUnixLike())">
<TargetFrameworks>net462;netcoreapp2.2</TargetFrameworks>
<TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
</PropertyGroup>
<PropertyGroup Condition="$([MSBuild]::IsOSUnixLike())">
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Compile Remove="PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress.NETCore.approved.cs" />
Expand Down Expand Up @@ -46,11 +46,11 @@
<PackageReference Include="Serilog.Sinks.NUnit" Version="1.0.1" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="4.6.0" />
<PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.15" />
<PackageReference Include="Serilog" Version="2.3.0" />
<PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="Serilog.Sinks.ColoredConsole" Version="2.0.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
<PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.2.12-alpha">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down

0 comments on commit 739946f

Please sign in to comment.