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

Commit d396f46

Browse files
RedthRedth
authored
Merge pull request #33 from xamarin/v25.1.0
Update to v25.1.0
2 parents 59c3563 + 3caf828 commit d396f46

File tree

200 files changed

+10801
-833
lines changed

Some content is hidden

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

200 files changed

+10801
-833
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ output/
1515
*.xcuserstate
1616
*.xcuserstate
1717
*.csproj.user
18+
*/nuget/*.targets
19+
1820

1921
Resource.designer.cs
2022
component.yaml
2123
Details.md
24+
/generated.targets

‎AndroidSupport.sln

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Media-Compat", "support-med
5151
EndProject
5252
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Transition", "transition\source\Transition.csproj", "{BF8F6617-A16E-43B8-9985-3D1066D1A081}"
5353
EndProject
54+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exif", "exifinterface\source\Exif.csproj", "{EBD7CBA0-E16C-460D-908C-89D453DDC556}"
55+
EndProject
5456
Global
5557
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5658
Debug|Any CPU = Debug|Any CPU
@@ -157,5 +159,9 @@ Global
157159
{BF8F6617-A16E-43B8-9985-3D1066D1A081}.Debug|Any CPU.Build.0 = Debug|Any CPU
158160
{BF8F6617-A16E-43B8-9985-3D1066D1A081}.Release|Any CPU.ActiveCfg = Release|Any CPU
159161
{BF8F6617-A16E-43B8-9985-3D1066D1A081}.Release|Any CPU.Build.0 = Release|Any CPU
162+
{EBD7CBA0-E16C-460D-908C-89D453DDC556}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
163+
{EBD7CBA0-E16C-460D-908C-89D453DDC556}.Debug|Any CPU.Build.0 = Debug|Any CPU
164+
{EBD7CBA0-E16C-460D-908C-89D453DDC556}.Release|Any CPU.ActiveCfg = Release|Any CPU
165+
{EBD7CBA0-E16C-460D-908C-89D453DDC556}.Release|Any CPU.Build.0 = Release|Any CPU
160166
EndGlobalSection
161167
EndGlobal

‎Metadata.generated.xml

Lines changed: 9207 additions & 0 deletions
Large diffs are not rendered by default.

‎SupportConsts.cs

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎animated-vector-drawable/component/component.template.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ samples:
3737
- Xamarin.Android.Support.v7.AppCompat
3838
- Xamarin.Android.Support.Vector.Drawable
3939
removeNodes:
40+
- "//xNS:Import[contains (@Project, 'Xamarin.Android.Support.Tasks.VectorDrawable.targets')]"
4041
- "//xNS:Import[contains (@Project, 'Xamarin.Android.Support.Vector.Drawable.targets')]"
42+
- "//xNS:Import[contains (@Project, 'generated.targets')]"
4143
local-nuget-repo: ../../output
4244
no_build: true

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,15 @@
1313
<licenseUrl>https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md</licenseUrl>
1414
<iconUrl>https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/animated-vector-drawable_128x128.png</iconUrl>
1515
<dependencies>
16-
<dependency id="Xamarin.Android.Support.Vector.Drawable" version="[$version$]"/>
16+
<group targetFramework="MonoAndroid70">
17+
<dependency id="Xamarin.Build.Download" version="0.4.2" />
18+
<dependency id="Xamarin.Android.Support.Vector.Drawable" version="[$version$]"/>
19+
</group>
1720
</dependencies>
1821
</metadata>
1922
<files>
23+
<file src="animated-vector-drawable/nuget/Xamarin.Android.Support.Animated.Vector.Drawable.targets" target="build/MonoAndroid70" />
24+
2025
<file src="output/Xamarin.Android.Support.Animated.Vector.Drawable.dll" target="lib/MonoAndroid70" />
2126
</files>
2227
</package>

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +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')" />
34
<PropertyGroup>
45
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
56
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -51,6 +52,7 @@
5152
<None Include="Resources\AboutResources.txt" />
5253
<None Include="Properties\AndroidManifest.xml" />
5354
<None Include="Assets\AboutAssets.txt" />
55+
<None Include="packages.config" />
5456
</ItemGroup>
5557
<ItemGroup>
5658
<AndroidResource Include="Resources\layout\Main.axml" />
@@ -101,5 +103,7 @@
101103
</ProjectReference>
102104
</ItemGroup>
103105
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
104-
<Import Project="..\..\..\vector-drawable\buildtask\bin\Release\Xamarin.Android.Support.Vector.Drawable.targets" />
105-
</Project>
106+
<Import Project="..\..\..\vector-drawable\buildtask\bin\Release\Xamarin.Android.Support.Tasks.VectorDrawable.targets" />
107+
<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')" />
109+
</Project>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Xamarin.Build.Download" version="0.4.2" targetFramework="monoandroid70" />
4+
</packages>

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +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')" />
34
<PropertyGroup>
45
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
56
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -51,12 +52,10 @@
5152
</ItemGroup>
5253
<ItemGroup>
5354
<Compile Include="Properties\AssemblyInfo.cs" />
54-
<Compile Include="..\..\SupportConsts.cs">
55-
<Link>Properties\SupportConsts.cs</Link>
56-
</Compile>
5755
<Compile Include="Additions\Additions.cs" />
5856
</ItemGroup>
5957
<ItemGroup>
58+
<TransformFile Include="..\..\Metadata.generated.xml" />
6059
<TransformFile Include="Transforms\EnumFields.xml" />
6160
<TransformFile Include="Transforms\EnumMethods.xml" />
6261
<TransformFile Include="Transforms\Metadata.xml" />
@@ -77,7 +76,12 @@
7776
</InputJar>
7877
</ItemGroup>
7978
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
79+
<Import Project="..\..\generated.targets" />
8080
<ItemGroup>
8181
<Folder Include="Additions\" />
8282
</ItemGroup>
83+
<ItemGroup>
84+
<None Include="packages.config" />
85+
</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')" />
8387
</Project>

‎animated-vector-drawable/source/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,3 @@
2020
// if desired. See the Mono documentation for more information about signing.
2121
//[assembly: AssemblyDelaySign(false)]
2222
//[assembly: AssemblyKeyFile("")]
23-
24-
// GridLayout-v7
25-
[assembly: Java.Interop.JavaLibraryReference ("classes.jar",
26-
PackageName = __SupportConsts.PackageName,
27-
SourceUrl = __SupportConsts.Url,
28-
EmbeddedArchive = __Consts.AarPath,
29-
Version = __SupportConsts.Version,
30-
Sha1sum = __SupportConsts.Sha1sum)]
31-
// GridLayout-v7 resources
32-
[assembly: Android.IncludeAndroidResourcesFromAttribute ("./",
33-
PackageName = __SupportConsts.PackageName,
34-
SourceUrl = __SupportConsts.Url,
35-
EmbeddedArchive = __Consts.AarPath,
36-
Version = __SupportConsts.Version,
37-
Sha1sum = __SupportConsts.Sha1sum)]
38-
39-
static class __Consts {
40-
public const string AarPath = "m2repository/com/android/support/animated-vector-drawable/" + __SupportConsts.AarVersion + "/animated-vector-drawable-" + __SupportConsts.AarVersion + ".aar";
41-
}

0 commit comments

Comments
 (0)