Scaffolding support minimal projects in .NET 6 Preview 7+

All.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29325.69
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31423.177
 MinimumVisualStudioVersion = 15.0.26730.03
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A4057ACF-27F0-4724-963B-44548B6BC4E9}"
 	ProjectSection(SolutionItems) = preProject
@@ -51,7 +51,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VS.Web.CG.Core", "src\Scaff
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VS.Web.CG", "src\Scaffolding\VS.Web.CG\VS.Web.CG.csproj", "{98D140A5-7719-4B03-B696-C5294B3CAD64}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VS.Web.CG.Contracts", "src\Scaffolding\VS.Web.CG.Contracts\VS.Web.CG.Contracts.csproj", "{315EDEE3-EB23-4019-958D-C1EEA5F1DA18}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Scaffolding.Shared", "src\Shared\Microsoft.DotNet.Scaffolding.Shared\Microsoft.DotNet.Scaffolding.Shared.csproj", "{315EDEE3-EB23-4019-958D-C1EEA5F1DA18}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VS.Web.CG.Design-anycpu", "src\Scaffolding\VS.Web.CG.Design-anycpu\VS.Web.CG.Design-anycpu.csproj", "{CB0F7112-C0BF-4249-BB41-5F2EFA760757}"
 EndProject
@@ -118,6 +118,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-msidentity", "tools\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.MSIdentity.UnitTests.Tests", "test\MSIdentityScaffolding\Microsoft.DotNet.MSIdentity.UnitTests.Tests\Microsoft.DotNet.MSIdentity.UnitTests.Tests.csproj", "{0711777C-64C2-49DC-A9CE-67BD641AA7A6}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{06E6C642-BB9B-4946-8AAA-8A8A463CBA48}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		debug_x86|Any CPU = debug_x86|Any CPU
@@ -738,7 +740,7 @@ Global
 		{AF3DE3DB-6FCD-459B-A413-70229C5AA34F} = {BDB7057B-B6C4-4DC9-9023-E6E78D25D5F0}
 		{E44DFA05-387E-44A9-8F5D-89EA9AAED43F} = {BDB7057B-B6C4-4DC9-9023-E6E78D25D5F0}
 		{98D140A5-7719-4B03-B696-C5294B3CAD64} = {BDB7057B-B6C4-4DC9-9023-E6E78D25D5F0}
-		{315EDEE3-EB23-4019-958D-C1EEA5F1DA18} = {BDB7057B-B6C4-4DC9-9023-E6E78D25D5F0}
+		{315EDEE3-EB23-4019-958D-C1EEA5F1DA18} = {06E6C642-BB9B-4946-8AAA-8A8A463CBA48}
 		{CB0F7112-C0BF-4249-BB41-5F2EFA760757} = {BDB7057B-B6C4-4DC9-9023-E6E78D25D5F0}
 		{B2FB25DC-DD8D-4A0E-AF9F-CCBC6ED75ED0} = {BDB7057B-B6C4-4DC9-9023-E6E78D25D5F0}
 		{867AB4D3-0EE0-4A3E-B0F0-78E2B612495A} = {BDB7057B-B6C4-4DC9-9023-E6E78D25D5F0}
@@ -768,6 +770,7 @@ Global
 		{6B863A66-CFFC-42B4-9316-13B168CB6C62} = {49D385E7-A045-4C54-868F-CEA8F67EDBA8}
 		{1DB98E3A-0749-4ACE-9EF2-EF6BC2C6648B} = {4B56CCB9-2693-492A-A0C5-B4D15DDF00A4}
 		{0711777C-64C2-49DC-A9CE-67BD641AA7A6} = {49D385E7-A045-4C54-868F-CEA8F67EDBA8}
+		{06E6C642-BB9B-4946-8AAA-8A8A463CBA48} = {A4057ACF-27F0-4724-963B-44548B6BC4E9}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {26BCDDB3-5505-4903-9D87-C942ED0D03E6}

Directory.Build.props

@@ -10,6 +10,7 @@
     <DebugType>pdbonly</DebugType>
     <DebugSymbol>true</DebugSymbol>
     <StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
+    <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
   </PropertyGroup>
 
   <PropertyGroup>

MSIdentityScaffolding.slnf

