Merge pull request #1 from harshjain2/patch

Patched commits from VSTS Fixed references issues.
microsoft · Aug 4, 2016 · adfc72c · adfc72c
2 parents 81a2ae9 + 4fc831b
commit adfc72c
Show file tree

Hide file tree

Showing 38 changed files with 739 additions and 66 deletions.
diff --git a/TestPlatform.sln b/TestPlatform.sln
@@ -83,6 +83,8 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "datacollector", "src\dataco
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "datacollector.x86", "src\datacollector.x86\datacollector.x86.xproj", "{00DFB5C7-3850-4A65-986B-713F200482D4}"
 EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "datacollector.x86.UnitTests", "test\datacollector.x86.UnitTests\datacollector.x86.UnitTests.xproj", "{00AA21F3-31E4-4748-AC0B-C4EADB41CA24}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -205,6 +207,10 @@ Global
 		{00DFB5C7-3850-4A65-986B-713F200482D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{00DFB5C7-3850-4A65-986B-713F200482D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{00DFB5C7-3850-4A65-986B-713F200482D4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{00AA21F3-31E4-4748-AC0B-C4EADB41CA24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{00AA21F3-31E4-4748-AC0B-C4EADB41CA24}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{00AA21F3-31E4-4748-AC0B-C4EADB41CA24}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{00AA21F3-31E4-4748-AC0B-C4EADB41CA24}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -241,5 +247,6 @@ Global
 		{0CC51428-B665-47B0-A093-042D31785928} = {707096D0-DCFB-44A2-979D-178740E5DADE}
 		{3572E78C-5AA5-4F68-876D-FC5322677263} = {D8EF073C-279A-4279-912D-E9D4B0635E17}
 		{00DFB5C7-3850-4A65-986B-713F200482D4} = {D8EF073C-279A-4279-912D-E9D4B0635E17}
+		{00AA21F3-31E4-4748-AC0B-C4EADB41CA24} = {463031A2-7F16-4E38-9944-1F5161D04933}
 	EndGlobalSection
 EndGlobal
diff --git a/dogfood/UnitTestProject/project.json b/dogfood/UnitTestProject/project.json
@@ -14,7 +14,7 @@
       "dependencies": {
         "Microsoft.NETCore.App": {
           "type": "platform",
-          "version": "1.0.0-rc2-3002702"
+          "version": "1.0.0"
         }
       }
     },

diff --git a/src/Microsoft.TestPlatform.Client/project.json b/src/Microsoft.TestPlatform.Client/project.json
@@ -20,7 +20,7 @@
         "portable-net45+win8"
       ],
       "dependencies": {
-        "NETStandard.Library": "1.5.0-rc2-24008"
+        "NETStandard.Library": "1.6.0"
       }
     },
     "net46": { }

diff --git a/src/Microsoft.TestPlatform.Common/project.json b/src/Microsoft.TestPlatform.Common/project.json
@@ -18,7 +18,7 @@
         "portable-net45+win8"
       ],
       "dependencies": {
-        "NETStandard.Library": "1.5.0-rc2-24008",
+        "NETStandard.Library": "1.6.0",
         "System.Runtime.Loader": "4.0.0-rc2-24027"
       }
     },

diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/project.json b/src/Microsoft.TestPlatform.CommunicationUtilities/project.json
@@ -20,7 +20,7 @@
         "portable-net45+win8"
       ],
       "dependencies": {
-        "NETStandard.Library": "1.5.0-rc2-24008",
+        "NETStandard.Library": "1.6.0",
         "System.Runtime.Serialization.Primitives": "4.0.10-*"
       }
     },

diff --git a/src/Microsoft.TestPlatform.CoreUtilities/project.json b/src/Microsoft.TestPlatform.CoreUtilities/project.json
@@ -13,7 +13,7 @@
         "portable-net45+win8"
       ],
       "dependencies": {
-        "NETStandard.Library": "1.5.0-rc2-24008"
+        "NETStandard.Library": "1.6.0"
       }
     },
     "net46": {

diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/project.json b/src/Microsoft.TestPlatform.CrossPlatEngine/project.json
@@ -20,9 +20,9 @@
         "portable-net45+win8"
       ],
       "dependencies": {
-        "NETStandard.Library": "1.5.0-rc2-24008",
+        "NETStandard.Library": "1.6.0",
         "System.Diagnostics.Process": "4.1.0-rc2-23704",
-        "System.Threading": "4.0.11-rc2-24027"
+        "System.Threading": "4.0.11"
       }
     },
     "net46": {}

diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/project.json b/src/Microsoft.TestPlatform.Extensions.TrxLogger/project.json
@@ -20,10 +20,10 @@
         "portable-net45+win8"
       ],
       "dependencies": {
-        "NETStandard.Library": "1.5.0-rc2-24008",
-        "System.Collections.NonGeneric": "4.0.1-rc2-24027",
+        "NETStandard.Library": "1.6.0",
+        "System.Collections.NonGeneric": "4.0.1",
         "System.Security.Principal.Windows": "4.0.0-rc2-24027",
-        "System.Collections.Specialized": "4.0.1-rc2-24027"
+        "System.Collections.Specialized": "4.0.1"
       }
     },
     "net46": { }

