Merge pull request #5 from djluck/net60-build

Net60 build
djluck · Apr 29, 2022 · 507ce51 · 507ce51
2 parents 7ec2f3d + 35ef4ff
commit 507ce51
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/publish-nuget-packages.yaml b/.github/workflows/publish-nuget-packages.yaml
@@ -10,6 +10,8 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.x'
     - run: |
         echo "Github ref is ${GITHUB_REF}"
         arrTag=(${GITHUB_REF//\// })

diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
@@ -13,5 +13,9 @@ jobs:
       uses: actions/setup-dotnet@v1	
       with:	
         dotnet-version: 3.1.x
+    - name: Setup .NET Core 6.0
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.x'
     - uses: actions/checkout@v1
     - run: dotnet test -c "Debug"
diff --git a/src/PromQL.Parser/Parser.cs b/src/PromQL.Parser/Parser.cs
@@ -36,7 +36,7 @@ private static IEnumerable<PromToken> FindTokensMatching(Func<TokenAttribute, bo
             .Select(x => Enum.Parse<PromToken>(x.enumMember.Name))
             .ToHashSet();
 
-        private static readonly HashSet<PromToken> AlphanumericOperatorTokens = FindTokensMatching(attr => attr.Category == "Operator" && Regex.IsMatch(attr.Example, "^[a-zA-Z0-9]+$"))
+        private static readonly HashSet<PromToken> AlphanumericOperatorTokens = FindTokensMatching(attr => attr.Category == "Operator" && Regex.IsMatch(attr.Example!, "^[a-zA-Z0-9]+$"))
             .ToHashSet();
 
         private static readonly HashSet<PromToken> KeywordAndAlphanumericOperatorTokens = FindTokensMatching(attr => attr.Category == "Keyword")

diff --git a/src/PromQL.Parser/PromQL.Parser.csproj b/src/PromQL.Parser/PromQL.Parser.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
         <LangVersion>9</LangVersion>
         <Nullable>enable</Nullable>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -19,7 +19,7 @@
 
     <ItemGroup>
         <PackageReference Include="ExhaustiveMatching.Analyzer" Version="0.5.0" />
-        <PackageReference Include="IsExternalInit" Version="1.0.1">
+        <PackageReference Include="IsExternalInit" Version="1.0.1" Condition="$(TargetFramework) == 'netcoreapp3.1'">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/tests/PromQL.Parser.Tests/PromQL.Parser.Tests.csproj b/tests/PromQL.Parser.Tests/PromQL.Parser.Tests.csproj