Skip to content

Commit b8c7005

Browse files
Per Kopsperkops
Per Kops
authored and
perkops
committed
feat: upgrade to .net 10 - incl projects and pipeline
1 parent 700b8ec commit b8c7005

File tree

15 files changed

+49
-85
lines changed

15 files changed

+49
-85
lines changed

‎.github/workflows/atc-coding-rules-update.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: '⚙ Install ATC Coding Rules updater'
2525
run: dotnet tool install --global atc-coding-rules-updater
2626
- name: ♻️ Run ATC Coding Rules updater
27-
run: atc-coding-rules-updater run --projectPath . --verbose --projectTarget DotNet8 --useTemporarySuppressions
27+
run: atc-coding-rules-updater run --projectPath . --verbose --projectTarget DotNet10 --useTemporarySuppressions
2828
- name: 🐛 Git - show changes
2929
shell: bash
3030
run: |
@@ -35,7 +35,7 @@ jobs:
3535
- run: |
3636
dotnet build -c Release
3737
- name: 💾Create PR
38-
uses: peter-evans/create-pull-request@v3
38+
uses: peter-evans/create-pull-request@v7
3939
with:
4040
commit-message: 'Pipeline ran atc-coding-rules-updater Build: ${{ env.GITHUB_RUN_ID}}'
4141
title: ATC Coding Rules Update

‎.github/workflows/post-integration.yml‎

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,10 @@ jobs:
3030
with:
3131
setAllVars: true
3232

33-
- name: ⚙️ Setup dotnet 8.0.x
33+
- name: ⚙️ Setup dotnet 10.0.x
3434
uses: actions/setup-dotnet@v4
3535
with:
36-
dotnet-version: '8.0.x'
37-
38-
- name: ⚙️ Set up JDK 17
39-
uses: actions/setup-java@v3
40-
with:
41-
java-version: 17
42-
distribution: 'zulu'
36+
dotnet-version: '10.0.x'
4337

4438
- name: 🧹 Clean
4539
run: dotnet clean -c Release && dotnet nuget locals all --clear
@@ -53,19 +47,6 @@ jobs:
5347
- name: 🧪 Run unit tests
5448
run: dotnet test -c Release --no-build --filter "Category!=Integration"
5549

56-
- name: 🌩️ SonarCloud install scanner
57-
run: dotnet tool install --global dotnet-sonarscanner
58-
59-
- name: 🌩️ SonarCloud analyze
60-
env:
61-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
62-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
63-
shell: pwsh
64-
run: |
65-
dotnet sonarscanner begin /k:"atc-coding-rules-updater" /o:"atc-net" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io"
66-
dotnet build -c Release /p:UseSourceLink=true --no-restore
67-
dotnet sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"
68-
6950
- name: ⏩ Merge to stable-branch
7051
run: |
7152
git config --local user.email ${{ env.ATC_EMAIL }}

‎.github/workflows/pre-integration.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
with:
2020
fetch-depth: 0
2121

22-
- name: ⚙️ Setup dotnet 8.0.x
22+
- name: ⚙️ Setup dotnet 10.0.x
2323
uses: actions/setup-dotnet@v4
2424
with:
25-
dotnet-version: '8.0.x'
25+
dotnet-version: '10.0.x'
2626

2727
- name: 🧹 Clean
2828
run: dotnet clean -c Release && dotnet nuget locals all --clear
@@ -43,10 +43,10 @@ jobs:
4343
with:
4444
fetch-depth: 0
4545

46-
- name: ⚙️ Setup dotnet 8.0.x
46+
- name: ⚙️ Setup dotnet 10.0.x
4747
uses: actions/setup-dotnet@v4
4848
with:
49-
dotnet-version: '8.0.x'
49+
dotnet-version: '10.0.x'
5050

5151
- name: 🔁 Restore packages
5252
run: dotnet restore

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ jobs:
2727
with:
2828
setAllVars: true
2929

30-
- name: ⚙️ Setup dotnet 8.0.x
30+
- name: ⚙️ Setup dotnet 10.0.x
3131
uses: actions/setup-dotnet@v4
3232
with:
33-
dotnet-version: '8.0.x'
33+
dotnet-version: '10.0.x'
3434

