Merge pull request #8888 from adamint/dev/adamint/myapp-wrong-generat…

…ion-root-namespace Avoid duplicating My in settings type if no root namespace exists
dotnet · Mar 3, 2023 · 7df0c34 · 7df0c34
2 parents acda127 + 0cd3ba3
commit 7df0c34
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Microsoft.VisualStudio.Editors/SettingsDesigner/SettingsSingleFileGeneratorBase.vb b/src/Microsoft.VisualStudio.Editors/SettingsDesigner/SettingsSingleFileGeneratorBase.vb
@@ -589,7 +589,7 @@ Namespace Microsoft.VisualStudio.Editors.SettingsDesigner
                 fullTypeName = projectRootNamespace & "."
             End If
 
-            If defaultNamespace <> "" Then
+            If defaultNamespace <> "" AndAlso Not defaultNamespace.Equals(MyNamespaceName) Then ' defaultNamespace, if none exists, will come in thru wszDefaultNamespace as My. We don't want to duplicate it.
                 fullTypeName &= defaultNamespace & "."
             End If