add cake and versioning (#32)

Author: austinlparker

.vscode/tasks.json

@@ -10,6 +10,17 @@
                 "kind": "build",
                 "isDefault": true
             }
+        },
+        {
+            "type": "cake",
+            "script": "Test",
+            "problemMatcher": [],
+            "group": "test"
+        },
+        {
+            "type": "cake",
+            "script": "Clean",
+            "problemMatcher": []
         }
     ]
 }

GitVersion.yml

@@ -0,0 +1,5 @@
+mode: Mainline
+assembly-informational-format: '{SemVer}-{CommitDate}'
+branches: {}
+ignore:
+  sha: []

build.cake

@@ -1,7 +1,9 @@
 #tool "xunit.runner.console"
+#tool "nuget:?package=GitVersion.CommandLine"
 
 var target = Argument("target", "Default");
 var configuration = Argument("configuration", "Release");
+var debugConfiguration = Argument("configuration", "Debug");
 var buildDir = Directory("./build");
 var distDir = Directory("./dist");
 var solutionFile = GetFiles("./*.sln").First();
@@ -16,6 +18,11 @@ Task("Clean")
 			.SetConfiguration(configuration)
 			.WithTarget("Clean")
 			.SetVerbosity(Verbosity.Minimal));
+
+		MSBuild(solutionFile, settings => settings
+			.SetConfiguration(debugConfiguration)
+			.WithTarget("Clean")
+			.SetVerbosity(Verbosity.Minimal));
 	});
 
 Task("Clean-Outputs")
@@ -30,7 +37,7 @@ Task("Build")
     .Does(() =>
 	{
 		NuGetRestore(solutionFile);
-
+		GitVersion(new GitVersionSettings { UpdateAssemblyInfo = true });
 		MSBuild(solutionFile, settings => settings
 			.SetConfiguration(configuration)
 			.WithTarget("Rebuild")
@@ -41,13 +48,13 @@ Task("Test")
 	.IsDependentOn("Build")
     .Does(() =>
 	{
-		XUnit2(string.Format("./test/**/bin/{0}/*.Tests.dll", configuration), new XUnit2Settings {
+		XUnit2(string.Format("./test/**/bin/Release/**/*.Tests.dll", configuration), new XUnit2Settings {
 			XmlReport = true,
 			OutputDirectory = buildDir
 		});
 });
 
 Task("Default")
-	.IsDependentOn("Build");
+	.IsDependentOn("Test");
 
 RunTarget(target);

examples/LightStep.CSharpAspectTestApp/Properties/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -31,6 +31,8 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+// [assembly: AssemblyVersion("0.1.29.0")]
+[assembly: AssemblyVersion("0.1.29.0")]
+[assembly: AssemblyFileVersion("0.1.29.0")]
+
+[assembly: AssemblyInformationalVersion("0.1.29-enhancement-addCake.1-2018-11-12")]

src/LightStep/LightStep.csproj

@@ -32,15 +32,11 @@
 
   <PropertyGroup>
       <Authors>Austin Parker</Authors>
-      <PackageVersion>0.0.8-alpha-$(CIRCLE_BUILD_NUM)</PackageVersion>
       <Company>LightStep</Company>
       <NeutralLanguage>en-US</NeutralLanguage>
       <AssemblyTitle>LightStep</AssemblyTitle>
       <Description>OpenTracing compliant tracer for LightStep.</Description>
       <Copyright>LightStep 2018</Copyright>
-  </PropertyGroup>
-
-  <PropertyGroup>
       <PackageTags>tracing</PackageTags>
       <PackageReleaseNotes>https://github.com/lightstep/lightstep-tracer-csharp/blob/master/CHANGELOG.md</PackageReleaseNotes>
       <PackageIconUrl>https://raw.githubusercontent.com/lightstep/lightstep-tracer-csharp/master/ls128x128.png</PackageIconUrl>
@@ -57,5 +53,6 @@
       <AssemblyOriginatorKeyFile>tracerSign.snk</AssemblyOriginatorKeyFile>
       <_UseRoslynPublicSignHack>false</_UseRoslynPublicSignHack>
       <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+      <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 </Project>

src/LightStep/Options.cs

@@ -102,14 +102,19 @@ private IDictionary<string, object> InitializeDefaultTags()
             {
                 [LightStepConstants.TracerPlatformKey] = LightStepConstants.TracerPlatformValue,
                 [LightStepConstants.TracerPlatformVersionKey] = GetPlatformVersion(),
-                [LightStepConstants.TracerVersionKey] = "0.0.7-alpha",
+                [LightStepConstants.TracerVersionKey] = GetTracerVersion(),
                 [LightStepConstants.ComponentNameKey] = GetComponentName(),
                 [LightStepConstants.HostnameKey] = GetHostName(),
                 [LightStepConstants.CommandLineKey] = GetCommandLine()
             };
             return attributes;
         }
 
+        private static string GetTracerVersion()
+        {
+            return typeof(LightStep.Tracer).Assembly.GetName().Version.ToString();
+        }
+
         private static string GetComponentName()
         {
             var entryAssembly = "";

src/LightStep/Properties/AssemblyInfo.cs

@@ -0,0 +1,17 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 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 Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("0.1.29.0")]
+[assembly: AssemblyVersion("0.1.29.0")]
+[assembly: AssemblyFileVersion("0.1.29.0")]
+[assembly: AssemblyInformationalVersion("0.1.29-enhancement-addCake.1-2018-11-12")]