Skip to content

Commit fa79d1f

Browse files
committed
Unify product names
1 parent 2f381b0 commit fa79d1f

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

Packages/com.unity.ide.visualstudio/Editor/VisualStudioForWindowsInstallation.cs

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,13 +152,21 @@ public static bool TryDiscoverInstallation(string editorPath, out IVisualStudioI
152152
installation = new VisualStudioForWindowsInstallation()
153153
{
154154
IsPrerelease = isPrerelease,
155-
Name = $"{vi.FileDescription} [{version.ToString(3)}]",
155+
Name = $"{FormatProductName(vi.FileDescription)} [{version.ToString(3)}]",
156156
Path = editorPath,
157157
Version = version
158158
};
159159
return true;
160160
}
161161

162+
public static string FormatProductName(string productName)
163+
{
164+
if (string.IsNullOrEmpty(productName))
165+
return string.Empty;
166+
167+
return productName.Replace("Microsoft ", string.Empty);
168+
}
169+
162170
public static IEnumerable<IVisualStudioInstallation> GetVisualStudioInstallations()
163171
{
164172
if (!VisualStudioEditor.IsWindows)
@@ -184,9 +192,9 @@ public IEnumerable<VisualStudioInstallation> ToVisualStudioInstallations()
184192
{
185193
foreach (var entry in entries)
186194
{
187-
yield return new VisualStudioForWindowsInstallation()
195+
yield return new VisualStudioForWindowsInstallation
188196
{
189-
Name = $"{entry.displayName} [{entry.catalog.productDisplayVersion}]",
197+
Name = $"{FormatProductName(entry.displayName)} [{entry.catalog.productDisplayVersion}]",
190198
Path = entry.productPath,
191199
IsPrerelease = entry.isPrerelease,
192200
Version = Version.Parse(entry.catalog.buildVersion)

0 commit comments

Comments
 (0)