From 17f522e66ce52d76d2746db518e31b1bfa7d35ca Mon Sep 17 00:00:00 2001
From: Mike Lorbetske <mike.lorbetske@n3-p.com>
Date: Thu, 4 May 2017 19:22:05 -0700
Subject: [PATCH 1/2] Update to no-timestamp packages and adjust feeds and
 cache accordingly

---
 NuGet.Config                                           | 4 ++--
 build/DependencyVersions.props                         | 6 +++---
 test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config | 5 +++--
 test/dotnet-new.Tests/NuGet.tempaspnetpatch.config     | 5 +++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/NuGet.Config b/NuGet.Config
index 4d79bc8e0..120a5daf6 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -5,13 +5,13 @@
     <clear />
     <add key="templating" value="https://dotnet.myget.org/F/templating/api/v3/index.json" />
     <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
-    <add key="aspnetcore-release" value="https://dotnet.myget.org/F/aspnetcore-release/api/v3/index.json" />
+    <add key="aspnet-final" value="https://dotnet.myget.org/F/aspnetcore-2-0-0-preview1-no-timestamp/api/v3/index.json" />
+    <add key="aspnet-release" value="https://dotnet.myget.org/F/aspnetcore-release/api/v3/index.json" />
     <add key="websdkfeed" value="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json" />
     <add key="cli-deps" value="https://dotnet.myget.org/F/cli-deps/api/v3/index.json" />
     <add key="roslyn" value="https://dotnet.myget.org/f/roslyn/api/v3/index.json" />
     <add key="xunit" value="https://www.myget.org/F/xunit/api/v3/index.json" />
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="AspNetCurrent" value="https://dotnet.myget.org/F/aspnet-feb2017-patch/api/v3/index.json" /> 
     <add key="vstest" value="https://dotnet.myget.org/F/vstest/api/v3/index.json" />
   </packageSources>
 </configuration>
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 5ef06e7cf..94c178b8d 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -12,15 +12,15 @@
     <SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
     <HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>
     <TemplateEngineVersion>1.0.0-beta2-20170503-217</TemplateEngineVersion>
-    <TemplateEngineTemplateVersion>1.0.0-beta2-20170503-217</TemplateEngineTemplateVersion>
-    <TemplateEngineTemplate2_0Version>1.0.0-beta2-20170503-217</TemplateEngineTemplate2_0Version>
+    <TemplateEngineTemplateVersion>1.0.0-beta2-20170504-221</TemplateEngineTemplateVersion>
+    <TemplateEngineTemplate2_0Version>1.0.0-beta2-20170504-221</TemplateEngineTemplate2_0Version>
     <PlatformAbstractionsVersion>2.0.0-preview1-002111</PlatformAbstractionsVersion>
     <DependencyModelVersion>2.0.0-preview1-002111</DependencyModelVersion>
     <CliCommandLineParserVersion>0.1.0-alpha-142</CliCommandLineParserVersion>
     <AspNetCoreRuntimeVersion>2.0.0-preview1-65</AspNetCoreRuntimeVersion>
 
     <!-- This should either be timestamped or notimestamp as appropriate -->
-    <AspNetCoreRuntimePackageFlavor>timestamped</AspNetCoreRuntimePackageFlavor>
+    <AspNetCoreRuntimePackageFlavor>notimestamp</AspNetCoreRuntimePackageFlavor>
 
   </PropertyGroup>
 
diff --git a/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config b/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config
index 1f41d2665..33b9693d5 100644
--- a/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config
+++ b/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config
@@ -4,7 +4,8 @@
     <!--To inherit the global NuGet package sources remove the <clear/> line below -->
     <clear />
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="DotnetCore" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" /> 
-    <add key="AspNetCurrent" value="https://dotnet.myget.org/F/aspnetcore-release/api/v3/index.json" /> 
+    <add key="DotnetCore" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
+    <add key="aspnet-final" value="https://dotnet.myget.org/F/aspnetcore-2-0-0-preview1-no-timestamp/api/v3/index.json" />
+    <add key="aspnet-release" value="https://dotnet.myget.org/F/aspnetcore-release/api/v3/index.json" />
   </packageSources>
 </configuration>
\ No newline at end of file
diff --git a/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config b/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config
index 1f41d2665..33b9693d5 100644
--- a/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config
+++ b/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config
@@ -4,7 +4,8 @@
     <!--To inherit the global NuGet package sources remove the <clear/> line below -->
     <clear />
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="DotnetCore" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" /> 
-    <add key="AspNetCurrent" value="https://dotnet.myget.org/F/aspnetcore-release/api/v3/index.json" /> 
+    <add key="DotnetCore" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
+    <add key="aspnet-final" value="https://dotnet.myget.org/F/aspnetcore-2-0-0-preview1-no-timestamp/api/v3/index.json" />
+    <add key="aspnet-release" value="https://dotnet.myget.org/F/aspnetcore-release/api/v3/index.json" />
   </packageSources>
 </configuration>
\ No newline at end of file

From 209d05992fb0cec455c37734f48386a05bd3dc71 Mon Sep 17 00:00:00 2001
From: Mike Lorbetske <mike.lorbetske@n3-p.com>
Date: Thu, 4 May 2017 22:46:23 -0700
Subject: [PATCH 2/2] Disable telemetry for new

---
 src/dotnet/commands/dotnet-new/NewCommandShim.cs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/dotnet/commands/dotnet-new/NewCommandShim.cs b/src/dotnet/commands/dotnet-new/NewCommandShim.cs
index bc06185cc..6e36fd9c0 100644
--- a/src/dotnet/commands/dotnet-new/NewCommandShim.cs
+++ b/src/dotnet/commands/dotnet-new/NewCommandShim.cs
@@ -29,13 +29,14 @@ namespace Microsoft.DotNet.Tools.New
         {
             var sessionId = Environment.GetEnvironmentVariable(MSBuildForwardingApp.TelemetrySessionIdEnvironmentVariableName);
             var telemetry = new Telemetry(new NuGetCacheSentinel(new CliFallbackFolderPathCalculator()), sessionId);
-            var logger = new TelemetryLogger((name, props, measures) =>
-            {
-                if (telemetry.Enabled)
-                {
-                    telemetry.TrackEvent(name, props, measures);
-                }
-            });
+            var logger = new TelemetryLogger(null);
+            //(name, props, measures) =>
+            //{
+            //    if (telemetry.Enabled)
+            //    {
+            //        telemetry.TrackEvent(name, props, measures);
+            //    }
+            //});
             return New3Command.Run(CommandName, CreateHost(), logger, FirstRun, args);
         }