Initial addition of tvOS Mono

eng/Subsets.props

@@ -58,9 +58,11 @@
 
   <PropertyGroup>
     <DefaultSubsetCategories>libraries-installer-coreclr-mono</DefaultSubsetCategories>
+    <DefaultSubsetCategories Condition="'$(TargetOS)' == 'tvOS'">libraries-installer-mono</DefaultSubsetCategories>
     <DefaultSubsetCategories Condition="'$(TargetOS)' == 'iOS'">libraries-installer-mono</DefaultSubsetCategories>
     <DefaultSubsetCategories Condition="'$(TargetOS)' == 'Android'">libraries-mono</DefaultSubsetCategories>
     <DefaultInstallerSubsets>corehost-managed-depproj-pkgproj-bundle-installers-test</DefaultInstallerSubsets>
+    <DefaultInstallerSubsets Condition="'$(TargetOS)' == 'tvOS'">depproj-pkgproj</DefaultInstallerSubsets>
     <DefaultInstallerSubsets Condition="'$(TargetOS)' == 'iOS'">depproj-pkgproj</DefaultInstallerSubsets>
     <!-- TODO: Split into multiple sets. -->
     <DefaultLibrariesSubsets>all</DefaultLibrariesSubsets>
@@ -80,7 +82,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <RuntimeFlavor Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'Android'">Mono</RuntimeFlavor>
+    <RuntimeFlavor Condition="'$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'Android'">Mono</RuntimeFlavor>
     <RuntimeFlavor Condition="'$(RuntimeFlavor)' == '' and $(_subsetCategory.Contains('mono')) and !$(_subsetCategory.Contains('coreclr'))">Mono</RuntimeFlavor>
     <RuntimeFlavor Condition="'$(RuntimeFlavor)' == ''">CoreCLR</RuntimeFlavor>
   </PropertyGroup>

eng/build.sh

@@ -19,7 +19,7 @@ usage()
   echo "Common settings:"
   echo "  --subset                   Build a subset, print available subsets with -subset help"
   echo "  --subsetCategory           Build a subsetCategory, print available subsetCategories with -subset help"
-  echo "  --os                       Build operating system: Windows_NT, Linux, FreeBSD, OSX, iOS or Android"
+  echo "  --os                       Build operating system: Windows_NT, Linux, FreeBSD, OSX, tvOS, iOS or Android"
   echo "  --arch                     Build platform: x86, x64, arm, armel or arm64"
   echo "  --configuration            Build configuration: Debug, Release or [CoreCLR]Checked (short: -c)"
   echo "  --runtimeConfiguration     Runtime build configuration: Debug, Release or [CoreCLR]Checked"

eng/codeOptimization.targets

@@ -9,7 +9,7 @@
            IBCMerge optimizations on Mac for now to unblock the offical build.
            See issue https://github.com/dotnet/runtime/issues/33303
       -->
-      <IsEligibleForNgenOptimization Condition="'$(TargetOS)' == 'OSX' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'Android'">false</IsEligibleForNgenOptimization>
+      <IsEligibleForNgenOptimization Condition="'$(TargetOS)' == 'OSX' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'Android'">false</IsEligibleForNgenOptimization>
   </PropertyGroup>
 
   <Target Name="SetApplyNgenOptimization"

eng/install-native-dependencies.sh

@@ -23,6 +23,16 @@ elif [ "$1" = "OSX" ]; then
     if [ "$?" != "0" ]; then
         exit 1;
     fi
+elif [ "$1" = "tvOS" ]; then
+    brew update
+    brew upgrade
+    if [ "$?" != "0" ]; then
+        exit 1;
+    fi
+    brew install openssl autoconf automake libtool pkg-config python3
+    if [ "$?" != "0" ]; then
+        exit 1;
+    fi
 elif [ "$1" = "iOS" ]; then
     brew update
     brew upgrade
@@ -34,7 +44,7 @@ elif [ "$1" = "iOS" ]; then
         exit 1;
     fi
 else
