Skip to content
This repository has been archived by the owner on Sep 20, 2021. It is now read-only.

Adding in AndroidSupport Standard project #25

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Adding in AndroidSupport Standard project #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ec2e7ca
Merge pull request #1 from lbugnion/master
MSicc Mar 11, 2018
9ffc286
moved AndroidSupport to PackageReferrence in csproj; Added AndroidSup…
MSicc Mar 11, 2018
d711aa8
reverted Android Target to 7.1
MSicc Mar 11, 2018
0fc7c67
reverted Android Target to 7.1
MSicc Mar 11, 2018
3f07a92
reverted Android Target to 7.1
MSicc Mar 11, 2018
2cb0d75
reverted Android Target to 7.1
MSicc Mar 11, 2018
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
18 changes: 18 additions & 0 deletions GalaSoft.MvvmLight/GalaSoft.MvvmLight (VS2017Std).sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GalaSoft.MvvmLight.Test (ST
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GalaSoft.MvvmLight.Test (PNET45Std)", "Tests\PCL\GalaSoft.MvvmLight.Test (PNET45Std)\GalaSoft.MvvmLight.Test (PNET45Std).csproj", "{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GalaSoft.MvvmLight.Platform.AndroidSupport (AndroidStd)", "GalaSoft.MvvmLight.AndroidSupport (AndroidStd)\GalaSoft.MvvmLight.Platform.AndroidSupport (AndroidStd).csproj", "{BC2F5D9B-6303-4296-A743-FDA5909416CA}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -143,6 +145,22 @@ Global
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Release|x64.Build.0 = Release|Any CPU
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Release|x86.ActiveCfg = Release|Any CPU
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Release|x86.Build.0 = Release|Any CPU
{BC2F5D9B-6303-4296-A743-FDA5909416CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BC2F5D9B-6303-4296-A743-FDA5909416CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BC2F5D9B-6303-4296-A743-FDA5909416CA}.Debug|ARM.ActiveCfg = Debug|Any CPU
{BC2F5D9B-6303-4296-A743-FDA5909416CA}.Debug|ARM.Build.0 = Debug|Any CPU
{BC2F5D9B-6303-4296-A743-FDA5909416CA}.Debug|x64.ActiveCfg = Debug|Any CPU
{BC2F5D9B-6303-4296-A743-FDA5909416CA}.Debug|x64.Build.0 = Debug|Any CPU
{BC2F5D9B-6303-4296-A743-FDA5909416CA}.Debug|x86.ActiveCfg = Debug|Any CPU
{BC2F5D9B-6303-4296-A743-FDA5909416CA}.Debug|x86.Build.0 = Debug|Any CPU
{BC2F5D9B-6303-4296-A743-FDA5909416CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BC2F5D9B-6303-4296-A743-FDA5909416CA}.Release|Any CPU.Build.0 = Release|Any CPU
{BC2F5D9B-6303-4296-A743-FDA5909416CA}.Release|ARM.ActiveCfg = Release|Any CPU
{BC2F5D9B-6303-4296-A743-FDA5909416CA}.Release|ARM.Build.0 = Release|Any CPU
{BC2F5D9B-6303-4296-A743-FDA5909416CA}.Release|x64.ActiveCfg = Release|Any CPU
{BC2F5D9B-6303-4296-A743-FDA5909416CA}.Release|x64.Build.0 = Release|Any CPU
{BC2F5D9B-6303-4296-A743-FDA5909416CA}.Release|x86.ActiveCfg = Release|Any CPU
{BC2F5D9B-6303-4296-A743-FDA5909416CA}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
82 changes: 82 additions & 0 deletions ...ndroidSupport (AndroidStd)/GalaSoft.MvvmLight.Platform.AndroidSupport (AndroidStd).csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{BC2F5D9B-6303-4296-A743-FDA5909416CA}</ProjectGuid>
<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>GalaSoft.MvvmLight</RootNamespace>
<AssemblyName>GalaSoft.MvvmLight.Platform.AndroidSupport</AssemblyName>
<FileAlignment>512</FileAlignment>
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;XAMARIN;ANDROID;DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Debug\GalaSoft.MvvmLight.Platform.AndroidSupport.XML</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE;XAMARIN;ANDROID</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\GalaSoft.MvvmLight.Platform.AndroidSupport.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Mono.Android" />
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\GalaSoft.MvvmLight.AndroidSupport\Helpers\CachingViewHolder.cs">
<Link>Helpers\CachingViewHolder.cs</Link>
</Compile>
<Compile Include="..\GalaSoft.MvvmLight.AndroidSupport\Helpers\ExtensionsAndroid2.cs">
<Link>Helpers\ExtensionsAndroid2.cs</Link>
</Compile>
<Compile Include="..\GalaSoft.MvvmLight.AndroidSupport\Helpers\ObservableRecyclerAdapter.cs">
<Link>Helpers\ObservableRecyclerAdapter.cs</Link>
</Compile>
<Compile Include="..\GalaSoft.MvvmLight.Platform %28NET45Std%29\Properties\AssemblyInfo.cs">
<Link>Properties\AssemblyInfo.cs</Link>
</Compile>
<Compile Include="Resources\Resource.Designer.cs">
</Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\GalaSoft.MvvmLight.Platform %28AndroidStd%29\GalaSoft.MvvmLight.Platform %28AndroidStd%29.csproj">
<Project>{05F13FC2-05A2-4CE2-951F-956BAFEC0D30}</Project>
<Name>GalaSoft.MvvmLight.Platform %28AndroidStd%29</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Android.Support.v7.RecyclerView">
<Version>23.3.0</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
Empty file added ...t.MvvmLight/GalaSoft.MvvmLight.AndroidSupport (AndroidStd)/Resources/Resource.Designer.cs
View file
Open in desktop
Empty file.
18 changes: 6 additions & 12 deletions ...Light/GalaSoft.MvvmLight.AndroidSupport/GalaSoft.MvvmLight.Platform.AndroidSupport.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -43,14 +43,6 @@
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Xml" />
<Reference Include="Xamarin.Android.Support.v4, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xamarin.Android.Support.v4.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Xamarin.Android.Support.v7.RecyclerView, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xamarin.Android.Support.v7.RecyclerView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\GalaSoft.MvvmLight.Platform %28NET45%29\Properties\AssemblyInfo.cs">
Expand All @@ -61,15 +53,17 @@
<Compile Include="Helpers\ObservableRecyclerAdapter.cs" />
<Compile Include="Resources\Resource.Designer.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\GalaSoft.MvvmLight.Platform %28Android%29\GalaSoft.MvvmLight.Platform %28Android%29.csproj">
<Project>{a5b7741d-e331-438c-b3bf-596b048db622}</Project>
<Name>GalaSoft.MvvmLight.Platform %28Android%29</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Android.Support.v7.RecyclerView">
<Version>23.3.0</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
5 changes: 0 additions & 5 deletions GalaSoft.MvvmLight/GalaSoft.MvvmLight.AndroidSupport/packages.config
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...mLight/GalaSoft.MvvmLight.Platform (Android)/GalaSoft.MvvmLight.Platform (Android).csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -84,4 +84,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
2 changes: 1 addition & 1 deletion .../GalaSoft.MvvmLight.Platform (AndroidStd)/GalaSoft.MvvmLight.Platform (AndroidStd).csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,4 +116,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
4 changes: 2 additions & 2 deletions GalaSoft.MvvmLight/Tests/AndroidTestApp/GalaSoft.MvvmLight.Test (Android).csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -168,4 +168,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
Loading