Merge pull request #383 from aspnet/jbagga/merge/release/2.1

Merge release/2.1 to dev
2018-03-19 16:34:21 -07:00 · 2018-03-19 16:34:21 -07:00 · 7f00516475
parent 8f2c029a95 88f29c76af
commit 7f00516475
16 changed files with 8 additions and 70 deletions
--- a/build/dependencies.props
+++ b/build/dependencies.props
@ -23,10 +23,8 @@
    <MicrosoftAspNetCoreTestingPackageVersion>2.1.0-preview2-30335</MicrosoftAspNetCoreTestingPackageVersion>
    <MicrosoftBuildFrameworkPackageVersion>15.6.82</MicrosoftBuildFrameworkPackageVersion>
    <MicrosoftBuildUtilitiesCorePackageVersion>15.6.82</MicrosoftBuildUtilitiesCorePackageVersion>
-    <MicrosoftEntityFrameworkCoreDesignPackageVersion>2.1.0-preview2-30335</MicrosoftEntityFrameworkCoreDesignPackageVersion>
    <MicrosoftEntityFrameworkCoreSqlitePackageVersion>2.1.0-preview2-30335</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
    <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>2.1.0-preview2-30335</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
-    <MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion>2.1.0-preview2-30335</MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion>
    <MicrosoftEntityFrameworkCoreToolsPackageVersion>2.1.0-preview2-30335</MicrosoftEntityFrameworkCoreToolsPackageVersion>
    <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>2.1.0-preview2-30335</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
    <MicrosoftExtensionsProcessSourcesPackageVersion>2.1.0-preview2-30335</MicrosoftExtensionsProcessSourcesPackageVersion>
@ -35,7 +33,6 @@
    <MicrosoftNETTestSdkPackageVersion>15.6.0</MicrosoftNETTestSdkPackageVersion>
    <MicrosoftVisualStudioWebBrowserLinkPackageVersion>2.1.0-preview2-30335</MicrosoftVisualStudioWebBrowserLinkPackageVersion>
    <MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion>2.1.0-preview2-30335</MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion>
-    <MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion>2.1.0-preview2-30131</MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion>
    <SeleniumFirefoxWebDriverPackageVersion>0.19.0</SeleniumFirefoxWebDriverPackageVersion>
    <SeleniumSupportPackageVersion>3.7.0</SeleniumSupportPackageVersion>
    <SeleniumWebDriverMicrosoftDriverPackageVersion>16.16299.0</SeleniumWebDriverMicrosoftDriverPackageVersion>
--- a/src/Microsoft.AspNetCore.SpaTemplates/Aurelia-CSharp.csproj.in
+++ b/src/Microsoft.AspNetCore.SpaTemplates/Aurelia-CSharp.csproj.in
@ -19,10 +19,6 @@
    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="${MicrosoftAspNetCoreStaticFilesPackageVersion}" />
  </ItemGroup>

-  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="${MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion}" />
-  </ItemGroup>
-
 <!--/-:cnd:noEmit -->
  <Target Name="DebugRunWebpack" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Debug' And !Exists('wwwroot\dist') ">
    <!-- Ensure Node.js is installed -->
--- a/src/Microsoft.AspNetCore.SpaTemplates/Knockout-CSharp.csproj.in
+++ b/src/Microsoft.AspNetCore.SpaTemplates/Knockout-CSharp.csproj.in
@ -19,10 +19,6 @@
    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="${MicrosoftAspNetCoreStaticFilesPackageVersion}" />
  </ItemGroup>

-  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="${MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion}" />
-  </ItemGroup>
-
 <!--/-:cnd:noEmit -->
  <Target Name="DebugRunWebpack" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Debug' And !Exists('wwwroot\dist') ">
    <!-- Ensure Node.js is installed -->
--- a/src/Microsoft.AspNetCore.SpaTemplates/Vue-CSharp.csproj.in
+++ b/src/Microsoft.AspNetCore.SpaTemplates/Vue-CSharp.csproj.in
@ -19,10 +19,6 @@
    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="${MicrosoftAspNetCoreStaticFilesPackageVersion}" />
  </ItemGroup>

