Skip to content

Commit f1bdcce

Browse files
davidbritchdavidbritch
authored
Merge pull request dotnet-architecture#343 from dotnet-architecture/xamarin-pcl-revert
Reverted Xamarin projects to use PCL/Mono for the time being
2 parents 5831c91 + e3f9817 commit f1bdcce

22 files changed

Lines changed: 1237 additions & 934 deletions

File tree

‎eShopOnContainers-MobileApps.sln‎

Lines changed: 104 additions & 101 deletions
Large diffs are not rendered by default.

‎src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignMockService.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ public async Task<ObservableCollection<CampaignItem>> GetAllCampaignsAsync(strin
4545

4646
public async Task<CampaignItem> GetCampaignByIdAsync(int campaignId, string token)
4747
{
48+
await Task.Delay(500);
49+
4850
return _mockCampaign.SingleOrDefault(c => c.Id == campaignId);
4951
}
5052
}

‎src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj‎

Lines changed: 228 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,235 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
5-
<PackageTargetFallback>portable-net45+win8+wpa81+wp8</PackageTargetFallback>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6+
<ProjectGuid>{BA96A12C-4EE3-46C4-BB3F-F811B554CD01}</ProjectGuid>
7+
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
8+
<UseMSBuildEngine>true</UseMSBuildEngine>
9+
<OutputType>Library</OutputType>
10+
<RootNamespace>eShopOnContainers.Core</RootNamespace>
11+
<AssemblyName>eShopOnContainers.Core</AssemblyName>
12+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13+
<TargetFrameworkProfile>Profile111</TargetFrameworkProfile>
14+
</PropertyGroup>
15+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16+
<DebugSymbols>true</DebugSymbols>
617
<DebugType>full</DebugType>
7-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
18+
<Optimize>false</Optimize>
19+
<OutputPath>bin\Debug</OutputPath>
20+
<DefineConstants>DEBUG;</DefineConstants>
21+
<ErrorReport>prompt</ErrorReport>
22+
<WarningLevel>4</WarningLevel>
23+
</PropertyGroup>
24+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
25+
<Optimize>true</Optimize>
26+
<OutputPath>bin\Release</OutputPath>
27+
<ErrorReport>prompt</ErrorReport>
28+
<WarningLevel>4</WarningLevel>
829
</PropertyGroup>
9-
1030
<ItemGroup>
11-
<PackageReference Include="Acr.UserDialogs" Version="6.3.3" />
12-
<PackageReference Include="Autofac" Version="4.5.0" />
13-
<PackageReference Include="IdentityModel" Version="2.10.0" />
14-
<PackageReference Include="Microsoft.NETCore.Platforms" Version="2.0.0" />
15-
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
16-
<PackageReference Include="PCLCrypto" Version="2.0.147" />
17-
<PackageReference Include="SlideOverKit" Version="2.1.4" />
18-
<PackageReference Include="Splat" Version="1.6.2" />
19-
<PackageReference Include="System.ComponentModel.Annotations" Version="4.4.0" />
20-
<PackageReference Include="Xam.Plugin.Geolocator" Version="3.0.4" />
21-
<PackageReference Include="Xam.Plugins.Settings" Version="2.6.0.12-beta" />
22-
<PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.2.9" />
23-
<PackageReference Include="Xamarin.Forms" Version="2.3.4.231" />
31+
<Compile Include="Properties\AssemblyInfo.cs" />
32+
<Compile Include="App.xaml.cs">
33+
<DependentUpon>App.xaml</DependentUpon>
34+
</Compile>
35+
<Compile Include="Animations\FadeToAnimation.cs" />
36+
<Compile Include="Animations\StoryBoard.cs" />
37+
<Compile Include="Animations\Base\AnimationBase.cs" />
38+
<Compile Include="Animations\Base\EasingType.cs" />
39+
<Compile Include="Controls\AddBasketButton.xaml.cs" />
40+
<Compile Include="Controls\CustomTabbedPage.cs" />
41+
<Compile Include="Controls\ToggleButton.cs" />
42+
<Compile Include="Behaviors\EventToCommandBehavior.cs" />
43+
<Compile Include="Behaviors\LineColorBehavior.cs" />
44+
<Compile Include="Behaviors\Base\BindableBehavior.cs" />
45+
<Compile Include="Converters\CountToBoolConverter.cs" />
46+
<Compile Include="Converters\DatetimeConverter.cs" />
47+
<Compile Include="Converters\DoubleConverter.cs" />
48+
<Compile Include="Converters\FirstValidationErrorConverter.cs" />
49+
<Compile Include="Converters\ImageConverter.cs" />
50+
<Compile Include="Converters\InverseBoolConverter.cs" />
51+
<Compile Include="Converters\InverseCountToBoolConverter.cs" />
52+
<Compile Include="Converters\ItemsToHeightConverter.cs" />
53+
<Compile Include="Converters\ItemTappedEventArgsConverter.cs" />
54+
<Compile Include="Converters\StringNullOrEmptyBoolConverter.cs" />
55+
<Compile Include="Converters\ToUpperConverter.cs" />
56+
<Compile Include="Converters\WebNavigatedEventArgsConverter.cs" />
57+
<Compile Include="Converters\WebNavigatingEventArgsConverter.cs" />
58+
<Compile Include="Helpers\EasingHelper.cs" />
59+
<Compile Include="Helpers\RandomNumberGenerator.cs" />
60+
<Compile Include="Helpers\ServicesHelper.cs" />
61+
<Compile Include="Helpers\Settings.cs" />
62+
<Compile Include="Views\Templates\BasketItemTemplate.xaml.cs" />
63+
<Compile Include="Views\Templates\CampaignTemplate.xaml.cs" />
64+
<Compile Include="Views\Templates\OrderItemTemplate.xaml.cs" />
65+
<Compile Include="Views\Templates\OrderTemplate.xaml.cs" />
66+
<Compile Include="Views\Templates\ProductTemplate.xaml.cs" />
67+
<Compile Include="Views\BasketView.xaml.cs" />
68+
<Compile Include="Views\CampaignDetailsView.xaml.cs" />
69+
<Compile Include="Views\CampaignView.xaml.cs" />
70+
<Compile Include="Views\CatalogView.xaml.cs" />
71+
<Compile Include="Views\CheckoutView.xaml.cs" />
72+
<Compile Include="Views\CustomNavigationView.xaml.cs" />
73+
<Compile Include="Views\FiltersView.xaml.cs" />
74+
<Compile Include="Views\LoginView.xaml.cs" />
75+
<Compile Include="Views\MainView.xaml.cs" />
76+
<Compile Include="Views\OrderDetailView.xaml.cs" />
77+
<Compile Include="Views\ProfileView.xaml.cs" />
78+
<Compile Include="Views\SettingsView.xaml.cs" />
79+
<Compile Include="Extensions\ObservableExtension.cs" />
80+
<Compile Include="Exceptions\ServiceAuthenticationException.cs" />
81+
<Compile Include="Models\Basket\BasketCheckout.cs" />
82+
<Compile Include="Models\Basket\BasketItem.cs" />
83+
<Compile Include="Models\Basket\CustomerBasket.cs" />
84+
<Compile Include="Models\Catalog\CatalogBrand.cs" />
85+
<Compile Include="Models\Catalog\CatalogItem.cs" />
86+
<Compile Include="Models\Catalog\CatalogRoot.cs" />
87+
<Compile Include="Models\Catalog\CatalogType.cs" />
88+
<Compile Include="Models\Location\Location.cs" />
89+
<Compile Include="Models\Marketing\Campaign.cs" />
90+
<Compile Include="Models\Marketing\CampaignItem.cs" />
91+
<Compile Include="Models\Marketing\CampaignRoot.cs" />
92+
<Compile Include="Models\Navigation\TabParameter.cs" />
93+
<Compile Include="Models\Orders\CancelOrderCommand.cs" />
94+
<Compile Include="Models\Orders\CardType.CS" />
95+
<Compile Include="Models\Orders\Order.cs" />
96+
<Compile Include="Models\Orders\OrderItem.cs" />
97+
<Compile Include="Models\Orders\OrderStatus.cs" />
98+
<Compile Include="Models\Token\UserToken.cs" />
99+
<Compile Include="Models\User\Address.cs" />
100+
<Compile Include="Models\User\LogoutParameter.cs" />
101+
<Compile Include="Models\User\PaymentInfo.cs" />
102+
<Compile Include="Models\User\UserInfo.cs" />
103+
<Compile Include="Triggers\BeginAnimation.cs" />
104+
<Compile Include="Services\Basket\BasketMockService.cs" />
105+
<Compile Include="Services\Basket\BasketService.cs" />
106+
<Compile Include="Services\Basket\IBasketService.cs" />
107+
<Compile Include="Services\Catalog\CatalogMockService.cs" />
108+
<Compile Include="Services\Catalog\CatalogService.cs" />
109+
<Compile Include="Services\Catalog\ICatalogService.cs" />
110+
<Compile Include="Services\Common\Common.cs" />
111+
<Compile Include="Services\Dialog\DialogService.cs" />
112+
<Compile Include="Services\Dialog\IDialogService.cs" />
113+
<Compile Include="Services\Identity\IdentityService.cs" />
114+
<Compile Include="Services\Identity\IIdentityService.cs" />
115+
<Compile Include="Services\Location\ILocationService.cs" />
116+
<Compile Include="Services\Location\LocationService.cs" />
117+
<Compile Include="Services\Marketing\CampaignMockService.cs" />
118+
<Compile Include="Services\Marketing\CampaignService.cs" />
119+
<Compile Include="Services\Marketing\ICampaignService.cs" />
120+
<Compile Include="Services\Navigation\INavigationService.cs" />
121+
<Compile Include="Services\Navigation\NavigationService.cs" />
122+
<Compile Include="Services\OpenUrl\IOpenUrlService.cs" />
123+
<Compile Include="Services\OpenUrl\OpenUrlService.cs" />
124+
<Compile Include="Services\Order\IOrderService.cs" />
125+
<Compile Include="Services\Order\OrderMockService.cs" />
126+
<Compile Include="Services\Order\OrderService.cs" />
127+
<Compile Include="Services\RequestProvider\HttpRequestExceptionEx.cs" />
128+
<Compile Include="Services\RequestProvider\IRequestProvider.cs" />
129+
<Compile Include="Services\RequestProvider\RequestProvider.cs" />
130+
<Compile Include="Services\User\IUserService.cs" />
131+
<Compile Include="Services\User\UserMockService.cs" />
132+
<Compile Include="Services\User\UserService.cs" />
133+
<Compile Include="ViewModels\Base\ExtendedBindableObject.cs" />
134+
<Compile Include="ViewModels\Base\MessageKeys.cs" />
135+
<Compile Include="ViewModels\Base\ViewModelBase.cs" />
136+
<Compile Include="ViewModels\Base\ViewModelLocator.cs" />
137+
<Compile Include="ViewModels\BasketViewModel.cs" />
138+
<Compile Include="ViewModels\CampaignDetailsViewModel.cs" />
139+
<Compile Include="ViewModels\CampaignViewModel.cs" />
140+
<Compile Include="ViewModels\CatalogViewModel.cs" />
141+
<Compile Include="ViewModels\CheckoutViewModel.cs" />
142+
<Compile Include="ViewModels\LoginViewModel.cs" />
143+
<Compile Include="ViewModels\MainViewModel.cs" />
144+
<Compile Include="ViewModels\OrderDetailViewModel.cs" />
145+
<Compile Include="ViewModels\ProfileViewModel.cs" />
146+
<Compile Include="ViewModels\SettingsViewModel.cs" />
147+
<Compile Include="Effects\EntryLineColorEffect.cs" />
148+
<Compile Include="Effects\ThemeEffects.cs" />
149+
<Compile Include="Validations\IsNotNullOrEmptyRule.cs" />
150+
<Compile Include="Validations\IValidationRule.cs" />
151+
<Compile Include="Validations\IValidity.cs" />
152+
<Compile Include="Validations\ValidatableObject.cs" />
153+
<Compile Include="GlobalSettings.cs" />
154+
</ItemGroup>
155+
<ItemGroup>
156+
<None Include="app.config" />
157+
<None Include="project.json" />
158+
</ItemGroup>
159+
<ItemGroup>
160+
<EmbeddedResource Include="App.xaml">
161+
<SubType>Designer</SubType>
162+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
163+
</EmbeddedResource>
164+
<EmbeddedResource Include="Controls\AddBasketButton.xaml">
165+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
166+
</EmbeddedResource>
167+
<EmbeddedResource Include="Views\Templates\BasketItemTemplate.xaml">
168+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
169+
</EmbeddedResource>
170+
<EmbeddedResource Include="Views\Templates\CampaignTemplate.xaml">
171+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
172+
</EmbeddedResource>
173+
<EmbeddedResource Include="Views\Templates\OrderItemTemplate.xaml">
174+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
175+
</EmbeddedResource>
176+
<EmbeddedResource Include="Views\Templates\OrderTemplate.xaml">
177+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
178+
</EmbeddedResource>
179+
<EmbeddedResource Include="Views\Templates\ProductTemplate.xaml">
180+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
181+
</EmbeddedResource>
182+
<EmbeddedResource Include="Views\BasketView.xaml">
183+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
184+
</EmbeddedResource>
185+
<EmbeddedResource Include="Views\CampaignDetailsView.xaml">
186+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
187+
</EmbeddedResource>
188+
<EmbeddedResource Include="Views\CampaignView.xaml">
189+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
190+
</EmbeddedResource>
191+
<EmbeddedResource Include="Views\CatalogView.xaml">
192+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
193+
</EmbeddedResource>
194+
<EmbeddedResource Include="Views\SettingsView.xaml">
195+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
196+
</EmbeddedResource>
197+
<EmbeddedResource Include="Views\ProfileView.xaml">
198+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
199+
</EmbeddedResource>
200+
<EmbeddedResource Include="Views\OrderDetailView.xaml">
201+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
202+
</EmbeddedResource>
203+
<EmbeddedResource Include="Views\MainView.xaml">
204+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
205+
</EmbeddedResource>
206+
<EmbeddedResource Include="Views\LoginView.xaml">
207+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
208+
</EmbeddedResource>
209+
<EmbeddedResource Include="Views\FiltersView.xaml">
210+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
211+
</EmbeddedResource>
212+
<EmbeddedResource Include="Views\CustomNavigationView.xaml">
213+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
214+
</EmbeddedResource>
215+
<EmbeddedResource Include="Views\CheckoutView.xaml">
216+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
217+
</EmbeddedResource>
24218
</ItemGroup>
25-
26219
<ItemGroup>
27-
<!-- https://bugzilla.xamarin.com/show_bug.cgi?id=55591 -->
28-
<None Remove="**\*.xaml" />
29-
30-
<Compile Update="**\*.xaml.cs" DependentUpon="%(Filename)" />
31-
<EmbeddedResource Include="**\*.xaml" SubType="Designer" Generator="MSBuild:UpdateDesignTimeXaml" />
220+
<Folder Include="Animations\" />
221+
<Folder Include="Behaviors\" />
222+
<Folder Include="Animations\Base\" />
223+
<Folder Include="Controls\" />
224+
<Folder Include="Helpers\" />
225+
<Folder Include="Views\" />
226+
<Folder Include="ViewModels\" />
227+
<Folder Include="Services\" />
228+
<Folder Include="Behaviors\Base\" />
229+
<Folder Include="Converters\" />
230+
<Folder Include="Validations\" />
32231
</ItemGroup>
33-
34-
</Project>
232+
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
233+
<Import Project="..\..\..\..\packages\Xamarin.Forms.2.3.4.270\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.270\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
234+
<Import Project="..\..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
235+
</Project>

0 commit comments

Comments
 (0)