From a06a7b55c4aa1cd4ade5652e3a83dbec220ac519 Mon Sep 17 00:00:00 2001
From: Mike Harder <mharder@microsoft.com>
Date: Mon, 14 May 2018 17:00:45 -0700
Subject: [PATCH] Upgrade from 2.1.300-rc1 to 2.1.300-rtm (#9)

- Add DotNetCore PackageSource
- Replace PackageSource.NuGetOrg with PackageSource.DotNetCore (as needed)
- Remove version number from a few files included in self-contained deployments
- Add "*.csproj.Complete" (Reaction to https://github.com/aspnet/Razor/pull/2316)
---
 AspNetCoreSdkTests/AssemblyInfo.cs            |  2 +-
 AspNetCoreSdkTests/NuGetPackageSource.cs      |  6 ++
 AspNetCoreSdkTests/RuntimeIdentifier.cs       | 19 +++-
 AspNetCoreSdkTests/TemplateTests.cs           | 93 ++++++++-----------
 .../Templates/AngularTemplate.cs              |  2 +-
 .../Templates/ConsoleApplicationTemplate.cs   | 10 +-
 AspNetCoreSdkTests/Templates/RazorUtil.cs     |  2 +
 7 files changed, 73 insertions(+), 61 deletions(-)

diff --git a/AspNetCoreSdkTests/AssemblyInfo.cs b/AspNetCoreSdkTests/AssemblyInfo.cs
index cd9c837b44..f6eeb3ec2d 100644
--- a/AspNetCoreSdkTests/AssemblyInfo.cs
+++ b/AspNetCoreSdkTests/AssemblyInfo.cs
@@ -20,4 +20,4 @@ public class AssemblySetUp
     {
         IOUtil.DeleteDir(TempDir);
     }
-}
\ No newline at end of file
+}
diff --git a/AspNetCoreSdkTests/NuGetPackageSource.cs b/AspNetCoreSdkTests/NuGetPackageSource.cs
index a20903007b..a680fd1047 100644
--- a/AspNetCoreSdkTests/NuGetPackageSource.cs
+++ b/AspNetCoreSdkTests/NuGetPackageSource.cs
@@ -16,6 +16,12 @@ namespace AspNetCoreSdkTests
             SourceArgumentLazy = new Lazy<string>("--source https://api.nuget.org/v3/index.json"),
         };
 
+        public static NuGetPackageSource DotNetCore { get; } = new NuGetPackageSource
+        {
+            Name = nameof(DotNetCore),
+            SourceArgumentLazy = new Lazy<string>("--source https://dotnet.myget.org/F/dotnet-core/api/v3/index.json"),
+        };
+
         public static NuGetPackageSource EnvironmentVariable { get; } = new NuGetPackageSource
         {
             Name = nameof(EnvironmentVariable),
diff --git a/AspNetCoreSdkTests/RuntimeIdentifier.cs b/AspNetCoreSdkTests/RuntimeIdentifier.cs
index caed20eac4..a0898b1968 100644
--- a/AspNetCoreSdkTests/RuntimeIdentifier.cs
+++ b/AspNetCoreSdkTests/RuntimeIdentifier.cs
@@ -12,11 +12,6 @@ namespace AspNetCoreSdkTests
             OSPlatforms = new[] { OSPlatform.Linux, OSPlatform.OSX, OSPlatform.Windows, },
         };
 
-        public static RuntimeIdentifier Win_x64 = new RuntimeIdentifier() {
-            Name = "win-x64",
-            OSPlatforms = new[] { OSPlatform.Windows, },
-        };
-
         public static RuntimeIdentifier Linux_x64 = new RuntimeIdentifier() {
             Name = "linux-x64",
             OSPlatforms = new[] { OSPlatform.Linux, },
@@ -28,6 +23,20 @@ namespace AspNetCoreSdkTests
             OSPlatforms = new[] { OSPlatform.OSX, },
         };
 
