Skip to content

Commit f6e0161

Browse files
author
Javier Suárez Ruiz
committed
2 parents 515ba92 + c452088 commit f6e0161

29 files changed

Lines changed: 726 additions & 90 deletions

‎build-images.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ dotnet publish $orderingPathToJson -o $orderingPathToPub
4242

4343
#*** Basket service image ***
4444
$basketPathToJson = $scriptPath + "\src\Services\Basket\Basket.API\project.json"
45-
Write-Host "basketPathToJson is $orderingPathToJson" -ForegroundColor Yellow
45+
Write-Host "basketPathToJson is $basketPathToJson" -ForegroundColor Yellow
4646
$basketPathToPub = $scriptPath + "\pub\basket"
4747
Write-Host "basketPathToPub is $basketPathToPub" -ForegroundColor Yellow
4848

4949
Write-Host "Restore Dependencies just in case as it is needed to run dotnet publish" -ForegroundColor Blue
5050
dotnet restore $basketPathToJson
51-
dotnet build $basketPathToPub
51+
dotnet build $basketPathToJson
5252
dotnet publish $basketPathToJson -o $basketPathToPub
5353

5454
docker build -t eshop/web $webPathToPub

‎docker-compose.yml‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ services:
1414
depends_on:
1515
- catalog.api
1616
- identity.data
17+
- basket.api
1718

1819
catalog.api:
1920
image: eshop/catalog.api
@@ -39,7 +40,7 @@ services:
3940
environment:
4041
- ConnectionString=Server=ordering.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
4142
ports:
42-
- "81:80"
43+
- "5102:80"
4344
# (Go to Production): For secured/final deployment, remove Ports mapping and
4445
# leave just the internal expose section
4546
# expose:
@@ -60,4 +61,19 @@ services:
6061
- SA_PASSWORD=Pass@word
6162
- ACCEPT_EULA=Y
6263
ports:
63-
- "5433:1433"
64+
- "5433:1433"
65+
66+
basket.api:
67+
image: eshop/basket.api
68+
environment:
69+
- ConnectionString=basket.data
70+
build:
71+
context: .
72+
dockerfile: Dockerfile
73+
ports:
74+
- "5103:80"
75+
depends_on:
76+
- basket.data
77+
78+
basket.data:
79+
image: redis

‎global.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"projects": [
33
"src",
44
"test",
5-
"src/Services/Ordering"
5+
"src/Services/Ordering",
6+
"src/Web"
67
],
78

