From e395b9240a7f9a2627e68c2fef2b759d5a3d92dc Mon Sep 17 00:00:00 2001
From: Mike Harder <mharder@microsoft.com>
Date: Wed, 20 Jun 2018 15:53:49 -0700
Subject: [PATCH] Add support for SDK 2.1.302 (#12)

---
 AspNetCoreSdkTests/NuGetPackageSource.cs |  6 ++++++
 AspNetCoreSdkTests/TemplateTests.cs      | 21 ++++++++++++---------
 AspNetCoreSdkTests/Util/DotNetUtil.cs    |  4 ++--
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/AspNetCoreSdkTests/NuGetPackageSource.cs b/AspNetCoreSdkTests/NuGetPackageSource.cs
index a680fd1047..6a2547b8b0 100644
--- a/AspNetCoreSdkTests/NuGetPackageSource.cs
+++ b/AspNetCoreSdkTests/NuGetPackageSource.cs
@@ -28,6 +28,12 @@ namespace AspNetCoreSdkTests
             SourceArgumentLazy = new Lazy<string>(() => $"--source {GetPackageSourceFromEnvironment()}"),
         };
 
+        public static NuGetPackageSource EnvironmentVariableAndNuGetOrg { get; } = new NuGetPackageSource
+        {
+            Name = nameof(EnvironmentVariableAndNuGetOrg),
+            SourceArgumentLazy = new Lazy<string>(() => string.Join(" ", EnvironmentVariable.SourceArgument, NuGetOrg.SourceArgument)),
+        };
+
         private NuGetPackageSource() { }
 
         public string Name { get; private set; }
diff --git a/AspNetCoreSdkTests/TemplateTests.cs b/AspNetCoreSdkTests/TemplateTests.cs
index 3052d17cb2..8076803b06 100644
--- a/AspNetCoreSdkTests/TemplateTests.cs
+++ b/AspNetCoreSdkTests/TemplateTests.cs
@@ -109,20 +109,23 @@ namespace AspNetCoreSdkTests
             }
             else
             {
+                // Pre-release SDKs require a private nuget feed
+                var packageSource = (DotNetUtil.SdkVersion == new Version(2, 1, 302)) ? NuGetPackageSource.EnvironmentVariableAndNuGetOrg : NuGetPackageSource.NuGetOrg;
+
                 // Self-contained
                 return new[]
                 {
                     // ClassLibrary does not require a package source, even for self-contained deployments
                     Template.GetInstance<ClassLibraryTemplate>(NuGetPackageSource.None, runtimeIdentifier),
-                    Template.GetInstance<ConsoleApplicationTemplate>(NuGetPackageSource.NuGetOrg, runtimeIdentifier),
-                    Template.GetInstance<RazorClassLibraryTemplate>(NuGetPackageSource.NuGetOrg, runtimeIdentifier),
-                    Template.GetInstance<WebTemplate>(NuGetPackageSource.NuGetOrg, runtimeIdentifier),
-                    Template.GetInstance<RazorTemplate>(NuGetPackageSource.NuGetOrg, runtimeIdentifier),
-                    Template.GetInstance<MvcTemplate>(NuGetPackageSource.NuGetOrg, runtimeIdentifier),
-                    Template.GetInstance<AngularTemplate>(NuGetPackageSource.NuGetOrg, runtimeIdentifier),
-                    Template.GetInstance<ReactTemplate>(NuGetPackageSource.NuGetOrg, runtimeIdentifier),
-                    Template.GetInstance<ReactReduxTemplate>(NuGetPackageSource.NuGetOrg, runtimeIdentifier),
-                    Template.GetInstance<WebApiTemplate>(NuGetPackageSource.NuGetOrg, runtimeIdentifier),
+                    Template.GetInstance<ConsoleApplicationTemplate>(packageSource, runtimeIdentifier),
+                    Template.GetInstance<RazorClassLibraryTemplate>(packageSource, runtimeIdentifier),
+                    Template.GetInstance<WebTemplate>(packageSource, runtimeIdentifier),
+                    Template.GetInstance<RazorTemplate>(packageSource, runtimeIdentifier),
+                    Template.GetInstance<MvcTemplate>(packageSource, runtimeIdentifier),
+                    Template.GetInstance<AngularTemplate>(packageSource, runtimeIdentifier),
+                    Template.GetInstance<ReactTemplate>(packageSource, runtimeIdentifier),
+                    Template.GetInstance<ReactReduxTemplate>(packageSource, runtimeIdentifier),
+                    Template.GetInstance<WebApiTemplate>(packageSource, runtimeIdentifier),
                 };
             }
         }
diff --git a/AspNetCoreSdkTests/Util/DotNetUtil.cs b/AspNetCoreSdkTests/Util/DotNetUtil.cs
index c45935406e..e0aea32982 100644
--- a/AspNetCoreSdkTests/Util/DotNetUtil.cs
+++ b/AspNetCoreSdkTests/Util/DotNetUtil.cs
@@ -34,8 +34,8 @@ namespace AspNetCoreSdkTests.Util
             var versionString = Regex.Match(info, @"Version:\W*([0-9.]+)").Groups[1].Value;
             var version = new Version(versionString);
 
-            // Supported version range is [2.1.300,2.1.301] (inclusive)
-            if (version >= new Version(2, 1, 300) && version <= new Version(2, 1, 301))
+            // Supported version range is [2.1.300,2.1.302] (inclusive)
+            if (version >= new Version(2, 1, 300) && version <= new Version(2, 1, 302))
             {
                 return version;
             }