diff --git a/src/Microsoft.TestPlatform.ObjectModel/CustomGuidConverter.cs b/src/Microsoft.TestPlatform.ObjectModel/CustomGuidConverter.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
+{
+    using System;
+    using System.ComponentModel;
+    using System.Globalization;
+
+    /// <summary>
+    /// Custom Guid converter class
+    /// </summary>
+    internal class CustomGuidConverter : GuidConverter
+    {
+       ///<inheritdoc/>       
+        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if(destinationType == typeof(Guid))
+            {
+                return new Guid(value.ToString());
+            }
+            return base.ConvertTo(context, culture, value, destinationType);
+        }
+    }
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/TestObject.cs b/src/Microsoft.TestPlatform.ObjectModel/TestObject.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft. All rights reserved.
 
 namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
 {
@@ -76,7 +76,8 @@ protected TestObject()
         public TestObject()
 #endif
         {
-            this.store = new Dictionary<TestProperty, object>();
+            this.store = new Dictionary<TestProperty, object>();            
+            TypeDescriptor.AddAttributes(typeof(Guid), new TypeConverterAttribute(typeof(CustomGuidConverter)));
         }
 
         [OnSerializing]
@@ -101,9 +102,9 @@ public void CacheLazyValuesOnSerializing(StreamingContext context)
             }
         }
 
-        #endregion Constructors
+#endregion Constructors
 
-        #region Properties
+#region Properties
 
         /// <summary>
         ///   Returns the TestProperties currently specified in this TestObject.
@@ -233,9 +234,9 @@ public void SetPropertyValue<T>(TestProperty property, LazyPropertyValue<T> valu
             PrivateSetPropertyValue(property, objValue);
         }
 
-        #endregion Property Values
+#endregion Property Values
 
-        #region Helpers
+#region Helpers
         /// <summary>
         ///   Return TestProperty's value
         /// </summary>
@@ -355,7 +356,7 @@ private static T ConvertPropertyTo<T>(TestProperty property, CultureInfo culture
             }
         }
 
-        #endregion Helpers
+#endregion Helpers
 
         private TraitCollection traits;
 
@@ -371,5 +372,5 @@ public TraitCollection Traits
                 return this.traits;
             }
         }
-    }
-}
+    } 
+}
diff --git a/src/Microsoft.TestPlatform.ObjectModel/project.json b/src/Microsoft.TestPlatform.ObjectModel/project.json
@@ -1,7 +1,7 @@
 {
   "version": "15.0.0-*",
   "buildOptions": {
-    "outputName": "Microsoft.VisualStudio.TestPlatform.ObjectModel",
+    //"outputName": "Microsoft.VisualStudio.TestPlatform.ObjectModel",
     "delaySign": true,
     "keyFile": "../../scripts/key.snk",
     "warningsAsErrors": true
@@ -26,14 +26,14 @@
         "portable-net45+win8"
       ],
       "dependencies": {
-        "NETStandard.Library": "1.5.0-rc2-24008",
+        "NETStandard.Library": "1.6.0",
         "System.Runtime.Serialization.Primitives": "4.0.10",
-        "System.Runtime.Extensions": "4.1.0-rc3-23808",
+        "System.Runtime.Extensions": "4.1.0",
         "System.Xml.XPath.XmlDocument": "4.0.1-rc2-24027",
         "System.ComponentModel.EventBasedAsync": "4.0.11-rc2-24018",
-        "System.Runtime.InteropServices": "4.1.0-rc2-24027",
-        "System.IO.FileSystem": "4.0.1-rc3-23808",
-        "System.ComponentModel.TypeConverter": "4.0.1-rc2-23911"
+        "System.Runtime.InteropServices": "4.1.0",
+        "System.IO.FileSystem": "4.0.1",
+        "System.ComponentModel.TypeConverter": "4.1.0"
       }
     }
   }

diff --git a/src/Microsoft.TestPlatform.Utilities/project.json b/src/Microsoft.TestPlatform.Utilities/project.json
@@ -26,7 +26,7 @@
         "portable-net45+wp80+win8+wpa81+dnxcore50"
       ],
       "dependencies": {
-        "NETStandard.Library": "1.5.0-rc2-24008"
+        "NETStandard.Library": "1.6.0"
       }
     },
     "net46": { }

diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/project.json b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/project.json
@@ -13,17 +13,17 @@
         "portable-net45+win8"
       ],
       "dependencies": {
-        "NETStandard.Library": "1.5.0-rc2-24008",
+        "NETStandard.Library": "1.6.0",
         "System.Runtime.Serialization.Primitives": "4.0.10",
-        "System.Runtime.Extensions": "4.1.0-rc3-23808",
+        "System.Runtime.Extensions": "4.1.0",
         "System.Xml.XPath.XmlDocument": "4.0.1-rc2-24027",
         "System.ComponentModel.EventBasedAsync": "4.0.11-rc2-24018",
-        "System.Runtime.InteropServices": "4.1.0-rc2-24027",
-        "System.IO.FileSystem": "4.0.1-rc3-23808",
-        "System.ComponentModel.TypeConverter": "4.0.1-rc2-23911",
+        "System.Runtime.InteropServices": "4.1.0",
+        "System.IO.FileSystem": "4.0.1",
+        "System.ComponentModel.TypeConverter": "4.1.0",
         "System.Diagnostics.Process": "4.1.0-rc2-23704",
         "Microsoft.TestPlatform.CommunicationUtilities": "15.0.0-*",
-        "Microsoft.TestPlatform.ObjectModel": "15.0.0-*",
+        "Microsoft.TestPlatform.ObjectModel": "15.0.0-*"
       }
     },
     "net46": {
@@ -33,7 +33,7 @@
       },
       "dependencies": {
         "Microsoft.TestPlatform.CommunicationUtilities": "15.0.0-*",
-        "Microsoft.TestPlatform.ObjectModel": "15.0.0-*",
+        "Microsoft.TestPlatform.ObjectModel": "15.0.0-*"
       }
     }
   }