[Build] Update maestro with macOS and tvOS (#862)

* [Build] Update maestro with macOS and tvOS * [Build] Add tvOS and macOS to workload/dogfood * Add Microsoft.iOS.Windows.Sdk Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
dotnet · Apr 27, 2021 · db5381b · db5381b
1 parent ec5f630
commit db5381b
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 9 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -4,17 +4,25 @@
       <Uri>https://github.com/dotnet/installer</Uri>
       <Sha>d9bf0d661ba2e1ac065ae119585dc7f0e3c29703</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Android.Sdk.Windows" Version="11.0.200-ci.main.234">
+    <Dependency Name="Microsoft.Android.Sdk.Windows" Version="11.0.200-ci.main.238">
       <Uri>https://github.com/xamarin/xamarin-android</Uri>
-      <Sha>a2156d41275b92de3cf23f7c79801327c74b7fe0</Sha>
+      <Sha>35d70842a4fb4539810ab19b22316ef7f5c137fb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="14.5.100-ci.main.658">
+    <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="14.5.100-ci.main.664">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>7415b898f82e1d964824abc0930cec7cbe911cbf</Sha>
+      <Sha>b88c3bb031e4164ba2c35466d0d3b2856dfe8e61</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.iOS.Sdk" Version="14.5.100-ci.main.658">
+    <Dependency Name="Microsoft.iOS.Sdk" Version="14.5.100-ci.main.664">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>7415b898f82e1d964824abc0930cec7cbe911cbf</Sha>
+      <Sha>b88c3bb031e4164ba2c35466d0d3b2856dfe8e61</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.tvOS.Sdk" Version="14.5.100-ci.main.664">
+      <Uri>https://github.com/xamarin/xamarin-macios</Uri>
+      <Sha>b88c3bb031e4164ba2c35466d0d3b2856dfe8e61</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.macOS.Sdk" Version="11.3.100-ci.main.664">
+      <Uri>https://github.com/xamarin/xamarin-macios</Uri>
+      <Sha>b88c3bb031e4164ba2c35466d0d3b2856dfe8e61</Sha>
     </Dependency>
   </ProductDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -2,8 +2,10 @@
   <!--Package versions-->
   <PropertyGroup>
     <MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.4.21221.10</MicrosoftDotnetSdkInternalPackageVersion>
-    <MicrosoftAndroidSdkWindowsPackageVersion>11.0.200-ci.main.234</MicrosoftAndroidSdkWindowsPackageVersion>
-    <MicrosoftMacCatalystSdkPackageVersion>14.5.100-ci.main.658</MicrosoftMacCatalystSdkPackageVersion>
-    <MicrosoftiOSSdkPackageVersion>14.5.100-ci.main.658</MicrosoftiOSSdkPackageVersion>
+    <MicrosoftAndroidSdkWindowsPackageVersion>11.0.200-ci.main.238</MicrosoftAndroidSdkWindowsPackageVersion>
+    <MicrosoftMacCatalystSdkPackageVersion>14.5.100-ci.main.664</MicrosoftMacCatalystSdkPackageVersion>
+    <MicrosoftiOSSdkPackageVersion>14.5.100-ci.main.664</MicrosoftiOSSdkPackageVersion>
+    <MicrosofttvOSSdkPackageVersion>14.5.100-ci.main.664</MicrosofttvOSSdkPackageVersion>
+    <MicrosoftmacOSSdkPackageVersion>11.3.100-ci.main.664</MicrosoftmacOSSdkPackageVersion>
   </PropertyGroup>
 </Project>
diff --git a/src/DotNet/Dependencies/Packs.csproj b/src/DotNet/Dependencies/Packs.csproj
@@ -11,5 +11,10 @@
     <PackageDownload Include="Microsoft.MacCatalyst.Sdk"        Version="[$(MicrosoftMacCatalystSdkPackageVersion)]" />
     <PackageDownload Include="Microsoft.iOS.Ref"                Version="[$(MicrosoftiOSSdkPackageVersion)]" />
     <PackageDownload Include="Microsoft.iOS.Sdk"                Version="[$(MicrosoftiOSSdkPackageVersion)]" />
+    <PackageDownload Include="Microsoft.iOS.Windows.Sdk"        Version="[$(MicrosoftiOSSdkPackageVersion)]" Condition="$([MSBuild]::IsOSPlatform('windows'))" />
+    <PackageDownload Include="Microsoft.tvOS.Ref"               Version="[$(MicrosofttvOSSdkPackageVersion)]" />
+    <PackageDownload Include="Microsoft.tvOS.Sdk"               Version="[$(MicrosofttvOSSdkPackageVersion)]" />
+    <PackageDownload Include="Microsoft.macOS.Ref"              Version="[$(MicrosoftmacOSSdkPackageVersion)]" />
+    <PackageDownload Include="Microsoft.macOS.Sdk"              Version="[$(MicrosoftmacOSSdkPackageVersion)]" />
   </ItemGroup>
 </Project>
diff --git a/src/DotNet/Dependencies/Workloads.csproj b/src/DotNet/Dependencies/Workloads.csproj
@@ -6,5 +6,7 @@
     <PackageDownload Include="Microsoft.NET.Workload.Android"     Version="[$(MicrosoftAndroidSdkWindowsPackageVersion)]" />
     <PackageDownload Include="Microsoft.NET.Workload.MacCatalyst" Version="[$(MicrosoftMacCatalystSdkPackageVersion)]" />
     <PackageDownload Include="Microsoft.NET.Workload.iOS"         Version="[$(MicrosoftiOSSdkPackageVersion)]" />
+    <PackageDownload Include="Microsoft.NET.Workload.tvOS"        Version="[$(MicrosofttvOSSdkPackageVersion)]" />
+    <PackageDownload Include="Microsoft.NET.Workload.macOS"       Version="[$(MicrosoftmacOSSdkPackageVersion)]" />
   </ItemGroup>
 </Project>