dotnet-aspnet-codegenerator Identity scenario for minimal hosting app…

…lications. (#1628) * initial update * Appropriate files being added and edited for the minimal hosting identity scenario * added new assembly for Shared tests, * fixed InsertBefore for GlobalStatements * minor fixes for DocumentBuilder.cs * added check to remove IdentityHostingStartup file. * changed the default global imports file path name.
dotnet · Sep 3, 2021 · 0a40930 · 0a40930
1 parent 2423355
commit 0a40930
Show file tree

Hide file tree

Showing 77 changed files with 692 additions and 255 deletions.
diff --git a/All.sln b/All.sln
@@ -120,6 +120,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.MSIdentity
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{06E6C642-BB9B-4946-8AAA-8A8A463CBA48}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{CA1DAC77-5D18-4986-A4BB-F6171DEE5A52}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.Scaffolding.Shared.Tests", "test\Shared\Microsoft.DotNet.Scaffolding.Shared.Tests\Microsoft.DotNet.Scaffolding.Shared.Tests.csproj", "{A4C14F41-7EBC-40C2-93DF-B131B713AB8D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		debug_x86|Any CPU = debug_x86|Any CPU
@@ -727,6 +731,24 @@ Global
 		{0711777C-64C2-49DC-A9CE-67BD641AA7A6}.Release|x64.Build.0 = Release|Any CPU
 		{0711777C-64C2-49DC-A9CE-67BD641AA7A6}.Release|x86.ActiveCfg = Release|Any CPU
 		{0711777C-64C2-49DC-A9CE-67BD641AA7A6}.Release|x86.Build.0 = Release|Any CPU
+		{A4C14F41-7EBC-40C2-93DF-B131B713AB8D}.debug_x86|Any CPU.ActiveCfg = Debug|Any CPU
+		{A4C14F41-7EBC-40C2-93DF-B131B713AB8D}.debug_x86|Any CPU.Build.0 = Debug|Any CPU
+		{A4C14F41-7EBC-40C2-93DF-B131B713AB8D}.debug_x86|x64.ActiveCfg = Debug|Any CPU
+		{A4C14F41-7EBC-40C2-93DF-B131B713AB8D}.debug_x86|x64.Build.0 = Debug|Any CPU
+		{A4C14F41-7EBC-40C2-93DF-B131B713AB8D}.debug_x86|x86.ActiveCfg = Debug|Any CPU
+		{A4C14F41-7EBC-40C2-93DF-B131B713AB8D}.debug_x86|x86.Build.0 = Debug|Any CPU
+		{A4C14F41-7EBC-40C2-93DF-B131B713AB8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A4C14F41-7EBC-40C2-93DF-B131B713AB8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A4C14F41-7EBC-40C2-93DF-B131B713AB8D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A4C14F41-7EBC-40C2-93DF-B131B713AB8D}.Debug|x64.Build.0 = Debug|Any CPU
+		{A4C14F41-7EBC-40C2-93DF-B131B713AB8D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A4C14F41-7EBC-40C2-93DF-B131B713AB8D}.Debug|x86.Build.0 = Debug|Any CPU
+		{A4C14F41-7EBC-40C2-93DF-B131B713AB8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A4C14F41-7EBC-40C2-93DF-B131B713AB8D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A4C14F41-7EBC-40C2-93DF-B131B713AB8D}.Release|x64.ActiveCfg = Release|Any CPU
+		{A4C14F41-7EBC-40C2-93DF-B131B713AB8D}.Release|x64.Build.0 = Release|Any CPU
+		{A4C14F41-7EBC-40C2-93DF-B131B713AB8D}.Release|x86.ActiveCfg = Release|Any CPU
+		{A4C14F41-7EBC-40C2-93DF-B131B713AB8D}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -771,6 +793,8 @@ Global
 		{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}
+		{CA1DAC77-5D18-4986-A4BB-F6171DEE5A52} = {81B64EBF-613D-43AE-82DA-B375FB751921}
+		{A4C14F41-7EBC-40C2-93DF-B131B713AB8D} = {CA1DAC77-5D18-4986-A4BB-F6171DEE5A52}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {26BCDDB3-5505-4903-9D87-C942ED0D03E6}

diff --git a/MSIdentityScaffolding.slnf b/MSIdentityScaffolding.slnf
@@ -6,7 +6,8 @@
       "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"
+      "test\\Shared\\Microsoft.DotNet.Scaffolding.Shared.Tests\\Microsoft.DotNet.Scaffolding.Shared.Tests.csproj",
+      "tools\\dotnet-msidentity\\dotnet-msidentity.csproj",
     ]
   }
 }
