Merge branch 'kartang/develop' into CLI

CleanPackages.ps1

@@ -1,7 +1,7 @@
 #enable verbose mode
 $VerbosePreference = "Continue";
 
-[String]$dnxRoot = [System.Environment]::ExpandEnvironmentVariables('%USERPROFILE%\.dnx');
+[String]$dnxRoot = [System.Environment]::ExpandEnvironmentVariables('%USERPROFILE%\.nuget');
 
 rm -r $dnxRoot\packages -Force 
 

test/Microsoft.ApplicationInsights.AspNetCore.Tests/TelemetryInitializers/ComponentVersionTelemetryInitializerTests.cs

@@ -16,7 +16,8 @@
             var config = new ConfigurationBuilder()
                 .SetBasePath(Directory.GetCurrentDirectory())
                 .AddJsonFile("project.json")
-                .Build(); var initializer = new ComponentVersionTelemetryInitializer(config);
+                .Build();
+            var initializer = new ComponentVersionTelemetryInitializer(config);
             initializer.Initialize(new RequestTelemetry());
         }
 
@@ -26,7 +27,8 @@
             var config = new ConfigurationBuilder()
                 .SetBasePath(Directory.GetCurrentDirectory())
                 .AddJsonFile("project.json")
-                .Build(); var initializer = new ComponentVersionTelemetryInitializer(config);
+                .Build();
+            var initializer = new ComponentVersionTelemetryInitializer(config);
             initializer.Initialize(new RequestTelemetry());
         }
 
@@ -49,7 +51,8 @@
             var config = new ConfigurationBuilder()
                 .SetBasePath(Directory.GetCurrentDirectory())
                 .AddJsonFile("project.json")
-                .Build(); var initializer = new ComponentVersionTelemetryInitializer(config);
+                .Build();
+            var initializer = new ComponentVersionTelemetryInitializer(config);
 
             var telemetry = new RequestTelemetry();
             telemetry.Context.Component.Version = "TestVersion";
@@ -57,5 +60,16 @@
 
             Assert.Equal("TestVersion", telemetry.Context.Component.Version);
         }
+
+        [Fact]
+        public void InitializeDoesNotThrowIfVersionDoesNotExist()
+        {
+            var config = new ConfigurationBuilder()
+                .SetBasePath(Directory.GetCurrentDirectory())
+                .Build();
+            var initializer = new ComponentVersionTelemetryInitializer(config);
+            var telemetry = new RequestTelemetry();
+            initializer.Initialize(telemetry);
+        }
     }
 }