Skip to content

Update Invalid Name Characters #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chzuluag merged 1 commit into from
Nov 19, 2024
Merged

Update Invalid Name Characters #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Microsoft.VisualStudio.SolutionPersistence/Errors.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Microsoft.VisualStudio.SolutionPersistence/Errors.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
</data>
<data name="InvalidName" xml:space="preserve">
<value>Names cannot:
- contain any of the following characters: / ? : \ * " &lt; &gt; | # &amp; %
- contain any of the following characters: / ? : \ * " &lt; &gt; |
- contain control characters
- be system reserved names, including 'CON', 'AUX', 'PRN', 'COM1' or 'LPT2'
- be '.' or '..'</value>
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.VisualStudio.SolutionPersistence/Model/SolutionModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ namespace Microsoft.VisualStudio.SolutionPersistence.Model;
public sealed class SolutionModel : PropertyContainerModel
{
#if NETFRAMEWORK
private const string InvalidNameChars = @"?:&\/*""<>|#%";
private const string InvalidNameChars = @"?:\/*""<>|";
#else
private static readonly SearchValues<char> InvalidNameChars = SearchValues.Create(@"?:&\/*""<>|#%");
private static readonly SearchValues<char> InvalidNameChars = SearchValues.Create(@"?:\/*""<>|");
#endif

private readonly VisualStudioProperties visualStudioProperties;
Expand Down
5 changes: 1 addition & 4 deletions test/Microsoft.VisualStudio.SolutionPersistence.Tests/Serialization/Validation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,8 @@ public void ConfigurationName()
">",
"?",
"*",
"%",
":",
"|",
"&",
"%",
"con",
"com1",
"lpt9",
Expand Down Expand Up @@ -170,7 +167,7 @@ public void SolutionFolders()
string invalidNameError = Errors.InvalidName;

// Don't allow invalid characters
Assert.StartsWith(invalidNameError, Assert.ThrowsAny<ArgumentException>(() => solution.AddFolder("/Foo#/")).Message);
Assert.StartsWith(invalidNameError, Assert.ThrowsAny<ArgumentException>(() => solution.AddFolder("/Foo</")).Message);

// Don't allow reserved names
Assert.StartsWith(invalidNameError, Assert.ThrowsAny<ArgumentException>(() => solution.AddFolder("/LPT4/")).Message);
Expand Down