-    echo "Must pass \"Linux\", \"iOS\" or \"OSX\" as first argument."
+    echo "Must pass \"Linux\", \"tvOS\", \"iOS\" or \"OSX\" as first argument."
     exit 1
 fi
 

eng/liveBuilds.targets

@@ -133,6 +133,11 @@
         <IsNative>true</IsNative>
       </RuntimeFiles>
 
+      <MonoCrossFiles Condition="'$(TargetOS)' == 'tvOS'"
+        Include="$(MonoArtifactsPath)\cross\*.*" />
+      <MonoIncludeFiles Condition="'$(TargetOS)' == 'tvOS'"
+        Include="$(MonoArtifactsPath)\include\**\*.*" />
+
       <MonoCrossFiles Condition="'$(TargetOS)' == 'iOS'"
         Include="$(MonoArtifactsPath)\cross\*.*" />
       <MonoIncludeFiles Condition="'$(TargetOS)' == 'iOS'"

eng/native/configureplatform.cmake

@@ -83,6 +83,19 @@ if(CLR_CMAKE_HOST_OS STREQUAL Darwin)
     set(CMAKE_ASM_COMPILE_OBJECT "${CMAKE_C_COMPILER} <FLAGS> <DEFINES> <INCLUDES> -o <OBJECT> -c <SOURCE>")
 endif(CLR_CMAKE_HOST_OS STREQUAL Darwin)
 