3535
- name: 🧹 Clean
3636
run: dotnet clean -c Release && dotnet nuget locals all --clear

‎Directory.Build.props‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
<PropertyGroup Label="Compile settings">
1818
<Nullable>enable</Nullable>
19-
<LangVersion>12.0</LangVersion>
19+
<LangVersion>14.0</LangVersion>
2020
<ImplicitUsings>enable</ImplicitUsings>
21-
<TargetFramework>net8.0</TargetFramework>
21+
<TargetFramework>net10.0</TargetFramework>
2222
<GenerateDocumentationFile>true</GenerateDocumentationFile>
2323
<NoWarn>1573,1591,1712,CA1014,NU1903</NoWarn>
2424

@@ -41,12 +41,13 @@
4141

4242
<!-- Shared code analyzers used for all projects in the solution -->
4343
<ItemGroup Label="Code Analyzers">
44+
<PackageReference Include="Atc.Analyzer" Version="0.1.11" PrivateAssets="All" />
4445
<PackageReference Include="AsyncFixer" Version="1.6.0" PrivateAssets="All" />
4546
<PackageReference Include="Asyncify" Version="0.9.7" PrivateAssets="All" />
46-
<PackageReference Include="Meziantou.Analyzer" Version="2.0.256" PrivateAssets="All" />
47+
<PackageReference Include="Meziantou.Analyzer" Version="2.0.257" PrivateAssets="All" />
4748
<PackageReference Include="SecurityCodeScan.VS2019" Version="5.6.7" PrivateAssets="All" />
4849
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435" PrivateAssets="All" />
49-
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.23.1.88495" PrivateAssets="All" />
50+
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.16.0.128591" PrivateAssets="All" />
5051
</ItemGroup>
5152

5253
</Project>

‎atc-coding-rules-updater.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"projectTarget": "DotNet8",
2+
"projectTarget": "DotNet10",
33
"mappings": {
44
"src": { "paths": [ "src" ] },
55
"test": { "paths": [ "test" ] }

‎sample/atc-coding-rules-updater.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"projectTarget": "DotNet8",
2+
"projectTarget": "DotNet10",
33
"useLatestMinorNugetVersion": true,
44
"useTemporarySuppressions": false,
55
"temporarySuppressionAsExcel": false,

‎src/Atc.CodingRules.AnalyzerProviders/Atc.CodingRules.AnalyzerProviders.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
</PropertyGroup>
66

77
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
88
<DefineConstants>TRACE;_PUBLISH_CHROMEDRIVER</DefineConstants>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Atc" Version="2.0.465" />
12+
<PackageReference Include="Atc" Version="3.0.12" />
1313
<PackageReference Include="HtmlAgilityPack" Version="1.11.60" />
1414
</ItemGroup>
1515

‎src/Atc.CodingRules.AnalyzerRulesMetaData.Generator.CLI/Atc.CodingRules.AnalyzerRulesMetaData.Generator.CLI.csproj‎

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

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

88
<ItemGroup>
9-
<PackageReference Include="HtmlAgilityPack" Version="1.11.33" />
9+
<PackageReference Include="HtmlAgilityPack" Version="1.11.60" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

‎src/Atc.CodingRules.Updater.CLI/Atc.CodingRules.Updater.CLI.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-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<PackageId>atc-coding-rules-updater</PackageId>
66
<PackageTags>coding-rules;rules</PackageTags>
77
<Description>A .NET Tool that can update a project with the latest atc-coding-rules.</Description>
@@ -13,11 +13,11 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Atc" Version="2.0.465" />
17-
<PackageReference Include="Atc.DotNet" Version="2.0.465" />
18-
<PackageReference Include="Atc.Console.Spectre" Version="2.0.465" />
16+
<PackageReference Include="Atc" Version="3.0.12" />
17+
<PackageReference Include="Atc.DotNet" Version="3.0.12" />
18+
<PackageReference Include="Atc.Console.Spectre" Version="3.0.12" />
1919
<PackageReference Include="EPPlus" Version="7.1.1" />
20-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
20+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

0 commit comments

Comments
 (0)