GitTools#1175 - First pass at GitVersionCore on netstadard - wip.

Haven't been able to resolve some compilation errors yet due to lack of replacemnt API's on netstandard.
dazinator · Jul 29, 2017 · 120d8b6 · 120d8b6
1 parent c8332ef
commit 120d8b6
Show file tree

Hide file tree

Showing 27 changed files with 341 additions and 211 deletions.
diff --git a/src/GitVersion.sln b/src/GitVersion.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26430.16
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitVersionExe", "GitVersionExe\GitVersionExe.csproj", "{C3578A7B-09A6-4444-9383-0DEAFA4958BD}"
 EndProject
@@ -26,6 +26,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		..\GitVersion.yml = ..\GitVersion.yml
 		..\LICENSE = ..\LICENSE
 		..\mkdocs.yml = ..\mkdocs.yml
+		NuGet.config = NuGet.config
 		..\README.md = ..\README.md
 	EndProjectSection
 EndProject

diff --git a/src/GitVersionCore/BuildServers/AppVeyor.cs b/src/GitVersionCore/BuildServers/AppVeyor.cs
@@ -3,6 +3,13 @@
     using System;
     using System.Net;
     using System.Text;
+#if !NETDESKTOP
+    using System.Net.Http;
+    using System.Threading.Tasks;
+    using System.Net.Http.Headers;
+    using Newtonsoft.Json;
+    using System.IO;
+#endif
 
     public class AppVeyor : BuildServerBase
     {
@@ -13,6 +20,97 @@ public override bool CanApplyToCurrentContext()
             return !string.IsNullOrEmpty(Environment.GetEnvironmentVariable(EnvironmentVariableName));
         }
 
+#if !NETDESKTOP
+
+
+        public override string GenerateSetVersionMessage(VersionVariables variables)
+        {
+
+            var buildNumber = Environment.GetEnvironmentVariable("APPVEYOR_BUILD_NUMBER");
+            var restBase = Environment.GetEnvironmentVariable("APPVEYOR_API_URL");
+
+            var request = (HttpWebRequest)WebRequest.Create(restBase + "api/build");            
+            request.Method = "PUT";
+
+
+            var data = string.Format("{{ \"version\": \"{0}.build.{1}\" }}", variables.FullSemVer, buildNumber);
+            var bytes = Encoding.UTF8.GetBytes(data);
+            if (request.Headers == null)
+            {
+                request.Headers = new WebHeaderCollection();
+            }
+            var bytesLength = bytes.Length;
+            request.Headers["Content-Length"] = bytesLength.ToString();
+
+            // request.ContentLength = bytes.Length;
+            request.ContentType = "application/json";
+
+            using (var writeStream = request.GetRequestStreamAsync().Result)
+            {
+                writeStream.Write(bytes, 0, bytes.Length);
+            }
+
+            //var result = request.BeginGetRequestStream((asyncResult) =>
+            // {
+            //     using (var writeStream = request.EndGetRequestStream(asyncResult))
+            //     {
+            //         writeStream.Write(bytes, 0, bytes.Length);
+            //     }
+
+            // }, null);
+
+            // result.AsyncWaitHandle.WaitOne(new TimeSpan(0, 3, 0));
+
+            using (var response = (HttpWebResponse)request.GetResponseAsync().Result)
+            {
+                if (response.StatusCode != HttpStatusCode.OK && response.StatusCode != HttpStatusCode.NoContent)
+                {
+                    var message = string.Format("Request failed. Received HTTP {0}", response.StatusCode);
+                    return message;
+                }
+            }
+
+            return string.Format("Set AppVeyor build number to '{0}'.", variables.FullSemVer);   
+
+        }
+
+
+        public override string[] GenerateSetParameterMessage(string name, string value)
+        {
+
+          //  var buildNumber = Environment.GetEnvironmentVariable("APPVEYOR_BUILD_NUMBER");
+            var restBase = Environment.GetEnvironmentVariable("APPVEYOR_API_URL");
+
+            var request = (HttpWebRequest)WebRequest.Create(restBase + "api/build/variables");
+            request.Method = "POST";
+            request.ContentType = "application/json";
+            request.Accept = "application/json";
+
+            var data = string.Format("{{ \"name\": \"GitVersion_{0}\", \"value\": \"{1}\" }}", name, value);           
+            var bytes = Encoding.UTF8.GetBytes(data);
+            if (request.Headers == null)
+            {
+                request.Headers = new WebHeaderCollection();
+            }
+            var bytesLength = bytes.Length;
+            // No property for content-length - and no Add() method on header collection? WHAAAAT
+            // request.ContentLength = bytes.Length;
+            request.Headers["Content-Length"] = bytesLength.ToString();                
+
+            using (var writeStream = request.GetRequestStreamAsync().Result)
+            {
+                writeStream.Write(bytes, 0, bytes.Length);
+            }         
+
+            return new[]
+            {
+                string.Format("Adding Environment Variable. name='GitVersion_{0}' value='{1}']", name, value)
+            };
+        }
+
+
+#else
+
         public override string GenerateSetVersionMessage(VersionVariables variables)
         {
             var buildNumber = Environment.GetEnvironmentVariable("APPVEYOR_BUILD_NUMBER");
@@ -23,7 +121,14 @@ public override string GenerateSetVersionMessage(VersionVariables variables)
 
             var data = string.Format("{{ \"version\": \"{0}.build.{1}\" }}", variables.FullSemVer, buildNumber);
             var bytes = Encoding.UTF8.GetBytes(data);
-            request.ContentLength = bytes.Length;
+            if (request.Headers == null)
+            {
+                request.Headers = new WebHeaderCollection();
+            }
+            var bytesLength = bytes.Length;
+            request.Headers["Content-Length"] = bytesLength.ToString();
+
+            // request.ContentLength = bytes.Length;
             request.ContentType = "application/json";
 
             using (var writeStream = request.GetRequestStream())
@@ -60,5 +165,9 @@ public override string[] GenerateSetParameterMessage(string name, string value)
                 string.Format("Adding Environment Variable. name='GitVersion_{0}' value='{1}']", name, value)
             };
         }