89
"sdk": {

‎src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
1818
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
1919
<AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
20-
<TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
20+
<TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
2121
<AndroidSupportedAbis>armeabi,armeabi-v7a,x86</AndroidSupportedAbis>
2222
<AndroidStoreUncompressedFileExtensions />
2323
<MandroidI18n />

‎src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj.bak‎

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

‎src/Mobile/eShopOnContainers/eShopOnContainers.iOS/eShopOnContainers.iOS.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<OutputType>Exe</OutputType>
1111
<RootNamespace>eShopOnContainers.iOS</RootNamespace>
1212
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
13-
<AssemblyName>eShopOnContainers.iOS</AssemblyName>
13+
<AssemblyName>eShopOnContainersiOS</AssemblyName>
1414
<NuGetPackageImportStamp>
1515
</NuGetPackageImportStamp>
1616
</PropertyGroup>

‎src/Mobile/eShopOnContainers/eShopOnContainers.iOS/eShopOnContainers.iOS.csproj.bak‎

Lines changed: 253 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,253 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
6+
<ProductVersion>8.0.30703</ProductVersion>
7+
<SchemaVersion>2.0</SchemaVersion>
8+
<ProjectGuid>{6EEB23DC-7063-4444-9AF8-90DF24F549C0}</ProjectGuid>
9+
<ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
10+
<OutputType>Exe</OutputType>
11+
<RootNamespace>eShopOnContainers.iOS</RootNamespace>
12+
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
13+
<AssemblyName>eShopOnContainers.iOS</AssemblyName>
14+
<NuGetPackageImportStamp>
15+
</NuGetPackageImportStamp>
16+
</PropertyGroup>
17+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
18+
<DebugSymbols>true</DebugSymbols>
19+
<DebugType>full</DebugType>
20+
<Optimize>false</Optimize>
21+
<OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
22+
<DefineConstants>DEBUG</DefineConstants>
23+
<ErrorReport>prompt</ErrorReport>
24+
<WarningLevel>4</WarningLevel>
25+
<ConsolePause>false</ConsolePause>
26+
<MtouchArch>i386, x86_64</MtouchArch>
27+
<MtouchLink>None</MtouchLink>
28+
<MtouchDebug>true</MtouchDebug>
29+
</PropertyGroup>
30+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
31+
<DebugType>none</DebugType>
32+
<Optimize>true</Optimize>
33+
<OutputPath>bin\iPhoneSimulator\Release</OutputPath>
34+
<ErrorReport>prompt</ErrorReport>
35+
<WarningLevel>4</WarningLevel>
36+
<MtouchLink>None</MtouchLink>
37+
<MtouchArch>i386, x86_64</MtouchArch>
38+
<ConsolePause>false</ConsolePause>
39+
</PropertyGroup>
40+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
41+
<DebugSymbols>true</DebugSymbols>
42+
<DebugType>full</DebugType>
43+
<Optimize>false</Optimize>
44+
<OutputPath>bin\iPhone\Debug</OutputPath>
45+
<DefineConstants>DEBUG</DefineConstants>
46+
<ErrorReport>prompt</ErrorReport>
47+
<WarningLevel>4</WarningLevel>
48+
<ConsolePause>false</ConsolePause>
49+
<MtouchArch>ARMv7, ARM64</MtouchArch>
50+
<CodesignKey>iPhone Developer</CodesignKey>
51+
<MtouchDebug>true</MtouchDebug>
52+
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
53+
</PropertyGroup>
54+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
55+
<DebugType>none</DebugType>
56+
<Optimize>true</Optimize>
57+
<OutputPath>bin\iPhone\Release</OutputPath>
58+
<ErrorReport>prompt</ErrorReport>
59+
<WarningLevel>4</WarningLevel>
60+
<MtouchArch>ARMv7, ARM64</MtouchArch>
61+
<ConsolePause>false</ConsolePause>
62+
<CodesignKey>iPhone Developer</CodesignKey>
63+
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
64+
</PropertyGroup>
65+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
66+
<DebugType>none</DebugType>
67+
<Optimize>True</Optimize>
68+
<OutputPath>bin\iPhone\Ad-Hoc</OutputPath>
69+
<ErrorReport>prompt</ErrorReport>
70+
<WarningLevel>4</WarningLevel>
71+
<ConsolePause>False</ConsolePause>
72+
<MtouchArch>ARMv7, ARM64</MtouchArch>
73+
<BuildIpa>True</BuildIpa>
74+
<CodesignProvision>Automatic:AdHoc</CodesignProvision>
75+
<CodesignKey>iPhone Distribution</CodesignKey>
76+
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
77+
</PropertyGroup>
78+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|iPhone' ">
79+
<DebugType>none</DebugType>
80+
<Optimize>True</Optimize>
81+
<OutputPath>bin\iPhone\AppStore</OutputPath>
82+
<ErrorReport>prompt</ErrorReport>
83+
<WarningLevel>4</WarningLevel>
84+
<ConsolePause>False</ConsolePause>
85+
<MtouchArch>ARMv7, ARM64</MtouchArch>
86+
<CodesignProvision>Automatic:AppStore</CodesignProvision>
87+
<CodesignKey>iPhone Distribution</CodesignKey>
88+
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
89+
</PropertyGroup>
90+
<ItemGroup>
91+
<Compile Include="Effects\EntryLineColorEffect.cs" />
92+
<Compile Include="Main.cs" />
93+
<Compile Include="AppDelegate.cs" />
94+
<BundleResource Include="..\CommonResources\Fonts\Montserrat-Bold.ttf">
95+
<Link>Resources\fonts\Montserrat-Bold.ttf</Link>
96+
</BundleResource>
97+
<BundleResource Include="..\CommonResources\Fonts\Montserrat-Regular.ttf">
98+
<Link>Resources\fonts\Montserrat-Regular.ttf</Link>
99+
</BundleResource>
100+
<BundleResource Include="..\CommonResources\Fonts\SourceSansPro-Regular.ttf">
101+
<Link>Resources\fonts\SourceSansPro-Regular.ttf</Link>
102+
</BundleResource>
103+
<Compile Include="Renderers\CustomTabbedPageRenderer.cs" />
104+
<None Include="app.config" />
105+
<None Include="Entitlements.plist" />
106+
<None Include="Info.plist" />
107+
<Compile Include="Properties\AssemblyInfo.cs" />
108+
<ITunesArtwork Include="iTunesArtwork" />
109+
<ITunesArtwork Include="iTunesArtwork@2x" />
110+
<None Include="packages.config" />
111+
</ItemGroup>
112+
<ItemGroup>
113+
<BundleResource Include="Resources\Default-568h%402x.png" />
114+
<BundleResource Include="Resources\Default-Portrait.png" />
115+
<BundleResource Include="Resources\Default-Portrait%402x.png" />
116+
<BundleResource Include="Resources\Default.png" />
117+
<BundleResource Include="Resources\Default%402x.png" />
118+
<BundleResource Include="Resources\Icon-60%402x.png" />
119+
<BundleResource Include="Resources\Icon-60%403x.png" />
120+
<BundleResource Include="Resources\Icon-76.png" />
121+
<BundleResource Include="Resources\Icon-76%402x.png" />
122+
<BundleResource Include="Resources\Icon-Small-40.png" />
123+
<BundleResource Include="Resources\Icon-Small-40%402x.png" />
124+
<BundleResource Include="Resources\Icon-Small-40%403x.png" />
125+
<BundleResource Include="Resources\Icon-Small.png" />
126+
<BundleResource Include="Resources\Icon-Small%402x.png" />
127+
<BundleResource Include="Resources\Icon-Small%403x.png" />
128+
<InterfaceDefinition Include="Resources\LaunchScreen.storyboard" />
129+
</ItemGroup>
130+
<ItemGroup>
131+
<Reference Include="Acr.Support.iOS, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
132+
<HintPath>..\..\packages\Acr.Support.2.1.0\lib\Xamarin.iOS10\Acr.Support.iOS.dll</HintPath>
133+
<Private>True</Private>
134+
</Reference>
135+
<Reference Include="Acr.UserDialogs, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
136+
<HintPath>..\..\packages\Acr.UserDialogs.6.3.1\lib\Xamarin.iOS10\Acr.UserDialogs.dll</HintPath>
137+
<Private>True</Private>
138+
</Reference>
139+
<Reference Include="Acr.UserDialogs.Interface, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
140+
<HintPath>..\..\packages\Acr.UserDialogs.6.3.1\lib\Xamarin.iOS10\Acr.UserDialogs.Interface.dll</HintPath>
141+
<Private>True</Private>
142+
</Reference>
143+
<Reference Include="FFImageLoading, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
144+
<HintPath>..\..\packages\Xamarin.FFImageLoading.2.2.6-pre-232\lib\Xamarin.iOS10\FFImageLoading.dll</HintPath>
145+
<Private>True</Private>
146+
</Reference>
147+
<Reference Include="FFImageLoading.Forms, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
148+
<HintPath>..\..\packages\Xamarin.FFImageLoading.Forms.2.2.6-pre-232\lib\Xamarin.iOS10\FFImageLoading.Forms.dll</HintPath>
149+
<Private>True</Private>
150+
</Reference>
151+
<Reference Include="FFImageLoading.Forms.Touch, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
152+
<HintPath>..\..\packages\Xamarin.FFImageLoading.Forms.2.2.6-pre-232\lib\Xamarin.iOS10\FFImageLoading.Forms.Touch.dll</HintPath>
153+
<Private>True</Private>
154+
</Reference>
155+
<Reference Include="FFImageLoading.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
156+
<HintPath>..\..\packages\Xamarin.FFImageLoading.2.2.6-pre-232\lib\Xamarin.iOS10\FFImageLoading.Platform.dll</HintPath>
157+
<Private>True</Private>
158+
</Reference>
159+
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
160+
<HintPath>..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
161+
<Private>True</Private>
162+
</Reference>
163+
<Reference Include="Microsoft.Practices.Unity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
164+
<HintPath>..\..\packages\Unity.4.0.1\lib\portable-net45+wp80+win8+wpa81+MonoAndroid10+MonoTouch10\Microsoft.Practices.Unity.dll</HintPath>
165+
<Private>True</Private>
166+
</Reference>
167+
<Reference Include="ModernHttpClient, Version=2.4.2.0, Culture=neutral, processorArchitecture=MSIL">
168+
<HintPath>..\..\packages\modernhttpclient.2.4.2\lib\Xamarin.iOS10\ModernHttpClient.dll</HintPath>
169+
<Private>True</Private>
170+
</Reference>
171+
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
172+
<HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
173+
<Private>True</Private>
174+
</Reference>
175+
<Reference Include="SlideOverKit, Version=1.0.6135.18790, Culture=neutral, processorArchitecture=MSIL">
176+
<HintPath>..\..\packages\SlideOverKit.2.1.4\lib\Xamarin.iOS10\SlideOverKit.dll</HintPath>
177+
<Private>True</Private>
178+
</Reference>
179+
<Reference Include="SlideOverKit.iOS, Version=1.0.6135.18893, Culture=neutral, processorArchitecture=MSIL">
180+
<HintPath>..\..\packages\SlideOverKit.2.1.4\lib\Xamarin.iOS10\SlideOverKit.iOS.dll</HintPath>
181+
<Private>True</Private>
182+
</Reference>
183+
<Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
184+
<HintPath>..\..\packages\Splat.1.6.2\lib\Xamarin.iOS10\Splat.dll</HintPath>
185+
<Private>True</Private>
186+
</Reference>
187+
<Reference Include="System" />
188+
<Reference Include="System.Xml" />
189+
<Reference Include="System.Core" />
190+
<Reference Include="WebP.Touch, Version=1.0.5923.35383, Culture=neutral, processorArchitecture=MSIL">
191+
<HintPath>..\..\packages\WebP.Touch.1.0.2\lib\Xamarin.iOS10\WebP.Touch.dll</HintPath>
192+
<Private>True</Private>
193+
</Reference>
194+
<Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
195+
<HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
196+
<Private>True</Private>
197+
</Reference>
198+
<Reference Include="Xamarin.Forms.Pages, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
199+
<HintPath>..\..\packages\Xamarin.Forms.Pages.2.3.2.118-pre1\lib\Xamarin.iOS10\Xamarin.Forms.Pages.dll</HintPath>
200+
<Private>True</Private>
201+
</Reference>
202+
<Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
203+
<HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
204+
<Private>True</Private>
205+
</Reference>
206+
<Reference Include="Xamarin.Forms.Platform.iOS, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
207+
<HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
208+
<Private>True</Private>
209+
</Reference>
210+
<Reference Include="Xamarin.Forms.Theme.Base, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
211+
<HintPath>..\..\packages\Xamarin.Forms.Theme.Base.1.0.0.43-pre1\lib\Xamarin.iOS10\Xamarin.Forms.Theme.Base.dll</HintPath>
212+
<Private>True</Private>
213+
</Reference>
214+
<Reference Include="Xamarin.Forms.Theme.iOS, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
215+
<HintPath>..\..\packages\Xamarin.Forms.Theme.Base.1.0.0.43-pre1\lib\Xamarin.iOS10\Xamarin.Forms.Theme.iOS.dll</HintPath>
216+
<Private>True</Private>
217+
</Reference>
218+
<Reference Include="Xamarin.Forms.Theme.Light, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
219+
<HintPath>..\..\packages\Xamarin.Forms.Theme.Light.1.0.0.43-pre1\lib\Xamarin.iOS10\Xamarin.Forms.Theme.Light.dll</HintPath>
220+
<Private>True</Private>
221+
</Reference>
222+
<Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
223+
<HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
224+
<Private>True</Private>
225+
</Reference>
226+
<Reference Include="Xamarin.iOS" />
227+
</ItemGroup>
228+
<ItemGroup>
229+
<ProjectReference Include="..\eShopOnContainers.Core\eShopOnContainers.Core.csproj">
230+
<Project>{65116D1C-145B-4693-ABDA-F0FB6F425191}</Project>
231+
<Name>eShopOnContainers.Core</Name>
232+
</ProjectReference>
233+
</ItemGroup>
234+
<ItemGroup>
235+
<BundleResource Include="Resources\fake_product_01.png" />
236+
</ItemGroup>
237+
<ItemGroup>
238+
<BundleResource Include="Resources\fake_product_03.png" />
239+
</ItemGroup>
240+
<ItemGroup>
241+
<BundleResource Include="Resources\fake_product_02.png" />
242+
</ItemGroup>
243+
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
244+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
245+
<PropertyGroup>
246+
<ErrorText>Este proyecto hace referencia a los paquetes NuGet que faltan en este equipo. Use la restauración de paquetes NuGet para descargarlos. Para obtener más información, consulte http://go.microsoft.com/fwlink/?LinkID=322105. El archivo que falta es {0}.</ErrorText>
247+
</PropertyGroup>
248+
<Error Condition="!Exists('..\..\packages\StyleCop.MSBuild.5.0.0-alpha01\build\StyleCop.MSBuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\StyleCop.MSBuild.5.0.0-alpha01\build\StyleCop.MSBuild.targets'))" />
249+
<Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
250+
</Target>
251+
<Import Project="..\..\packages\StyleCop.MSBuild.5.0.0-alpha01\build\StyleCop.MSBuild.targets" Condition="Exists('..\..\packages\StyleCop.MSBuild.5.0.0-alpha01\build\StyleCop.MSBuild.targets')" />
252+
<Import Project="..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
253+
</Project>

‎src/Services/Basket/Basket.API/Controllers/BasketController.cs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,11 @@ public BasketController(IBasketRepository repository)
2222
}
2323
// GET api/values/5
2424
[HttpGet("{id}")]
25-
public async Task<CustomerBasket> Get(Guid id)
25+
public async Task<IActionResult> Get(string id)
2626
{
27-
return await _repository.GetBasket(id);
27+
var basket = await _repository.GetBasket(id);
28+
29+
return Ok(basket);
2830
}
2931

