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

Commit c97481b

Browse files
RedthRedth
committed
Merge master
This merges the PR’s for arch-lifecycle-extensions and arch-core-runtime bindings.
2 parents 596a021 + 26bc741 commit c97481b

File tree

20 files changed

+453
-29
lines changed

20 files changed

+453
-29
lines changed

‎AndroidSupport.sln‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ EndProject
7676
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core-Utils", "support-core-utils\source\Core-Utils.csproj", "{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}"
7777
EndProject
7878
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content", "support-content\source\Content.csproj", "{F38426DC-DF6F-4FB3-8E9B-1F2E2BBEB554}"
79+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Core.Runtime", "arch-core\runtime\source\Arch.Core.Runtime.csproj", "{4C9E1C1E-09C3-469C-B3C2-79651DF13871}"
80+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Extensions", "arch-lifecycle\extensions\source\Arch.Lifecycle.Extensions.csproj", "{8DFA4E1A-7DF0-4FC5-A8F3-8E6E30E3DA70}"
7981
EndProject
8082
Global
8183
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -231,10 +233,20 @@ Global
231233
{F38426DC-DF6F-4FB3-8E9B-1F2E2BBEB554}.Debug|Any CPU.Build.0 = Debug|Any CPU
232234
{F38426DC-DF6F-4FB3-8E9B-1F2E2BBEB554}.Release|Any CPU.ActiveCfg = Release|Any CPU
233235
{F38426DC-DF6F-4FB3-8E9B-1F2E2BBEB554}.Release|Any CPU.Build.0 = Release|Any CPU
236+
{4C9E1C1E-09C3-469C-B3C2-79651DF13871}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
237+
{4C9E1C1E-09C3-469C-B3C2-79651DF13871}.Debug|Any CPU.Build.0 = Debug|Any CPU
238+
{4C9E1C1E-09C3-469C-B3C2-79651DF13871}.Release|Any CPU.ActiveCfg = Release|Any CPU
239+
{4C9E1C1E-09C3-469C-B3C2-79651DF13871}.Release|Any CPU.Build.0 = Release|Any CPU
240+
{8DFA4E1A-7DF0-4FC5-A8F3-8E6E30E3DA70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
241+
{8DFA4E1A-7DF0-4FC5-A8F3-8E6E30E3DA70}.Debug|Any CPU.Build.0 = Debug|Any CPU
242+
{8DFA4E1A-7DF0-4FC5-A8F3-8E6E30E3DA70}.Release|Any CPU.ActiveCfg = Release|Any CPU
243+
{8DFA4E1A-7DF0-4FC5-A8F3-8E6E30E3DA70}.Release|Any CPU.Build.0 = Release|Any CPU
234244
EndGlobalSection
235245
GlobalSection(NestedProjects) = preSolution
236246
{4C9E1C1E-09C3-469C-B3C2-79651DF13870} = {3AC04D8E-9E4C-401F-AED5-239F226BF9C2}
237247
{1489A4D8-8D13-4113-BD73-3025CDE3E3A0} = {3AC04D8E-9E4C-401F-AED5-239F226BF9C2}
238248
{25CE44A9-FA51-4468-952F-21A13F066384} = {3AC04D8E-9E4C-401F-AED5-239F226BF9C2}
249+
{4C9E1C1E-09C3-469C-B3C2-79651DF13871} = {3AC04D8E-9E4C-401F-AED5-239F226BF9C2}
250+
{8DFA4E1A-7DF0-4FC5-A8F3-8E6E30E3DA70} = {3AC04D8E-9E4C-401F-AED5-239F226BF9C2}
239251
EndGlobalSection
240252
EndGlobal

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ The build script for this project uses [Cake](http://cakebuild.net). To run the
3939

4040
**Mac**:
4141
```
42-
sh build.sh --target libs
42+
sh build.sh --target=libs
4343
```
4444

4545
**Windows (experimental support only)**:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@
2626

2727
[assembly: AssemblyInformationalVersion ("{NUGET_VERSION}")]
2828

29-
[assembly: Android.LinkerSafe]
29+
[assembly: Android.LinkerSafe]

‎arch-core/runtime/nuget/template.nuspec‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0"?>
2+
<package>
3+
<metadata>
4+
<id>Xamarin.Android.Arch.Core.Runtime</id>
5+
<title>Xamarin Android Architecture Core - Runtime</title>
6+
<version>$version$</version>
7+
<authors>Xamarin Inc.</authors>
8+
<owners>Xamarin Inc.</owners>
9+
<requireLicenseAcceptance>true</requireLicenseAcceptance>
10+
<description>Android Architecture Core - Runtime C# bindings for Xamarin</description>
11+
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
12+
<projectUrl>https://go.microsoft.com/fwlink/?linkid=865327</projectUrl>
13+
<licenseUrl>https://go.microsoft.com/fwlink/?linkid=865385</licenseUrl>
14+
<iconUrl>https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/arch-core-runtime_128x128.png</iconUrl>
15+
<dependencies>
16+
<group targetFramework="MonoAndroid80">
17+
<dependency id="Xamarin.Android.Support.Annotations" version="26.1.0" />
18+
<dependency id="Xamarin.Android.Arch.Core.Common" version="1.0.0" />
19+
</group>
20+
</dependencies>
21+
</metadata>
22+
<files>
23+
<file src="arch-core/common/nuget/Xamarin.Android.Arch.Core.Runtime.targets" target="build/MonoAndroid80" />
24+
25+
<file src="output/Xamarin.Android.Arch.Core.Runtime.dll" target="lib/MonoAndroid80" />
26+
27+
<file src="External-Dependency-Info.txt" target="THIRD-PARTY-NOTICES.txt" />
28+
</files>
29+
</package>

‎arch-core/runtime/source/Arch.Core.Runtime.csproj‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{4C9E1C1E-09C3-469C-B3C2-79651DF13871}</ProjectGuid>
8+
<ProjectTypeGuids>{10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
9+
<OutputType>Library</OutputType>
10+
<RootNamespace>Android.Arch.Core.Runtime</RootNamespace>
11+
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
12+
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
13+
<AssemblyName>Xamarin.Android.Arch.Core.Runtime</AssemblyName>
14+
<TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
15+
<!-- <SignAssembly>true</SignAssembly>
16+
<DelaySign>true</DelaySign>
17+
<AssemblyOriginatorKeyFile>publickey.snk</AssemblyOriginatorKeyFile> -->
18+
<AndroidClassParser>class-parse</AndroidClassParser>
19+
<ProductVersion>8.0.30703</ProductVersion>
20+
<SchemaVersion>2.0</SchemaVersion>
21+
</PropertyGroup>
22+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
23+
<DebugSymbols>true</DebugSymbols>
24+
<DebugType>full</DebugType>
25+
<Optimize>false</Optimize>
26+
<OutputPath>bin\Debug</OutputPath>
27+
<DefineConstants>DEBUG;</DefineConstants>
28+
<ErrorReport>prompt</ErrorReport>
29+
<WarningLevel>4</WarningLevel>
30+
<AndroidLinkMode>None</AndroidLinkMode>
31+
<ConsolePause>false</ConsolePause>
32+
</PropertyGroup>
33+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
34+
<DebugType>full</DebugType>
35+
<Optimize>true</Optimize>
36+
<OutputPath>bin\Release</OutputPath>
37+
<ErrorReport>prompt</ErrorReport>
38+
<WarningLevel>4</WarningLevel>
39+
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
40+
<ConsolePause>false</ConsolePause>
41+
</PropertyGroup>
42+
<PropertyGroup>
43+
<!--Docs URL Can be found here: http://dl-ssl.google.com/android/repository/repository-8.xml -->
44+
<DroidDocPaths>..\..\..\docs\reference</DroidDocPaths>
45+
</PropertyGroup>
46+
<ItemGroup>
47+
<Reference Include="System" />
48+
<Reference Include="System.Xml" />
49+
<Reference Include="System.Core" />
50+
<Reference Include="Mono.Android" />
51+
</ItemGroup>
52+
<ItemGroup>
53+
<Compile Include="Properties\AssemblyInfo.cs" />
54+
</ItemGroup>
55+
<ItemGroup>
56+
<TransformFile Include="Transforms\EnumFields.xml" />
57+
<TransformFile Include="Transforms\EnumMethods.xml" />
58+
<TransformFile Include="Transforms\Metadata.xml" />
59+
<TransformFile Include="..\..\..\Metadata.generated.xml">
60+
<Link>Transforms\Metadata.generated.xml</Link>
61+
</TransformFile>
62+
<TransformFile Include="..\..\..\Metadata.common.xml">
63+
<Link>Transforms\Metadata.common.xml</Link>
64+
</TransformFile>
65+
</ItemGroup>
66+
<ItemGroup>
67+
<Folder Include="Additions\" />
68+
<Folder Include="Jars\" />
69+
</ItemGroup>
70+
<ItemGroup>
71+
<EmbeddedJar Include="..\..\..\externals\arch-core\arch-core-runtime.aar">
72+
<Link>arch-core-runtime.aar</Link>
73+
</EmbeddedJar>
74+
</ItemGroup>
75+
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
76+
77+
</Project>

‎arch-core/runtime/source/Properties/AssemblyInfo.cs‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
using System.Reflection;
2+
using System.Runtime.CompilerServices;
3+
using Android.App;
4+
5+
// Information about this assembly is defined by the following attributes.
6+
// Change them to the values specific to your project.
7+
8+
[assembly: AssemblyTitle("Xamarin.Android.Arch.Core.Runtime")]
9+
[assembly: AssemblyDescription("")]
10+
[assembly: AssemblyConfiguration("")]
11+
[assembly: AssemblyCompany ("Microsoft Corporation")]
12+
[assembly: AssemblyProduct("")]
13+
[assembly: AssemblyCopyright ("Copyright © Microsoft Corporation")]
14+
[assembly: AssemblyTrademark("")]
15+
[assembly: AssemblyCulture("")]
16+
17+
// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
18+
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
19+
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
20+
21+
[assembly: AssemblyVersion("1.0.0")]
22+
23+
// The following attributes are used to specify the signing key for the assembly,
24+
// if desired. See the Mono documentation for more information about signing.
25+
26+
//[assembly: AssemblyDelaySign(false)]
27+
//[assembly: AssemblyKeyFile("")]
28+
29+
[assembly: AssemblyMetadata ("BUILD_COMMIT", "{BUILD_COMMIT}")]
30+
[assembly: AssemblyMetadata ("BUILD_NUMBER", "{BUILD_NUMBER}")]
31+
[assembly: AssemblyMetadata ("BUILD_TIMESTAMP", "{BUILD_TIMESTAMP}")]
32+
33+
[assembly: AssemblyInformationalVersion ("{NUGET_VERSION}")]
34+
35+
[assembly: Android.LinkerSafe]

‎arch-core/runtime/source/Transforms/EnumFields.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<enum-field-mappings>
2+
</enum-field-mappings>
3+

‎arch-core/runtime/source/Transforms/EnumMethods.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<enum-method-mappings>
2+
</enum-method-mappings>

‎arch-core/runtime/source/Transforms/Metadata.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<metadata>
2+
</metadata>

‎arch-lifecycle/extensions/nuget/template.nuspec‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0"?>
2+
<package>
3+
<metadata>
4+
<id>Xamarin.Android.Arch.Lifecycle.Extensions</id>
5+
<title>Xamarin Android Architecture Lifecycle - Extensions</title>
6+
<version>$version$</version>
7+
<authors>Xamarin Inc.</authors>
8+
<owners>Xamarin Inc.</owners>
9+
<requireLicenseAcceptance>true</requireLicenseAcceptance>
10+
<description>Android Architecture Lifecycle - Extensions C# bindings for Xamarin</description>
11+
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
12+
<projectUrl>https://go.microsoft.com/fwlink/?linkid=865327</projectUrl>
13+
<licenseUrl>https://go.microsoft.com/fwlink/?linkid=865385</licenseUrl>
14+
<iconUrl>https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/arch-lifecycle-extensions_128x128.png</iconUrl>
15+
<dependencies>
16+
<group targetFramework="MonoAndroid80">
17+
<dependency id="Xamarin.Android.Support.Annotations" version="26.1.0" />
18+
<dependency id="Xamarin.Android.Support.Fragment" version="26.1.0" />
19+
<dependency id="Xamarin.Android.Arch.Lifecycle.Runtime" version="1.0.3" />
20+
<dependency id="Xamarin.Android.Arch.Lifecycle.Common" version="1.0.3" />
21+
<dependency id="Xamarin.Android.Arch.Core.Common" version="1.0.0" />
22+
<dependency id="Xamarin.Android.Arch.Core.Runtime" version="1.0.0" />
23+
</group>
24+
</dependencies>
25+
</metadata>
26+
<files>
27+
<file src="arch-lifecycle/extensions/nuget/Xamarin.Android.Arch.Lifecycle.Extensions.targets" target="build/MonoAndroid80" />
28+
29+
<file src="output/Xamarin.Android.Arch.Lifecycle.Extensions.dll" target="lib/MonoAndroid80" />
30+
31+
<file src="External-Dependency-Info.txt" target="THIRD-PARTY-NOTICES.txt" />
32+
</files>
33+
</package>

0 commit comments

Comments
 (0)