Skip to content

Commit 4ec338b

Browse files
davidkallesendavidkallesen
authored
Merge pull request #159 from atc-net/feature/Add-support-for-project-framework-cli
Feature/add support for project framework cli
2 parents a450a90 + 2e67e47 commit 4ec338b

File tree

15 files changed

+41
-47
lines changed

15 files changed

+41
-47
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
atc_check_for_updates:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v3
12+
- uses: actions/checkout@v4
1313
with:
1414
fetch-depth: '0'
1515
- name: ⚙ set environment stuff

‎.github/workflows/post-integration.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: 🛒 Checkout repository
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v4
2121
with:
2222
fetch-depth: 0
2323
token: ${{ secrets.PAT_WORKFLOWS }}
@@ -31,7 +31,7 @@ jobs:
3131
setAllVars: true
3232

3333
- name: ⚙️ Setup dotnet 8.0.x
34-
uses: actions/setup-dotnet@v1
34+
uses: actions/setup-dotnet@v4
3535
with:
3636
dotnet-version: '8.0.x'
3737

‎.github/workflows/pre-integration.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ jobs:
1515
runs-on: ${{ matrix.os }}
1616
steps:
1717
- name: 🛒 Checkout repository
18-
uses: actions/checkout@v2
18+
uses: actions/checkout@v4
1919
with:
2020
fetch-depth: 0
2121

2222
- name: ⚙️ Setup dotnet 8.0.x
23-
uses: actions/setup-dotnet@v1
23+
uses: actions/setup-dotnet@v4
2424
with:
2525
dotnet-version: '8.0.x'
2626

@@ -39,12 +39,12 @@ jobs:
3939
- dotnet-build
4040
steps:
4141
- name: 🛒 Checkout repository
42-
uses: actions/checkout@v2
42+
uses: actions/checkout@v4
4343
with:
4444
fetch-depth: 0
4545

4646
- name: ⚙️ Setup dotnet 8.0.x
47-
uses: actions/setup-dotnet@v1
47+
uses: actions/setup-dotnet@v4
4848
with:
4949
dotnet-version: '8.0.x'
5050

‎.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: 🛒 Checkout repository
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v4
1818
with:
1919
fetch-depth: 0
2020
token: ${{ secrets.PAT_WORKFLOWS }}
@@ -28,7 +28,7 @@ jobs:
2828
setAllVars: true
2929

3030
- name: ⚙️ Setup dotnet 8.0.x
31-
uses: actions/setup-dotnet@v1
31+
uses: actions/setup-dotnet@v4
3232
with:
3333
dotnet-version: '8.0.x'
3434

‎Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343
<ItemGroup Label="Code Analyzers">
4444
<PackageReference Include="AsyncFixer" Version="1.6.0" PrivateAssets="All" />
4545
<PackageReference Include="Asyncify" Version="0.9.7" PrivateAssets="All" />
46-
<PackageReference Include="Meziantou.Analyzer" Version="2.0.146" PrivateAssets="All" />
46+
<PackageReference Include="Meziantou.Analyzer" Version="2.0.147" PrivateAssets="All" />
4747
<PackageReference Include="SecurityCodeScan.VS2019" Version="5.6.7" PrivateAssets="All" />
4848
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435" PrivateAssets="All" />
49-
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.23.0.88079" PrivateAssets="All" />
49+
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.23.1.88495" PrivateAssets="All" />
5050
</ItemGroup>
5151

5252
</Project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ atc-coding-rules-updater `
99
run `
1010
-p $currentPath `
1111
--optionsPath $currentPath'\atc-coding-rules-updater.json' `
12-
-v
12+
--verbose

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Atc" Version="2.0.442" />
12+
<PackageReference Include="Atc" Version="2.0.465" />
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

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

88
<ItemGroup>

‎src/Atc.CodingRules.Updater.CLI/Atc.CodingRules.Updater.CLI.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Atc" Version="2.0.442" />
17-
<PackageReference Include="Atc.DotNet" Version="2.0.442" />
18-
<PackageReference Include="Atc.Console.Spectre" Version="2.0.442" />
19-
<PackageReference Include="EPPlus" Version="7.1.0" />
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" />
19+
<PackageReference Include="EPPlus" Version="7.1.1" />
2020
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
2121
</ItemGroup>
2222

‎src/Atc.CodingRules.Updater.CLI/ProjectHelper.cs

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,12 @@ private static void HandleEditorConfigFiles(
119119
continue;
120120
}
121121

122-
EditorConfigHelper.HandleFile(logger, "ProjectFramework", projectFrameworkCodingRulesBaseUrl, csProjFile.Directory!, projectFrameworkType.ToStringLowerCase());
122+
EditorConfigHelper.HandleFile(
123+
logger,
124+
"ProjectFramework",
125+
projectFrameworkCodingRulesBaseUrl,
126+
csProjFile.Directory!,
127+
projectFrameworkType.ToStringLowerCase());
123128
}
124129
}
125130

@@ -141,29 +146,17 @@ private static ProjectFrameworkType DetermineProjectFrameworkType(
141146
}
142147
else
143148
{
144-
switch (projectType)
149+
projectFrameworkType = projectType switch
145150
{
146-
case DotnetProjectType.AzureFunctionApp:
147-
projectFrameworkType = ProjectFrameworkType.AzureFunctions;
148-
break;
149-
case DotnetProjectType.BlazorServerApp:
150-
case DotnetProjectType.BlazorWAsmApp:
151-
projectFrameworkType = ProjectFrameworkType.Blazor;
152-
break;
153-
case DotnetProjectType.MauiApp:
154-
projectFrameworkType = ProjectFrameworkType.Maui;
155-
break;
156-
case DotnetProjectType.WinFormApp:
157-
projectFrameworkType = ProjectFrameworkType.WinForms;
158-
break;
159-
case DotnetProjectType.WpfApp:
160-
case DotnetProjectType.WpfLibrary:
161-
projectFrameworkType = ProjectFrameworkType.Wpf;
162-
break;
163-
case DotnetProjectType.WebApi:
164-
projectFrameworkType = ProjectFrameworkType.WebApi;
165-
break;
166-
}
151+
DotnetProjectType.AzureFunctionApp => ProjectFrameworkType.AzureFunctions,
152+
DotnetProjectType.BlazorServerApp or DotnetProjectType.BlazorWAsmApp => ProjectFrameworkType.Blazor,
153+
DotnetProjectType.CliApp => ProjectFrameworkType.Cli,
154+
DotnetProjectType.MauiApp => ProjectFrameworkType.Maui,
155+
DotnetProjectType.WinFormApp => ProjectFrameworkType.WinForms,
156+
DotnetProjectType.WpfApp or DotnetProjectType.WpfLibrary => ProjectFrameworkType.Wpf,
157+
DotnetProjectType.WebApi => ProjectFrameworkType.WebApi,
158+
_ => projectFrameworkType,
159+
};
167160
}
168161

169162
return projectFrameworkType;

0 commit comments

Comments
 (0)