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

[net6.0] Update dependencies from xamarin/xamarin-android #9504

Merged
merged 7 commits into from
Aug 23, 2022
Merged

[net6.0] Update dependencies from xamarin/xamarin-android #9504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1c245af
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Aug 17, 2022
b652c4f
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Aug 17, 2022
9bdbe42
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Aug 17, 2022
c918e5e
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Aug 18, 2022
77c5561
Merge branch 'net6.0' into darc-net6.0-16f32cbd-2d7c-48c3-bd87-acfbd6…
mattleibow Aug 19, 2022
dbee078
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Aug 19, 2022
e309a7f
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Aug 22, 2022
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
4 changes: 2 additions & 2 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<!-- Begin: Package sources from dotnet-aspnetcore -->
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-pub-dotnet-runtime-6bb76b3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-6bb76b3f/nuget/v3/index.json" />
<add key="darc-pub-dotnet-runtime-531f715" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-531f715f/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-windowsdesktop -->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-1026ad5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-1026ad55/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-3f6c45a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3f6c45a2/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<!-- <add key="local" value="artifacts" /> -->
Expand Down
14 changes: 7 additions & 7 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.401-servicing.22414.1" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.401-servicing.22415.11" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>5f7c64b20387f212601fae8d5f88e8eb73b12a9c</Sha>
<Sha>ab13fb50e90766d83f7d8c0e1ab6a38cb30e7d41</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.9" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>6bb76b3f463ea3ae3c2327706760fcea7213e51a</Sha>
<Sha>531f715f281e7a6456375635c02b6dd301d95996</Sha>
</Dependency>
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="32.0.455">
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="32.0.461">
<Uri>https://github.com/xamarin/xamarin-android</Uri>
<Sha>4acf6c6a573002f79de7daa8c964642b30db086e</Sha>
<Sha>48f6b30172730f069c2279965cb62eb4041b66c0</Sha>
</Dependency>
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.447">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
Expand All @@ -28,9 +28,9 @@
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>e45c10c68e85a6c6bb10542dff5fcaac3f8dade3</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.8" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.9" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>1026ad55ddb8587bf68829d3f5e8abafa65548fe</Sha>
<Sha>3f6c45a2580cd9387b643163de8136a9691764c8</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsAppSDK" Version="0.0.1">
<Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal</Uri>
Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project>
<PropertyGroup>
<!-- dotnet/installer -->
<MicrosoftDotnetSdkInternalPackageVersion>6.0.401-servicing.22414.1</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.401-servicing.22415.11</MicrosoftDotnetSdkInternalPackageVersion>
<!-- dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>6.0.9</MicrosoftNETCoreAppRefPackageVersion>
<!-- NOTE: should eventually revert back to $(MicrosoftNETCoreAppRefPackageVersion) in .NET 7 -->
<MicrosoftExtensionsPackageVersion>6.0.0</MicrosoftExtensionsPackageVersion>
<MicrosoftExtensionsServicingPackageVersion>6.0.1</MicrosoftExtensionsServicingPackageVersion>
<SystemCodeDomPackageVersion>6.0.0</SystemCodeDomPackageVersion>
<!-- xamarin/xamarin-android -->
<MicrosoftAndroidSdkWindowsPackageVersion>32.0.455</MicrosoftAndroidSdkWindowsPackageVersion>
<MicrosoftAndroidSdkWindowsPackageVersion>32.0.461</MicrosoftAndroidSdkWindowsPackageVersion>
<!-- xamarin/xamarin-macios -->
<MicrosoftiOSSdkPackageVersion>15.4.447</MicrosoftiOSSdkPackageVersion>
<MicrosoftMacCatalystSdkPackageVersion>15.4.447</MicrosoftMacCatalystSdkPackageVersion>
Expand All @@ -18,7 +18,7 @@
<!-- Samsung/Tizen.NET -->
<SamsungTizenSdkPackageVersion>7.0.400-preview.1.0</SamsungTizenSdkPackageVersion>
<!-- emsdk -->
<MicrosoftNETWorkloadEmscriptenManifest60300PackageVersion>6.0.8</MicrosoftNETWorkloadEmscriptenManifest60300PackageVersion>
<MicrosoftNETWorkloadEmscriptenManifest60300PackageVersion>6.0.9</MicrosoftNETWorkloadEmscriptenManifest60300PackageVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenManifest60300PackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<!-- wasdk -->
<MicrosoftWindowsAppSDKPackageVersion>1.1.3</MicrosoftWindowsAppSDKPackageVersion>
Expand Down