+if(CLR_CMAKE_HOST_OS STREQUAL tvOS)
+    set(CLR_CMAKE_HOST_UNIX 1)
+    set(CLR_CMAKE_HOST_IOS 1)
+    set(CLR_CMAKE_HOST_TVOS 1)
+    if(CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
+        set(CLR_CMAKE_HOST_UNIX_AMD64 1)
+    elseif(CMAKE_OSX_ARCHITECTURES MATCHES "arm64")
+        set(CLR_CMAKE_HOST_UNIX_ARM64 1)
+    else()
+        clr_unknown_arch()
+    endif()
+endif(CLR_CMAKE_HOST_OS STREQUAL tvOS)
+
 if(CLR_CMAKE_HOST_OS STREQUAL iOS)
     set(CLR_CMAKE_HOST_UNIX 1)
     set(CLR_CMAKE_HOST_IOS 1)

eng/native/init-distro-rid.sh

@@ -159,6 +159,8 @@ initDistroRidGlobal()
                 distroRid="linux-$buildArch"
             elif [ "$targetOs" = "OSX" ]; then
                 distroRid="osx-$buildArch"
+            elif [ "$targetOs" = "tvOS" ]; then
+                distroRid="tvos-$buildArch"
             elif [ "$targetOs" = "iOS" ]; then
                 distroRid="ios-$buildArch"
             elif [ "$targetOs" = "Android" ]; then

eng/pipelines/common/platform-matrix.yml

@@ -286,6 +286,46 @@ jobs:
         helixQueueGroup: ${{ parameters.helixQueueGroup }}
         ${{ insert }}: ${{ parameters.jobParameters }}
 
+# tvOS x64
+
+- ${{ if containsValue(parameters.platforms, 'tvOS_x64') }}:
+  - template: xplat-setup.yml
+    parameters:
+      jobTemplate: ${{ parameters.jobTemplate }}
+      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+      osGroup: tvOS
+      archType: x64
+      platform: tvOS_x64
+      jobParameters:
+        runtimeFlavor: mono
+        stagedBuild: ${{ parameters.stagedBuild }}
+        buildConfig: ${{ parameters.buildConfig }}
+        ${{ if eq(parameters.passPlatforms, true) }}:
+          platforms: ${{ parameters.platforms }}
+        helixQueueGroup: ${{ parameters.helixQueueGroup }}
+        managedTestBuildOsGroup: OSX
+        ${{ insert }}: ${{ parameters.jobParameters }}
+
+# tvOS arm64
+
+- ${{ if containsValue(parameters.platforms, 'tvOS_arm64') }}:
+  - template: xplat-setup.yml
+    parameters:
+      jobTemplate: ${{ parameters.jobTemplate }}
+      helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+      osGroup: tvOS
+      archType: arm64
+      platform: tvOS_arm64
+      jobParameters:
+        runtimeFlavor: mono
+        stagedBuild: ${{ parameters.stagedBuild }}
+        buildConfig: ${{ parameters.buildConfig }}
+        ${{ if eq(parameters.passPlatforms, true) }}:
+          platforms: ${{ parameters.platforms }}
+        helixQueueGroup: ${{ parameters.helixQueueGroup }}
+        managedTestBuildOsGroup: OSX
+        ${{ insert }}: ${{ parameters.jobParameters }}
+
 # iOS x64
 
 - ${{ if containsValue(parameters.platforms, 'iOS_x64') }}:

eng/pipelines/common/xplat-setup.yml

@@ -109,6 +109,10 @@ jobs:
         ${{ if eq(parameters.osGroup, 'iOS') }}:
           vmImage: 'macOS-10.14'
 
+        # Public OSX Build Pool
+        ${{ if eq(parameters.osGroup, 'tvOS') }}:
+          vmImage: 'macOS-10.14'
+
         # Official Build Windows Pool
         ${{ if and(eq(parameters.osGroup, 'Windows_NT'), ne(variables['System.TeamProject'], 'public')) }}:
           name: NetCoreInternal-Pool

eng/pipelines/installer/jobs/base-job.yml

@@ -127,6 +127,24 @@ jobs:
         $(CommonMSBuildArgs)
         $(OfficialBuildArg)
 
+  - ${{ if eq(parameters.osGroup, 'tvOS') }}:
+
+    - name: CommonMSBuildArgs
+      value: >-
+        /p:PortableBuild=true
+        /p:SkipTests=$(SkipTests)
+
+    - name: BaseJobBuildCommand
+      value: >-
+        $(Build.SourcesDirectory)/installer.sh --restore --build --ci --test
+        -configuration $(_BuildConfig)
+        -os ${{ parameters.osGroup }}
+        -arch ${{ parameters.archType }}
+        /p:StripSymbols=true
+        $(LiveOverridePathArgs)
+        $(CommonMSBuildArgs)
+        $(OfficialBuildArg)
+
   - ${{ if eq(parameters.osGroup, 'iOS') }}:
 
     - name: CommonMSBuildArgs

eng/pipelines/libraries/base-job.yml

@@ -66,6 +66,10 @@ jobs:
         - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
           - _runtimeOSArg: -os ${{ parameters.osGroup }}
 
+        # force a value for OS when cross-building tvOS on OSX
+        - ${{ if eq(parameters.osGroup, 'tvOS') }}:
+          - _runtimeOSArg: -os ${{ parameters.osGroup }}
+
         # force a value for OS when cross-building iOS on OSX
         - ${{ if eq(parameters.osGroup, 'iOS') }}:
           - _runtimeOSArg: -os ${{ parameters.osGroup }}

eng/pipelines/mono/templates/build-job.yml

@@ -65,6 +65,9 @@ jobs:
         value: /p:OutputRid=linux-musl-${{ parameters.archType }}
       - name: _PortableBuild
         value: true
+    - ${{ if eq(parameters.osGroup, 'tvOS') }}:
+      - name: osOverride
+        value: -os tvOS
     - ${{ if eq(parameters.osGroup, 'iOS') }}:
       - name: osOverride
         value: -os iOS
@@ -79,7 +82,7 @@ jobs:
     # Linux builds use docker images with dependencies preinstalled,
     # and FreeBSD builds use a build agent with dependencies
     # preinstalled, so we only need this step for OSX and Windows.
-    - ${{ if in(parameters.osGroup, 'OSX', 'iOS') }}:
+    - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}:
       - script: sh $(Build.SourcesDirectory)/eng/install-native-dependencies.sh $(osGroup)
         displayName: Install native dependencies
     - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:

eng/pipelines/runtime-official.yml

@@ -94,6 +94,8 @@ stages:
       - Android_x86
       - Android_arm
       - Android_arm64
+      - tvOS_x64
+      - tvOS_arm64
       - iOS_x64
       # - iOS_arm # https://github.com/dotnet/runtime/issues/34465
       - iOS_arm64
@@ -145,6 +147,8 @@ stages:
       - Android_x86
       - Android_arm
       - Android_arm64
+      - tvOS_x64
+      - tvOS_arm64
       - iOS_x64
       # - iOS_arm # https://github.com/dotnet/runtime/issues/34465
       - iOS_arm64
@@ -203,6 +207,9 @@ stages:
         buildFullPlatformManifest: false
       runtimeFlavor: mono
       platforms:
+      - tvOS_x64
+      - tvOS_arm64
+      - iOS_arm
       # - iOS_arm # https://github.com/dotnet/runtime/issues/34465
       - iOS_arm64
       - iOS_x64

eng/pipelines/runtime.yml

@@ -256,6 +256,8 @@ jobs:
     - Android_x86
     - Android_arm
     - Android_arm64
+    - tvOS_x64
+    - tvOS_arm64
     - iOS_x64
     - iOS_arm
     - iOS_arm64
@@ -290,6 +292,8 @@ jobs:
     - Android_x86
     - Android_arm
     - Android_arm64
+    - tvOS_x64
+    - tvOS_arm64
     - iOS_x64
     - iOS_arm
     - iOS_arm64
@@ -411,6 +415,8 @@ jobs:
     - Android_x86
     - Android_arm
     - Android_arm64
+    - tvOS_x64
+    - tvOS_arm64
     # - iOS_arm # https://github.com/dotnet/runtime/issues/34465
     - iOS_arm64
     - iOS_x64
@@ -427,6 +433,8 @@ jobs:
     - Android_x86
     - Android_arm
     - Android_arm64
+    - tvOS_x64
+    - tvOS_arm64
     # - iOS_arm # https://github.com/dotnet/runtime/issues/34465
     - iOS_arm64
     - iOS_x64
@@ -523,6 +531,8 @@ jobs:
     buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
     runtimeFlavor: mono
     platforms:
+      - tvOS_x64
+      - tvOS_arm64
       - iOS_x64
       # - iOS_arm # https://github.com/dotnet/runtime/issues/34465
       - iOS_arm64

src/libraries/Directory.Build.props

@@ -36,13 +36,15 @@
     <TargetArchitecture Condition="'$(TargetArchitecture)' == '' and '$(HostArch)' == 'arm'">arm</TargetArchitecture>
     <TargetArchitecture Condition="'$(TargetArchitecture)' == '' and '$(HostArch)' == 'arm64'">arm64</TargetArchitecture>
     <TargetArchitecture Condition="'$(TargetArchitecture)' == '' and '$(TargetOS)' == 'WebAssembly'">wasm</TargetArchitecture>
+    <TargetArchitecture Condition="'$(TargetArchitecture)' == '' and '$(TargetOS)' == 'tvOS'">x64</TargetArchitecture>
     <TargetArchitecture Condition="'$(TargetArchitecture)' == '' and '$(TargetOS)' == 'iOS'">x64</TargetArchitecture>
     <TargetArchitecture Condition="'$(TargetArchitecture)' == '' and '$(TargetOS)' == 'Android'">x64</TargetArchitecture>
     <TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>
 
     <!-- RuntimeOS is calculated based on the build system OS, however if building for WebAssembly/iOS/Android we need to let
          the build system to use webassembly/ios/android as the RuntimeOS for produced package RIDs. -->
     <RuntimeOS Condition="'$(TargetOS)' == 'WebAssembly'">$(TargetOS.ToLowerInvariant())</RuntimeOS>
