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

[build] add feeds to fix MAUI Integration #9344

Merged
merged 1 commit into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<!-- Android binary, to support delta APK install -->
<add key="xamarin.android util" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/Xamarin.Android/nuget/v3/index.json" />
<!-- Added manually for dotnet/runtime 8.0.10 -->
<add key="darc-pub-dotnet-emsdk-d667257" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-d6672570/nuget/v3/index.json" />
<add key="darc-pub-dotnet-runtime-b5f5349" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-b5f53494/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-91b783e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-91b783ed/nuget/v3/index.json" />
<add key="darc-pub-dotnet-runtime-eeb6f52" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-eeb6f525/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources />
</configuration>
7 changes: 3 additions & 4 deletions build-tools/scripts/DotNet.targets
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,13 @@

<!-- Parse NuGet.config -->
<XmlPeek
Condition=" '$(MauiUseLocalPacks)' != 'true' "
XmlInputPath="$(XamarinAndroidSourcePath)NuGet.config"
Condition=" '$(MauiUseLocalPacks)' == 'true' "
XmlInputPath="$(MauiSourcePath)\NuGet.config"
Query="/configuration/packageSources/add/@value">
<Output TaskParameter="Result" ItemName="_NuGetSources" />
</XmlPeek>
<XmlPeek
Condition=" '$(MauiUseLocalPacks)' == 'true' "
XmlInputPath="$(MauiSourcePath)\NuGet.config"
XmlInputPath="$(XamarinAndroidSourcePath)NuGet.config"
Query="/configuration/packageSources/add/@value">
<Output TaskParameter="Result" ItemName="_NuGetSources" />
</XmlPeek>
Expand Down
Loading