Skip to content

Commit b8a4259

Browse files
LoopedBard3LoopedBard3
authored
Update maui dependencies to fix builds (#4899)
Update maui package versions and XCode version used.
1 parent aa07135 commit b8a4259

File tree

3 files changed

+60
-36
lines changed

3 files changed

+60
-36
lines changed

‎NuGet.config

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,11 @@
77
<clear />
88
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
99
<!-- Begin: Package sources from dotnet-android -->
10-
<add key="darc-pub-dotnet-android-8db145f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-8db145fa/nuget/v3/index.json" />
10+
<add key="darc-pub-dotnet-android-be1cab9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-be1cab92/nuget/v3/index.json" />
1111
<!-- End: Package sources from dotnet-android -->
12-
<!-- Begin: Package sources from dotnet-runtime -->
13-
<!-- End: Package sources from dotnet-runtime -->
14-
<!-- Begin: Package sources from dotnet-windowsdesktop -->
15-
<!-- End: Package sources from dotnet-windowsdesktop -->
16-
<!-- Begin: Package sources from xamarin-xamarin-macios -->
17-
<add key="darc-pub-xamarin-xamarin-macios-b660cc6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-xamarin-xamarin-macios-b660cc67/nuget/v3/index.json" />
18-
<!-- End: Package sources from xamarin-xamarin-macios -->
19-
<!-- Begin: Package sources from dotnet-aspnetcore -->
20-
<!-- End: Package sources from dotnet-aspnetcore -->
21-
<!-- Begin: Package sources from dotnet-emsdk -->
22-
<!-- End: Package sources from dotnet-emsdk -->
23-
<!-- Begin: Package sources from dotnet-maui -->
24-
<!-- End: Package sources from dotnet-maui -->
12+
<!-- Begin: Package sources from dotnet-macios -->
13+
<add key="darc-pub-dotnet-macios-8071534" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-80715342/nuget/v3/index.json" />
14+
<!-- End: Package sources from dotnet-macios -->
2515
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2616
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
2717
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
@@ -37,6 +27,21 @@
3727
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
3828
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
3929
<add key="benchmark-dotnet-prerelease" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/benchmark-dotnet-prerelease/nuget/v3/index.json" />
30+
31+
<!-- Added manually for .NET 8 MAUI -->
32+
<add key="darc-pub-dotnet-maui-a33a875e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-maui-a33a875e/nuget/v3/index.json" />
33+
<!-- Added manually for dotnet/runtime 8.0.18 -->
34+
<add key="darc-pub-dotnet-runtime-c0390586" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-c0390586/nuget/v3/index.json" />
35+
<!-- Added manually for dotnet/runtime 9.0.8 -->
36+
<add key="darc-pub-dotnet-runtime-b4fb3656" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-89d42fdf/nuget/v3/index.json" />
37+
<!-- Added manually for .NET 9 Android -->
38+
<add key="darc-pub-dotnet-android-1719a35" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-1719a35b/nuget/v3/index.json" />
39+
<!-- Added manually for .NET 8 Android -->
40+
<add key="darc-pub-dotnet-android-cdb777a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-cdb777a0/nuget/v3/index.json" />
41+
<!-- Added manually for .NET 9 macios -->
42+
<add key="darc-pub-dotnet-macios-0e1a194" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-0e1a194f/nuget/v3/index.json" />
43+
<add key="darc-pub-dotnet-macios-0e1a194-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-0e1a194f-1/nuget/v3/index.json" />
44+
<add key="darc-pub-dotnet-macios-af20d0b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-af20d0b6/nuget/v3/index.json" />
4045
</packageSources>
4146
<disabledPackageSources>
4247
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->

‎eng/Version.Details.xml

Lines changed: 40 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -55,41 +55,60 @@
5555
Mapping_Microsoft.tvOS.Sdk:default
5656
-->
5757
<!-- Dependencies for .NET MAUI workload -->
58-
<Dependency Name="Microsoft.Maui.Controls" Version="9.0.80-ci.main.25270.2">
58+
<Dependency Name="Microsoft.Maui.Controls" Version="10.0.0-ci.net10.25404.10">
5959
<Sha>79c97a00bbc6d9710f46cc644154505bf01f3c51</Sha>
6060
<Uri>https://github.com/dotnet/maui</Uri>
6161
</Dependency>
62-
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.103-servicing.25065.25" CoherentParentDependency="Microsoft.Maui.Controls">
63-
<Sha>049799c39d766c58ef6388865d5f5ed273b6a75e</Sha>
64-
<Uri>https://github.com/dotnet/sdk</Uri>
62+
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-preview.7.25380.108">
63+
<Sha>30000d883e06c122311a66894579bc12329a09d4</Sha>
64+
<Uri>https://github.com/dotnet/dotnet</Uri>
6565
</Dependency>
66-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.1" CoherentParentDependency="Microsoft.NET.Sdk">
67-
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
68-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
66+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.100-preview.7.25380.108" CoherentParentDependency="Microsoft.NET.Sdk">
67+
<Sha>30000d883e06c122311a66894579bc12329a09d4</Sha>
68+
<Uri>https://github.com/dotnet/dotnet</Uri>
6969
</Dependency>
7070
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100" Version="9.0.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
7171
<Sha>4c9d1b112c16716c2479e054e9ad4db8b5b8c70c</Sha>
7272
<Uri>https://github.com/dotnet/emsdk</Uri>
7373
</Dependency>
74-
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="35.0.60" CoherentParentDependency="Microsoft.Maui.Controls">
75-
<Sha>8db145fa59226e66e81ae5b8a8b116d225e4bff2</Sha>
74+
<!-- Previous .NET Android version(s) -->
75+
<Dependency Name="Microsoft.NET.Sdk.Android.Manifest-9.0.100" Version="35.0.92" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
7676
<Uri>https://github.com/dotnet/android</Uri>
77+
<Sha>be1cab92326783479054e72990da08008e5be819</Sha>
7778
</Dependency>
78-
<Dependency Name="Microsoft.MacCatalyst.Sdk.net9.0_18.2" Version="18.2.9181" CoherentParentDependency="Microsoft.Maui.Controls">
79-
<Sha>b660cc67d31c4f8da94b221c864eb27061c60cda</Sha>
80-
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
79+
<Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_18.5" Version="18.5.10603-net10-p7">
80+
<Uri>https://github.com/dotnet/macios</Uri>
81+
<Sha>cf8e458a7acc484e3a50f64e427680e35d7bf49f</Sha>
8182
</Dependency>
82-
<Dependency Name="Microsoft.macOS.Sdk.net9.0_15.2" Version="15.2.9181" CoherentParentDependency="Microsoft.Maui.Controls">
83-
<Sha>b660cc67d31c4f8da94b221c864eb27061c60cda</Sha>
84-
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
83+
<Dependency Name="Microsoft.macOS.Sdk.net10.0_15.5" Version="15.5.10603-net10-p7">
84+
<Uri>https://github.com/dotnet/macios</Uri>
85+
<Sha>cf8e458a7acc484e3a50f64e427680e35d7bf49f</Sha>
8586
</Dependency>
86-
<Dependency Name="Microsoft.iOS.Sdk.net9.0_18.2" Version="18.2.9181" CoherentParentDependency="Microsoft.Maui.Controls">
87-
<Sha>b660cc67d31c4f8da94b221c864eb27061c60cda</Sha>
88-
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
87+
<Dependency Name="Microsoft.iOS.Sdk.net10.0_18.5" Version="18.5.10603-net10-p7">
88+
<Uri>https://github.com/dotnet/macios</Uri>
89+
<Sha>cf8e458a7acc484e3a50f64e427680e35d7bf49f</Sha>
8990
</Dependency>
90-
<Dependency Name="Microsoft.tvOS.Sdk.net9.0_18.2" Version="18.2.9181" CoherentParentDependency="Microsoft.Maui.Controls">
91-
<Sha>b660cc67d31c4f8da94b221c864eb27061c60cda</Sha>
92-
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
91+
<Dependency Name="Microsoft.tvOS.Sdk.net10.0_18.5" Version="18.5.10603-net10-p7">
92+
<Uri>https://github.com/dotnet/macios</Uri>
93+
<Sha>cf8e458a7acc484e3a50f64e427680e35d7bf49f</Sha>
94+
</Dependency>
95+
<!-- Previous .NET iOS version(s) -->
96+
<!-- This is a subscription of the .NET 9 latest stable versions of our packages -->
97+
<Dependency Name="Microsoft.MacCatalyst.Sdk.net9.0_18.5" Version="18.5.9216" CoherentParentDependency="Microsoft.MacCatalyst.Sdk.net10.0_18.5">
98+
<Uri>https://github.com/dotnet/macios</Uri>
99+
<Sha>af20d0b615668b2e13d0ffe81ba7ec4f89a398c9</Sha>
100+
</Dependency>
101+
<Dependency Name="Microsoft.macOS.Sdk.net9.0_15.5" Version="15.5.9216" CoherentParentDependency="Microsoft.macOS.Sdk.net10.0_15.5">
102+
<Uri>https://github.com/dotnet/macios</Uri>
103+
<Sha>af20d0b615668b2e13d0ffe81ba7ec4f89a398c9</Sha>
104+
</Dependency>
105+
<Dependency Name="Microsoft.iOS.Sdk.net9.0_18.5" Version="18.5.9216" CoherentParentDependency="Microsoft.iOS.Sdk.net10.0_18.5">
106+
<Uri>https://github.com/dotnet/macios</Uri>
107+
<Sha>af20d0b615668b2e13d0ffe81ba7ec4f89a398c9</Sha>
108+
</Dependency>
109+
<Dependency Name="Microsoft.tvOS.Sdk.net9.0_18.5" Version="18.5.9216" CoherentParentDependency="Microsoft.tvOS.Sdk.net10.0_18.5">
110+
<Uri>https://github.com/dotnet/macios</Uri>
111+
<Sha>af20d0b615668b2e13d0ffe81ba7ec4f89a398c9</Sha>
93112
</Dependency>
94113
</ToolsetDependencies>
95114
</Dependencies>

‎eng/performance/maui_scenarios_ios.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848

4949
<ItemGroup>
5050
<PreparePayloadWorkItem Include="@(MAUIiOSScenario)">
51-
<Command>sudo xcode-select -s /Applications/Xcode_16.3.app; $(Python) pre.py publish -f $(PERFLAB_Framework)-ios --self-contained -c Release -r ios-arm64 $(NativeAOTCommandProps) --binlog $(PreparePayloadWorkItemBaseDirectory)%(PreparePayloadWorkItem.ScenarioDirectoryName)/%(PreparePayloadWorkItem.ScenarioDirectoryName).binlog -o $(PreparePayloadWorkItemBaseDirectory)%(PreparePayloadWorkItem.ScenarioDirectoryName); cd ../; zip -r %(PreparePayloadWorkItem.ScenarioDirectoryName).zip %(PreparePayloadWorkItem.ScenarioDirectoryName)</Command>
51+
<Command>sudo xcode-select -s /Applications/Xcode_16.4.app; $(Python) pre.py publish -f $(PERFLAB_Framework)-ios --self-contained -c Release -r ios-arm64 $(NativeAOTCommandProps) --binlog $(PreparePayloadWorkItemBaseDirectory)%(PreparePayloadWorkItem.ScenarioDirectoryName)/%(PreparePayloadWorkItem.ScenarioDirectoryName).binlog -o $(PreparePayloadWorkItemBaseDirectory)%(PreparePayloadWorkItem.ScenarioDirectoryName); cd ../; zip -r %(PreparePayloadWorkItem.ScenarioDirectoryName).zip %(PreparePayloadWorkItem.ScenarioDirectoryName)</Command>
5252
<WorkingDirectory>%(PreparePayloadWorkItem.PayloadDirectory)</WorkingDirectory>
5353
</PreparePayloadWorkItem>
5454
</ItemGroup>

0 commit comments

Comments
 (0)