Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
/ corefx Public archive

Use product version in RuntimeInformation.FrameworkDescription #35516

Merged
merged 3 commits into from
Feb 23, 2019
Merged

Use product version in RuntimeInformation.FrameworkDescription #35516

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e179d0
Use product version in RuntimeInformation.FrameworkDescription
jkotas Feb 19, 2019
18da9cb
Include FrameworkDescription in the Assert
jkotas Feb 22, 2019
57b249e
Strip the git hash in the fallback
jkotas Feb 23, 2019
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
12 changes: 9 additions & 3 deletions ...meInformation/src/System/Runtime/InteropServices/RuntimeInformation/RuntimeInformation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,15 @@ public static string FrameworkDescription
{
if (s_frameworkDescription == null)
{
AssemblyFileVersionAttribute attr = (AssemblyFileVersionAttribute)(typeof(object).GetTypeInfo().Assembly.GetCustomAttribute(typeof(AssemblyFileVersionAttribute)));
Debug.Assert(attr != null);
s_frameworkDescription = $"{FrameworkName} {attr.Version}";
string versionString = (string)AppContext.GetData("FX_PRODUCT_VERSION");

if (versionString == null)
{
// Use AssemblyInformationalVersionAttribute as fallback if the exact product version is not specified by the host
versionString = typeof(object).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion;
}

s_frameworkDescription = $"{FrameworkName} {versionString}";
}

return s_frameworkDescription;
Expand Down
44 changes: 15 additions & 29 deletions src/System.Runtime.InteropServices.RuntimeInformation/tests/DescriptionNameTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,31 +44,17 @@ public void DumpRuntimeInformationToConsole()

[Fact]
[SkipOnTargetFramework(~TargetFrameworkMonikers.Netcoreapp)]
public void VerifyRuntimeDebugNameOnNetCoreApp()
public void VerifyRuntimeNameOnNetCoreApp()
{
AssemblyFileVersionAttribute attr = (AssemblyFileVersionAttribute)(typeof(object).GetTypeInfo().Assembly.GetCustomAttribute(typeof(AssemblyFileVersionAttribute)));
string expected = string.Format(".NET Core {0}", attr.Version);
Assert.Equal(expected, RuntimeInformation.FrameworkDescription);
Assert.True(RuntimeInformation.FrameworkDescription.StartsWith(".NET Core"));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: could you add FraneworkDescription as part of a second argument so we're see what it is if the assert fails?

Assert.Same(RuntimeInformation.FrameworkDescription, RuntimeInformation.FrameworkDescription);
}

[Fact]
[SkipOnTargetFramework(~TargetFrameworkMonikers.NetFramework)]
public void VerifyRuntimeDebugNameOnNetFramework()
[SkipOnTargetFramework(~TargetFrameworkMonikers.UapAot)]
public void VerifyRuntimeNameOnNetNative()
{
AssemblyFileVersionAttribute attr = (AssemblyFileVersionAttribute)(typeof(object).GetTypeInfo().Assembly.GetCustomAttribute(typeof(AssemblyFileVersionAttribute)));
string expected = string.Format(".NET Framework {0}", attr.Version);
Assert.Equal(expected, RuntimeInformation.FrameworkDescription);
Assert.Same(RuntimeInformation.FrameworkDescription, RuntimeInformation.FrameworkDescription);
}

[Fact]
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework | TargetFrameworkMonikers.Netcoreapp)]
public void VerifyRuntimeDebugNameOnNetCoreUwp()
{
AssemblyFileVersionAttribute attr = (AssemblyFileVersionAttribute)(typeof(object).GetTypeInfo().Assembly.GetCustomAttribute(typeof(AssemblyFileVersionAttribute)));
string expected = string.Format(PlatformDetection.IsNetNative ? ".NET Native {0}" : ".NET Core {0}", attr.Version);
Assert.Equal(expected, RuntimeInformation.FrameworkDescription);
Assert.True(RuntimeInformation.FrameworkDescription.StartsWith(".NET Native"));
Assert.Same(RuntimeInformation.FrameworkDescription, RuntimeInformation.FrameworkDescription);
}

Expand All @@ -87,32 +73,32 @@ public void VerifyWindowsDescriptionDoesNotContainTrailingWhitespace()
Assert.False(RuntimeInformation.OSDescription.EndsWith(" "));
}

[Fact, PlatformSpecific(TestPlatforms.Windows)] // Checks Windows debug name in RuntimeInformation
public void VerifyWindowsDebugName()
[Fact, PlatformSpecific(TestPlatforms.Windows)] // Checks Windows name in RuntimeInformation
public void VerifyWindowsName()
{
Assert.Contains("windows", RuntimeInformation.OSDescription, StringComparison.OrdinalIgnoreCase);
}

[Fact, PlatformSpecific(TestPlatforms.Linux)] // Checks Linux debug name in RuntimeInformation
public void VerifyLinuxDebugName()
[Fact, PlatformSpecific(TestPlatforms.Linux)] // Checks Linux name in RuntimeInformation
public void VerifyLinuxName()
{
Assert.Contains("linux", RuntimeInformation.OSDescription, StringComparison.OrdinalIgnoreCase);
}

[Fact, PlatformSpecific(TestPlatforms.NetBSD)] // Checks NetBSD debug name in RuntimeInformation
public void VerifyNetBSDDebugName()
[Fact, PlatformSpecific(TestPlatforms.NetBSD)] // Checks NetBSD name in RuntimeInformation
public void VerifyNetBSDName()
{
Assert.Contains("netbsd", RuntimeInformation.OSDescription, StringComparison.OrdinalIgnoreCase);
}

[Fact, PlatformSpecific(TestPlatforms.FreeBSD)] // Checks FreeBSD debug name in RuntimeInformation
public void VerifyFreeBSDDebugName()
[Fact, PlatformSpecific(TestPlatforms.FreeBSD)] // Checks FreeBSD name in RuntimeInformation
public void VerifyFreeBSDName()
{
Assert.Contains("FreeBSD", RuntimeInformation.OSDescription, StringComparison.OrdinalIgnoreCase);
}

[Fact, PlatformSpecific(TestPlatforms.OSX)] // Checks OSX debug name in RuntimeInformation
public void VerifyOSXDebugName()
[Fact, PlatformSpecific(TestPlatforms.OSX)] // Checks OSX name in RuntimeInformation
public void VerifyOSXName()
{
Assert.Contains("darwin", RuntimeInformation.OSDescription, StringComparison.OrdinalIgnoreCase);
}
Expand Down