Merge branch 'main' into mu-20230329-androidx.media.players

This commit is contained in:
moljac 2024-07-05 07:52:30 +02:00 коммит произвёл GitHub
Родитель 6053520760 0d9339b4e8
Коммит 393a3a859d
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
4 изменённых файлов: 14 добавлений и 2 удалений

Просмотреть файл

@ -225,6 +225,7 @@
<AndroidNamespaceReplacement Include='adselection' Replacement='AdSelection' /> <AndroidNamespaceReplacement Include='adselection' Replacement='AdSelection' />
<AndroidNamespaceReplacement Include='appsetid' Replacement='AppSetId' /> <AndroidNamespaceReplacement Include='appsetid' Replacement='AppSetId' />
<AndroidNamespaceReplacement Include='customaudience' Replacement='CustomAudience' /> <AndroidNamespaceReplacement Include='customaudience' Replacement='CustomAudience' />
<AndroidNamespaceReplacement Include='mediaextensions' Replacement='MediaExtensions' />
</ItemGroup> </ItemGroup>
</Project> </Project>

Просмотреть файл

@ -240,8 +240,8 @@
{ {
"groupId": "androidx.car.app", "groupId": "androidx.car.app",
"artifactId": "app", "artifactId": "app",
"version": "1.2.0", "version": "1.4.0",
"nugetVersion": "1.2.0.11", "nugetVersion": "1.4.0",
"nugetId": "Xamarin.AndroidX.Car.App.App", "nugetId": "Xamarin.AndroidX.Car.App.App",
"dependencyOnly": false "dependencyOnly": false
}, },

Просмотреть файл

@ -25,6 +25,9 @@ if (!nupkgs.Any()) {
Warning($"##vso[task.logissue type=warning]No NuGet packages were found."); Warning($"##vso[task.logissue type=warning]No NuGet packages were found.");
} else { } else {
Parallel.ForEach (nupkgs, nupkg => { Parallel.ForEach (nupkgs, nupkg => {
// See https://github.com/xamarin/AndroidX/issues/916
if (nupkg.FullPath.Contains ("Xamarin.AndroidX.Car.App.App"))
return;
var version = "--latest"; var version = "--latest";
var versionFile = nupkg.FullPath + ".baseversion"; var versionFile = nupkg.FullPath + ".baseversion";
if (FileExists(versionFile)) { if (FileExists(versionFile)) {

Просмотреть файл

@ -93,16 +93,24 @@ AndroidX.Car.App.Annotations
AndroidX.Car.App.Connection AndroidX.Car.App.Connection
AndroidX.Car.App.Constraints AndroidX.Car.App.Constraints
AndroidX.Car.App.Hardware AndroidX.Car.App.Hardware
AndroidX.Car.App.Hardware.Climate
AndroidX.Car.App.Hardware.Common AndroidX.Car.App.Hardware.Common
AndroidX.Car.App.Hardware.Info AndroidX.Car.App.Hardware.Info
AndroidX.Car.App.Managers AndroidX.Car.App.Managers
AndroidX.Car.App.Media
AndroidX.Car.App.MediaExtensions
AndroidX.Car.App.Messaging
AndroidX.Car.App.Messaging.Model
AndroidX.Car.App.Model AndroidX.Car.App.Model
AndroidX.Car.App.Model.Constraints AndroidX.Car.App.Model.Constraints
AndroidX.Car.App.Model.SignIn AndroidX.Car.App.Model.SignIn
AndroidX.Car.App.Navigation AndroidX.Car.App.Navigation
AndroidX.Car.App.Navigation.Model AndroidX.Car.App.Navigation.Model
AndroidX.Car.App.Navigation.Model.Constraints
AndroidX.Car.App.Notification AndroidX.Car.App.Notification
AndroidX.Car.App.Serialization AndroidX.Car.App.Serialization
AndroidX.Car.App.Suggestion
AndroidX.Car.App.Suggestion.Model
AndroidX.Car.App.Utils AndroidX.Car.App.Utils
AndroidX.Car.App.Validation AndroidX.Car.App.Validation
AndroidX.Car.App.Versioning AndroidX.Car.App.Versioning