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.

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

Android Ecosystem 20230714 net7.0 nuget bumps fix issue 16074 type renaming #16176

Merged
merged 2 commits into from
Jul 18, 2023
Merged

Android Ecosystem 20230714 net7.0 nuget bumps fix issue 16074 type renaming #16176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35bb927
android ecosystem package version bumps after alignment publish
moljac Jul 14, 2023
a10b6b9
Update Directory.Build.targets
moljac Jul 14, 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
26 changes: 13 additions & 13 deletions eng/AndroidX.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,55 +2,55 @@
<ItemGroup>
<PackageReference
Update="Xamarin.AndroidX.AppCompat.AppCompatResources"
Version="1.6.1.2"
Version="1.6.1.3"
/>
<PackageReference
Update="Xamarin.AndroidX.Browser"
Version="1.5.0.2"
Version="1.5.0.3"
/>
<PackageReference
Update="Xamarin.AndroidX.SwipeRefreshLayout"
Version="1.1.0.13"
Version="1.1.0.14"
/>
<PackageReference
Update="Xamarin.AndroidX.Lifecycle.LiveData"
Version="2.6.1.2"
Version="2.6.1.3"
/>
<PackageReference
Update="Xamarin.AndroidX.Navigation.UI"
Version="2.6.0"
Version="2.6.0.1"
/>
<PackageReference
Update="Xamarin.AndroidX.Navigation.Fragment"
Version="2.6.0"
Version="2.6.0.1"
/>
<PackageReference
Update="Xamarin.AndroidX.Navigation.Runtime"
Version="2.6.0"
Version="2.6.0.1"
/>
<PackageReference
Update="Xamarin.AndroidX.Navigation.Common"
Version="2.6.0"
Version="2.6.0.1"
/>
<PackageReference
Update="Xamarin.AndroidX.MediaRouter"
Version="1.4.0.1"
Version="1.4.0.2"
/>
<PackageReference
Update="Xamarin.AndroidX.Palette"
Version="1.0.0.18"
Version="1.0.0.19"
/>
<PackageReference
Update="Xamarin.AndroidX.RecyclerView"
Version="1.3.0.2"
Version="1.3.0.3"
/>
<PackageReference
Update="Xamarin.Build.Download"
Version="0.11.4"
/>
<PackageReference
Update="Xamarin.Google.Android.Material"
Version="1.9.0.1"
Version="1.9.0.2"
/>
<PackageReference
Update="Xamarin.AndroidX.Migration"
Expand All @@ -59,7 +59,7 @@
/>
<PackageReference
Update="Xamarin.AndroidX.Window.WindowJava"
Version="1.1.0"
Version="1.1.0.1"
/>
</ItemGroup>
</Project>
8 changes: 4 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@
<_MicrosoftWebWebView2Version>1.0.1823.32</_MicrosoftWebWebView2Version>
<!-- GLIDE - the android maven artifact in /src/Core/AndroidNative/maui/build.gradle -->
<!-- must be kept in sync with the binding library version to it here: -->
<_XamarinAndroidGlideVersion>4.15.1</_XamarinAndroidGlideVersion>
<_XamarinAndroidXSecurityVersion>1.1.0-alpha06</_XamarinAndroidXSecurityVersion>
<_XamarinGoogleCryptoTinkAndroidVersion>1.9.0.1</_XamarinGoogleCryptoTinkAndroidVersion>
<_XamarinAndroidGlideVersion>4.15.1.2</_XamarinAndroidGlideVersion>
<_XamarinAndroidXSecurityVersion>1.1.0.1-alpha06</_XamarinAndroidXSecurityVersion>
<_XamarinGoogleCryptoTinkAndroidVersion>1.9.0.2</_XamarinGoogleCryptoTinkAndroidVersion>
<!-- Android Maps -->
<XamarinGooglePlayServicesMaps>118.1.0.2</XamarinGooglePlayServicesMaps>
<XamarinGooglePlayServicesMaps>118.1.0.3</XamarinGooglePlayServicesMaps>
<!--
SKIASHARP & HARFBUZZSHARP - the various things must be kept in sync with maui graphics:
- NuGet versions below
Expand Down
12 changes: 6 additions & 6 deletions src/Compatibility/ControlGallery/src/Android/Compatibility.ControlGallery.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="Xam.Plugin.DeviceInfo" Version="4.1.1" />
<PackageReference Include="Xamarin.Build.Download" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" />
<PackageReference Include="Xamarin.AndroidX.Browser" />
<PackageReference Include="Xamarin.AndroidX.Palette" />
<PackageReference Include="Xamarin.Google.Android.Material" />
<PackageReference Include="Xamarin.Build.Download" Version="0.11.4" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.6.1.3" />
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.5.0.3" />
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.19" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.9.0.2" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions ...ompatibility/ControlGallery/src/EmbeddingTestBeds/Embedding.Droid/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project>
<ItemGroup>
<PackageReference Include="Xamarin.AndroidX.Browser" />
<PackageReference Include="Xamarin.AndroidX.Palette" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" />
<PackageReference Include="Xamarin.Google.Android.Material" />
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.5.0.2" />
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.19" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.6.1.3" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.9.0.2" />
</ItemGroup>
<Import Project="..\..\..\..\..\eng\AndroidX.targets" />
</Project>
6 changes: 3 additions & 3 deletions src/Compatibility/Maps/src/Android/Compatibility.Maps.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" />
<PackageReference Include="Xamarin.Google.Android.Material" />
<PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="118.1.0.2" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.6.1.3" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.9.0.2" />
<PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="118.1.0.3" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Compatibility/Material/src/Android/Compatibility.Material.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<AndroidResource Include="Resources\**\*" />
</ItemGroup>
<ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) " >
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" />
<PackageReference Include="Xamarin.Google.Android.Material" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.6.1.3" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.9.0.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">
Expand Down
6 changes: 3 additions & 3 deletions src/Controls/Foldable/src/Controls.Foldable.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
</ItemGroup>
<ItemGroup Condition=" '$(UseMaui)' != 'true' and '$(TargetPlatformIdentifier)' == 'android' ">
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" />
<PackageReference Include="Xamarin.Google.Android.Material" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.6.1.3" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.9.0.2" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' ">
<PackageReference Include="Xamarin.AndroidX.Window.WindowJava" />
<PackageReference Include="Xamarin.AndroidX.Window.WindowJava" Version="1.1.0.1" />
</ItemGroup>