+
+
+#endif
+
     }
 }
diff --git a/src/GitVersionCore/BuildServers/BuildServerList.cs b/src/GitVersionCore/BuildServers/BuildServerList.cs
@@ -7,7 +7,9 @@ public static class BuildServerList
     {
         static List<IBuildServer> BuildServers = new List<IBuildServer>
         {
+#if NETDESKTOP
             new ContinuaCi(),
+#endif
             new TeamCity(),
             new AppVeyor(),
             new MyGet(),

diff --git a/src/GitVersionCore/BuildServers/ContinuaCi.cs b/src/GitVersionCore/BuildServers/ContinuaCi.cs
@@ -1,5 +1,6 @@
 namespace GitVersion
 {
+#if NETDESKTOP
     using Microsoft.Win32;
 
     public class ContinuaCi : BuildServerBase
@@ -42,4 +43,7 @@ static bool RegistryKeyExists(string keyName, RegistryView registryView)
             return localKey != null;
         }
     }
+
+#endif
+
 }
diff --git a/src/GitVersionCore/BuildServers/MyGet.cs b/src/GitVersionCore/BuildServers/MyGet.cs
@@ -10,7 +10,7 @@ public override bool CanApplyToCurrentContext()
             var buildRunner = Environment.GetEnvironmentVariable("BuildRunner");
 
             return !string.IsNullOrEmpty(buildRunner)
-                && buildRunner.Equals("MyGet", StringComparison.InvariantCultureIgnoreCase);
+                && buildRunner.Equals("MyGet", StringComparerUtils.IngoreCaseComparison);
         }
 
         public override string[] GenerateSetParameterMessage(string name, string value)
@@ -20,7 +20,7 @@ public override string[] GenerateSetParameterMessage(string name, string value)
                 string.Format("##myget[setParameter name='GitVersion.{0}' value='{1}']", name, ServiceMessageEscapeHelper.EscapeValue(value))
             };
 
-            if (string.Equals(name, "LegacySemVerPadded", StringComparison.InvariantCultureIgnoreCase))
+            if (string.Equals(name, "LegacySemVerPadded", StringComparerUtils.IngoreCaseComparison))
             {
                 messages.Add(string.Format("##myget[buildNumber '{0}']", ServiceMessageEscapeHelper.EscapeValue(value)));
             }

