diff --git a/Cdelta.sln b/Cdelta.sln index 0844b08..5c31465 100644 --- a/Cdelta.sln +++ b/Cdelta.sln @@ -14,6 +14,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "src\Core\Core.csproj", "{14017185-C15A-4A26-BB6C-BE59C740CA5D}" + ProjectSection(ProjectDependencies) = postProject + {F87087C1-AD14-400F-A87C-01B5B80A9237} = {F87087C1-AD14-400F-A87C-01B5B80A9237} + EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "src\Tests\Tests.csproj", "{B4188C3C-08D4-4A83-86A3-42E84304D46B}" EndProject diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6d32d5e..21b8a67 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -74,5 +74,5 @@ jobs: displayName: 'Run tests' inputs: command: 'test' - arguments: '$(Pipeline.Workspace)\**\net50\Cdelta.Tests.dll' + arguments: '$(Pipeline.Workspace)\**\net5.0\Cdelta.Tests.dll' testRunTitle: '.NET 5.0 ($(agent.os))' \ No newline at end of file diff --git a/src/Core/CdeltaGenerator.cs b/src/Core/CdeltaGenerator.cs index 2dcf409..3da624f 100644 --- a/src/Core/CdeltaGenerator.cs +++ b/src/Core/CdeltaGenerator.cs @@ -36,9 +36,9 @@ public void Execute(GeneratorExecutionContext context) var inputStream = new AntlrInputStream(input); - CdeltaLexer lexer = new CdeltaLexer(inputStream); - CommonTokenStream tokenStream = new CommonTokenStream(lexer); - CdeltaParser parser = new CdeltaParser(tokenStream); + var lexer = new CdeltaLexer(inputStream); + var tokenStream = new CommonTokenStream(lexer); + var parser = new CdeltaParser(tokenStream); CdeltaParser.CodeFileContext parsed = parser.codeFile(); var visitor = new CdeltaGrammarVisitor(); @@ -48,8 +48,8 @@ public void Execute(GeneratorExecutionContext context) context.AddSource($"{Path.GetFileName(file.Path)}.cs", code); } - using Stream stream = typeof(CdeltaGenerator).Assembly.GetManifestResourceStream("Cdelta.IAutomaton.cs"); - using StreamReader reader = new StreamReader(stream); + using var stream = typeof(CdeltaGenerator).Assembly.GetManifestResourceStream("Cdelta.IAutomaton.cs"); + using var reader = new StreamReader(stream); context.AddSource("IAutomaton.cs", reader.ReadToEnd()); } @@ -57,11 +57,11 @@ public void Execute(GeneratorExecutionContext context) public void Initialize(GeneratorInitializationContext context) { #if FALSE && DEBUG - if (!Debugger.IsAttached) + if (!System.Diagnostics.Debugger.IsAttached) { - Debugger.Launch(); + System.Diagnostics.Debugger.Launch(); } #endif } } -} +} \ No newline at end of file diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj index bfac630..e9a61aa 100644 --- a/src/Core/Core.csproj +++ b/src/Core/Core.csproj @@ -13,7 +13,7 @@ 1.0.0 - preview2 + David Sungaila false MIT @@ -21,7 +21,7 @@ https://github.com/sungaila/Cdelta https://raw.githubusercontent.com/sungaila/Cdelta/master/etc/Icon_128.png A C# source generator for finite-state machines ‐ easily referenced as a Roslyn analyzer. - Initial preview release + Initial release Roslyn CodeAnalysis Compiler Transpiler CSharp C# Analyzers DotNetAnalyzers StateMachine Cdelta Cδ SourceGenerator ISourceGenerator state-machine StateMachine Automaton Automata NFA DFA https://github.com/sungaila/Cdelta.git git @@ -36,6 +36,7 @@ 9.0 enable strict + 1701;1702;3021;NU5128 nullable true true @@ -45,14 +46,12 @@ debug - 1701;1702;3021;NU5128 true true - 1701;1702;3021;NU5128 true true @@ -76,4 +75,16 @@ + + + + + $(GetTargetPathDependsOn);GetDependencyTargetPaths + + + + + + + \ No newline at end of file diff --git a/src/Grammar/Grammar.csproj b/src/Grammar/Grammar.csproj index 98710c0..78b3c49 100644 --- a/src/Grammar/Grammar.csproj +++ b/src/Grammar/Grammar.csproj @@ -12,7 +12,8 @@ 9.0 enable strict - nullable;NU1605 + 1701;1702;3021;1584;1658 + nullable true true @@ -20,24 +21,22 @@ debug - 1701;1702;3021;1584;1658 true - 1701;1702;3021;1584;1658 true true - - - - - - + + + + + + diff --git a/src/Tests/LowerCamelCaseTest.cs b/src/Tests/LowerCamelCaseTest.cs index f7dd10e..bbd1626 100644 --- a/src/Tests/LowerCamelCaseTest.cs +++ b/src/Tests/LowerCamelCaseTest.cs @@ -1,5 +1,6 @@ #pragma warning disable IDE1006 using Microsoft.VisualStudio.TestTools.UnitTesting; +[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)] namespace Cdelta.Tests { diff --git a/src/Tests/Tests.csproj b/src/Tests/Tests.csproj index f20abc3..be14d20 100644 --- a/src/Tests/Tests.csproj +++ b/src/Tests/Tests.csproj @@ -1,7 +1,7 @@  - net50 + net5.0 Cdelta.Tests Cdelta.Tests false @@ -12,7 +12,7 @@ 9.0 enable strict - nullable;NU1605 + nullable true true