add basic FreeBSD support #3228

wfurt · 2017-09-19T05:29:14Z

This is part for https://github.com/dotnet/corefx/issues/1626

This change adds recognition for FreeBSD and implements function to get OS version.
There should be no impact for other platforms.

./dotnet --info
Runtime Environment:
OS Name: FreeBSD
OS Version: 11.0-RELEASE-p1
OS Platform: FreeBSD
RID: linux-x64
Base Path: /mnt/dotnetcli4/dotnetcli.OK/sdk/2.0.0-preview1-005977/

(RID fixup is not part of this change)

dnfclas · 2017-09-19T05:29:19Z

@wfurt,
Thanks for having already signed the Contribution License Agreement. Your agreement was validated by .NET Foundation. We will now review your pull request.
Thanks,
.NET Foundation Pull Request Bot

eerhardt · 2017-09-19T12:54:48Z

@wfurt - the RID calculation code exists in 2 places - once in C# and once in C++. Since you are changing the C# RID calculation code, you should also change the C++ RID calculation:

https://github.com/dotnet/core-setup/blob/master/src/corehost/common/pal.unix.cpp#L207-L400

wfurt · 2017-09-19T16:42:11Z

Thanks for the pointer @eerhardt I'll get that as separate PR.
I'm still not quite sure how one or the other is used.
This change is needed so cli can properly determine file extensions
as fas as RID I did not find direct use yet.

eerhardt · 2017-09-19T16:49:33Z

I'll get that as separate PR.

Please don't separate this. These two pieces of logic (managed and native RID calculation) need to remain in sync, it doesn't make sense for one to be updated, without the other.

I'm still not quite sure how one or the other is used.

The managed RID calculation is pretty self-explanatory - anywhere managed code needs to get the current machine's RID, it calls into RuntimeEnvironment.GetRuntimeIdentifier().

The native RID calculation is used by the dotnet host in order to pick the correct native assets at runtime.

It would be ideal if these two places could be shared, but it currently isn't easily possible. The managed code is used outside of .NET Core, so it can't depend on an API that is only available in .NET Core. The native piece is invoked before the CLR is even loaded, so it cannot invoke managed code. This is why we have the calculation in two places.

src/managed/Microsoft.DotNet.PlatformAbstractions/RuntimeEnvironment.cs

@@ -101,6 +103,8 @@ private static string GetRIDOS()
                    return OperatingSystem.ToLowerInvariant();
                case Platform.Darwin:
                    return "osx";
+                case Platform.FreeBSD:
+                    return "FreeBSD";


src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs

+            String verson = RuntimeInformation.OSDescription;
+            try
+            {
+                return RuntimeInformation.OSDescription.Split()[1];


… script

wfurt · 2017-09-20T18:56:19Z

set on rid freebsd.11-x64

src/corehost/build.sh

        else
            __rid_plat="linux"
        fi
    fi
+    echo __rid_plat=$__rid_plat


src/managed/Microsoft.DotNet.PlatformAbstractions/RuntimeEnvironment.cs

@@ -60,6 +60,8 @@ private static string GetRIDVersion()
                    return $".{OperatingSystemVersion}";
                case Platform.Darwin:
                    return $".{OperatingSystemVersion}";
+                case Platform.FreeBSD:
+                    return $".{OperatingSystemVersion.Split('.')[0]}";


src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs

@@ -214,6 +231,11 @@ private static Platform DetermineOSPlatform()
            {
                return Platform.Darwin;
            }
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Create("FREEBSD")))


src/managed/Microsoft.DotNet.PlatformAbstractions/RuntimeEnvironment.cs

@@ -60,6 +60,8 @@ private static string GetRIDVersion()
                    return $".{OperatingSystemVersion}";
                case Platform.Darwin:
                    return $".{OperatingSystemVersion}";
+                case Platform.FreeBSD:
+                    return $".{OperatingSystemVersion.Split('.')[0]}";


src/corehost/common/pal.unix.cpp

+    if (ret == 0)
+    {
+        char *pos = strchr(str,'.');
+        if (pos) {


…ix net45 build

src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs

+            try
+            {
+                // second token up to first dot
+                return RuntimeInformation.OSDescription.Split()[1].Split('.')[0];


eerhardt

Looks good. Thanks @wfurt !

bartonjs · 2018-10-23T22:43:49Z

Based on how we do Ubuntu (every numbered release) this should probably include the minor. So on a latest-and-greatest build we'd want it to be freebsd.11.2-x64 (to allow is to insert new assets aligned to a minor release, if needed)

add basic FreeBSD support

c616e56

wfurt requested review from pranavkm, stephentoub and weshaggard September 19, 2017 05:29

dnfclas added the cla-already-signed label Sep 19, 2017

wfurt added the os-freebsd FreeBSD OS label Sep 19, 2017

eerhardt reviewed Sep 19, 2017

View reviewed changes

src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs Outdated

String verson = RuntimeInformation.OSDescription;

try

{

return RuntimeInformation.OSDescription.Split()[1];

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

set RID as freebsd.11 for FreeBSD. add missing parts to PAL and build…

9f16aea

… script

wfurt requested a review from janvorli September 20, 2017 18:55

eerhardt reviewed Sep 20, 2017

View reviewed changes

src/corehost/build.sh Outdated

else

__rid_plat="linux"

fi

fi

echo __rid_plat=$__rid_plat

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

remove debug echo

a4be239

eerhardt reviewed Sep 20, 2017

View reviewed changes

janvorli reviewed Sep 20, 2017

View reviewed changes

src/corehost/common/pal.unix.cpp Outdated

if (ret == 0)

{

char *pos = strchr(str,'.');

if (pos) {

This comment was marked as spam.

Sign in to view

return only major version for FreeBSD so it is consistent with rid. F…

b8a2d3c

…ix net45 build

janvorli reviewed Sep 21, 2017

View reviewed changes

eerhardt approved these changes Sep 22, 2017

View reviewed changes

janvorli merged commit 9dff3ce into dotnet:master Oct 3, 2017

wfurt mentioned this pull request Jan 30, 2020

Update platform functions to use major and minor version number on FreeBSD dotnet/runtime#3320

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add basic FreeBSD support #3228

add basic FreeBSD support #3228

wfurt commented Sep 19, 2017

dnfclas commented Sep 19, 2017

eerhardt commented Sep 19, 2017

wfurt commented Sep 19, 2017

eerhardt commented Sep 19, 2017

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

wfurt commented Sep 20, 2017

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

eerhardt left a comment

bartonjs commented Oct 23, 2018

add basic FreeBSD support #3228

add basic FreeBSD support #3228

Conversation

wfurt commented Sep 19, 2017

dnfclas commented Sep 19, 2017

eerhardt commented Sep 19, 2017

wfurt commented Sep 19, 2017

eerhardt commented Sep 19, 2017

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

wfurt commented Sep 20, 2017

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

eerhardt left a comment

Choose a reason for hiding this comment

bartonjs commented Oct 23, 2018