+    <RuntimeOS Condition="'$(TargetOS)' == 'tvOS'">$(TargetOS.ToLowerInvariant())</RuntimeOS>
     <RuntimeOS Condition="'$(TargetOS)' == 'iOS'">$(TargetOS.ToLowerInvariant())</RuntimeOS>
     <RuntimeOS Condition="'$(TargetOS)' == 'Android'">$(TargetOS.ToLowerInvariant())</RuntimeOS>
 
@@ -98,6 +100,7 @@
     <_portableOS Condition="'$(_runtimeOSFamily)' == 'osx'">osx</_portableOS>
     <_portableOS Condition="'$(_runtimeOSFamily)' == 'FreeBSD'">freebsd</_portableOS>
     <_portableOS Condition="'$(RuntimeOS)' == 'WebAssembly'">webassembly</_portableOS>
+    <_portableOS Condition="'$(RuntimeOS)' == 'tvos'">tvos</_portableOS>
     <_portableOS Condition="'$(RuntimeOS)' == 'ios'">ios</_portableOS>
     <_portableOS Condition="'$(RuntimeOS)' == 'android'">android</_portableOS>
 
@@ -121,6 +124,9 @@
     <ToolRuntimeRID Condition="'$(RuntimeOS)' == 'android' and '$(TargetOS)' != 'Windows_NT' and $(_buildingInOSX)">osx-x64</ToolRuntimeRID>
     <ToolRuntimeRID Condition="'$(RuntimeOS)' == 'android' and '$(TargetOS)' != 'Windows_NT' and !$(_buildingInOSX)">linux-x64</ToolRuntimeRID>
 
+    <!-- There are no tvOS tools and it can be built on OSX only, so use that -->
+    <ToolRuntimeRID Condition="'$(RuntimeOS)' == 'tvos'">osx-x64</ToolRuntimeRID>
+
     <!-- There are no iOS tools and it can be built on OSX only, so use that -->
     <ToolRuntimeRID Condition="'$(RuntimeOS)' == 'ios'">osx-x64</ToolRuntimeRID>
 

src/libraries/OSGroups.json

@@ -17,6 +17,11 @@
         "Unix"
         ]
       },
+    "tvOS": {
+      "#import": [
+        "Unix"
+        ]
+      },
     "iOS": {
       "#import": [
         "Unix"
@@ -38,4 +43,4 @@
         ]
       }
     }
-}
+}

src/libraries/System.Console/src/System.Console.csproj

@@ -3,7 +3,7 @@
     <RootNamespace>System.Console</RootNamespace>
     <AssemblyName>System.Console</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-iOS</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-tvOS</TargetFrameworks>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
@@ -21,8 +21,8 @@
       <Link>Common\System\Text\ConsoleEncoding.cs</Link>
     </Compile>
   </ItemGroup>
-  <!-- iOS -->
-  <ItemGroup Condition="'$(TargetsiOS)' == 'true'">
+  <!-- iOS/tvOS -->
+  <ItemGroup Condition="'$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true'">
     <Compile Include="System\ConsolePal.iOS.cs" />
     <Compile Include="$(CommonPath)Interop\OSX\System.Native\Interop.Log.cs">
       <Link>Common\Interop\OSX\Interop.Log.cs</Link>
@@ -174,7 +174,7 @@
     </Compile>
   </ItemGroup>
   <!-- Unix -->
-  <ItemGroup Condition=" '$(TargetsUnix)' == 'true' and '$(TargetsiOS)' != 'true'">
+  <ItemGroup Condition=" '$(TargetsUnix)' == 'true' and '$(TargetsiOS)' != 'true' and '$(TargetstvOS)' != 'true'">
     <Compile Include="System\ConsolePal.Unix.cs" />
     <Compile Include="System\TermInfo.cs" />
     <Compile Include="System\IO\StdInReader.cs" />
@@ -292,4 +292,4 @@
   <ItemGroup Condition="'$(TargetsUnix)' == 'true'">
     <Reference Include="System.Threading.Thread" />
   </ItemGroup>
-</Project>
+</Project>