+        public static RuntimeIdentifier Win_x64 = new RuntimeIdentifier()
+        {
+            Name = "win-x64",
+            OSPlatforms = new[] { OSPlatform.Windows, },
+        };
+
+        public static IEnumerable<RuntimeIdentifier> All = new[]
+        {
+            RuntimeIdentifier.None,
+            RuntimeIdentifier.Linux_x64,
+            RuntimeIdentifier.OSX_x64,
+            RuntimeIdentifier.Win_x64,
+        };
+
         private RuntimeIdentifier() { }
 
         public string Name { get; private set; }
diff --git a/AspNetCoreSdkTests/TemplateTests.cs b/AspNetCoreSdkTests/TemplateTests.cs
index c83a519ef7..6660c7922b 100644
--- a/AspNetCoreSdkTests/TemplateTests.cs
+++ b/AspNetCoreSdkTests/TemplateTests.cs
@@ -81,61 +81,50 @@ namespace AspNetCoreSdkTests
                 serverError);
         }
 
-        private static readonly IEnumerable<Template> _restoreTemplates = new[]
+        private static IEnumerable<Template> GetTemplates(RuntimeIdentifier runtimeIdentifier)
         {
-            // Framework-dependent
-            Template.GetInstance<ClassLibraryTemplate>(NuGetPackageSource.None, RuntimeIdentifier.None),
-            Template.GetInstance<ConsoleApplicationTemplate>(NuGetPackageSource.None, RuntimeIdentifier.None),
-            // Offline restore currently not supported for RazorClassLibrary template (https://github.com/aspnet/Universe/issues/1123)
-            Template.GetInstance<RazorClassLibraryTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.None),
-            Template.GetInstance<WebTemplate>(NuGetPackageSource.None, RuntimeIdentifier.None),
-            Template.GetInstance<RazorTemplate>(NuGetPackageSource.None, RuntimeIdentifier.None),
-            Template.GetInstance<MvcTemplate>(NuGetPackageSource.None, RuntimeIdentifier.None),
-            Template.GetInstance<AngularTemplate>(NuGetPackageSource.None, RuntimeIdentifier.None),
-            Template.GetInstance<ReactTemplate>(NuGetPackageSource.None, RuntimeIdentifier.None),
-            Template.GetInstance<ReactReduxTemplate>(NuGetPackageSource.None, RuntimeIdentifier.None),
-            Template.GetInstance<WebApiTemplate>(NuGetPackageSource.None, RuntimeIdentifier.None),
+            if (runtimeIdentifier == RuntimeIdentifier.None)
+            {
+                // Framework-dependent
+                return new[]
+                {
+                    Template.GetInstance<ClassLibraryTemplate>(NuGetPackageSource.None, runtimeIdentifier),
+                    Template.GetInstance<ConsoleApplicationTemplate>(NuGetPackageSource.None, runtimeIdentifier),
+                    // Offline restore currently not supported for RazorClassLibrary template (https://github.com/aspnet/Universe/issues/1123)
+                    Template.GetInstance<RazorClassLibraryTemplate>(NuGetPackageSource.NuGetOrg, runtimeIdentifier),
+                    Template.GetInstance<WebTemplate>(NuGetPackageSource.None, runtimeIdentifier),
+                    Template.GetInstance<RazorTemplate>(NuGetPackageSource.None, runtimeIdentifier),
+                    Template.GetInstance<MvcTemplate>(NuGetPackageSource.None, runtimeIdentifier),
+                    Template.GetInstance<AngularTemplate>(NuGetPackageSource.None, runtimeIdentifier),
+                    Template.GetInstance<ReactTemplate>(NuGetPackageSource.None, runtimeIdentifier),
+                    Template.GetInstance<ReactReduxTemplate>(NuGetPackageSource.None, runtimeIdentifier),
+                    Template.GetInstance<WebApiTemplate>(NuGetPackageSource.None, runtimeIdentifier),
+                };
+            }
+            else
+            {
+                // 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.DotNetCore, runtimeIdentifier),
+                    Template.GetInstance<RazorClassLibraryTemplate>(NuGetPackageSource.NuGetOrg, runtimeIdentifier),
+                    Template.GetInstance<WebTemplate>(NuGetPackageSource.DotNetCore, runtimeIdentifier),
+                    Template.GetInstance<RazorTemplate>(NuGetPackageSource.DotNetCore, runtimeIdentifier),
+                    Template.GetInstance<MvcTemplate>(NuGetPackageSource.DotNetCore, runtimeIdentifier),
+                    Template.GetInstance<AngularTemplate>(NuGetPackageSource.DotNetCore, runtimeIdentifier),
+                    Template.GetInstance<ReactTemplate>(NuGetPackageSource.DotNetCore, runtimeIdentifier),
+                    Template.GetInstance<ReactReduxTemplate>(NuGetPackageSource.DotNetCore, runtimeIdentifier),
+                    Template.GetInstance<WebApiTemplate>(NuGetPackageSource.DotNetCore, runtimeIdentifier),
+                };
+            }
+        }
 