diff --git a/Scaffolding.slnf b/Scaffolding.slnf
@@ -24,7 +24,8 @@
         "test\\Scaffolding\\VS.Web.CG.Sources.Test\\VS.Web.CG.Sources.Tests.csproj",
         "test\\Scaffolding\\VS.Web.CG.Templating.Test\\VS.Web.CG.Templating.Tests.csproj",
         "test\\Scaffolding\\VS.Web.CG.Tools.Test\\VS.Web.CG.Tools.Tests.csproj",
-        "test\\Scaffolding\\E2E_Test\\E2E_Test.Tests.csproj"
+        "test\\Scaffolding\\E2E_Test\\E2E_Test.Tests.csproj",
+        "test\\Shared\\Microsoft.DotNet.Scaffolding.Shared.Tests\\Microsoft.DotNet.Scaffolding.Shared.Tests.csproj"
     ]
   }
 }
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -25,88 +25,83 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Microsoft.AspNetCore.Razor.Language -->
-    <MicrosoftAspNetCoreRazorLanguagePackageVersion>6.0.0-preview.7.21378.6</MicrosoftAspNetCoreRazorLanguagePackageVersion>
-    <!-- Microsoft.AspNetCore.Razor.Runtime -->
-    <MicrosoftAspNetCoreRazorRuntimePackageVersion>2.2.0</MicrosoftAspNetCoreRazorRuntimePackageVersion>
+    <MicrosoftAspNetCoreRazorLanguagePackageVersion>6.0.0-rc.1.21423.14</MicrosoftAspNetCoreRazorLanguagePackageVersion>
     <!-- Microsoft.Build-->
-    <MicrosoftBuildPackageVersion>16.8.0 </MicrosoftBuildPackageVersion>
+    <MicrosoftBuildPackageVersion>16.9.0 </MicrosoftBuildPackageVersion>
     <!-- Microsoft.Build.Utilities-->
-    <MicrosoftBuildUtilitiesCorePackageVersion>16.8.0 </MicrosoftBuildUtilitiesCorePackageVersion>
+    <MicrosoftBuildUtilitiesCorePackageVersion>16.9.0 </MicrosoftBuildUtilitiesCorePackageVersion>
     <!-- Microsoft.CodeAnalysis.CSharp -->
     <MicrosoftCodeAnalysisCSharpPackageVersion>4.0.0-3.final</MicrosoftCodeAnalysisCSharpPackageVersion>
     <!-- Microsoft.CodeAnalysis.Razor -->
-    <MicrosoftCodeAnalysisRazorPackageVersion>6.0.0-preview.7.21378.6</MicrosoftCodeAnalysisRazorPackageVersion>
+    <MicrosoftCodeAnalysisRazorPackageVersion>6.0.0-rc.1.21423.14</MicrosoftCodeAnalysisRazorPackageVersion>
     <!-- Microsoft.CodeAnalysis.CSharp.Workspaces -->
     <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.0.0-3.final</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
     <!-- Microsoft.Extensions.CommandLineUtils.Sources -->
-    <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>6.0.0-preview.1.21076.2</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
+    <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>6.0.0-preview.3.21166.3</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
     <!-- Microsoft.EntityFrameworkCore.Design -->
-    <MicrosoftEntityFrameworkCoreDesignPackageVersion>6.0.0-preview.7.21378.4</MicrosoftEntityFrameworkCoreDesignPackageVersion>
+    <MicrosoftEntityFrameworkCoreDesignPackageVersion>6.0.0-rc.1.21423.18</MicrosoftEntityFrameworkCoreDesignPackageVersion>
     <!-- Microsoft.Extensions.DependencyInjection -->
