Skip to content

Update RuntimeEnvironment.GetSystemVersion() #89575

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
AaronRobinsonMSFT merged 3 commits into from
Jul 27, 2023
Merged

Update RuntimeEnvironment.GetSystemVersion() #89575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03c4f2a
Update RuntimeEnvironment.GetSystemVersion()
AaronRobinsonMSFT Jul 27, 2023
c3d9112
Apply suggestions from code review
AaronRobinsonMSFT Jul 27, 2023
7c00d32
Update src/libraries/System.Runtime.InteropServices/src/System/Runtim…
AaronRobinsonMSFT Jul 27, 2023
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 ...s/System.Runtime.InteropServices/src/System/Runtime/InteropServices/RuntimeEnvironment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ public static string GetRuntimeDirectory()
[Obsolete(Obsoletions.RuntimeEnvironmentMessage, DiagnosticId = Obsoletions.RuntimeEnvironmentDiagId, UrlFormat = Obsoletions.SharedUrlFormat)]
public static object GetRuntimeInterfaceAsObject(Guid clsid, Guid riid) => throw new PlatformNotSupportedException();

public static string GetSystemVersion() => typeof(object).Assembly.ImageRuntimeVersion;
public static string GetSystemVersion() => $"v{Environment.Version}";
}
}
3 changes: 2 additions & 1 deletion ...ntime.InteropServices.UnitTests/System/Runtime/InteropServices/RuntimeEnvironmentTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ public void RuntimeEnvironmentRuntimeDirectory()
[Fact]
public void RuntimeEnvironmentSysVersion()
{
Assert.NotEmpty(RuntimeEnvironment.GetSystemVersion());
// The historical format of this API is "vX.Y.Z", so we validate and retain that.
Assert.Equal($"v{Environment.Version}", RuntimeEnvironment.GetSystemVersion());
}

#pragma warning disable SYSLIB0019 // RuntimeEnvironment members SystemConfigurationFile, GetRuntimeInterfaceAsIntPtr, and GetRuntimeInterfaceAsObject are no longer supported and throw PlatformNotSupportedException.
Expand Down