Skip to content

Commit 9f4deb3

Browse files
mattleibowrmarinho
authored andcommitted
Merged PR 53979: Merge rel/10-rc2 into internal/rel/10-rc2
Fix a merge conflict with the MAUI bump. ---- #### AI description (iteration 1) #### PR Classification This pull request performs a dependency configuration update for .NET MAUI package references and version settings. #### PR Summary The changes update configuration files to use the latest .NET MAUI settings. - `NuGet.config`: Modifies the MAUI package reference by replacing the .NET 8 key and URL with the .NET 9 equivalent. - `eng/Versions.props`: Bumps the previous MAUI released version from 9.0.82 to 9.0.110. <!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
2 parents 0235585 + 69f3df6 commit 9f4deb3

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

NuGet.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
<add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
2626
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" protocolVersion="3" />
2727
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" protocolVersion="3" />
28-
<!-- Added manually for .NET 8 MAUI -->
29-
<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" />
28+
<!-- Added manually for .NET 9 MAUI -->
29+
<add key="darc-pub-dotnet-maui-69d28e51" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-maui-69d28e51/nuget/v3/index.json" />
3030
<!-- Added manually for dotnet/runtime 8.0.21 -->
3131
<add key="darc-pub-dotnet-runtime-c0390586" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/8.0.415-servicing.25476.4-shipping/nuget/v3/index.json" />
3232
<!-- Added manually for dotnet/runtime 9.0.10 -->

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</PropertyGroup>
2828
<PropertyGroup>
2929
<!-- Current previous .NET SDK major version's stable release of MAUI packages -->
30-
<MicrosoftMauiPreviousDotNetReleasedVersion>9.0.82</MicrosoftMauiPreviousDotNetReleasedVersion>
30+
<MicrosoftMauiPreviousDotNetReleasedVersion>9.0.110</MicrosoftMauiPreviousDotNetReleasedVersion>
3131
<!-- dotnet/sdk -->
3232
<MicrosoftNETSdkPackageVersion>10.0.100-rc.2.25501.104</MicrosoftNETSdkPackageVersion>
3333
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>

0 commit comments

Comments
 (0)