Skip to content
This repository has been archived by the owner on Dec 21, 2023. It is now read-only.

Commit

Permalink
Merge branch 'main' into release/6.0.3xx-rc1
Browse files Browse the repository at this point in the history
  • Loading branch information
@Redth
Redth committed Mar 26, 2022
2 parents 148e69d + e615f51 commit 78fafb4
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,25 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4050c126c96204c3c4cdd9f3ba715a0779201719</Sha>
</Dependency>
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="31.0.300-rc.1.30">
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="31.0.300-rc.1.32">
<Uri>https://github.com/xamarin/xamarin-android</Uri>
<Sha>1f907f01c3e239ee24ddecc43787c5cae527491f</Sha>
<Sha>4b33a6229c9babde795dea48d20ca86d8f9f9c97</Sha>
</Dependency>
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.100-rc.1.69">
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.100-rc.1.92">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>aa3d95ef22985c6e5bfaa80da558acda89a8967d</Sha>
<Sha>a1a4771448538ae033ecd6408be40db4601ddb22</Sha>
</Dependency>
<Dependency Name="Microsoft.iOS.Sdk" Version="15.4.100-rc.1.69">
<Dependency Name="Microsoft.iOS.Sdk" Version="15.4.100-rc.1.92">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>aa3d95ef22985c6e5bfaa80da558acda89a8967d</Sha>
<Sha>a1a4771448538ae033ecd6408be40db4601ddb22</Sha>
</Dependency>
<Dependency Name="Microsoft.tvOS.Sdk" Version="15.4.100-rc.1.69">
<Dependency Name="Microsoft.tvOS.Sdk" Version="15.4.100-rc.1.92">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>aa3d95ef22985c6e5bfaa80da558acda89a8967d</Sha>
<Sha>a1a4771448538ae033ecd6408be40db4601ddb22</Sha>
</Dependency>
<Dependency Name="Microsoft.macOS.Sdk" Version="12.3.100-rc.1.69">
<Dependency Name="Microsoft.macOS.Sdk" Version="12.3.100-rc.1.92">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>aa3d95ef22985c6e5bfaa80da558acda89a8967d</Sha>
<Sha>a1a4771448538ae033ecd6408be40db4601ddb22</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.4" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
Expand Down
10 changes: 5 additions & 5 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
<MicrosoftNETWorkloadEmscriptenManifest60300PackageVersion>6.0.4</MicrosoftNETWorkloadEmscriptenManifest60300PackageVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenManifest60300PackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<!-- xamarin/xamarin-android -->
<MicrosoftAndroidSdkWindowsPackageVersion>31.0.300-rc.1.30</MicrosoftAndroidSdkWindowsPackageVersion>
<MicrosoftAndroidSdkWindowsPackageVersion>31.0.300-rc.1.32</MicrosoftAndroidSdkWindowsPackageVersion>
<!-- xamarin/xamarin-macios -->
<MicrosoftiOSSdkPackageVersion>15.4.100-rc.1.69</MicrosoftiOSSdkPackageVersion>
<MicrosoftMacCatalystSdkPackageVersion>15.4.100-rc.1.69</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>12.3.100-rc.1.69</MicrosoftmacOSSdkPackageVersion>
<MicrosofttvOSSdkPackageVersion>15.4.100-rc.1.69</MicrosofttvOSSdkPackageVersion>
<MicrosoftiOSSdkPackageVersion>15.4.100-rc.1.92</MicrosoftiOSSdkPackageVersion>
<MicrosoftMacCatalystSdkPackageVersion>15.4.100-rc.1.92</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>12.3.100-rc.1.92</MicrosoftmacOSSdkPackageVersion>
<MicrosofttvOSSdkPackageVersion>15.4.100-rc.1.92</MicrosofttvOSSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22171.2</MicrosoftDotNetBuildTasksFeedPackageVersion>
</PropertyGroup>
<PropertyGroup>
Expand Down

0 comments on commit 78fafb4

Please sign in to comment.