Skip to content
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

Jump to bottom

[Build] Update maestro with macOS and tvOS #862

Merged
merged 3 commits into from
Apr 27, 2021
Merged

[Build] Update maestro with macOS and tvOS #862

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
322588d
[Build] Update maestro with macOS and tvOS
rmarinho Apr 27, 2021
b99a0b4
[Build] Add tvOS and macOS to workload/dogfood
rmarinho Apr 27, 2021
b3796e0
Add Microsoft.iOS.Windows.Sdk
jonathanpeppers Apr 27, 2021
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
20 changes: 14 additions & 6 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
8 changes: 5 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
5 changes: 5 additions & 0 deletions src/DotNet/Dependencies/Packs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 2 additions & 0 deletions src/DotNet/Dependencies/Workloads.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>