Skip to content

Commit cbab7b0

Browse files
committed
feat: upgrade to .net 8
BREAKING CHANGE: - upgrade to .net 8 - use `dotnet/runtime` image
1 parent 6c83d6e commit cbab7b0

11 files changed

+17
-13
lines changed

.editorconfig

+4
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,8 @@ dotnet_style_qualification_for_field = false:error
352352
dotnet_style_qualification_for_method = false:error
353353
dotnet_style_qualification_for_property = false:error
354354
dotnet_style_require_accessibility_modifiers = for_non_interface_members:error
355+
dotnet_style_collection_initializer = true:error
356+
dotnet_style_prefer_collection_expression = true:error
355357

356358
# ReSharper properties
357359
resharper_accessor_owner_body = expression_body
@@ -839,6 +841,7 @@ resharper_toplevel_function_declaration_return_type_style = do_not_change
839841
resharper_toplevel_function_definition_return_type_style = do_not_change
840842
resharper_trailing_comma_in_multiline_lists = true
841843
resharper_trailing_comma_in_singleline_lists = false
844+
resharper_use_collection_expression_highlighting = error
842845
resharper_use_continuous_indent_inside_initializer_braces = true
843846
resharper_use_continuous_indent_inside_parens = true
844847
resharper_use_continuous_line_indent_in_expression_braces = false
@@ -2932,6 +2935,7 @@ resharper_redundant_to_string_call_for_value_type_highlighting = error
29322935
resharper_redundant_to_string_call_highlighting = error
29332936
resharper_redundant_type_arguments_of_method_highlighting = error
29342937
resharper_redundant_type_check_in_pattern_highlighting = warning
2938+
resharper_redundant_type_declaration_body_highlighting = error
29352939
resharper_redundant_unsafe_context_highlighting = error
29362940
resharper_redundant_using_directive_global_highlighting = error
29372941
resharper_redundant_using_directive_highlighting = error

Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine as build
1+
FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine as build
22

33
ENV PRROJECT_NAME "ReportGenerator.BitbucketPipe"
44

@@ -14,9 +14,9 @@ COPY src/$PRROJECT_NAME/. ./
1414
RUN dotnet publish --no-restore -c release -o /app
1515

1616

17-
FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine
17+
FROM mcr.microsoft.com/dotnet/runtime:8.0-alpine
1818

19-
LABEL maintainer="@amit_e"
19+
LABEL maintainer="@LoremFooBar"
2020

2121
WORKDIR /app
2222

bitbucket-pipelines.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ definitions:
22
steps:
33
- step: &build-and-test
44
name: Build and test
5-
image: mcr.microsoft.com/dotnet/sdk:7.0
5+
image: mcr.microsoft.com/dotnet/sdk:8.0
66
caches:
77
- dotnetcore
88
script:

src/ReportGenerator.BitbucketPipe/ReportGenerationFailedException.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
namespace ReportGenerator.BitbucketPipe;
44

5-
public class ReportGenerationFailedException : Exception { }
5+
public class ReportGenerationFailedException : Exception;

src/ReportGenerator.BitbucketPipe/ReportGenerator.BitbucketPipe.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<Nullable>enable</Nullable>
77

@@ -14,7 +14,7 @@
1414
<PackageReference Include="Macross.Json.Extensions" Version="3.0.0"/>
1515
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0"/>
1616
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0"/>
17-
<PackageReference Include="ReportGenerator.Core" Version="5.2.1" />
17+
<PackageReference Include="ReportGenerator.Core" Version="5.2.1"/>
1818
<PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0"/>
1919
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0"/>
2020
</ItemGroup>

src/ReportGenerator.BitbucketPipe/packages.lock.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"version": 1,
33
"dependencies": {
4-
"net7.0": {
4+
"net8.0": {
55
"IdentityModel": {
66
"type": "Direct",
77
"requested": "[6.2.0, )",

tests/ReportGenerator.BitbucketPipe.Tests/BDD/ThenAttribute.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
namespace ReportGenerator.BitbucketPipe.Tests.BDD;
44

5-
public class ThenAttribute : TestAttribute { }
5+
public class ThenAttribute : TestAttribute;

tests/ReportGenerator.BitbucketPipe.Tests/ReportGenerator.BitbucketPipe.Tests.csproj

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

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

tests/ReportGenerator.BitbucketPipe.Tests/ReportGeneratorTests/When_Generating_Report_Filtering_Out_All_Files.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ protected override void Given()
2626
Reports =
2727
$"ExampleCoverageTestResults{Path.DirectorySeparatorChar}*{Path.DirectorySeparatorChar}example.cobertura.xml",
2828
ReportTypes = "JsonSummary;Html",
29-
ExtraArguments = new[] { "-fileFilters:+IDoNotExist.cs" },
29+
ExtraArguments = ["-fileFilters:+IDoNotExist.cs"],
3030
};
3131
var reportGeneratorOptions = new OptionsWrapper<ReportGeneratorOptions>(_reportGeneratorOptions);
3232

tests/ReportGenerator.BitbucketPipe.Tests/ReportGeneratorTests/When_Generating_Report_Supplying_Extra_Arguments.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ protected override void Given()
2626
Reports =
2727
$"ExampleCoverageTestResults{Path.DirectorySeparatorChar}*{Path.DirectorySeparatorChar}example.cobertura.xml",
2828
ReportTypes = "JsonSummary;Html",
29-
ExtraArguments = new[] { $"-fileFilters:+*{Path.DirectorySeparatorChar}BitbucketClient.cs" },
29+
ExtraArguments = [$"-fileFilters:+*{Path.DirectorySeparatorChar}BitbucketClient.cs"],
3030
};
3131
var reportGeneratorOptions = new OptionsWrapper<ReportGeneratorOptions>(_reportGeneratorOptions);
3232

tests/ReportGenerator.BitbucketPipe.Tests/packages.lock.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"version": 1,
33
"dependencies": {
4-
"net7.0": {
4+
"net8.0": {
55
"coverlet.collector": {
66
"type": "Direct",
77
"requested": "[6.0.0, )",

0 commit comments

Comments
 (0)