3032
// POST api/values
@@ -36,7 +38,7 @@ public void Post([FromBody]CustomerBasket value)
3638

3739
// DELETE api/values/5
3840
[HttpDelete("{id}")]
39-
public void Delete(Guid id)
41+
public void Delete(string id)
4042
{
4143
_repository.DeleteBasket(id);
4244
}

‎src/Services/Basket/Basket.API/Model/Basket.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API.Model
77
{
88
public class CustomerBasket
99
{
10-
public Guid CustomerId { get; private set; }
11-
public IList<BasketItem> BasketItems => new List<BasketItem>();
10+
public string BuyerId { get; set; }
11+
public List<BasketItem> Items { get; set; }
1212

13-
public CustomerBasket(Guid customerId)
13+
public CustomerBasket(string customerId)
1414
{
15-
CustomerId = customerId;
15+
BuyerId = customerId;
16+
Items = new List<Model.BasketItem>();
1617
}
1718
}
1819
}

‎src/Services/Basket/Basket.API/Model/BasketItem.cs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API.Model
77
{
88
public class BasketItem
99
{
10-
public Guid Id { get; set; }
11-
public decimal Price { get; set; }
12-
public int Count { get; set; }
10+
public string Id { get; set; }
11+
public string ProductId { get; set; }
12+
public string ProductName { get; set; }
13+
public decimal UnitPrice { get; set; }
14+
public int Quantity { get; set; }
15+
public string PictureUrl { get; set; }
1316
}
1417
}

0 commit comments

Comments
 (0)