fix bug

loresoft · Dec 6, 2023 · 014e279 · 014e279
1 parent 70faced
commit 014e279
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 23 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -4,6 +4,7 @@ env:
   DOTNET_NOLOGO: true
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   BUILD_PATH: '${{github.workspace}}/artifacts'
+  COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
 
 on:
   push:
@@ -42,6 +43,13 @@ jobs:
     - name: Run Test
       run: dotnet test --no-build --configuration Release --collect:"XPlat Code Coverage" --settings coverlet.runsettings
 
+    - name: Report Coverage
+      if: success()
+      uses: coverallsapp/github-action@v2
+      with:
+        file: "${{github.workspace}}/test/*/TestResults/*/coverage.info"
+        format: lcov
+
     - name: Create Packages
       if: success() && github.event_name != 'pull_request'
       run: dotnet pack --configuration Release --include-symbols --include-source --no-build --no-restore --output "${{env.BUILD_PATH}}"

diff --git a/src/AssemblyMetadata.Generators/AssemblyMetadataGenerator.cs b/src/AssemblyMetadata.Generators/AssemblyMetadataGenerator.cs
@@ -3,6 +3,7 @@
 using System.Runtime.Versioning;
 
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 namespace AssemblyMetadata.Generators;
@@ -83,7 +84,7 @@ private static GeneratorContext SemanticTransform(GeneratorAttributeSyntaxContex
                     name = name.Substring(0, name.Length - 9);
 
                 var argument = attribute.ConstructorArguments.FirstOrDefault();
-                var value = argument.Value?.ToString() ?? string.Empty;
+                var value = argument.ToCSharpString() ?? string.Empty;
 
                 if (string.IsNullOrWhiteSpace(value))
                     continue;
@@ -97,7 +98,7 @@ private static GeneratorContext SemanticTransform(GeneratorAttributeSyntaxContex
                 var key = nameArgument.Value?.ToString() ?? string.Empty;
 
                 var valueArgument = attribute.ConstructorArguments[1];
-                var value = valueArgument.Value?.ToString() ?? string.Empty;
+                var value = valueArgument.ToCSharpString() ?? string.Empty;
 
                 if (string.IsNullOrWhiteSpace(key) || string.IsNullOrWhiteSpace(value))
                     continue;

diff --git a/src/AssemblyMetadata.Generators/AssemblyMetadataWriter.cs b/src/AssemblyMetadata.Generators/AssemblyMetadataWriter.cs
@@ -44,14 +44,13 @@ public static string Generate(EquatableArray<AssemblyConstant> constants)
         foreach (var constant in constants)
         {
             var name = SafeName(constant.Name);
-            var value = SafeValue(constant.Value);
 
             codeBuilder
                 .Append("public const string ")
                 .Append(name)
-                .Append(" = \"")
-                .Append(value)
-                .AppendLine("\";")
+                .Append(" = ")
+                .Append(constant.Value)
+                .AppendLine(";")
                 .AppendLine();
         }
 
@@ -67,14 +66,6 @@ public static string SafeName(string name)
         return ToPropertyName(name.AsSpan());
     }
 
-    public static string SafeValue(string value)
-    {
-        return value
-            .Replace("\\", "\\\\")
-            .Replace("\"", "\\\"")
-            .Replace(Environment.NewLine, "\\r\\n");
-    }
-
     public static string ToPropertyName(ReadOnlySpan<char> span)
     {
         if (span.IsEmpty)

diff --git a/test/AssemblyMetadata.Generators.Tests/PropertyNameTests.cs b/test/AssemblyMetadata.Generators.Tests/PropertyNameTests.cs
@@ -16,13 +16,4 @@ public void PropertyName(string input, string expected)
         var actual = AssemblyMetadataWriter.ToPropertyName(input);
         Assert.Equal(expected, actual);
     }
-
-    [Theory]
-    [InlineData("Name\\Test", "Name\\\\Test")]
-    [InlineData("Name\"Test\"", "Name\\\"Test\\\"")]
-    public void SafeValue(string input, string expected)
-    {
-        var actual = AssemblyMetadataWriter.SafeValue(input);
-        Assert.Equal(expected, actual);
-    }
 }
diff --git a/...ators.Tests/Snapshots/GeneratorTests.GenerateAssemblyMetadataGeneratorsTests.verified.txt b/...ators.Tests/Snapshots/GeneratorTests.GenerateAssemblyMetadataGeneratorsTests.verified.txt
@@ -10,6 +10,8 @@ internal static partial class ThisAssembly
 
     public const string HardKey = "HardValue";
 
+    public const string VerifyTargetFrameworks = "";
+
     public const string VerifyProjectDirectory = "D:\\Projects\\GitHub\\AssemblyMetadata.Generators\\test\\AssemblyMetadata.Generators.Tests\\";
 
     public const string VerifySolutionDirectory = "D:\\Projects\\GitHub\\AssemblyMetadata.Generators\\";