Cleanup the solution and projects to ensure that they load and build …

…on VS2017
aaubry · Jan 24, 2018 · 4d6ae4d · 4d6ae4d
1 parent 9978242
commit 4d6ae4d
Show file tree

Hide file tree

Showing 24 changed files with 162 additions and 509 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,3 +26,5 @@ README.html
 
 samples/dotnet/project.lock.json
 YamlDotNet/Properties/AssemblyInfo.Generated.cs
+
+/.vs
diff --git a/PerformanceTests/YamlDotNet.PerformanceTests.vlatest/Program.cs b/PerformanceTests/YamlDotNet.PerformanceTests.vlatest/Program.cs
@@ -23,6 +23,7 @@
 using System.IO;
 using YamlDotNet.Serialization;
 using YamlDotNet.PerformanceTests.Lib;
+using YamlDotNet.Serialization.NamingConventions;
 
 namespace YamlDotNet.PerformanceTests.vlatest
 {

diff --git a/YamlDotNet.Test/YamlDotNet.Test.csproj b/YamlDotNet.Test/YamlDotNet.Test.csproj
@@ -9,6 +9,7 @@
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <Configurations>Debug;Release-Unsigned</Configurations>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

diff --git a/YamlDotNet.sln b/YamlDotNet.sln
diff --git a/YamlDotNet/Core/AnchorNotFoundException.cs b/YamlDotNet/Core/AnchorNotFoundException.cs
@@ -64,7 +64,7 @@ public AnchorNotFoundException(string message, Exception inner)
         {
         }
 
-#if !(PORTABLE || UNITY)
+#if !(NETSTANDARD1_3 || UNITY)
         /// <summary>
         /// Initializes a new instance of the <see cref="AnchorNotFoundException"/> class.
         /// </summary>

diff --git a/YamlDotNet/Core/ForwardAnchorNotSupportedException.cs b/YamlDotNet/Core/ForwardAnchorNotSupportedException.cs
@@ -65,7 +65,7 @@ public ForwardAnchorNotSupportedException(string message, Exception inner)
         {
         }
 
-#if !(PORTABLE || UNITY)
+#if !(NETSTANDARD1_3 || UNITY)
         /// <summary>
         /// Initializes a new instance of the <see cref="AnchorNotFoundException"/> class.
         /// </summary>

diff --git a/YamlDotNet/Core/MaximumRecursionLevelReachedException.cs b/YamlDotNet/Core/MaximumRecursionLevelReachedException.cs
@@ -64,7 +64,7 @@ public MaximumRecursionLevelReachedException(string message, Exception inner)
         {
         }
 
-#if !(PORTABLE || UNITY)
+#if !(NETSTANDARD1_3 || UNITY)
         /// <summary>
         /// Initializes a new instance of the <see cref="MaximumRecursionLevelReachedException"/> class.
         /// </summary>

diff --git a/YamlDotNet/Core/SemanticErrorException.cs b/YamlDotNet/Core/SemanticErrorException.cs
@@ -64,7 +64,7 @@ public SemanticErrorException(string message, Exception inner)
         {
         }
 
-#if !(PORTABLE || UNITY)
+#if !(NETSTANDARD1_3 || UNITY)
         /// <summary>
         /// Initializes a new instance of the <see cref="SemanticErrorException"/> class.
         /// </summary>

diff --git a/YamlDotNet/Core/SyntaxErrorException.cs b/YamlDotNet/Core/SyntaxErrorException.cs
@@ -64,7 +64,7 @@ public SyntaxErrorException(string message, Exception inner)
         {
         }
 
-#if !(PORTABLE || UNITY)
+#if !(NETSTANDARD1_3 || UNITY)
         /// <summary>
         /// Initializes a new instance of the <see cref="SyntaxErrorException"/> class.
         /// </summary>

diff --git a/YamlDotNet/Core/YamlException.cs b/YamlDotNet/Core/YamlException.cs
@@ -84,7 +84,7 @@ public YamlException(string message, Exception inner)
         {
         }
 
-#if !(PORTABLE || UNITY)
+#if !(NETSTANDARD1_3 || UNITY)
         /// <summary>
         /// Initializes a new instance of the <see cref="YamlException"/> class.
         /// </summary>

diff --git a/YamlDotNet/GlobalSuppressions.cs b/YamlDotNet/GlobalSuppressions.cs
diff --git a/YamlDotNet/Helpers/Portability.cs b/YamlDotNet/Helpers/Portability.cs
@@ -28,7 +28,7 @@
 
 namespace YamlDotNet
 {
-#if (PORTABLE || UNITY)
+#if (NETSTANDARD1_3 || UNITY)
     internal static class StandardRegexOptions
     {
         public const RegexOptions Compiled = RegexOptions.None;
@@ -40,11 +40,11 @@ internal static class StandardRegexOptions
     }
 #endif
 
-#if PORTABLE
-     /// <summary>
+#if NETSTANDARD1_3
+    /// <summary>
     /// Mock UTF7Encoding to avoid having to add #if all over the place
     /// </summary>
-   internal sealed class UTF7Encoding : System.Text.Encoding
+    internal sealed class UTF7Encoding : System.Text.Encoding
     {
         public override int GetByteCount(char[] chars, int index, int count)
         {
@@ -455,3 +455,15 @@ public static object ReadValue(this PropertyInfo property, object target)
     }
 #endif
 }
+
+#if NETSTANDARD1_3
+namespace System.Runtime.Serialization
+{
+    public class SerializationException : Exception
+    {
+        public SerializationException(string message) : base(message)
+        {
+        }
+    }
+}
+#endif
diff --git a/YamlDotNet/Properties/AssemblyInfo.cs b/YamlDotNet/Properties/AssemblyInfo.cs
@@ -20,47 +20,16 @@
 //  SOFTWARE.
 
 #if !UNITY
-using System.Reflection;
-using System.Runtime.InteropServices;
 using System;
 using System.Runtime.CompilerServices;
 
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("YamlDotNet")]
-[assembly: AssemblyDescription("The YamlDotNet library.")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("YamlDotNet")]
-[assembly: AssemblyCopyright("Copyright (c) Antoine Aubry and contributors 2008, 2009, 2010, 2011, 2012, 2013, 2014")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers
-// by using the '*' as shown below:
-[assembly: AssemblyVersion("0.0.1")]
-[assembly: AssemblyFileVersion("0.0.0")]
-[assembly: AssemblyInformationalVersion("0.0.0")]
-
 [assembly: CLSCompliant(true)]
 #if !SIGNED
 #if NETSTANDARD1_3 || !PORTABLE
-[assembly: InternalsVisibleTo("YamlDotNet.Test")]
+[assembly: InternalsVisibleTo("YamlDotNet.Test")]
 #else
 [assembly: InternalsVisibleTo("YamlDotNet.Test.Portable")]
 #endif
 #endif
-
+
 #endif
diff --git a/YamlDotNet/Serialization/Utilities/TypeConverter.cs b/YamlDotNet/Serialization/Utilities/TypeConverter.cs
@@ -36,7 +36,7 @@ namespace YamlDotNet.Serialization.Utilities
     /// </summary>
     public static class TypeConverter
     {
-#if !(PORTABLE || UNITY)
+#if !(NETSTANDARD1_3 || UNITY)
         /// <summary>
         /// Registers a <see cref="System.ComponentModel.TypeConverter"/> dynamically.
         /// </summary>
@@ -168,7 +168,7 @@ public static object ChangeType(object value, Type destinationType, CultureInfo
                     return true;
             }
 
-#if !PORTABLE
+#if NET35
             // Try with the source type's converter
             var sourceConverter = TypeDescriptor.GetConverter(value);
             if (sourceConverter != null && sourceConverter.CanConvertTo(destinationType))

diff --git a/YamlDotNet/YamlDotNet.Signed.nuspec b/YamlDotNet/YamlDotNet.Signed.nuspec
@@ -13,13 +13,10 @@
         <tags>yaml parser development library serialization signed strongname</tags>
     </metadata>
     <files>
-        <file src="bin\Release-Signed\net35\YamlDotNet.dll" target="lib\net35" />
-        <file src="bin\Release-Signed\net35\YamlDotNet.xml" target="lib\net35" />
+        <file src="bin\Release-Signed\net45\YamlDotNet.dll" target="lib\net45" />
+        <file src="bin\Release-Signed\net45\YamlDotNet.xml" target="lib\net45" />
 
-        <file src="bin\Release-Portable-Signed\YamlDotNet.dll" target="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1" />
-        <file src="bin\Release-Portable-Signed\YamlDotNet.xml" target="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1" />
-
-        <file src="bin\Release-DotNetStandard-Signed\netstandard1.3\YamlDotNet.dll" target="lib\netstandard1.3" />
-        <file src="bin\Release-DotNetStandard-Signed\netstandard1.3\YamlDotNet.xml" target="lib\netstandard1.3" />
+        <file src="bin\Release-Signed\netstandard1.3\YamlDotNet.dll" target="lib\netstandard1.3" />
+        <file src="bin\Release-Signed\netstandard1.3\YamlDotNet.xml" target="lib\netstandard1.3" />
     </files>
 </package>
diff --git a/YamlDotNet/YamlDotNet.Unsigned.nuspec b/YamlDotNet/YamlDotNet.Unsigned.nuspec
@@ -13,13 +13,10 @@
         <tags>yaml parser development library serialization</tags>
     </metadata>
     <files>
-        <file src="bin\Release-Unsigned\net35\YamlDotNet.dll" target="lib\net35" />
-        <file src="bin\Release-Unsigned\net35\YamlDotNet.xml" target="lib\net35" />
+        <file src="bin\Release-Unsigned\net45\YamlDotNet.dll" target="lib\net45" />
+        <file src="bin\Release-Unsigned\net45\YamlDotNet.xml" target="lib\net45" />
 
-        <file src="bin\Release-Portable-Unsigned\YamlDotNet.dll" target="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1" />
-        <file src="bin\Release-Portable-Unsigned\YamlDotNet.xml" target="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1" />
-
-        <file src="bin\Release-DotNetStandard-Unsigned\netstandard1.3\YamlDotNet.dll" target="lib\netstandard1.3" />
-        <file src="bin\Release-DotNetStandard-Unsigned\netstandard1.3\YamlDotNet.xml" target="lib\netstandard1.3" />
+        <file src="bin\Release-Unsigned\netstandard1.3\YamlDotNet.dll" target="lib\netstandard1.3" />
+        <file src="bin\Release-Unsigned\netstandard1.3\YamlDotNet.xml" target="lib\netstandard1.3" />
     </files>
 </package>