-            // Self-contained, win-x64
-            // ClassLibrary does not require a package source, even for self-contained deployments
-            Template.GetInstance<ClassLibraryTemplate>(NuGetPackageSource.None, RuntimeIdentifier.Win_x64),
-            Template.GetInstance<ConsoleApplicationTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.Win_x64),
-            Template.GetInstance<RazorClassLibraryTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.Win_x64),
-            Template.GetInstance<WebTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.Win_x64),
-            Template.GetInstance<RazorTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.Win_x64),
-            Template.GetInstance<MvcTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.Win_x64),
-            Template.GetInstance<AngularTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.Win_x64),
-            Template.GetInstance<ReactTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.Win_x64),
-            Template.GetInstance<ReactReduxTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.Win_x64),
-            Template.GetInstance<WebApiTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.Win_x64),
-
-            // Self-contained, linux-x64
-            // ClassLibrary does not require a package source, even for self-contained deployments
-            Template.GetInstance<ClassLibraryTemplate>(NuGetPackageSource.None, RuntimeIdentifier.Linux_x64),
-            Template.GetInstance<ConsoleApplicationTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.Linux_x64),
-            Template.GetInstance<RazorClassLibraryTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.Linux_x64),
-            Template.GetInstance<WebTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.Linux_x64),
-            Template.GetInstance<RazorTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.Linux_x64),
-            Template.GetInstance<MvcTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.Linux_x64),
-            Template.GetInstance<AngularTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.Linux_x64),
-            Template.GetInstance<ReactTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.Linux_x64),
-            Template.GetInstance<ReactReduxTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.Linux_x64),
-            Template.GetInstance<WebApiTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.Linux_x64),
-
-            // Self-contained, osx-x64
-            // ClassLibrary does not require a package source, even for self-contained deployments
-            Template.GetInstance<ClassLibraryTemplate>(NuGetPackageSource.None, RuntimeIdentifier.OSX_x64),
-            Template.GetInstance<ConsoleApplicationTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.OSX_x64),
-            Template.GetInstance<RazorClassLibraryTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.OSX_x64),
-            Template.GetInstance<WebTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.OSX_x64),
-            Template.GetInstance<RazorTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.OSX_x64),
-            Template.GetInstance<MvcTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.OSX_x64),
-            Template.GetInstance<AngularTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.OSX_x64),
-            Template.GetInstance<ReactTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.OSX_x64),
-            Template.GetInstance<ReactReduxTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.OSX_x64),
-            Template.GetInstance<WebApiTemplate>(NuGetPackageSource.NuGetOrg, RuntimeIdentifier.OSX_x64),
-        };
+        private static readonly IEnumerable<Template> _restoreTemplates = RuntimeIdentifier.All.SelectMany(r => GetTemplates(r));
 
+        // Must call ToList() or similar on RestoreData to ensure TestCaseData instances can be compared to each other,
+        // which is required to use Except() in RunData.
         public static IEnumerable<TestCaseData> RestoreData = _restoreTemplates.Select(t => new TestCaseData(t)).ToList();
 
         public static IEnumerable<TestCaseData> BuildData => RestoreData;
