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.

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

[net8.0] Update dependencies from xamarin/xamarin-android #22097

Open
wants to merge 43 commits into
base: net8.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
f568bb1
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Apr 27, 2024
19de17d
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Apr 28, 2024
4851b6c
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Apr 29, 2024
bb70cdf
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Apr 30, 2024
e7a63d2
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] May 1, 2024
d6d952c
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] May 2, 2024
6f54380
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] May 3, 2024
674d8aa
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] May 4, 2024
ffb8755
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] May 5, 2024
77d327a
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] May 6, 2024
156cd6a
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] May 7, 2024
396a27a
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] May 8, 2024
4a61690
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] May 10, 2024
9436a58
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] May 11, 2024
2cfdd3a
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] May 12, 2024
572927d
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] May 13, 2024
b77cf38
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] May 14, 2024
ecee6ec
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] May 15, 2024
3b4ed71
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] May 16, 2024
648664f
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] May 17, 2024
80ae122
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] May 18, 2024
c5e8f1f
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] May 19, 2024
ec88dc3
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] May 21, 2024
71735e9
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] May 22, 2024
f2b5480
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] May 23, 2024
aaeee53
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] May 24, 2024
5ea7966
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] May 25, 2024
d107f04
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] May 26, 2024
3deda9c
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] May 27, 2024
a257e87
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] May 28, 2024
bcc177a
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] May 29, 2024
8a08b4e
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] May 30, 2024
2ba0a95
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] May 31, 2024
6a39ebf
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Jun 1, 2024
6af909b
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Jun 2, 2024
8742401
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Jun 3, 2024
99ae5dd
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Jun 4, 2024
253f28b
Update NuGet.config
rmarinho Jun 4, 2024
b6c6141
Use 8.0.204
rmarinho Jun 4, 2024
b954182
Merge branch 'net8.0' into darc-net8.0-b6cf9a86-b0d4-43a3-afef-b3d9ec…
rmarinho Jun 4, 2024
dd7cd3c
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Jun 5, 2024
0dd4f6d
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Jun 6, 2024
e1ac884
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Jun 7, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
33 changes: 13 additions & 20 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,26 @@
<configuration>
<packageSources>
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-runtime -->
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-08a90ca" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-08a90ca2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-08a90ca-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-08a90ca2-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-pub-dotnet-runtime-fd8f5b5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-fd8f5b5a/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
<add key="skiasharp" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/SkiaSharp/nuget/v3/index.json" />
<add key="wasdk-internal" value="https://pkgs.dev.azure.com/microsoft/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json" />
<add key="benchmark-dotnet-prerelease" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/benchmark-dotnet-prerelease/nuget/v3/index.json" />
<!-- Added manually for dotnet/runtime 7.0.15 -->
<add key="darc-pub-dotnet-emsdk-33b038b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-33b038b5/nuget/v3/index.json" />
<add key="darc-pub-dotnet-runtime-8473eeb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-8473eeb9/nuget/v3/index.json" />
<!-- Added manually for dotnet/runtime 6.0.26 -->
<add key="darc-pub-dotnet-runtime-647b468" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-647b468f/nuget/v3/index.json" />
<!-- Added manually for dotnet/runtime 7.0.17 -->
<add key="darc-pub-dotnet-emsdk-ec6dc98" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec6dc98e/nuget/v3/index.json" />
<add key="darc-pub-dotnet-runtime-38ab85f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-38ab85f1/nuget/v3/index.json" />
<!-- Added manually for dotnet/runtime 6.0.28 -->
<add key="darc-pub-dotnet-runtime-3e88dca" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-3e88dcaf/nuget/v3/index.json" />
<!-- <add key="local" value="artifacts" /> -->
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" protocolVersion="3" />
<!-- Added manually for dotnet/runtime 7.0.18 -->
<add key="darc-pub-dotnet-emsdk-c7ba18b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c7ba18be/nuget/v3/index.json" />
<add key="darc-pub-dotnet-runtime-0d59506" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-0d59506d/nuget/v3/index.json" />
<!-- Added manually for dotnet/runtime 6.0.29 -->
<add key="darc-pub-dotnet-runtime-c005d62" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-c005d624/nuget/v3/index.json" />
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" protocolVersion="3" />
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" protocolVersion="3" />
</packageSources>
Expand Down
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.103-servicing.24119.1">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.204-servicing.24169.39">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>96079bf81dc2299f54c3a0673fed1cf58ca2a2a5</Sha>
<Sha>5b9983e91a5c841353034dbcdb9c1ced38e33de7</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.3">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>62304a6d7085e32672ec988835eab41d89b82e25</Sha>
<Sha>fd8f5b5af7d73f697fe9654ad8ed7953cd597287</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="8.0.3">
<Dependency Name="System.Text.Json" Version="8.0.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>62304a6d7085e32672ec988835eab41d89b82e25</Sha>
<Sha>fd8f5b5af7d73f697fe9654ad8ed7953cd597287</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="8.0.1">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand All @@ -24,9 +24,9 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>62304a6d7085e32672ec988835eab41d89b82e25</Sha>
</Dependency>
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="34.0.104">
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="34.0.114">
<Uri>https://github.com/xamarin/xamarin-android</Uri>
<Sha>183b7f7688f6b3283256555f50eec38fc35ef6f6</Sha>
<Sha>fa1b8017f7f8519bc55aa689ea016e4f03c994ee</Sha>
</Dependency>
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="17.2.8062">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
Expand All @@ -44,9 +44,9 @@
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>66484fc6c35c47e7b0d88d487ea19d0f7bcda80a</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.3" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.4" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>9a29abdd764a4de0f253ed368871877a47725247</Sha>
<Sha>08a90ca2c88b17f1b5d081318354a41db0882cff</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsAppSDK" Version="0.0.1">
<Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal</Uri>
Expand Down
10 changes: 5 additions & 5 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
<!-- Current previous .NET SDK major version's stable release of MAUI packages -->
<MicrosoftMauiPreviousDotNetReleasedVersion>7.0.101</MicrosoftMauiPreviousDotNetReleasedVersion>
<!-- dotnet/installer -->
<MicrosoftDotnetSdkInternalPackageVersion>8.0.103-servicing.24119.1</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>8.0.204-servicing.24169.39</MicrosoftDotnetSdkInternalPackageVersion>
<!-- dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>8.0.3</MicrosoftNETCoreAppRefPackageVersion>
<SystemTextJsonPackageVersion>8.0.3</SystemTextJsonPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.4</MicrosoftNETCoreAppRefPackageVersion>
<SystemTextJsonPackageVersion>8.0.4</SystemTextJsonPackageVersion>
<SystemTextEncodingsWebPackageVersion>8.0.0</SystemTextEncodingsWebPackageVersion>
<MicrosoftBclAsyncInterfacesPackageVersion>8.0.0</MicrosoftBclAsyncInterfacesPackageVersion>
<!-- Microsoft/Extensions -->
Expand All @@ -49,7 +49,7 @@
<MicrosoftExtensionsLoggingDebugVersion>8.0.0</MicrosoftExtensionsLoggingDebugVersion>
<MicrosoftExtensionsPrimitivesVersion>8.0.0</MicrosoftExtensionsPrimitivesVersion>
<!-- xamarin/xamarin-android -->
<MicrosoftAndroidSdkWindowsPackageVersion>34.0.104</MicrosoftAndroidSdkWindowsPackageVersion>
<MicrosoftAndroidSdkWindowsPackageVersion>34.0.114</MicrosoftAndroidSdkWindowsPackageVersion>
<!-- xamarin/xamarin-macios -->
<MicrosoftMacCatalystSdkPackageVersion>17.2.8062</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>14.2.8062</MicrosoftmacOSSdkPackageVersion>
Expand Down Expand Up @@ -136,7 +136,7 @@
</PropertyGroup>
<PropertyGroup>
<VersionBand Condition=" '$(VersionBand)' == '' ">$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftDotnetSdkInternalPackageVersion), `^\d+\.\d+\.\d`))00</VersionBand>
<DotNetVersionBand Condition=" '$(DotNetPreviewVersionBand)' == '' ">$(VersionBand)$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftDotnetSdkInternalPackageVersion), `\-(preview|rc|alpha).\d+`))</DotNetVersionBand>
<DotNetVersionBand Condition=" '$(DotNetPreviewVersionBand)' == '' ">8.0.100</DotNetVersionBand>
<DotNetSdkManifestsFolder>$(DotNetVersionBand)</DotNetSdkManifestsFolder>
<DotNetMauiManifestVersionBand>$(DotNetVersionBand)</DotNetMauiManifestVersionBand>
<DotNetMonoManifestVersionBand>$(DotNetVersionBand)</DotNetMonoManifestVersionBand>
Expand Down