Skip to content

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

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

Merged
merged 36 commits into from
Aug 17, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
3f51802
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Aug 10, 2023
ab92071
Keep MaciOS/Tizen on 8.0.100-preview.7 for now
jonathanpeppers Aug 10, 2023
57438e5
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Aug 10, 2023
b53d01b
Restore macios version band
jonathanpeppers Aug 10, 2023
fb8e461
darc update-dependencies --id 187639
jonathanpeppers Aug 10, 2023
d570687
darc update-dependencies --id 187638
jonathanpeppers Aug 10, 2023
35e3a56
darc update-dependencies --id 187637
jonathanpeppers Aug 10, 2023
751ba0d
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Aug 11, 2023
eedb681
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Aug 11, 2023
49f4dfe
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Aug 13, 2023
1c036a9
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Aug 15, 2023
008575f
Merge branch 'net8.0' into darc-net8.0-86149052-55dc-46f6-b48c-05eb3a…
jonathanpeppers Aug 15, 2023
3bc6718
[net8.0] Update dependencies from xamarin/xamarin-macios (#16749)
jonathanpeppers Aug 15, 2023
4b36722
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Aug 15, 2023
e7ab7a5
[net8.0] Update dependencies from xamarin/xamarin-macios (#16760)
dotnet-maestro[bot] Aug 15, 2023
7d4006d
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Aug 16, 2023
cf7603e
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Aug 16, 2023
b7742ca
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Aug 16, 2023
e1844ce
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Aug 16, 2023
a8c2be0
Merge branch 'darc-net8.0-4603d24b-e41b-4bf5-a490-35fc50cef099' into …
rmarinho Aug 16, 2023
5a80e35
Bump Tizen
rmarinho Aug 16, 2023
b328452
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Aug 16, 2023
fd8151c
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Aug 16, 2023
1254b2a
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Aug 16, 2023
538da27
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Aug 16, 2023
6560d65
Merge branch 'darc-net8.0-be292e1f-b40f-4a09-9a39-ad3de090b64b' into …
rmarinho Aug 16, 2023
6328466
Extract *all* files in workload manifest packs
jonathanpeppers Aug 16, 2023
c43ede3
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Aug 16, 2023
b8e12c8
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Aug 16, 2023
e82b4e2
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Aug 16, 2023
b3d56b2
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Aug 16, 2023
728e552
Merge branch 'darc-net8.0-f6b32f6c-747e-411b-9632-ae4c62fa025e' into …
rmarinho Aug 16, 2023
86b16f1
Revert "Merge branch 'darc-net8.0-f6b32f6c-747e-411b-9632-ae4c62fa025…
rmarinho Aug 16, 2023
0d13d0b
Set `UseRidGraph=true`
jonathanpeppers Aug 16, 2023
6886225
Set UseRidGraph=true earlier during the build
jonathanpeppers Aug 16, 2023
a08f8ef
[build] Set UseRidGraph to true on GraphicsTester
rmarinho Aug 17, 2023
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
32 changes: 16 additions & 16 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-preview.7.23376.3" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-rc.1.23415.5" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>daebeea8ea53b3b8c8d6656977f59991fc550885</Sha>
<Sha>e5bfaee3514192f2a496f8b0bdd00208ac15458d</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.7.23375.6" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-rc.1.23414.4" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>65b696cf5e7599ad68107138a1acb643d1cedd9d</Sha>
<Sha>e89794659669cb7bb967db73a7ea6889c3891727</Sha>
</Dependency>
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="34.0.0-preview.7.383">
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="34.0.0-rc.1.420">
<Uri>https://github.com/xamarin/xamarin-android</Uri>
<Sha>3cad6a931ded2a65a9849586edaa8947913eee72</Sha>
<Sha>786a1fd677e57534e20c26a5c5dda86cd5fc06fa</Sha>
</Dependency>
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="16.4.8694-net8-p7">
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="16.4.8774-net8-rc1">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>6df75714f41a9b5049e9026bfedd7d0e98e14eb2</Sha>
<Sha>0c18a67eb79dfbd94ad81a7f498866557aa80b7d</Sha>
</Dependency>
<Dependency Name="Microsoft.macOS.Sdk" Version="13.3.8694-net8-p7">
<Dependency Name="Microsoft.macOS.Sdk" Version="13.3.8774-net8-rc1">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>6df75714f41a9b5049e9026bfedd7d0e98e14eb2</Sha>
<Sha>0c18a67eb79dfbd94ad81a7f498866557aa80b7d</Sha>
</Dependency>
<Dependency Name="Microsoft.iOS.Sdk" Version="16.4.8694-net8-p7">
<Dependency Name="Microsoft.iOS.Sdk" Version="16.4.8774-net8-rc1">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>6df75714f41a9b5049e9026bfedd7d0e98e14eb2</Sha>
<Sha>0c18a67eb79dfbd94ad81a7f498866557aa80b7d</Sha>
</Dependency>
<Dependency Name="Microsoft.tvOS.Sdk" Version="16.4.8694-net8-p7">
<Dependency Name="Microsoft.tvOS.Sdk" Version="16.4.8774-net8-rc1">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>6df75714f41a9b5049e9026bfedd7d0e98e14eb2</Sha>
<Sha>0c18a67eb79dfbd94ad81a7f498866557aa80b7d</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-preview.7.23375.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-rc.1.23411.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>f2265941403ac9885fa7aa0057bd5cd56e80b511</Sha>
<Sha>abfa03c97f4175d4d209435cd0e71f558e36c3fd</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsAppSDK" Version="0.0.1">
<Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal</Uri>
Expand Down
18 changes: 9 additions & 9 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,26 @@
<!-- Current previous .NET SDK major version's stable release of MAUI packages -->
<MicrosoftMauiPreviousDotNetReleasedVersion>7.0.92</MicrosoftMauiPreviousDotNetReleasedVersion>
<!-- dotnet/installer -->
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-preview.7.23376.3</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-rc.1.23415.5</MicrosoftDotnetSdkInternalPackageVersion>
<!-- dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.7.23375.6</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-rc.1.23414.4</MicrosoftNETCoreAppRefPackageVersion>
<SystemTextJsonPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemTextJsonPackageVersion>
<SystemTextEncodingsWebPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemTextEncodingsWebPackageVersion>
<MicrosoftBclAsyncInterfacesPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftBclAsyncInterfacesPackageVersion>
<!-- Microsoft/Extensions -->
<MicrosoftExtensionsPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftExtensionsPackageVersion>
<SystemCodeDomPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemCodeDomPackageVersion>
<!-- xamarin/xamarin-android -->
<MicrosoftAndroidSdkWindowsPackageVersion>34.0.0-preview.7.383</MicrosoftAndroidSdkWindowsPackageVersion>
<MicrosoftAndroidSdkWindowsPackageVersion>34.0.0-rc.1.420</MicrosoftAndroidSdkWindowsPackageVersion>
<!-- xamarin/xamarin-macios -->
<MicrosoftMacCatalystSdkPackageVersion>16.4.8694-net8-p7</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>13.3.8694-net8-p7</MicrosoftmacOSSdkPackageVersion>
<MicrosoftiOSSdkPackageVersion>16.4.8694-net8-p7</MicrosoftiOSSdkPackageVersion>
<MicrosofttvOSSdkPackageVersion>16.4.8694-net8-p7</MicrosofttvOSSdkPackageVersion>
<MicrosoftMacCatalystSdkPackageVersion>16.4.8774-net8-rc1</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>13.3.8774-net8-rc1</MicrosoftmacOSSdkPackageVersion>
<MicrosoftiOSSdkPackageVersion>16.4.8774-net8-rc1</MicrosoftiOSSdkPackageVersion>
<MicrosofttvOSSdkPackageVersion>16.4.8774-net8-rc1</MicrosofttvOSSdkPackageVersion>
<!-- Samsung/Tizen.NET -->
<SamsungTizenSdkPackageVersion>7.0.122</SamsungTizenSdkPackageVersion>
<SamsungTizenSdkPackageVersion>7.0.124</SamsungTizenSdkPackageVersion>
<!-- emsdk -->
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-preview.7.23375.2</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-rc.1.23411.2</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<!-- wasdk -->
<MicrosoftWindowsAppSDKPackageVersion>1.3.230724000</MicrosoftWindowsAppSDKPackageVersion>
Expand Down
6 changes: 3 additions & 3 deletions src/DotNet/DotNet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
DestinationFolder="$(_InstallTempDirectory)"
/>
<ItemGroup>
<_WorkloadFiles Include="$(_InstallTempDirectory)data/WorkloadManifest.*" />
<_WorkloadFiles Include="$(_InstallTempDirectory)data/*" />
</ItemGroup>
<CopyWorkloadFiles
Name="microsoft.net.sdk.maui"
Expand Down Expand Up @@ -180,8 +180,8 @@
We downloaded these to $(_WorkloadManifestDir), so we could move files individually.
-->
<ItemGroup>
<_WorkloadFiles Include="$(_WorkloadManifestDir)microsoft.net.*/*/data/WorkloadManifest.*" />
<_WorkloadFiles Include="$(_WorkloadManifestDir)samsung.net.sdk.*/*/data/WorkloadManifest.*" />
<_WorkloadFiles Include="$(_WorkloadManifestDir)microsoft.net.*/*/data/*" />
<_WorkloadFiles Include="$(_WorkloadManifestDir)samsung.net.sdk.*/*/data/*" />
</ItemGroup>
<CopyWorkloadFiles
Files="@(_WorkloadFiles)"
Expand Down
1 change: 1 addition & 0 deletions src/Graphics/samples/GraphicsTester.WinUI.Desktop/GraphicsTester.WinUI.Desktop.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<WindowsPackageType>MSIX</WindowsPackageType>
<GenerateLibraryLayout>false</GenerateLibraryLayout>
<IsPackable>false</IsPackable>
<UseRidGraph>true</UseRidGraph>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions src/Workload/Microsoft.Maui.Sdk/Sdk/Microsoft.Maui.Sdk.Before.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
<OutputType Condition="'$(OutputType)' == 'Exe'">WinExe</OutputType>
<!-- Generate ReadyToRun (AOT) when building for Release -->
<PublishReadyToRun Condition=" '$(PublishReadyToRun)' == '' and '$(Configuration)' == 'Release' and '$(OutputType)' == 'WinExe' ">true</PublishReadyToRun>
<!-- Use full RID graph: https://github.com/dotnet/docs/issues/36527 -->
<UseRidGraph Condition=" '$([MSBuild]::GetTargetPlatformIdentifier($(TargetFramework)))' == 'windows' ">true</UseRidGraph>
</PropertyGroup>

<!-- The Windows App SDK does not support AnyCPU without a RID, so make sure we pick the "best" one we can -->
Expand Down