mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'release/2.0.0' into release/2.0.0-UpdateDependencies

Browse source
This commit is contained in:
Eric Erhardt 2017-06-01 12:28:54 -05:00
commit ea40317e18
2 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
build/DependencyVersions.props
View file

@ -9,13 +9,13 @@
<CLI_NETSDK_Version>2.0.0-preview2-20170531-2</CLI_NETSDK_Version> <CLI_NETSDK_Version>2.0.0-preview2-20170531-2</CLI_NETSDK_Version>
<CLI_NuGet_Version>4.3.0-preview1-2500</CLI_NuGet_Version> <CLI_NuGet_Version>4.3.0-preview1-2500</CLI_NuGet_Version>
<CLI_WEBSDK_Version>2.0.0-rel-20170518-512</CLI_WEBSDK_Version> <CLI_WEBSDK_Version>2.0.0-rel-20170518-512</CLI_WEBSDK_Version>
<CLI_TestPlatform_Version>15.3.0-preview-20170502-03</CLI_TestPlatform_Version> <CLI_TestPlatform_Version>15.3.0-preview-20170601-03</CLI_TestPlatform_Version>
<SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion> <SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
<SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion> <SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
<HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion> <HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>
<TemplateEngineVersion>1.0.0-beta2-20170523-241</TemplateEngineVersion> <TemplateEngineVersion>1.0.0-beta2-20170531-247</TemplateEngineVersion>
<TemplateEngineTemplateVersion>1.0.0-beta2-20170526-244</TemplateEngineTemplateVersion> <TemplateEngineTemplateVersion>1.0.0-beta2-20170531-247</TemplateEngineTemplateVersion>
<TemplateEngineTemplate2_0Version>1.0.0-beta2-20170526-244</TemplateEngineTemplate2_0Version> <TemplateEngineTemplate2_0Version>1.0.0-beta2-20170531-247</TemplateEngineTemplate2_0Version>
<PlatformAbstractionsVersion>2.0.0-preview2-25331-01</PlatformAbstractionsVersion> <PlatformAbstractionsVersion>2.0.0-preview2-25331-01</PlatformAbstractionsVersion>
<DependencyModelVersion>2.0.0-preview2-25331-01</DependencyModelVersion> <DependencyModelVersion>2.0.0-preview2-25331-01</DependencyModelVersion>
<CliCommandLineParserVersion>0.1.0-alpha-142</CliCommandLineParserVersion> <CliCommandLineParserVersion>0.1.0-alpha-142</CliCommandLineParserVersion>
@ -24,8 +24,8 @@
<!-- This should either be timestamped or notimestamp as appropriate --> <!-- This should either be timestamped or notimestamp as appropriate -->
<AspNetCoreRuntimePackageFlavor>timestamped</AspNetCoreRuntimePackageFlavor> <AspNetCoreRuntimePackageFlavor>timestamped</AspNetCoreRuntimePackageFlavor>
<AspNetCoreRuntimeVersion>dev-128</AspNetCoreRuntimeVersion> <AspNetCoreRuntimeVersion>dev-134</AspNetCoreRuntimeVersion>
<AspNetCoreCoherenceTimestamp>preview2-25179</AspNetCoreCoherenceTimestamp> <AspNetCoreCoherenceTimestamp>preview2-25332</AspNetCoreCoherenceTimestamp>
</PropertyGroup> </PropertyGroup>

19
src/dotnet/commands/dotnet-new/NewCommandShim.cs
View file

@ -31,13 +31,18 @@ namespace Microsoft.DotNet.Tools.New
var sessionId = Environment.GetEnvironmentVariable(MSBuildForwardingApp.TelemetrySessionIdEnvironmentVariableName); var sessionId = Environment.GetEnvironmentVariable(MSBuildForwardingApp.TelemetrySessionIdEnvironmentVariableName);
var telemetry = new Telemetry(new NuGetCacheSentinel(new CliFallbackFolderPathCalculator()), sessionId); var telemetry = new Telemetry(new NuGetCacheSentinel(new CliFallbackFolderPathCalculator()), sessionId);
var logger = new TelemetryLogger(null); var logger = new TelemetryLogger(null);
//(name, props, measures) =>
//{ if (telemetry.Enabled)
// if (telemetry.Enabled) {
// { logger = new TelemetryLogger((name, props, measures) =>
// telemetry.TrackEvent(name, props, measures); {
// } if (telemetry.Enabled)
//}); {
telemetry.TrackEvent(name, props, measures);
}
});
}
return New3Command.Run(CommandName, CreateHost(), logger, FirstRun, args); return New3Command.Run(CommandName, CreateHost(), logger, FirstRun, args);
} }