Skip to content

Commit 9019f2a

Browse files
Update build to net6 (#224)
* Update dotnetBuild.yml * Update XML to MD to .NET6.0 * Update analyzer target framework to .net6.0 * Update versioning * Fix failing build
1 parent 9a667f7 commit 9019f2a

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

.github/workflows/dotnetBuild.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ on:
77
branches: [ main ]
88
workflow_dispatch:
99
env:
10-
version: 0.1.9
10+
version: 0.1.10
1111
jobs:
1212
build:
1313
runs-on: windows-latest
1414
steps:
1515
- uses: actions/checkout@v2
16-
- name: Setup .NET 5.0
16+
- name: Setup .NET 6.0
1717
uses: actions/setup-dotnet@v1
1818
with:
19-
dotnet-version: '5.0.x'
19+
dotnet-version: '6.0.x'
2020
- name: Get Build Information
2121
run: |
2222
pwd

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFramework>net5.0</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
55
<LangVersion>8.0</LangVersion>
66
</PropertyGroup>

IntelliTect.Analyzer/IntelliTect.Analyzer/Analyzers/FavorDirectoryEnumerationCalls.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ private void AnalyzeInvocation(SyntaxNodeAnalysisContext context)
6161
{
6262
// Unsure if this is the best way to determine if member was defined in the project.
6363
SymbolInfo symbol = context.SemanticModel.GetSymbolInfo(nameSyntax);
64-
if (symbol.Symbol == null)
64+
if (symbol.Symbol == null || symbol.Symbol.OriginalDefinition.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat) == "global::System.IO.Directory")
6565
{
6666
Location loc = memberAccess.GetLocation();
6767
context.ReportDiagnostic(Diagnostic.Create(_Rule301, loc, memberAccess.Name));
@@ -73,7 +73,7 @@ private void AnalyzeInvocation(SyntaxNodeAnalysisContext context)
7373
{
7474
// Unsure if this is the best way to determine if member was defined in the project.
7575
SymbolInfo symbol = context.SemanticModel.GetSymbolInfo(nameSyntax);
76-
if (symbol.Symbol == null)
76+
if (symbol.Symbol is null || symbol.Symbol.OriginalDefinition.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat) == "global::System.IO.Directory")
7777
{
7878
Location loc = memberAccess.GetLocation();
7979
context.ReportDiagnostic(Diagnostic.Create(_Rule302, loc, memberAccess.Name));

Tools/XMLtoMD/GuidelineXmlToMD.Test/GuidelineXmlToMD.Test.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<NoWarn>CA2007,CA1815,CA1303,CA1707,CA1305,IDE0008,INTL0003</NoWarn>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>

Tools/XMLtoMD/GuidelineXmlToMD/GuidelineXmlToMD.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>net5.0</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
<LangVersion>9.0</LangVersion>
77
<PackAsTool>true</PackAsTool>
88
<ToolCommandName>IntelliTect.EssentialCSharp.Publishing</ToolCommandName>

0 commit comments

Comments
 (0)