Merge pull request #2 from BigBang1112/dev

Add apostrophe support for attributes

Author: BigBang1112

.github/workflows/dotnet.yml

@@ -22,6 +22,7 @@ jobs:
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
+          9.0.x
           8.0.x
     
     - name: Restore dependencies

.github/workflows/publish.yml

@@ -27,6 +27,7 @@ jobs:
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
+          9.0.x
           8.0.x
           
     - name: Restore dependencies

MinimalXmlReader.Benchmarks/MinimalXmlReader.Benchmarks.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFrameworks>net8.0</TargetFrameworks>
+		<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<LangVersion>11</LangVersion>

MinimalXmlReader.Tests/MinimalXmlReader.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0</TargetFrameworks>
+		<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 
@@ -11,13 +11,13 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-		<PackageReference Include="xunit" Version="2.9.0" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+		<PackageReference Include="xunit" Version="2.9.2" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
-		<PackageReference Include="coverlet.collector" Version="6.0.2">
+		<PackageReference Include="coverlet.collector" Version="6.0.3">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>

MinimalXmlReader/MiniXmlReader.cs

@@ -308,12 +308,21 @@ private Dictionary<string, string> ReadAttributes(bool expectsProcessingInstruct
 
             Advance();
 
+            var isApostrophe = false;
+
             if (!SkipChar('"'))
             {
-                throw new Exception("Expected \"");
+                if (SkipChar('\''))
+                {
+                    isApostrophe = true;
+                }
+                else
+                {
+                    throw new Exception("Expected \" or '");
+                }
             }
 
-            var attValue = ReadUntilChar('"', includeSpaces: true);
+            var attValue = ReadUntilChar(isApostrophe ? '\'' : '"', includeSpaces: true);
 
             Advance();
 
@@ -407,12 +416,21 @@ private void SkipAttributes(bool expectsProcessingInstruction = false)
 
             Advance();
 
+            var isApostrophe = false;
+
             if (!SkipChar('"'))
             {
-                throw new Exception("Expected \"");
+                if (SkipChar('\''))
+                {
+                    isApostrophe = true;
+                }
+                else
+                {
+                    throw new Exception("Expected \" or '");
+                }
             }
 
-            SkipUntilChar('"', includeSpaces: true);
+            SkipUntilChar(isApostrophe ? '\'' : '"', includeSpaces: true);
 
             Advance();
 

MinimalXmlReader/MinimalXmlReader.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
         <PackageId>MinimalXmlReader</PackageId>
-        <Version>0.1.1</Version>
+        <Version>0.1.2</Version>
         <Authors>BigBang1112</Authors>
         <Description>Simple, lightweight, and fast XML reader for .NET, mainly viable for NativeAOT, and for those that don't want to waste 6MB of executable binary just to read a few XML lines.</Description>
         <Copyright>Copyright (c) 2024 Petr Pivoňka</Copyright>
@@ -14,7 +14,7 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0</TargetFrameworks>
+		<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<LangVersion>12</LangVersion>