-  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="${MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion}" />
-  </ItemGroup>
-
 <!--/-:cnd:noEmit -->
  <Target Name="DebugRunWebpack" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Debug' And !Exists('wwwroot\dist') ">
    <!-- Ensure Node.js is installed -->
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in
@ -32,7 +32,6 @@
    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="${MicrosoftAspNetCoreMvcPackageVersion}" />
    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="${MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion}" PrivateAssets="All" />
    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="${MicrosoftAspNetCoreStaticFilesPackageVersion}" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="${MicrosoftEntityFrameworkCoreDesignPackageVersion}" PrivateAssets="All" Condition="'$(IndividualLocalAuth)' == 'True'" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="${MicrosoftEntityFrameworkCoreSqlitePackageVersion}" Condition=" '$(IndividualLocalAuth)' == 'True' AND '$(UseLocalDB)' != 'True'" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="${MicrosoftEntityFrameworkCoreSqlServerPackageVersion}" Condition=" '$(IndividualLocalAuth)' == 'True' AND '$(UseLocalDB)' == 'True'" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="${MicrosoftEntityFrameworkCoreToolsPackageVersion}" PrivateAssets="All" Condition="'$(IndividualLocalAuth)' == 'True'" />
@ -40,9 +39,4 @@
    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="${MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion}" PrivateAssets="All" Condition="'$(IndividualAuth)' == 'True'" />
  </ItemGroup>

-  <ItemGroup Condition="'$(NoTools)' != 'True'">
-    <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="${MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion}" Condition="'$(IndividualLocalAuth)' == 'True'" />
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="${MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion}" />
-  </ItemGroup>
-
 </Project>
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in
@ -33,7 +33,6 @@
    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="${MicrosoftAspNetCoreMvcPackageVersion}" />
    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="${MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion}" PrivateAssets="All" />
    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="${MicrosoftAspNetCoreStaticFilesPackageVersion}" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="${MicrosoftEntityFrameworkCoreDesignPackageVersion}" PrivateAssets="All" Condition="'$(IndividualLocalAuth)' == 'True'" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="${MicrosoftEntityFrameworkCoreSqlitePackageVersion}" Condition=" '$(IndividualLocalAuth)' == 'True' AND '$(UseLocalDB)' != 'True'" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="${MicrosoftEntityFrameworkCoreSqlServerPackageVersion}" Condition=" '$(IndividualLocalAuth)' == 'True' AND '$(UseLocalDB)' == 'True'" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="${MicrosoftEntityFrameworkCoreToolsPackageVersion}" PrivateAssets="All" Condition="'$(IndividualLocalAuth)' == 'True'" />
@ -41,9 +40,4 @@
    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="${MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion}" PrivateAssets="All" Condition="'$(IndividualAuth)' == 'True'" />
  </ItemGroup>

-  <ItemGroup Condition="'$(NoTools)' != 'True'">
-    <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="${MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion}" Condition="'$(IndividualLocalAuth)' == 'True'" />
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="${MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion}" />
-  </ItemGroup>
-
 </Project>
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/WebApi-CSharp.csproj.in
@ -22,8 +22,4 @@
    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="${MicrosoftAspNetCoreMvcPackageVersion}" />
  </ItemGroup>

-  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="${MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion}" />
-  </ItemGroup>
-
 </Project>
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/dotnetcli.host.json
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/dotnetcli.host.json
@ -52,10 +52,6 @@
    "Framework": {
      "longName": "framework"
    },
-    "NoTools": {
-      "isHidden": "true",
-      "longName": "no-tools"
-    },
    "HttpPort": {
      "isHidden": true
    },
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json
@ -336,11 +336,6 @@
      "parameters": {
        "format": "yyyy"
      }
-    },
-    "NoTools": {
-      "type": "parameter",
-      "datatype": "bool",
-      "defaultValue": "false"
    }
  },
  "primaryOutputs": [
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/dotnetcli.host.json
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/dotnetcli.host.json
@ -52,10 +52,6 @@
    "Framework": {
      "longName": "framework"
    },
-    "NoTools": {
-      "isHidden": "true",
-      "longName": "no-tools"
-    },
    "skipRestore": {
      "longName": "no-restore",
      "shortName": ""
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json
@ -332,11 +332,6 @@
        "format": "yyyy"
      }
    },