<!-- Add icon for NuGet -->
Expand Down
16 changes: 8 additions & 8 deletions src/Core/src/Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@
<ProjectReference Include="..\..\Graphics\src\Graphics.Win2D\Graphics.Win2D.csproj" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-android'))">
<PackageReference Include="Xamarin.Android.Glide" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" />
<PackageReference Include="Xamarin.Google.Android.Material" />
<PackageReference Include="Xamarin.AndroidX.SwipeRefreshLayout" />
<PackageReference Include="Xamarin.AndroidX.Navigation.UI" />
<PackageReference Include="Xamarin.AndroidX.Navigation.Fragment" />
<PackageReference Include="Xamarin.AndroidX.Navigation.Runtime" />
<PackageReference Include="Xamarin.AndroidX.Navigation.Common" />
<PackageReference Include="Xamarin.Android.Glide" Version="4.15.1.2" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.6.1.3" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.9.0.2" />
<PackageReference Include="Xamarin.AndroidX.SwipeRefreshLayout" Version="1.1.0.14" />
<PackageReference Include="Xamarin.AndroidX.Navigation.UI" Version="2.6.0.1" />
<PackageReference Include="Xamarin.AndroidX.Navigation.Fragment" Version="2.6.0.1" />
<PackageReference Include="Xamarin.AndroidX.Navigation.Runtime" Version="2.6.0.1" />
<PackageReference Include="Xamarin.AndroidX.Navigation.Common" Version="2.6.0.1" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-tizen'))">
<PackageReference Include="Tizen.UIExtensions.NUI" />
Expand Down
6 changes: 3 additions & 3 deletions src/Essentials/src/Essentials.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
<Compile Include="**\*.android.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
<Compile Include="**\*.android.*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
<AndroidResource Include="Resources\xml\*.xml" />
<PackageReference Include="Xamarin.AndroidX.Browser" />
<PackageReference Include="Xamarin.AndroidX.Security.SecurityCrypto" />
<PackageReference Include="Xamarin.Google.Crypto.Tink.Android" />
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.5.0.3" />
<PackageReference Include="Xamarin.AndroidX.Security.SecurityCrypto" Version="1.1.0.1-alpha06" />
<PackageReference Include="Xamarin.Google.Crypto.Tink.Android" Version="1.9.0.2" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'ios' Or '$(TargetPlatformIdentifier)' == 'maccatalyst' ">
<Compile Include="**\*.ios.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
Expand Down