-    <MicrosoftExtensionsDependencyInjectionPackageVersion>6.0.0-preview.7.21377.19</MicrosoftExtensionsDependencyInjectionPackageVersion>
+    <MicrosoftExtensionsDependencyInjectionPackageVersion>6.0.0-rc.1.21423.9</MicrosoftExtensionsDependencyInjectionPackageVersion>
     <!-- Microsoft.Extensions.FileProviders.Physical -->
-    <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>6.0.0-preview.7.21377.19</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
+    <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>6.0.0-rc.1.21423.9</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
     <NewtonsoftJsonPackageVersion>13.0.1</NewtonsoftJsonPackageVersion>
-    <SystemCollectionsImmutablePackageVersion>5.0.0</SystemCollectionsImmutablePackageVersion>
     <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
     <!-- Everything below here are Packages only used by test projects -->
-    <!-- Microsoft.AspNetCore.Hosting -->
-    <MicrosoftAspNetCoreHostingPackageVersion>3.0.0-preview4-19123-01</MicrosoftAspNetCoreHostingPackageVersion>
     <!-- Microsoft.AspNetCore.Server.Kestrel -->
-    <MicrosoftAspNetCoreServerKestrelPackageVersion>3.0.0-preview4-19123-01</MicrosoftAspNetCoreServerKestrelPackageVersion>
+    <MicrosoftAspNetCoreServerKestrelPackageVersion>6.0.0-rc.1.21423.14</MicrosoftAspNetCoreServerKestrelPackageVersion>
     <!-- Microsoft.AspNetCore.Server.IISIntegration -->
-    <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>3.0.0-preview4-19123-01</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
+    <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>6.0.0-rc.1.21423.14</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
     <!-- Microsoft.ApplicationInsights.AspNetCore -->
-    <MicrosoftApplicationInsightsAspNetCorePackageVersion>2.6.1</MicrosoftApplicationInsightsAspNetCorePackageVersion>
+    <MicrosoftApplicationInsightsAspNetCorePackageVersion>2.18.0</MicrosoftApplicationInsightsAspNetCorePackageVersion>
     <!-- Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore -->
-    <MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>3.0.0-preview5-19227-01</MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>
+    <MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>6.0.0-rc.1.21423.14</MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>
     <!-- Microsoft.AspNetCore.Identity.EntityFrameworkCore -->
-    <MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>5.0.0</MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>
+    <MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>6.0.0-rc.1.21423.14</MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>
     <!-- Microsoft.AspNetCore.Identity.UI -->
-    <MicrosoftAspNetCoreIdentityUIPackageVersion>5.0.0</MicrosoftAspNetCoreIdentityUIPackageVersion>
+    <MicrosoftAspNetCoreIdentityUIPackageVersion>6.0.0-rc.1.21423.14</MicrosoftAspNetCoreIdentityUIPackageVersion>
     <!-- Microsoft.Extensions.Identity.Stores -->
-    <MicrosoftExtensionsIdentityStoresPackageVersion>5.0.0</MicrosoftExtensionsIdentityStoresPackageVersion>
+    <MicrosoftExtensionsIdentityStoresPackageVersion>6.0.0-rc.1.21423.14</MicrosoftExtensionsIdentityStoresPackageVersion>
     <!-- Microsoft.AspNetCore -->
     <!-- this is from aspnetcore-dev (test project only) -->
-    <MicrosoftAspNetCorePackageVersion>3.0.0-alpha1-10584</MicrosoftAspNetCorePackageVersion>
-    <MicrosoftBuildRuntimePackageVersion>16.6.0</MicrosoftBuildRuntimePackageVersion>
+    <MicrosoftAspNetCorePackageVersion>6.0.0-rc.1.21423.14</MicrosoftAspNetCorePackageVersion>
+    <MicrosoftBuildRuntimePackageVersion>16.9.0</MicrosoftBuildRuntimePackageVersion>
     <!-- Microsoft.AspNetCore.Mvc -->
     <!-- this is from aspnetcore-dev (test only) -->
