Merge pull request #16 from pmahend1/Dev

updated dll with XML attribute value escape fix
pmahend1 · Apr 1, 2021 · 21424a8 · 21424a8
2 parents d19710a + bd0b498
commit 21424a8
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 15 deletions.
diff --git a/.github/workflows/BuildDeployCI.yml b/.github/workflows/BuildDeployCI.yml
@@ -24,17 +24,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2.3.3
-
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 3.1.402
-
-      - name: Install Dependencies
-        run: dotnet restore .\PrettyXML.VSMac\PrettyXML.VSMac.sln
-
+
       - name: Build
-        run: msbuild .\PrettyXML.VSMac\PrettyXML.VSMac\PrettyXML.VSMac.csproj /t:rebuild -property:Configuration=Release
+        run: msbuild .\PrettyXML.VSMac\PrettyXML.VSMac\PrettyXML.VSMac.csproj -restore -target:Rebuild -property:Configuration=Release
 
       - name: Upload Artifacts
         if: ${{ github.event_name == 'push' }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 ## Preview
 
+### 1.0.2-beta
+
+Fixed XML attribute value escape issue.
+
+### 1.0.1-beta
+
+Update DLL
+
 ### 1.0.0-beta
 
 Initial release beta.
diff --git a/PrettyXML.VSMac/PrettyXML.VSMac/Properties/AddinInfo.cs b/PrettyXML.VSMac/PrettyXML.VSMac/Properties/AddinInfo.cs
@@ -29,7 +29,7 @@
 [assembly: Addin(
     "PrettyXML.VSMac",
     Namespace = "PrettyXML.VSMac",
-    Version = "1.0.1-beta",
+    Version = "1.0.2-beta",
     Category = "Code formatters",
     Flags = AddinFlags.None,
     EnabledByDefault = true,

diff --git a/PrettyXML.VSMac/PrettyXML.VSMac/XMLFormatter.cs b/PrettyXML.VSMac/PrettyXML.VSMac/XMLFormatter.cs
@@ -1,7 +1,7 @@
-using System.Diagnostics;
+using System.Diagnostics;
 using System.Linq;
-using Microsoft.CodeAnalysis.Text;
-using Microsoft.VisualStudio.Text;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
 using MonoDevelop.Components.Commands;
 using MonoDevelop.Ide;
@@ -57,7 +57,8 @@ protected override void Run(object dataItem)
                     ext.EndsWith("xsl") ||
                     ext.EndsWith("xaml") ||
                     ext.EndsWith("axml")||
-                    ext.EndsWith("resx"))
+                    ext.EndsWith("resx") || 
+                    ext.EndsWith("plist") )
                 {
 
                     var formattedText = formatter.Format(currentDocumentText);

diff --git a/PrettyXML.VSMac/PrettyXML.VSMac/lib/XmlFormatter.dll b/PrettyXML.VSMac/PrettyXML.VSMac/lib/XmlFormatter.dll