diff --git a/Source/Demos/Demo.Animations/Demo.Animations.csproj b/Source/Demos/Demo.Animations/Demo.Animations.csproj
index 4e87c0b4..2e86d0b4 100644
--- a/Source/Demos/Demo.Animations/Demo.Animations.csproj
+++ b/Source/Demos/Demo.Animations/Demo.Animations.csproj
@@ -23,6 +23,7 @@
4
false
false
+ 6
true
diff --git a/Source/Demos/Demo.Batching/Demo.Batching.csproj b/Source/Demos/Demo.Batching/Demo.Batching.csproj
index 3a22fd2c..d7359488 100644
--- a/Source/Demos/Demo.Batching/Demo.Batching.csproj
+++ b/Source/Demos/Demo.Batching/Demo.Batching.csproj
@@ -23,6 +23,7 @@
4
false
false
+ 6
true
diff --git a/Source/Demos/Demo.BitmapFonts/Demo.BitmapFonts.csproj b/Source/Demos/Demo.BitmapFonts/Demo.BitmapFonts.csproj
index 89d666fd..8fdcb4c8 100644
--- a/Source/Demos/Demo.BitmapFonts/Demo.BitmapFonts.csproj
+++ b/Source/Demos/Demo.BitmapFonts/Demo.BitmapFonts.csproj
@@ -22,6 +22,7 @@
4
false
false
+ 6
true
diff --git a/Source/Demos/Demo.Camera/Demo.Camera.csproj b/Source/Demos/Demo.Camera/Demo.Camera.csproj
index efc0f2e9..c997a46b 100644
--- a/Source/Demos/Demo.Camera/Demo.Camera.csproj
+++ b/Source/Demos/Demo.Camera/Demo.Camera.csproj
@@ -23,6 +23,7 @@
4
false
false
+ 6
true
diff --git a/Source/Demos/Demo.EntityComponentSystem/Demo.EntityComponentSystem.csproj b/Source/Demos/Demo.EntityComponentSystem/Demo.EntityComponentSystem.csproj
index cd05be39..7d3f5ab2 100644
--- a/Source/Demos/Demo.EntityComponentSystem/Demo.EntityComponentSystem.csproj
+++ b/Source/Demos/Demo.EntityComponentSystem/Demo.EntityComponentSystem.csproj
@@ -23,6 +23,7 @@
4
false
false
+ 6
true
diff --git a/Source/Demos/Demo.Gui/Demo.Gui.csproj b/Source/Demos/Demo.Gui/Demo.Gui.csproj
index 63f6d243..5efc8b4a 100644
--- a/Source/Demos/Demo.Gui/Demo.Gui.csproj
+++ b/Source/Demos/Demo.Gui/Demo.Gui.csproj
@@ -23,6 +23,7 @@
4
false
false
+ 6
true
diff --git a/Source/Demos/Demo.InputListeners/Demo.InputListeners.csproj b/Source/Demos/Demo.InputListeners/Demo.InputListeners.csproj
index f396a6ca..63bdc30e 100644
--- a/Source/Demos/Demo.InputListeners/Demo.InputListeners.csproj
+++ b/Source/Demos/Demo.InputListeners/Demo.InputListeners.csproj
@@ -23,6 +23,7 @@
4
false
false
+ 6
true
diff --git a/Source/Demos/Demo.NuclexGui/Demo.NuclexGui.csproj b/Source/Demos/Demo.NuclexGui/Demo.NuclexGui.csproj
index 899b6bea..82a089d0 100644
--- a/Source/Demos/Demo.NuclexGui/Demo.NuclexGui.csproj
+++ b/Source/Demos/Demo.NuclexGui/Demo.NuclexGui.csproj
@@ -23,6 +23,7 @@
4
false
false
+ 6
true
diff --git a/Source/Demos/Demo.Particles/Demo.Particles.csproj b/Source/Demos/Demo.Particles/Demo.Particles.csproj
index 89644cc3..d34619cb 100644
--- a/Source/Demos/Demo.Particles/Demo.Particles.csproj
+++ b/Source/Demos/Demo.Particles/Demo.Particles.csproj
@@ -23,6 +23,7 @@
4
false
false
+ 6
true
diff --git a/Source/Demos/Demo.Platformer/Demo.Platformer.csproj b/Source/Demos/Demo.Platformer/Demo.Platformer.csproj
index b5a90d2b..72727bd8 100644
--- a/Source/Demos/Demo.Platformer/Demo.Platformer.csproj
+++ b/Source/Demos/Demo.Platformer/Demo.Platformer.csproj
@@ -23,6 +23,7 @@
4
false
false
+ 6
true
diff --git a/Source/Demos/Demo.SceneGraphs/Demo.SceneGraphs.csproj b/Source/Demos/Demo.SceneGraphs/Demo.SceneGraphs.csproj
index ffcbd9aa..aba8bc36 100644
--- a/Source/Demos/Demo.SceneGraphs/Demo.SceneGraphs.csproj
+++ b/Source/Demos/Demo.SceneGraphs/Demo.SceneGraphs.csproj
@@ -23,6 +23,7 @@
4
false
false
+ 6
true
diff --git a/Source/Demos/Demo.Screens/Demo.Screens.csproj b/Source/Demos/Demo.Screens/Demo.Screens.csproj
index a89a43b9..dd30b4bf 100644
--- a/Source/Demos/Demo.Screens/Demo.Screens.csproj
+++ b/Source/Demos/Demo.Screens/Demo.Screens.csproj
@@ -23,6 +23,7 @@
4
false
false
+ 6
true
diff --git a/Source/Demos/Demo.SpaceGame/Demo.SpaceGame.csproj b/Source/Demos/Demo.SpaceGame/Demo.SpaceGame.csproj
index 8ec7718f..2d7db977 100644
--- a/Source/Demos/Demo.SpaceGame/Demo.SpaceGame.csproj
+++ b/Source/Demos/Demo.SpaceGame/Demo.SpaceGame.csproj
@@ -23,6 +23,7 @@
4
false
false
+ 6
true
diff --git a/Source/Demos/Demo.SpriteSheetAnimations/Demo.SpriteSheetAnimatons.csproj b/Source/Demos/Demo.SpriteSheetAnimations/Demo.SpriteSheetAnimatons.csproj
index 3e08ed88..69ed85ed 100644
--- a/Source/Demos/Demo.SpriteSheetAnimations/Demo.SpriteSheetAnimatons.csproj
+++ b/Source/Demos/Demo.SpriteSheetAnimations/Demo.SpriteSheetAnimatons.csproj
@@ -23,6 +23,7 @@
4
false
false
+ 6
true
diff --git a/Source/Demos/Demo.Sprites/Demo.Sprites.csproj b/Source/Demos/Demo.Sprites/Demo.Sprites.csproj
index ddce1837..10fb3621 100644
--- a/Source/Demos/Demo.Sprites/Demo.Sprites.csproj
+++ b/Source/Demos/Demo.Sprites/Demo.Sprites.csproj
@@ -23,6 +23,7 @@
4
false
false
+ 6
true
diff --git a/Source/Demos/Demo.TiledMaps/Demo.TiledMaps.csproj b/Source/Demos/Demo.TiledMaps/Demo.TiledMaps.csproj
index 34a9f822..6bd081d9 100644
--- a/Source/Demos/Demo.TiledMaps/Demo.TiledMaps.csproj
+++ b/Source/Demos/Demo.TiledMaps/Demo.TiledMaps.csproj
@@ -23,6 +23,7 @@
4
false
false
+ 6
true
diff --git a/Source/Demos/Demo.ViewportAdapters/Demo.ViewportAdapters.csproj b/Source/Demos/Demo.ViewportAdapters/Demo.ViewportAdapters.csproj
index d74ccfc1..c35f7ce1 100644
--- a/Source/Demos/Demo.ViewportAdapters/Demo.ViewportAdapters.csproj
+++ b/Source/Demos/Demo.ViewportAdapters/Demo.ViewportAdapters.csproj
@@ -23,6 +23,8 @@
4
false
false
+ x64
+ 6
true
diff --git a/Source/MonoGame.Extended.Collisions/MonoGame.Extended.Collisions.csproj b/Source/MonoGame.Extended.Collisions/MonoGame.Extended.Collisions.csproj
index 58290f38..e0dd9d95 100644
--- a/Source/MonoGame.Extended.Collisions/MonoGame.Extended.Collisions.csproj
+++ b/Source/MonoGame.Extended.Collisions/MonoGame.Extended.Collisions.csproj
@@ -24,6 +24,7 @@
DEBUG;TRACE
prompt
4
+ 6
pdbonly
diff --git a/Source/MonoGame.Extended.Content.Pipeline.Tiled/MonoGame.Extended.Content.Pipeline.Tiled.csproj b/Source/MonoGame.Extended.Content.Pipeline.Tiled/MonoGame.Extended.Content.Pipeline.Tiled.csproj
index 5223c98c..12ab78df 100644
--- a/Source/MonoGame.Extended.Content.Pipeline.Tiled/MonoGame.Extended.Content.Pipeline.Tiled.csproj
+++ b/Source/MonoGame.Extended.Content.Pipeline.Tiled/MonoGame.Extended.Content.Pipeline.Tiled.csproj
@@ -22,6 +22,7 @@
prompt
4
true
+ 6
pdbonly
diff --git a/Source/MonoGame.Extended.Content.Pipeline/MonoGame.Extended.Content.Pipeline.csproj b/Source/MonoGame.Extended.Content.Pipeline/MonoGame.Extended.Content.Pipeline.csproj
index 43f61115..6997cc46 100644
--- a/Source/MonoGame.Extended.Content.Pipeline/MonoGame.Extended.Content.Pipeline.csproj
+++ b/Source/MonoGame.Extended.Content.Pipeline/MonoGame.Extended.Content.Pipeline.csproj
@@ -22,6 +22,7 @@
prompt
4
true
+ 6
pdbonly
diff --git a/Source/MonoGame.Extended.Graphics/MonoGame.Extended.Graphics.csproj b/Source/MonoGame.Extended.Graphics/MonoGame.Extended.Graphics.csproj
index 631427bf..0f18f6b2 100644
--- a/Source/MonoGame.Extended.Graphics/MonoGame.Extended.Graphics.csproj
+++ b/Source/MonoGame.Extended.Graphics/MonoGame.Extended.Graphics.csproj
@@ -25,6 +25,7 @@
prompt
4
true
+ 6
pdbonly
diff --git a/Source/MonoGame.Extended.Gui/MonoGame.Extended.Gui.csproj b/Source/MonoGame.Extended.Gui/MonoGame.Extended.Gui.csproj
index 20cc37e8..e923eb21 100644
--- a/Source/MonoGame.Extended.Gui/MonoGame.Extended.Gui.csproj
+++ b/Source/MonoGame.Extended.Gui/MonoGame.Extended.Gui.csproj
@@ -24,6 +24,7 @@
DEBUG;TRACE
prompt
4
+ 6
pdbonly
diff --git a/Source/MonoGame.Extended.Gui/Serialization/GuiControlJsonConverter.cs b/Source/MonoGame.Extended.Gui/Serialization/GuiControlJsonConverter.cs
index 1cdcf2e3..5021c76a 100644
--- a/Source/MonoGame.Extended.Gui/Serialization/GuiControlJsonConverter.cs
+++ b/Source/MonoGame.Extended.Gui/Serialization/GuiControlJsonConverter.cs
@@ -25,7 +25,9 @@ namespace MonoGame.Extended.Gui.Serialization
var skin = (string) style["Skin"];
var control = controlFactory.Create(style.TargetType, skin);
- if (style.TryGetValue(nameof(GuiControl.Controls), out var childControls))
+ object childControls;
+
+ if (style.TryGetValue(nameof(GuiControl.Controls), out childControls))
{
var controlCollection = childControls as GuiControlCollection;
diff --git a/Source/MonoGame.Extended.Gui/Serialization/GuiControlStyleJsonConverter.cs b/Source/MonoGame.Extended.Gui/Serialization/GuiControlStyleJsonConverter.cs
index 6cd50c17..57c97af2 100644
--- a/Source/MonoGame.Extended.Gui/Serialization/GuiControlStyleJsonConverter.cs
+++ b/Source/MonoGame.Extended.Gui/Serialization/GuiControlStyleJsonConverter.cs
@@ -51,7 +51,9 @@ namespace MonoGame.Extended.Gui.Serialization
{
var propertyName = keyValuePair.Key;
var rawValue = keyValuePair.Value;
- var value = properties.TryGetValue(propertyName, out var propertyInfo)
+
+ PropertyInfo propertyInfo;
+ var value = properties.TryGetValue(propertyName, out propertyInfo)
? DeserializeValueAs(serializer, rawValue, propertyInfo.PropertyType)
: DeserializeValueAs(serializer, rawValue, typeof(object));
diff --git a/Source/MonoGame.Extended.Tiled/MonoGame.Extended.Tiled.csproj b/Source/MonoGame.Extended.Tiled/MonoGame.Extended.Tiled.csproj
index 00822de9..38f75347 100644
--- a/Source/MonoGame.Extended.Tiled/MonoGame.Extended.Tiled.csproj
+++ b/Source/MonoGame.Extended.Tiled/MonoGame.Extended.Tiled.csproj
@@ -25,6 +25,7 @@
prompt
4
true
+ 6
pdbonly
diff --git a/Source/MonoGame.Extended/ColorHelper.cs b/Source/MonoGame.Extended/ColorHelper.cs
index 60e18f63..370af3dc 100644
--- a/Source/MonoGame.Extended/ColorHelper.cs
+++ b/Source/MonoGame.Extended/ColorHelper.cs
@@ -72,7 +72,9 @@ namespace MonoGame.Extended
public static Color FromName(string name)
{
- if(_colorsByName.TryGetValue(name, out var color))
+ Color color;
+
+ if(_colorsByName.TryGetValue(name, out color))
return color;
throw new InvalidOperationException($"{name} is not a valid color");
diff --git a/Source/MonoGame.Extended/MonoGame.Extended.csproj b/Source/MonoGame.Extended/MonoGame.Extended.csproj
index f898ec77..181f3af0 100644
--- a/Source/MonoGame.Extended/MonoGame.Extended.csproj
+++ b/Source/MonoGame.Extended/MonoGame.Extended.csproj
@@ -25,6 +25,7 @@
prompt
4
true
+ 6
pdbonly