Merge pull request #7 from red-gate/compatibility-analyzer

ChrisLambrou · web-flow · commit 6c9a0e920596 · 2018-04-04T08:13:01.000+01:00
Enable compatibility analyzer, and fix issue in TinyJsonSer
diff --git a/Source/ULibs.FullExceptionString/ULibs.FullExceptionString.csproj b/Source/ULibs.FullExceptionString/ULibs.FullExceptionString.csproj
@@ -5,4 +5,8 @@
     <Copyright>2018</Copyright>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.2.12-alpha" />
+  </ItemGroup>
+
 </Project>
diff --git a/Source/ULibs.ShellEscape/ULibs.ShellEscape.csproj b/Source/ULibs.ShellEscape/ULibs.ShellEscape.csproj
@@ -5,4 +5,8 @@
     <Copyright>2017</Copyright>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.2.12-alpha" />
+  </ItemGroup>
+
 </Project>
diff --git a/Source/ULibs.TinyJsonDeser/ULibs.TinyJsonDeser.csproj b/Source/ULibs.TinyJsonDeser/ULibs.TinyJsonDeser.csproj
@@ -5,4 +5,8 @@
     <Copyright>2018</Copyright>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.2.12-alpha" />
+  </ItemGroup>
+
 </Project>
diff --git a/Source/ULibs.TinyJsonSer/JsonSerializer.cs b/Source/ULibs.TinyJsonSer/JsonSerializer.cs
@@ -191,7 +191,7 @@ private void SerializeDictionary(object target, Action<string> writeString, Acti
                 var newIndentLevel = indentLevel + 1;
                 var newIndent = GetIndent(newIndentLevel);
                 bool isFirstElement = true;
-                foreach (DictionaryEntry entry in dictionary)
+                foreach (var key in dictionary.Keys)
                 {
                     if (isFirstElement)
                     {
@@ -203,9 +203,9 @@ private void SerializeDictionary(object target, Action<string> writeString, Acti
                     }
 
                     writeString(newIndent);
-                    SerializeString(entry.Key.ToString(), writeString, writeChar);
+                    SerializeString(key.ToString(), writeString, writeChar);
                     writeString(_keyValueSeparator);
-                    Serialize(entry.Value, writeString, writeChar, newIndentLevel);
+                    Serialize(dictionary[key], writeString, writeChar, newIndentLevel);
                 }
 
                 writeString(GetIndent(indentLevel));
diff --git a/Source/ULibs.TinyJsonSer/RELEASENOTES.md b/Source/ULibs.TinyJsonSer/RELEASENOTES.md
@@ -1,5 +1,11 @@
 # ULibs.TinyJsonSer release notes
 
+## 1.0.2
+
+### Improvements
+
+- Removed use of `DictionaryEntry` type, to improve cross-platform compatibility.
+
 ## 1.0.1
 
 ### Improvements
diff --git a/Source/ULibs.TinyJsonSer/ULibs.TinyJsonSer.csproj b/Source/ULibs.TinyJsonSer/ULibs.TinyJsonSer.csproj
@@ -5,4 +5,8 @@
     <Copyright>2016</Copyright>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.2.12-alpha" />
+  </ItemGroup>
+
 </Project>
diff --git a/Source/ULibs.UlibsProjectTemplate/ULibs.UlibsProjectTemplate.csproj b/Source/ULibs.UlibsProjectTemplate/ULibs.UlibsProjectTemplate.csproj
@@ -5,4 +5,8 @@
     <Copyright>2017</Copyright>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.2.12-alpha" />
+  </ItemGroup>
+
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ private void SerializeDictionary(object target, Action<string> writeString, Acti`
`191`	`191`	`var newIndentLevel = indentLevel + 1;`
`192`	`192`	`var newIndent = GetIndent(newIndentLevel);`
`193`	`193`	`bool isFirstElement = true;`
`194`		`- foreach (DictionaryEntry entry in dictionary)`
	`194`	`+ foreach (var key in dictionary.Keys)`
`195`	`195`	`{`
`196`	`196`	`if (isFirstElement)`
`197`	`197`	`{`
`@@ -203,9 +203,9 @@ private void SerializeDictionary(object target, Action<string> writeString, Acti`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`writeString(newIndent);`
`206`		`- SerializeString(entry.Key.ToString(), writeString, writeChar);`
	`206`	`+ SerializeString(key.ToString(), writeString, writeChar);`
`207`	`207`	`writeString(_keyValueSeparator);`
`208`		`- Serialize(entry.Value, writeString, writeChar, newIndentLevel);`
	`208`	`+ Serialize(dictionary[key], writeString, writeChar, newIndentLevel);`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`writeString(GetIndent(indentLevel));`