-    "NoTools": {
-      "type": "parameter",
-      "datatype": "bool",
-      "defaultValue": "false"
-    },
    "skipRestore": {
      "type": "parameter",
      "datatype": "bool",
--- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in
+++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in
@ -26,10 +26,6 @@
    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="${MicrosoftAspNetCoreStaticFilesPackageVersion}" />
  </ItemGroup>

-  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="${MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion}" />
-  </ItemGroup>
-
  <ItemGroup>
    <!-- Don't publish the SPA source files, but do show them in the project files list -->
    <Content Remove="$(SpaRoot)**" />
--- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in
+++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/React-CSharp.csproj.in
@ -23,10 +23,6 @@
    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="${MicrosoftAspNetCoreStaticFilesPackageVersion}" />
  </ItemGroup>

-  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="${MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion}" />
-  </ItemGroup>
-
  <ItemGroup>
    <!-- Don't publish the SPA source files, but do show them in the project files list -->
    <Content Remove="$(SpaRoot)**" />
--- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in
+++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in
@ -23,10 +23,6 @@
    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="${MicrosoftAspNetCoreStaticFilesPackageVersion}" />
  </ItemGroup>

-  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="${MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion}" />
-  </ItemGroup>
-
  <ItemGroup>
    <!-- Don't publish the SPA source files, but do show them in the project files list -->
    <Content Remove="$(SpaRoot)**" />
--- a/test/Templates.Test/MvcTemplateTest.cs
+++ b/test/Templates.Test/MvcTemplateTest.cs
@ -17,7 +17,7 @@ namespace Templates.Test
        [OSSkipCondition(OperatingSystems.Linux)]
        [OSSkipCondition(OperatingSystems.MacOSX)]
        [InlineData(null)]
-        [InlineData("F#", Skip= "https://github.com/aspnet/templating/issues/365")]
+        [InlineData("F#", Skip = "https://github.com/aspnet/templating/issues/365")]
        public void MvcTemplate_NoAuth_Works_NetFramework(string languageOverride)
            => MvcTemplate_NoAuthImpl("net461", languageOverride);

@ -55,17 +55,17 @@ namespace Templates.Test
            }
        }

-        [ConditionalFact]
+        [ConditionalFact(Skip = "https://github.com/aspnet/templating/issues/378")]
        [OSSkipCondition(OperatingSystems.Linux)]
        [OSSkipCondition(OperatingSystems.MacOSX)]
        public void MvcTemplate_IndividualAuth_Works_NetFramework()
            => MvcTemplate_IndividualAuthImpl("net461");

-        [Fact]
+        [Fact(Skip = "https://github.com/aspnet/templating/issues/378")]
        public void MvcTemplate_IndividualAuth_Works_NetCore()
            => MvcTemplate_IndividualAuthImpl(null);

-        [Fact]
+        [Fact(Skip = "https://github.com/aspnet/templating/issues/378")]
        public void MvcTemplate_IndividualAuth_UsingLocalDB_Works_NetCore()
            => MvcTemplate_IndividualAuthImpl(null, true);

@ -84,7 +84,6 @@ namespace Templates.Test
            }
            Assert.Contains("Microsoft.EntityFrameworkCore.Tools", projectFileContents);
            Assert.Contains("Microsoft.VisualStudio.Web.CodeGeneration.Design", projectFileContents);
-            Assert.Contains("Microsoft.EntityFrameworkCore.Tools.DotNet", projectFileContents);

            RunDotNetEfCreateMigration("mvc");

--- a/test/Templates.Test/RazorPagesTemplateTest.cs
+++ b/test/Templates.Test/RazorPagesTemplateTest.cs
@ -47,16 +47,17 @@ namespace Templates.Test
            }
        }

-        [ConditionalFact]
+        [ConditionalFact(Skip = "https://github.com/aspnet/templating/issues/378")]
        [OSSkipCondition(OperatingSystems.Linux)]
        [OSSkipCondition(OperatingSystems.MacOSX)]
        public void RazorPagesTemplate_IndividualAuth_Works_NetFramework()
            => RazorPagesTemplate_IndividualAuthImpl("net461");

-        [Fact]
+        [Fact(Skip = "https://github.com/aspnet/templating/issues/378")]
        public void RazorPagesTemplate_IndividualAuth_Works_NetCore()
            => RazorPagesTemplate_IndividualAuthImpl(null);
-        [Fact]
+
+        [Fact(Skip = "https://github.com/aspnet/templating/issues/378")]
        public void RazorPagesTemplate_IndividualAuth_UsingLocalDB_Works_NetCore()
            => RazorPagesTemplate_IndividualAuthImpl(null, true);

@ -73,7 +74,6 @@ namespace Templates.Test
            }
            Assert.Contains("Microsoft.EntityFrameworkCore.Tools", projectFileContents);
            Assert.Contains("Microsoft.VisualStudio.Web.CodeGeneration.Design", projectFileContents);
-            Assert.Contains("Microsoft.EntityFrameworkCore.Tools.DotNet", projectFileContents);

            RunDotNetEfCreateMigration("razorpages");