diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index aee8b9cad..4603e7c40 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -13,9 +13,9 @@
$(CLI_SharedFrameworkVersion)
$(CLI_SharedFrameworkVersion)
$(CLI_SharedFrameworkVersion)
- 1.0.0-beta2-20170523-241
- 1.0.0-beta2-20170526-244
- 1.0.0-beta2-20170526-244
+ 1.0.0-beta2-20170531-247
+ 1.0.0-beta2-20170531-247
+ 1.0.0-beta2-20170531-247
2.0.0-preview2-25324-03
2.0.0-preview2-25324-03
0.1.0-alpha-142
@@ -24,8 +24,8 @@
timestamped
- dev-128
- preview2-25179
+ dev-134
+ preview2-25332
diff --git a/scripts/obtain/dotnet-install.sh b/scripts/obtain/dotnet-install.sh
index b42d16c64..83ad96d17 100755
--- a/scripts/obtain/dotnet-install.sh
+++ b/scripts/obtain/dotnet-install.sh
@@ -398,7 +398,7 @@ construct_download_link() {
local download_link=null
if [ "$shared_runtime" = true ]; then
- download_link="$azure_feed/Runtime/$specific_version/dotnet-$specific_version-$osname-$normalized_architecture.tar.gz"
+ download_link="$azure_feed/Runtime/$specific_version/dotnet-runtime-$specific_version-$osname-$normalized_architecture.tar.gz"
else
download_link="$azure_feed/Sdk/$specific_version/dotnet-dev-$specific_version-$osname-$normalized_architecture.tar.gz"
fi
diff --git a/src/dotnet/commands/dotnet-new/NewCommandShim.cs b/src/dotnet/commands/dotnet-new/NewCommandShim.cs
index 7dea29376..86f7b1574 100644
--- a/src/dotnet/commands/dotnet-new/NewCommandShim.cs
+++ b/src/dotnet/commands/dotnet-new/NewCommandShim.cs
@@ -31,13 +31,18 @@ namespace Microsoft.DotNet.Tools.New
var sessionId = Environment.GetEnvironmentVariable(MSBuildForwardingApp.TelemetrySessionIdEnvironmentVariableName);
var telemetry = new Telemetry(new NuGetCacheSentinel(new CliFallbackFolderPathCalculator()), sessionId);
var logger = new TelemetryLogger(null);
- //(name, props, measures) =>
- //{
- // if (telemetry.Enabled)
- // {
- // telemetry.TrackEvent(name, props, measures);
- // }
- //});
+
+ if (telemetry.Enabled)
+ {
+ logger = new TelemetryLogger((name, props, measures) =>
+ {
+ if (telemetry.Enabled)
+ {
+ telemetry.TrackEvent(name, props, measures);
+ }
+ });
+ }
+
return New3Command.Run(CommandName, CreateHost(), logger, FirstRun, args);
}
diff --git a/src/dotnet/commands/dotnet-run/LaunchSettings/LaunchSettingsManager.cs b/src/dotnet/commands/dotnet-run/LaunchSettings/LaunchSettingsManager.cs
index 8246e820c..dd27329c6 100644
--- a/src/dotnet/commands/dotnet-run/LaunchSettings/LaunchSettingsManager.cs
+++ b/src/dotnet/commands/dotnet-run/LaunchSettings/LaunchSettingsManager.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using Microsoft.DotNet.Cli.Utils;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
namespace Microsoft.DotNet.Tools.Run.LaunchSettings
@@ -82,7 +83,7 @@ namespace Microsoft.DotNet.Tools.Run.LaunchSettings
return provider.TryApplySettings(model, profileObject, ref command);
}
- catch (Exception ex)
+ catch (JsonException ex)
{
return new LaunchSettingsApplyResult(false, string.Format(LocalizableStrings.UnexpectedExceptionProcessingLaunchSettings, ex.Message));
}