diff --git a/AspNetCoreSdkTests/Templates/AngularTemplate.cs b/AspNetCoreSdkTests/Templates/AngularTemplate.cs
index 6e20a390a9..bd858349d8 100644
--- a/AspNetCoreSdkTests/Templates/AngularTemplate.cs
+++ b/AspNetCoreSdkTests/Templates/AngularTemplate.cs
@@ -15,7 +15,7 @@ namespace AspNetCoreSdkTests.Templates
         // the file contents being identical.  Replacing the generated hash with "[HASH]" allows the tests to pass
         // on both platforms.
         public override IEnumerable<string> FilesAfterPublish =>
-            base.FilesAfterPublish.Select(f => Regex.Replace(f, @"main\.[0-9a-f]*\.bundle\.js$", "main.[HASH].bundle.js"));
+            base.FilesAfterPublish.Select(f => Regex.Replace(f, @"main\.[0-9a-f]+\.bundle\.js$", "main.[HASH].bundle.js"));
 
         public override IEnumerable<string> ExpectedFilesAfterPublish => 
             base.ExpectedFilesAfterPublish
diff --git a/AspNetCoreSdkTests/Templates/ConsoleApplicationTemplate.cs b/AspNetCoreSdkTests/Templates/ConsoleApplicationTemplate.cs
index 25651f5f60..9051b30310 100644
--- a/AspNetCoreSdkTests/Templates/ConsoleApplicationTemplate.cs
+++ b/AspNetCoreSdkTests/Templates/ConsoleApplicationTemplate.cs
@@ -74,6 +74,12 @@ namespace AspNetCoreSdkTests.Templates
             base.ExpectedBinFilesAfterBuild
             .Concat(_additionalBinFilesAfterBuild[RuntimeIdentifier]());
 
+        // A few files included in self-contained deployments contain version numbers in the filename, which must
+        // be replaced so tests can pass on all versions.
+        public override IEnumerable<string> FilesAfterPublish =>
+            base.FilesAfterPublish
+            .Select(f => Regex.Replace(f, @"_amd64_amd64_[0-9\.]+\.dll$", "_amd64_amd64_[VERSION].dll"));
+
         private Func<IEnumerable<string>> _additionalFilesAfterPublishCommon = () => new[]
         {
             "Microsoft.CSharp.dll",
@@ -298,13 +304,13 @@ namespace AspNetCoreSdkTests.Templates
                         "hostpolicy.dll",
                         "Microsoft.DiaSymReader.Native.amd64.dll",
                         "mscordaccore.dll",
-                        "mscordaccore_amd64_amd64_4.6.26426.02.dll",
+                        "mscordaccore_amd64_amd64_[VERSION].dll",
                         "mscordbi.dll",
                         "mscorrc.debug.dll",
                         "mscorrc.dll",
                         "sos.dll",
                         "SOS.NETCore.dll",
-                        "sos_amd64_amd64_4.6.26426.02.dll",
+                        "sos_amd64_amd64_[VERSION].dll",
                         "ucrtbase.dll",
                     })
                 },
diff --git a/AspNetCoreSdkTests/Templates/RazorUtil.cs b/AspNetCoreSdkTests/Templates/RazorUtil.cs
index c4207acf06..6f78c07d06 100644
--- a/AspNetCoreSdkTests/Templates/RazorUtil.cs
+++ b/AspNetCoreSdkTests/Templates/RazorUtil.cs
@@ -8,6 +8,8 @@ namespace AspNetCoreSdkTests.Templates
     {
         public static IEnumerable<string> GetExpectedObjFilesAfterBuild(Template template) => new[]
          {
+            // Added between 2.1.300-rc1 and 2.1.300-rtm (https://github.com/aspnet/Razor/pull/2316)
+            $"{template.Name}.csproj.CopyComplete",
             $"{template.Name}.RazorAssemblyInfo.cache",
             $"{template.Name}.RazorAssemblyInfo.cs",
             $"{template.Name}.RazorCoreGenerate.cache",