From 76c63f90c77f95a38d7df2df2f43d0c27529e52b Mon Sep 17 00:00:00 2001 From: Zachary Halzel Date: Wed, 12 Apr 2023 14:42:20 -0400 Subject: [PATCH] Fix string for default Project Description (#2373) * Fix string for default Project Description * Add back check for Startup.cs, for .NET Framework projects --- .../ProjectDescription/ProjectDescriptionReader.cs | 2 +- .../ProjectDescriptions/dotnet_webapp.json | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/MSIdentityScaffolding/Microsoft.DotNet.MSIdentity/ProjectDescription/ProjectDescriptionReader.cs b/src/MSIdentityScaffolding/Microsoft.DotNet.MSIdentity/ProjectDescription/ProjectDescriptionReader.cs index e19ed0594..c91a3a81d 100644 --- a/src/MSIdentityScaffolding/Microsoft.DotNet.MSIdentity/ProjectDescription/ProjectDescriptionReader.cs +++ b/src/MSIdentityScaffolding/Microsoft.DotNet.MSIdentity/ProjectDescription/ProjectDescriptionReader.cs @@ -41,7 +41,7 @@ public ProjectDescriptionReader(IEnumerable files) } // If projectDescription cannot be inferred, default to Web App - return ProjectDescriptions.FirstOrDefault(p => string.Equals(ProjectTypes.WebApp, p.Identifier)); + return ProjectDescriptions.FirstOrDefault(p => string.Equals($"{ProjectTypeIdPrefix}{ProjectTypes.WebApp}", p.Identifier)); } static readonly JsonSerializerOptions serializerOptionsWithComments = new JsonSerializerOptions diff --git a/src/MSIdentityScaffolding/Microsoft.DotNet.MSIdentity/ProjectDescriptions/dotnet_webapp.json b/src/MSIdentityScaffolding/Microsoft.DotNet.MSIdentity/ProjectDescriptions/dotnet_webapp.json index dccd80e67..0f92e9956 100644 --- a/src/MSIdentityScaffolding/Microsoft.DotNet.MSIdentity/ProjectDescriptions/dotnet_webapp.json +++ b/src/MSIdentityScaffolding/Microsoft.DotNet.MSIdentity/ProjectDescriptions/dotnet_webapp.json @@ -3,6 +3,10 @@ "ProjectRelativeFolder": "", "BasedOnProjectDescription": "dotnet-web", "MatchesForProjectType": [ + { + "FileRelativePath": "Startup.cs", + "MatchAny": [ ".AddAzureAD", ".AddMicrosoftIdentityWebApp", ".AddMicrosoftIdentityWebAppAuthentication", "Microsoft.Owin" ] + }, { "FolderRelativePath": "Pages", "FileRelativePath": "Index.cshtml",