@@ -3,6 +3,7 @@
     "path": "All.sln",
     "projects": [
       "src\\MSIdentityScaffolding\\Microsoft.DotNet.MSIdentity\\Microsoft.DotNet.MSIdentity.csproj",
+      "src\\Shared\\Microsoft.DotNet.Scaffolding.Shared\\Microsoft.DotNet.Scaffolding.Shared.csproj",
       "test\\MSIdentityScaffolding\\Microsoft.DotNet.MSIdentity.Tests\\Microsoft.DotNet.MSIdentity.Tests.csproj",
       "test\\MSIdentityScaffolding\\Microsoft.DotNet.MSIdentity.UnitTests.Tests\\Microsoft.DotNet.MSIdentity.UnitTests.Tests.csproj",
       "tools\\dotnet-msidentity\\dotnet-msidentity.csproj"

Scaffolding.slnf

@@ -5,7 +5,7 @@
         "tools\\dotnet-aspnet-codegenerator\\dotnet-aspnet-codegenerator.csproj",
         "tools\\dotnet-scaffold\\dotnet-scaffold.csproj",
         "src\\Scaffolding\\VS.Web.CG\\VS.Web.CG.csproj",
-        "src\\Scaffolding\\VS.Web.CG.Contracts\\VS.Web.CG.Contracts.csproj",
+        "src\\Shared\\Microsoft.DotNet.Scaffolding.Shared\\Microsoft.DotNet.Scaffolding.Shared.csproj",
         "src\\Scaffolding\\VS.Web.CG.Core\\VS.Web.CG.Core.csproj",
         "src\\Scaffolding\\VS.Web.CG.Design\\VS.Web.CG.Design.csproj",
         "src\\Scaffolding\\VS.Web.CG.Design-anycpu\\VS.Web.CG.Design-anycpu.csproj",

eng/Signing.props

@@ -7,6 +7,8 @@
 
   <ItemGroup>
       <FileSignInfo Include = "Newtonsoft.Json.dll" CertificateName="3PartySHA2"/>
+      <FileSignInfo Include = "MessagePack.dll" CertificateName="3PartySHA2"/>
+      <FileSignInfo Include = "MessagePack.Annotations.dll" CertificateName="3PartySHA2"/>
   </ItemGroup>
 
   <ItemGroup Label="Code sign exclusions">

eng/Versions.props

@@ -15,7 +15,7 @@
   <PropertyGroup>
     <VersionPrefix>6.0.0</VersionPrefix>
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
-    <PreReleaseVersionIteration>6</PreReleaseVersionIteration>
+    <PreReleaseVersionIteration>7</PreReleaseVersionIteration>
     <IsServicingBuild Condition="'$(PreReleaseVersionLabel)' == 'servicing'">true</IsServicingBuild>
     <!--
         When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
@@ -25,29 +25,28 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Microsoft.AspNetCore.Razor.Language -->
-    <MicrosoftAspNetCoreRazorLanguagePackageVersion>6.0.0-preview.6.21355.2</MicrosoftAspNetCoreRazorLanguagePackageVersion>
+    <MicrosoftAspNetCoreRazorLanguagePackageVersion>6.0.0-preview.7.21377.13</MicrosoftAspNetCoreRazorLanguagePackageVersion>
     <!-- Microsoft.AspNetCore.Razor.Runtime -->
     <MicrosoftAspNetCoreRazorRuntimePackageVersion>2.2.0</MicrosoftAspNetCoreRazorRuntimePackageVersion>
     <!-- Microsoft.Build-->
     <MicrosoftBuildPackageVersion>16.8.0 </MicrosoftBuildPackageVersion>
     <!-- Microsoft.Build.Utilities-->
     <MicrosoftBuildUtilitiesCorePackageVersion>16.8.0 </MicrosoftBuildUtilitiesCorePackageVersion>
     <!-- Microsoft.CodeAnalysis.CSharp -->
-    <MicrosoftCodeAnalysisCSharpPackageVersion>3.9.0</MicrosoftCodeAnalysisCSharpPackageVersion>
+    <MicrosoftCodeAnalysisCSharpPackageVersion>4.0.0-3.21369.3</MicrosoftCodeAnalysisCSharpPackageVersion>
     <!-- Microsoft.CodeAnalysis.Razor -->
-    <MicrosoftCodeAnalysisRazorPackageVersion>6.0.0-preview.6.21355.2</MicrosoftCodeAnalysisRazorPackageVersion>
+    <MicrosoftCodeAnalysisRazorPackageVersion>6.0.0-preview.7.21377.13</MicrosoftCodeAnalysisRazorPackageVersion>
     <!-- Microsoft.CodeAnalysis.CSharp.Workspaces -->
-    <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>3.9.0</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
+    <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.0.0-3.21369.3</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
     <!-- Microsoft.Extensions.CommandLineUtils.Sources -->
     <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>6.0.0-preview.1.21076.2</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
     <!-- Microsoft.EntityFrameworkCore.Design -->
-    <MicrosoftEntityFrameworkCoreDesignPackageVersion>6.0.0-preview.6.21352.1</MicrosoftEntityFrameworkCoreDesignPackageVersion>
+    <MicrosoftEntityFrameworkCoreDesignPackageVersion>6.0.0-preview.7.21377.5</MicrosoftEntityFrameworkCoreDesignPackageVersion>
     <!-- Microsoft.Extensions.DependencyInjection -->
-    <MicrosoftExtensionsDependencyInjectionPackageVersion>6.0.0-preview.6.21352.12</MicrosoftExtensionsDependencyInjectionPackageVersion>
+    <MicrosoftExtensionsDependencyInjectionPackageVersion>6.0.0-preview.7.21377.12</MicrosoftExtensionsDependencyInjectionPackageVersion>
     <!-- Microsoft.Extensions.FileProviders.Physical -->
-    <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>6.0.0-preview.6.21352.12</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
-    <NewtonsoftJsonPackageVersion>11.0.2</NewtonsoftJsonPackageVersion>
-    <VisualStudio_NewtonsoftJsonPackageVersion>9.0.1</VisualStudio_NewtonsoftJsonPackageVersion>
+    <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>6.0.0-preview.7.21377.12</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
+    <NewtonsoftJsonPackageVersion>13.0.1</NewtonsoftJsonPackageVersion>
     <SystemCollectionsImmutablePackageVersion>5.0.0</SystemCollectionsImmutablePackageVersion>
     <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
     <!-- Everything below here are Packages only used by test projects -->
@@ -120,12 +119,12 @@
     <XunitRunnerVisualStudioPackageVersion>2.4.1</XunitRunnerVisualStudioPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
-    <SystemCollectionsImmutableVersion>6.0.0-preview.6.21352.12</SystemCollectionsImmutableVersion>
+    <SystemCollectionsImmutableVersion>6.0.0-preview.7.21377.12</SystemCollectionsImmutableVersion>
   </PropertyGroup>
   <!-- Package versions for MSIdentity projects-->
   <PropertyGroup>
     <AzureIdentityVersion>1.3.0</AzureIdentityVersion>
-    <CodeAnalysisVersion>3.9.0</CodeAnalysisVersion>
+    <CodeAnalysisVersion>4.0.0-3.21369.3</CodeAnalysisVersion>
     <MicrosoftExtensionsConfigurationVersion>3.1.9</MicrosoftExtensionsConfigurationVersion>
     <MicrosoftExtensionsConfigurationBinderVersion>3.1.9</MicrosoftExtensionsConfigurationBinderVersion>
     <MicrosoftExtensionsConfigurationCommandLineVersion>3.1.9</MicrosoftExtensionsConfigurationCommandLineVersion>

global.json

@@ -1,8 +1,12 @@
 {
   "tools": {
-    "dotnet": "6.0.100-preview.6.21355.2"
+    "dotnet": "6.0.100-preview.7.21369.19"
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21379.2"
+  },
+  "sdk": {
+    "version": "6.0.100-preview.7.21369.19",
+    "allowPrerelease": true
   }
 }

scripts/install-aspnet-codegenerator.cmd

@@ -1,23 +1,24 @@
 set VERSION=6.0.0-dev
-set DEFAULT_NUPKG_PATH=%userprofile%/.nuget/packages
+set DEFAULT_NUPKG_PATH=%userprofile%\.nuget\packages
 set SRC_DIR=%cd%
 set NUPKG=artifacts/packages/Debug/Shipping/
 call taskkill /f /im dotnet.exe
 call rd /Q /S artifacts
 call dotnet build Scaffolding.slnf
-call dotnet pack Scaffolding.slnf 
+call dotnet pack Scaffolding.slnf
 call dotnet tool uninstall -g dotnet-aspnet-codegenerator 
 
 call cd %DEFAULT_NUPKG_PATH%
+call C:
 call rd /Q /S microsoft.visualstudio.web.codegeneration
-call rd /Q /S microsoft.visualstudio.web.codegeneration.contracts
+call rd /Q /S microsoft.dotnet.scaffolding.shared
 call rd /Q /S microsoft.visualstudio.web.codegeneration.core
 call rd /Q /S microsoft.visualstudio.web.codegeneration.design
 call rd /Q /S microsoft.visualstudio.web.codegeneration.entityframeworkcore
 call rd /Q /S microsoft.visualstudio.web.codegeneration.templating
 call rd /Q /S microsoft.visualstudio.web.codegeneration.utils
 call rd /Q /S microsoft.visualstudio.web.codegenerators.mvc
-
+call D:
 call cd  %SRC_DIR%/%NUPKG% 
 call dotnet tool install -g dotnet-aspnet-codegenerator --add-source %SRC_DIR%\%NUPKG% --version %VERSION%
 call cd %SRC_DIR%

scripts/install-aspnet-codegenerator.sh

@@ -13,7 +13,7 @@ rm -rf artifacts
 dotnet tool uninstall -g dotnet-aspnet-codegenerator 
 cd $DEFAULT_NUPKG_PATH
 rm -rf microsoft.visualstudio.web.codegeneration
-rm -rf microsoft.visualstudio.web.codegeneration.contracts
+rm -rf Microsoft.DotNet.Scaffolding.Shared
 rm -rf microsoft.visualstudio.web.codegeneration.core
 rm -rf microsoft.visualstudio.web.codegeneration.design
 rm -rf microsoft.visualstudio.web.codegeneration.entityframeworkcore

scripts/install-scaffold.cmd

@@ -10,7 +10,7 @@ call dotnet tool uninstall -g Microsoft.dotnet-scaffold
 
 call cd %DEFAULT_NUPKG_PATH%
 call rd /Q /S microsoft.visualstudio.web.codegeneration
-call rd /Q /S microsoft.visualstudio.web.codegeneration.contracts
+call rd /Q /S Microsoft.DotNet.Scaffolding.Shared
 call rd /Q /S microsoft.visualstudio.web.codegeneration.core
 call rd /Q /S microsoft.visualstudio.web.codegeneration.design
 call rd /Q /S microsoft.visualstudio.web.codegeneration.entityframeworkcore

scripts/install-scaffold.sh

@@ -13,7 +13,7 @@ rm -rf artifacts
 dotnet tool uninstall -g Microsoft.dotnet-scaffold
 cd $DEFAULT_NUPKG_PATH
 rm -rf microsoft.visualstudio.web.codegeneration
-rm -rf microsoft.visualstudio.web.codegeneration.contracts
+rm -rf Microsoft.DotNet.Scaffolding.Shared
 rm -rf microsoft.visualstudio.web.codegeneration.core
 rm -rf microsoft.visualstudio.web.codegeneration.design
 rm -rf microsoft.visualstudio.web.codegeneration.entityframeworkcore

src/MSIdentityScaffolding/Microsoft.DotNet.MSIdentity/CodeReaderWriter/ProjectModifier.cs

@@ -12,6 +12,7 @@
 using Microsoft.DotNet.MSIdentity.AuthenticationParameters;
 using Microsoft.DotNet.MSIdentity.Properties;
 using Microsoft.DotNet.MSIdentity.Tool;
+using Microsoft.DotNet.Scaffolding.Shared.Project;
 
 namespace Microsoft.DotNet.MSIdentity.CodeReaderWriter
 {
@@ -50,12 +51,12 @@ public async Task AddAuthCodeAsync()
                     foreach (var file in codeModifierConfig.Files)
                     {
                         var fileName = file.FileName;
-                        string className = GetClassName(fileName);
+                        string className = ProjectModifierHelper.GetClassName(fileName);
 
                         //if the file we are modifying is Startup.cs, use Program.cs to find the correct file to edit.
                         if (!string.IsNullOrEmpty(file.FileName) && file.FileName.Equals("Startup.cs", StringComparison.OrdinalIgnoreCase))
                         {
-                            fileName = await GetStarupClass(project);
+                            fileName = await ProjectModifierHelper.GetStartupClass(_toolOptions.ProjectPath, project);
                         }
 
                         if (!string.IsNullOrEmpty(fileName))
@@ -150,72 +151,5 @@ node is ClassDeclarationSyntax cds &&
             string jsonText = Encoding.UTF8.GetString(fileContent);
             return JsonSerializer.Deserialize<CodeModifierConfig>(jsonText);
         }
-
-        internal string GetClassName(string? className)
-        {
-            string formattedClassName = string.Empty;
-            if (!string.IsNullOrEmpty(className))
-            {
-                string[] blocks = className.Split(".cs");
-                if (blocks.Length > 1)
-                {
-                    return blocks[0];
-                }
-            }
-            return formattedClassName;
-        }
-
-        //Get Startup class name from CreateHostBuilder in Program.cs. If Program.cs is not being used, method
-        //will bail out.
-        internal async Task<string?> GetStarupClass(CodeAnalysis.Project project)
-        {
-            var programFilePath = Directory.EnumerateFiles(_toolOptions.ProjectPath, "Program.cs").FirstOrDefault();
-            if (!string.IsNullOrEmpty(programFilePath))
-            {
-                var programDoc = project.Documents.Where(d => d.Name.Equals(programFilePath)).FirstOrDefault();
-                var startupClassName = await GetStartupClassName(programDoc);
-                string className = startupClassName;
-                var startupFilePath = string.Empty;
-                if (!string.IsNullOrEmpty(startupClassName))
-                {
-                    return string.Concat(startupClassName, ".cs");
-                }
-            }
-            return string.Empty;
-        }
-
-        internal async Task<string> GetStartupClassName(Document? programDoc)
-        {
-            if (programDoc != null && await programDoc.GetSyntaxRootAsync() is CompilationUnitSyntax root)
-            {
-                var namespaceNode = root.Members.OfType<NamespaceDeclarationSyntax>()?.FirstOrDefault();
-                var programClassNode = namespaceNode?.DescendantNodes()
-                    .Where(node =>
-                        node is ClassDeclarationSyntax cds &&
-                        cds.Identifier
-                           .ValueText.Contains("Program"))
-                    .First();
-
-                var nodes = programClassNode?.DescendantNodes();
-                var useStartupNode = programClassNode?.DescendantNodes()
-                    .Where(node =>
-                        node is MemberAccessExpressionSyntax maes &&
-                        maes.ToString()
-                            .Contains("webBuilder.UseStartup"))
-                    .First();
-
-                var useStartupTxt = useStartupNode?.ToString();
-                if (!string.IsNullOrEmpty(useStartupTxt))
-                {
-                    int startIndex = useStartupTxt.IndexOf("<");
-                    int endIndex = useStartupTxt.IndexOf(">");
-                    if (startIndex > -1 && endIndex > startIndex)
-                    {
-                        return useStartupTxt.Substring(startIndex + 1, endIndex - startIndex - 1);
-                    }
-                }
-            }
-            return string.Empty;
-        }
     }
 }