-    <MicrosoftAspNetCoreMvcPackageVersion>3.0.0-alpha1-10584</MicrosoftAspNetCoreMvcPackageVersion>
+    <MicrosoftAspNetCoreMvcPackageVersion>6.0.0-rc.1.21423.14</MicrosoftAspNetCoreMvcPackageVersion>
     <!-- Microsoft.AspNetCore.Authentication.Cookies -->
     <!-- this is from aspnetcore-dev (test only) -->
-    <MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>3.0.0-alpha1-10584</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>
+    <MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>6.0.0-rc.1.21423.14</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>
     <!-- Microsoft.AspNetCore.StaticFiles -->
     <!-- this is from aspnetcore-dev (test only) -->
-    <MicrosoftAspNetCoreStaticFilesPackageVersion>3.0.0-alpha1-10584</MicrosoftAspNetCoreStaticFilesPackageVersion>
+    <MicrosoftAspNetCoreStaticFilesPackageVersion>6.0.0-rc.1.21423.14</MicrosoftAspNetCoreStaticFilesPackageVersion>
     <!-- Microsoft.DotNet.ProjectModel -->
     <MicrosoftDotNetProjectModelPackageVersion>1.0.0-rc3-003121</MicrosoftDotNetProjectModelPackageVersion>
     <!-- Microsoft.EntityFrameworkCore -->
-    <MicrosoftEntityFrameworkCorePackageVersion>6.0.0-preview.6.21352.1</MicrosoftEntityFrameworkCorePackageVersion>
+    <MicrosoftEntityFrameworkCorePackageVersion>6.0.0-rc.1.21423.18</MicrosoftEntityFrameworkCorePackageVersion>
     <!-- Microsoft.EntityFramework.Design for test-->
-    <MicrosoftEntityFrameworkCoreDesignTestPackageVersion>6.0.0-preview.6.21352.1</MicrosoftEntityFrameworkCoreDesignTestPackageVersion>
+    <MicrosoftEntityFrameworkCoreDesignTestPackageVersion>6.0.0-rc.1.21423.18</MicrosoftEntityFrameworkCoreDesignTestPackageVersion>
     <!-- Microsoft.EntityFrameworkCore.SqlServer -->
-    <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>6.0.0-preview.6.21352.1</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
+    <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>6.0.0-rc.1.21423.18</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
     <!-- Microsoft.Extensions.Configuration.Abstractions -->
-    <MicrosoftExtensionsConfigurationAbstractionsPackageVersion>6.0.0-preview.6.21352.12</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
+    <MicrosoftExtensionsConfigurationAbstractionsPackageVersion>6.0.0-rc.1.21423.9</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
     <!-- Microsoft.Extensions.Configuration.EnvironmentVariables -->
-    <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>6.0.0-preview.6.21352.12</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
+    <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>6.0.0-rc.1.21423.9</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
     <!-- Microsoft.Extensions.Configuration.Json -->
-    <MicrosoftExtensionsConfigurationJsonPackageVersion>5.0.0</MicrosoftExtensionsConfigurationJsonPackageVersion>
+    <MicrosoftExtensionsConfigurationJsonPackageVersion>6.0.0-rc.1.21423.9</MicrosoftExtensionsConfigurationJsonPackageVersion>
     <!-- Microsoft.Extensions.Configuration.UserSecrets -->
-    <MicrosoftExtensionsConfigurationUserSecretsPackageVersion>5.0.0</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
+    <MicrosoftExtensionsConfigurationUserSecretsPackageVersion>6.0.0-rc.1.21423.9</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
     <!--Microsoft.Extensions.DependencyMoel -->
-    <MicrosoftExtensionsDependencyModelPackageVersion>5.0.0</MicrosoftExtensionsDependencyModelPackageVersion>
+    <MicrosoftExtensionsDependencyModelPackageVersion>6.0.0-rc.1.21423.9</MicrosoftExtensionsDependencyModelPackageVersion>
     <!-- Microsoft.Extensions.FileProviders.Embedded -->
-    <MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>5.0.0</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
+    <MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>6.0.0-rc.1.21423.14</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
     <!-- Microsoft.Extensions.Logging.Console -->