diff --git a/src/GitVersionCore/Configuration/Config.cs b/src/GitVersionCore/Configuration/Config.cs
@@ -4,6 +4,7 @@
     using System.Collections.Generic;
     using System.Globalization;
     using System.Linq;
+    using System.Reflection;
     using System.Text.RegularExpressions;
     using YamlDotNet.Serialization;
 

diff --git a/src/GitVersionCore/Configuration/ConfigurationProvider.cs b/src/GitVersionCore/Configuration/ConfigurationProvider.cs
@@ -6,7 +6,7 @@ namespace GitVersion
     using System.IO;
     using System.Linq;
     using System.Text;
-    using WarningException = System.ComponentModel.WarningException;
+    using WarningException = GitTools.WarningException;
 
     public class ConfigurationProvider
     {

diff --git a/src/GitVersionCore/Configuration/LegacyConfig.cs b/src/GitVersionCore/Configuration/LegacyConfig.cs
@@ -3,6 +3,7 @@ namespace GitVersion
     using System.Collections.Generic;
     using System.Linq;
     using YamlDotNet.Serialization;
+    using System.Reflection;
 
     /// <summary>
     /// Obsolete properties are added to this, so we can check to see if they are used and provide good error messages for migration
@@ -42,7 +43,9 @@ public class LegacyConfig
 
         private T MergeObjects<T>(T target, T source)
         {
-            typeof(T).GetProperties()
+
+            var typeInfo = typeof(T);
+            typeInfo.GetProperties()
                 .Where(prop => prop.CanRead && prop.CanWrite)
                 .Select(_ => new
                 {

diff --git a/src/GitVersionCore/Configuration/OldConfigurationException.cs b/src/GitVersionCore/Configuration/OldConfigurationException.cs
@@ -10,10 +10,12 @@ public OldConfigurationException(string message) : base(message)
         {
         }
 
+#if NETDESKTOP
         protected OldConfigurationException(
             SerializationInfo info,
             StreamingContext context) : base(info, context)
         {
         }
+#endif
     }
 }
diff --git a/src/GitVersionCore/Configuration/TypeHelper.cs b/src/GitVersionCore/Configuration/TypeHelper.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+
+//public static class TypeHelper
+//{
+//#if NETDESKTOP
+//    public static Type GetType<T>()
+//    {
+//        return GetType<T>();
+//    }
+//#else
+//    public static TypeInfo GetType<T>()
+//    {
+//        return GetType<T>();
+//    }
+//#endif
+
+//#if NETDESKTOP
+//    public static IEnumerable<ConstructorInfo> GetConstructorsForType<T>()
+//    {
+//        return GetType<T>().GetConstructors();
+//    }
+//#else
+//    public static IEnumerable<ConstructorInfo> GetConstructorsForType<T>()
+//    {
+//        return GetType<T>().DeclaredConstructors;
+//    }
+//#endif
+//}
diff --git a/src/GitVersionCore/ExecuteCore.cs b/src/GitVersionCore/ExecuteCore.cs
@@ -1,5 +1,6 @@
 namespace GitVersion
 {
+    using GitTools;
     using GitVersion.Helpers;
     using LibGit2Sharp;
     using System;

diff --git a/src/GitVersionCore/Extensions/ReadEmbeddedResourceExtensions.cs b/src/GitVersionCore/Extensions/ReadEmbeddedResourceExtensions.cs
@@ -1,6 +1,7 @@
 namespace GitVersionCore.Extensions
 {
     using System.IO;
+    using System.Reflection;
 
     public static class ReadEmbeddedResourceExtensions
     {
@@ -23,7 +24,11 @@ public static string ReadAsStringFromEmbeddedResource<T>(this string resourceNam
 
         public static Stream ReadFromEmbeddedResource<T>(this string resourceName)
         {
+#if NETDESKTOP
             var assembly = typeof(T).Assembly;
+#else
+            var assembly = typeof(T).GetTypeInfo().Assembly;
+#endif
             return assembly.GetManifestResourceStream(resourceName);
         }
     }