Merge pull request #4937 from MDoerner/FixAttributesEncodingIssue

Fixes attributes encoding issue

Author: retailcoder

Rubberduck.Core/UI/Command/MenuItems/CommandBars/SerializeProjectsCommandMenuItem.cs

@@ -77,9 +77,9 @@ protected override void OnExecute(object parameter)
                 _serializationProvider.SerializeProject(library);
             }
 
-#if DEBUG
-            //This block must be inside a DEBUG block because the Serialize method 
-            //called is conditionally compiled and available only for a DEBUG build.
+#if TRACE_COM_SAFE
+            //This block must be inside a conditional compilation block because the Serialize method 
+            //called is conditionally compiled and available only if the compilation constant TRACE_COM_SAFE is set.
             var path = !string.IsNullOrWhiteSpace(_serializationProvider.Target)
                 ? Path.GetDirectoryName(_serializationProvider.Target)
                 : Path.GetTempPath();

Rubberduck.VBEEditor/ComManagement/ComSafeBase.cs

@@ -32,7 +32,7 @@ public void Dispose()
 
         protected virtual void Dispose(bool disposing)
         {
-#if DEBUG
+#if TRACE_COM_SAFE
             if (_disposed)
             {
                 return;
@@ -70,7 +70,7 @@ protected virtual void Dispose(bool disposing)
 #endif
         }
 
-#if DEBUG
+#if TRACE_COM_SAFE
         private struct TraceData
         {
             internal int HashCode { get; set; }

Rubberduck.VBEEditor/ComManagement/IComSafe.cs

@@ -7,9 +7,9 @@ public interface IComSafe: IDisposable
     {
         void Add(ISafeComWrapper comWrapper);
         bool TryRemove(ISafeComWrapper comWrapper);
-#if DEBUG
+#if TRACE_COM_SAFE
         /// <summary>
-        /// Available in DEBUG build only. Provide a mechanism for serializing both
+        /// Available only if the compilation constant TRACE_COM_SAFE is set. Provide a mechanism for serializing both
         /// a snapshot of the COM safe at the instant and a historical activity log
         /// with a limited stack trace for each entry.
         /// </summary>

Rubberduck.VBEEditor/ComManagement/StrongComSafe.cs

@@ -1,8 +1,11 @@
 using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
+#if TRACE_COM_SAFE
+using System.Linq;
+using System.Collections.Generic;
+#endif
+
 namespace Rubberduck.VBEditor.ComManagement
 {
     public class StrongComSafe: ComSafeBase
@@ -19,14 +22,14 @@ public override void Add(ISafeComWrapper comWrapper)
                     comWrapper, 
                     key =>
                     {
-#if DEBUG
+#if TRACE_COM_SAFE
                         TraceAdd(comWrapper);
 #endif
                         return 1;
                     }, 
                     (key, value) =>
                     {
-#if DEBUG
+#if TRACE_COM_SAFE
                         TraceUpdate(comWrapper);
 #endif
                         return value;
@@ -42,7 +45,7 @@ public override bool TryRemove(ISafeComWrapper comWrapper)
             }
 
             var result = _comWrapperCache.TryRemove(comWrapper, out _);
-#if DEBUG
+#if TRACE_COM_SAFE
             TraceRemove(comWrapper, result);
 #endif
             return result;
@@ -67,7 +70,7 @@ protected override void Dispose(bool disposing)
             _comWrapperCache.Clear();
         }
 
-#if DEBUG
+#if TRACE_COM_SAFE
         protected override IDictionary<int, ISafeComWrapper> GetWrappers()
         {
             return _comWrapperCache.Keys.ToDictionary(GetComWrapperObjectHashCode);

Rubberduck.VBEEditor/ComManagement/WeakComSafe.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
-#if DEBUG
+#if TRACE_COM_SAFE
 using System.Linq;
+using System.Collections.Generic;
 #endif
 
 namespace Rubberduck.VBEditor.ComManagement
@@ -22,14 +22,14 @@ public override void Add(ISafeComWrapper comWrapper)
                     GetComWrapperObjectHashCode(comWrapper), 
                     key =>
                     {
-#if DEBUG
+#if TRACE_COM_SAFE
                         TraceAdd(comWrapper);
 #endif
                         return (DateTime.UtcNow, new WeakReference<ISafeComWrapper>(comWrapper));
                     },
                     (key, value) =>
                     {
-#if DEBUG
+#if TRACE_COM_SAFE
                         TraceUpdate(comWrapper);
 #endif
                         return (value.insertTime, new WeakReference<ISafeComWrapper>(comWrapper));
@@ -46,7 +46,7 @@ public override bool TryRemove(ISafeComWrapper comWrapper)
             }
 
             var result = _comWrapperCache.TryRemove(GetComWrapperObjectHashCode(comWrapper), out _);
-#if DEBUG
+#if TRACE_COM_SAFE
             TraceRemove(comWrapper, result);
 #endif
             return result;
@@ -74,7 +74,7 @@ protected override void Dispose(bool disposing)
             _comWrapperCache.Clear();
         }
 
-#if DEBUG
+#if TRACE_COM_SAFE
         protected override IDictionary<int, ISafeComWrapper> GetWrappers()
         {
             var dictionary = new Dictionary<int, ISafeComWrapper>();

Rubberduck.VBEEditor/SourceCodeHandling/SourceFileHandlerComponentSourceCodeHandlerAdapter.cs

@@ -1,4 +1,5 @@
 using System.IO;
+using System.Text;
 using Rubberduck.VBEditor.SafeComWrappers;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
@@ -31,7 +32,7 @@ public IVBComponent SubstituteCode(IVBComponent module, string newCode)
             {
                 return module;
             }
-            File.WriteAllText(fileName, newCode);
+            File.WriteAllText(fileName, newCode, Encoding.Default);
             return _tempSourceFileHandler.ImportAndCleanUp(module, fileName);
         }
     }