-    <MicrosoftExtensionsLoggingConsolePackageVersion>5.0.0</MicrosoftExtensionsLoggingConsolePackageVersion>
+    <MicrosoftExtensionsLoggingConsolePackageVersion>6.0.0-rc.1.21423.9</MicrosoftExtensionsLoggingConsolePackageVersion>
     <!-- Microsoft.Extensions.Logging.Debug -->
-    <MicrosoftExtensionsLoggingDebugPackageVersion>5.0.0</MicrosoftExtensionsLoggingDebugPackageVersion>
+    <MicrosoftExtensionsLoggingDebugPackageVersion>6.0.0-rc.1.21423.9</MicrosoftExtensionsLoggingDebugPackageVersion>
     <!-- Microsoft.Extensions.Logging -->
-    <MicrosoftExtensionsLoggingPackageVersion>5.0.0</MicrosoftExtensionsLoggingPackageVersion>
+    <MicrosoftExtensionsLoggingPackageVersion>6.0.0-rc.1.21423.9</MicrosoftExtensionsLoggingPackageVersion>
     <!-- Microsoft.Extensions.Options.ConfigurationExtensions -->
-    <MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>5.0.0</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
+    <MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>6.0.0-rc.1.21423.9</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
     <!-- Microsoft.NET.Sdk.Razor -->
     <MicrosoftNETSdkRazorPackageVersion>5.0.0-preview.6.20312.15</MicrosoftNETSdkRazorPackageVersion>
     <!-- Microsoft.NET.Test.Sdk-->

diff --git a/global.json b/global.json
@@ -1,12 +1,12 @@
 {
   "tools": {
-    "dotnet": "6.0.100-rc.1.21379.2"
+    "dotnet": "6.0.100-rc.1.21426.8"
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21430.1"
   },
   "sdk": {
-    "version": "6.0.100-rc.1.21379.2",
+    "version": "6.0.100-rc.1.21426.8",
     "allowPrerelease": true
   }
 }
diff --git a/...MSIdentityScaffolding/Microsoft.DotNet.MSIdentity/CodeReaderWriter/CodeChange/CodeFile.cs b/...MSIdentityScaffolding/Microsoft.DotNet.MSIdentity/CodeReaderWriter/CodeChange/CodeFile.cs
diff --git a/...dentityScaffolding/Microsoft.DotNet.MSIdentity/CodeReaderWriter/CodeChange/CodeSnippet.cs b/...dentityScaffolding/Microsoft.DotNet.MSIdentity/CodeReaderWriter/CodeChange/CodeSnippet.cs
diff --git a/src/MSIdentityScaffolding/Microsoft.DotNet.MSIdentity/CodeReaderWriter/CodeChange/Method.cs b/src/MSIdentityScaffolding/Microsoft.DotNet.MSIdentity/CodeReaderWriter/CodeChange/Method.cs
diff --git a/src/MSIdentityScaffolding/Microsoft.DotNet.MSIdentity/CodeReaderWriter/CodeModifierConfig.cs b/src/MSIdentityScaffolding/Microsoft.DotNet.MSIdentity/CodeReaderWriter/CodeModifierConfig.cs
diff --git a/src/MSIdentityScaffolding/Microsoft.DotNet.MSIdentity/CodeReaderWriter/CodeWriter.cs b/src/MSIdentityScaffolding/Microsoft.DotNet.MSIdentity/CodeReaderWriter/CodeWriter.cs
@@ -7,7 +7,7 @@
 using Microsoft.DotNet.MSIdentity.AuthenticationParameters;
 using Microsoft.DotNet.MSIdentity.Project;
 using Microsoft.DotNet.MSIdentity.Properties;
-using Microsoft.DotNet.MSIdentity.Tool;
+using Microsoft.DotNet.MSIdentity.Shared;
 using Microsoft.Extensions.Internal;
 
 namespace Microsoft.DotNet.MSIdentity.CodeReaderWriter

diff --git a/src/MSIdentityScaffolding/Microsoft.DotNet.MSIdentity/CodeReaderWriter/ProjectExtensions.cs b/src/MSIdentityScaffolding/Microsoft.DotNet.MSIdentity/CodeReaderWriter/ProjectExtensions.cs