This commit is contained in:
mlorbetske 2017-06-01 09:31:13 -07:00
commit 78093ae1be
4 changed files with 20 additions and 14 deletions

View file

@ -13,9 +13,9 @@
<SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
<SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
<HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>
<TemplateEngineVersion>1.0.0-beta2-20170523-241</TemplateEngineVersion>
<TemplateEngineTemplateVersion>1.0.0-beta2-20170526-244</TemplateEngineTemplateVersion>
<TemplateEngineTemplate2_0Version>1.0.0-beta2-20170526-244</TemplateEngineTemplate2_0Version>
<TemplateEngineVersion>1.0.0-beta2-20170531-247</TemplateEngineVersion>
<TemplateEngineTemplateVersion>1.0.0-beta2-20170531-247</TemplateEngineTemplateVersion>
<TemplateEngineTemplate2_0Version>1.0.0-beta2-20170531-247</TemplateEngineTemplate2_0Version>
<PlatformAbstractionsVersion>2.0.0-preview2-25324-03</PlatformAbstractionsVersion>
<DependencyModelVersion>2.0.0-preview2-25324-03</DependencyModelVersion>
<CliCommandLineParserVersion>0.1.0-alpha-142</CliCommandLineParserVersion>
@ -24,8 +24,8 @@
<!-- This should either be timestamped or notimestamp as appropriate -->
<AspNetCoreRuntimePackageFlavor>timestamped</AspNetCoreRuntimePackageFlavor>
<AspNetCoreRuntimeVersion>dev-128</AspNetCoreRuntimeVersion>
<AspNetCoreCoherenceTimestamp>preview2-25179</AspNetCoreCoherenceTimestamp>
<AspNetCoreRuntimeVersion>dev-134</AspNetCoreRuntimeVersion>
<AspNetCoreCoherenceTimestamp>preview2-25332</AspNetCoreCoherenceTimestamp>
</PropertyGroup>

View file

@ -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

View file

@ -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);
}

View file

@ -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));
}