Skip to content
This repository was archived by the owner on Jun 20, 2023. It is now read-only.

Commit aa6ce5b

Browse files
RedthRedth
authored
Merge pull request #49 from xamarin/v25.3.1
v25.3.1
2 parents b652773 + 887f5bd commit aa6ce5b

File tree

158 files changed

+2820
-433
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

158 files changed

+2820
-433
lines changed

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ output/
1616
*.xcuserstate
1717
*.csproj.user
1818
*/nuget/*.targets
19-
19+
!merge.targets
20+
!template.targets
2021

2122
Resource.designer.cs
2223
component.yaml

‎AndroidSupport.sln

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Transition", "transition\so
5353
EndProject
5454
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exif", "exifinterface\source\Exif.csproj", "{EBD7CBA0-E16C-460D-908C-89D453DDC556}"
5555
EndProject
56+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Annotations", "support-annotations\source\Annotations.csproj", "{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}"
57+
EndProject
58+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DynamicAnimation", "dynamic-animation\source\DynamicAnimation.csproj", "{157F6FC3-90D1-40D5-91D0-A2552034B41A}"
59+
EndProject
5660
Global
5761
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5862
Debug|Any CPU = Debug|Any CPU
@@ -163,5 +167,13 @@ Global
163167
{EBD7CBA0-E16C-460D-908C-89D453DDC556}.Debug|Any CPU.Build.0 = Debug|Any CPU
164168
{EBD7CBA0-E16C-460D-908C-89D453DDC556}.Release|Any CPU.ActiveCfg = Release|Any CPU
165169
{EBD7CBA0-E16C-460D-908C-89D453DDC556}.Release|Any CPU.Build.0 = Release|Any CPU
170+
{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
171+
{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
172+
{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
173+
{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.Build.0 = Release|Any CPU
174+
{157F6FC3-90D1-40D5-91D0-A2552034B41A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
175+
{157F6FC3-90D1-40D5-91D0-A2552034B41A}.Debug|Any CPU.Build.0 = Debug|Any CPU
176+
{157F6FC3-90D1-40D5-91D0-A2552034B41A}.Release|Any CPU.ActiveCfg = Release|Any CPU
177+
{157F6FC3-90D1-40D5-91D0-A2552034B41A}.Release|Any CPU.Build.0 = Release|Any CPU
166178
EndGlobalSection
167179
EndGlobal

‎Metadata.generated.xml

Lines changed: 1341 additions & 60 deletions
Large diffs are not rendered by default.

‎animated-vector-drawable/nuget/Xamarin.Android.Support.Animated.Vector.Drawable.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
<copyright>Copyright © Microsoft Corporation</copyright>
1212
<projectUrl>https://github.com/xamarin/AndroidSupportComponents/</projectUrl>
1313
<licenseUrl>https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md</licenseUrl>
14-
<iconUrl>https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/animated-vector-drawable_128x128.png</iconUrl>
14+
<iconUrl>https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/animated-vector-drawable_128x128.png</iconUrl>
1515
<dependencies>
1616
<group targetFramework="MonoAndroid70">
17-
<dependency id="Xamarin.Build.Download" version="0.4.2" />
17+
<dependency id="Xamarin.Build.Download" version="0.4.3" />
1818
<dependency id="Xamarin.Android.Support.Vector.Drawable" version="[$version$]"/>
1919
</group>
2020
</dependencies>

‎animated-vector-drawable/samples/VectorDrawableSample/VectorDrawableSample.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\Xamarin.Build.Download.0.4.2\build\Xamarin.Build.Download.props" Condition="Exists('..\packages\Xamarin.Build.Download.0.4.2\build\Xamarin.Build.Download.props')" />
3+
<Import Project="..\packages\Xamarin.Build.Download.0.4.3\build\Xamarin.Build.Download.props" Condition="Exists('..\packages\Xamarin.Build.Download.0.4.3\build\Xamarin.Build.Download.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -103,7 +103,6 @@
103103
</ProjectReference>
104104
</ItemGroup>
105105
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
106-
<Import Project="..\..\..\vector-drawable\buildtask\bin\Release\Xamarin.Android.Support.Tasks.VectorDrawable.targets" />
107106
<Import Project="..\..\..\generated.targets" />
108-
<Import Project="..\packages\Xamarin.Build.Download.0.4.2\build\Xamarin.Build.Download.targets" Condition="Exists('..\packages\Xamarin.Build.Download.0.4.2\build\Xamarin.Build.Download.targets')" />
107+
<Import Project="..\packages\Xamarin.Build.Download.0.4.3\build\Xamarin.Build.Download.targets" Condition="Exists('..\packages\Xamarin.Build.Download.0.4.3\build\Xamarin.Build.Download.targets')" />
109108
</Project>

‎animated-vector-drawable/samples/VectorDrawableSample/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Xamarin.Build.Download" version="0.4.2" targetFramework="monoandroid70" />
3+
<package id="Xamarin.Build.Download" version="0.4.3" targetFramework="monoandroid70" />
44
</packages>

‎animated-vector-drawable/source/Additions/Additions.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
using System;
2-
namespace Android.Support.Graphics.Drawable
3-
{
4-
// Metadata.xml XPath class reference: path="/api/package[@name='android.support.graphics.drawable']/class[@name='AnimatedVectorDrawableCompat']"
5-
public partial class AnimatedVectorDrawableCompat
6-
{
7-
public override void SetAlpha (int alpha)
8-
{
9-
Alpha = alpha;
10-
}
11-
}
12-
}
1+
//using System;
2+
//namespace Android.Support.Graphics.Drawable
3+
//{
4+
// // Metadata.xml XPath class reference: path="/api/package[@name='android.support.graphics.drawable']/class[@name='AnimatedVectorDrawableCompat']"
5+
// public partial class AnimatedVectorDrawableCompat
6+
// {
7+
// public override void SetAlpha (int alpha)
8+
// {
9+
// Alpha = alpha;
10+
// }
11+
// }
12+
//}

‎animated-vector-drawable/source/Animated-Vector-Drawable.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\packages\Xamarin.Build.Download.0.4.2\build\Xamarin.Build.Download.props" Condition="Exists('..\..\packages\Xamarin.Build.Download.0.4.2\build\Xamarin.Build.Download.props')" />
3+
<Import Project="..\..\packages\Xamarin.Build.Download.0.4.3\build\Xamarin.Build.Download.props" Condition="Exists('..\..\packages\Xamarin.Build.Download.0.4.3\build\Xamarin.Build.Download.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -83,5 +83,5 @@
8383
<ItemGroup>
8484
<None Include="packages.config" />
8585
</ItemGroup>
86-
<Import Project="..\..\packages\Xamarin.Build.Download.0.4.2\build\Xamarin.Build.Download.targets" Condition="Exists('..\..\packages\Xamarin.Build.Download.0.4.2\build\Xamarin.Build.Download.targets')" />
86+
<Import Project="..\..\packages\Xamarin.Build.Download.0.4.3\build\Xamarin.Build.Download.targets" Condition="Exists('..\..\packages\Xamarin.Build.Download.0.4.3\build\Xamarin.Build.Download.targets')" />
8787
</Project>

‎animated-vector-drawable/source/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Xamarin.Build.Download" version="0.4.2" targetFramework="monoandroid70" />
3+
<package id="Xamarin.Build.Download" version="0.4.3" targetFramework="monoandroid70" />
44
</packages>

0 commit comments

Comments
 (0)