diff --git a/.github/workflows/dotnetBuild.yml b/.github/workflows/dotnetBuild.yml index cdf57e0f..ec779c94 100644 --- a/.github/workflows/dotnetBuild.yml +++ b/.github/workflows/dotnetBuild.yml @@ -6,16 +6,16 @@ on: pull_request: branches: [ main ] env: - version: 0.1.9 + version: 0.1.10 jobs: build: runs-on: windows-latest steps: - uses: actions/checkout@v2 - - name: Setup .NET 5.0 + - name: Setup .NET 6.0 uses: actions/setup-dotnet@v1 with: - dotnet-version: '5.0.x' + dotnet-version: '6.0.x' - name: Get Build Information run: | pwd diff --git a/Directory.Build.props b/Directory.Build.props index 8d23ed7a..82c3b254 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,6 @@  - net5.0 true - 8.0 + 10.0 \ No newline at end of file diff --git a/IntelliTect.Analyzer/IntelliTect.Analyzer.Integration.Tests/IntelliTect.Analyzer.Integration.Tests.csproj b/IntelliTect.Analyzer/IntelliTect.Analyzer.Integration.Tests/IntelliTect.Analyzer.Integration.Tests.csproj index 693d1c4b..c1c71837 100644 --- a/IntelliTect.Analyzer/IntelliTect.Analyzer.Integration.Tests/IntelliTect.Analyzer.Integration.Tests.csproj +++ b/IntelliTect.Analyzer/IntelliTect.Analyzer.Integration.Tests/IntelliTect.Analyzer.Integration.Tests.csproj @@ -1,22 +1,25 @@ - + net5.0;net6.0 false - - - - + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/IntelliTect.Analyzer/IntelliTect.Analyzer.Test/IntelliTect.Analyzer.Tests.csproj b/IntelliTect.Analyzer/IntelliTect.Analyzer.Test/IntelliTect.Analyzer.Tests.csproj index 957fd4fc..61fd42e9 100644 --- a/IntelliTect.Analyzer/IntelliTect.Analyzer.Test/IntelliTect.Analyzer.Tests.csproj +++ b/IntelliTect.Analyzer/IntelliTect.Analyzer.Test/IntelliTect.Analyzer.Tests.csproj @@ -1,6 +1,7 @@  + net5.0;net6.0 CA2007,CA1815,CA1303,CA1707,CA1305 diff --git a/IntelliTect.Analyzer/IntelliTect.Analyzer/Analyzers/FavorDirectoryEnumerationCalls.cs b/IntelliTect.Analyzer/IntelliTect.Analyzer/Analyzers/FavorDirectoryEnumerationCalls.cs index cf2008f6..3c3e924c 100644 --- a/IntelliTect.Analyzer/IntelliTect.Analyzer/Analyzers/FavorDirectoryEnumerationCalls.cs +++ b/IntelliTect.Analyzer/IntelliTect.Analyzer/Analyzers/FavorDirectoryEnumerationCalls.cs @@ -61,7 +61,7 @@ private void AnalyzeInvocation(SyntaxNodeAnalysisContext context) { // Unsure if this is the best way to determine if member was defined in the project. SymbolInfo symbol = context.SemanticModel.GetSymbolInfo(nameSyntax); - if (symbol.Symbol == null) + if (symbol.Symbol == null || symbol.Symbol.OriginalDefinition.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat) == "global::System.IO.Directory") { Location loc = memberAccess.GetLocation(); context.ReportDiagnostic(Diagnostic.Create(_Rule301, loc, memberAccess.Name)); @@ -73,7 +73,7 @@ private void AnalyzeInvocation(SyntaxNodeAnalysisContext context) { // Unsure if this is the best way to determine if member was defined in the project. SymbolInfo symbol = context.SemanticModel.GetSymbolInfo(nameSyntax); - if (symbol.Symbol == null) + if (symbol.Symbol is null || symbol.Symbol.OriginalDefinition.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat) == "global::System.IO.Directory") { Location loc = memberAccess.GetLocation(); context.ReportDiagnostic(Diagnostic.Create(_Rule302, loc, memberAccess.Name)); diff --git a/Tools/XMLtoMD/GuidelineXmlToMD.Test/GuidelineXmlToMD.Test.csproj b/Tools/XMLtoMD/GuidelineXmlToMD.Test/GuidelineXmlToMD.Test.csproj index 7c90c485..ad05226b 100644 --- a/Tools/XMLtoMD/GuidelineXmlToMD.Test/GuidelineXmlToMD.Test.csproj +++ b/Tools/XMLtoMD/GuidelineXmlToMD.Test/GuidelineXmlToMD.Test.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 CA2007,CA1815,CA1303,CA1707,CA1305,IDE0008,INTL0003 false diff --git a/Tools/XMLtoMD/GuidelineXmlToMD/GuidelineXmlToMD.csproj b/Tools/XMLtoMD/GuidelineXmlToMD/GuidelineXmlToMD.csproj index f05c752e..3b732723 100644 --- a/Tools/XMLtoMD/GuidelineXmlToMD/GuidelineXmlToMD.csproj +++ b/Tools/XMLtoMD/GuidelineXmlToMD/GuidelineXmlToMD.csproj @@ -2,7 +2,7 @@ Exe - net5.0 + net6.0 9.0 true IntelliTect.EssentialCSharp.Publishing