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

Commit aa6ce5b

Browse files
authoredApr 27, 2017
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

+2-1
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

+12
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

0 commit comments

Comments
 (0)