src/MSIdentityScaffolding/Microsoft.DotNet.MSIdentity/Microsoft.DotNet.MSIdentity.csproj

@@ -22,8 +22,8 @@
     <DelaySign>false</DelaySign>
   </PropertyGroup>
 
-   <Import Project="$(RepoRoot)eng\Versions.MSIdentity.props" />
-
+  <Import Project="$(RepoRoot)eng\Versions.MSIdentity.props" />
+  
   <ItemGroup>
     <PackageReference Include="Azure.Identity" Version="$(AzureIdentityVersion)" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsConfigurationVersion)" />
@@ -50,11 +50,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="$(RepoRoot)src\Scaffolding\Shared\Cli.Utils\*.cs">
-      <Link>Shared\%(RecursiveDir)%(FileName).cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
+    <ProjectReference Include="$(RepoRoot)\src\Shared\Microsoft.DotNet.Scaffolding.Shared\Microsoft.DotNet.Scaffolding.Shared.csproj" />
     <Folder Include="Resources\" />
   </ItemGroup>
 

src/MSIdentityScaffolding/Microsoft.DotNet.MSIdentity/Tool/AppProvisioningTool.cs

@@ -43,7 +43,6 @@ public AppProvisioningTool(string commandName, ProvisioningToolOptions provision
 
         public async Task<ApplicationParameters?> Run()
         {
-            //Debugger.Launch();
             //get csproj file path
             if (string.IsNullOrEmpty(ProvisioningToolOptions.ProjectFilePath))
             {

src/Scaffolding/VS.Web.CG.Core/DefaultCodeGeneratorAssemblyProvider.cs

@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using Microsoft.VisualStudio.Web.CodeGeneration.Contracts.ProjectModel;
+using Microsoft.DotNet.Scaffolding.Shared.ProjectModel;
 using Microsoft.VisualStudio.Web.CodeGeneration.DotNet;
 using Microsoft.VisualStudio.Web.CodeGeneration.Utils;
 

src/Scaffolding/VS.Web.CG.Core/ExceptionExtensions.cs

@@ -1,7 +1,8 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.DotNet.Scaffolding.Shared;
 
 namespace Microsoft.VisualStudio.Web.CodeGeneration
 {