Merge branch 'main' into ref/subcommands

belav · Nov 11, 2024 · 0d6c739 · 0d6c739
2 parents 9415156 + cfb0a03
commit 0d6c739
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "csharpier": {
-      "version": "0.29.0",
+      "version": "0.29.2",
       "commands": [
         "dotnet-csharpier"
       ]

diff --git a/Src/CSharpier.Cli/HasMismatchedCliAndMsBuildVersions.cs b/Src/CSharpier.Cli/HasMismatchedCliAndMsBuildVersions.cs
@@ -78,6 +78,12 @@ public static bool Check(string directoryName, IFileSystem fileSystem, ILogger l
             }
 
             var versionOfMsBuildPackage = csharpierMsBuildElement.Attribute("Version")?.Value;
+            if (versionOfMsBuildPackage == "0.0.1")
+            {
+                // csharpier uses 0.0.1 as a placeholder in some tests, just ignore it
+                continue;
+            }
+
             if (versionOfMsBuildPackage == null)
             {
                 versionOfMsBuildPackage = GetPackagesVersion(pathToCsProj);