Skip to content

Commit 06d57fc

Browse files
jsuarezruizjsuarezruiz
committed
Changed project error message language
Updated README
1 parent c792800 commit 06d57fc

6 files changed

Lines changed: 49 additions & 9 deletions

File tree

‎src/Mobile/AndroidSDKManager.ps1‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
$AndroidToolPath = "${env:ProgramFiles(x86)}\Android\android-sdk\tools\android.bat"
2+
if (!(Test-Path $AndroidToolPath)) {
3+
$AndroidToolPath = "$env:localappdata\Android\android-sdk\tools\android.bat"
4+
} elseif (!(Test-Path $AndroidToolPath)) {
5+
Write-Error "Unable to find Android SDK Manager tools."
6+
return
7+
}
8+
9+
Function Get-AndroidSDKs() {
10+
$output = & $AndroidToolPath list sdk --all
11+
$sdks = $output |% {
12+
if ($_ -match '(?<index>\d+)- (?<sdk>.+), revision (?<revision>[\d\.]+)') {
13+
$sdk = New-Object PSObject
14+
Add-Member -InputObject $sdk -MemberType NoteProperty -Name Index -Value $Matches.index
15+
Add-Member -InputObject $sdk -MemberType NoteProperty -Name Name -Value $Matches.sdk
16+
Add-Member -InputObject $sdk -MemberType NoteProperty -Name Revision -Value $Matches.revision
17+
$sdk
18+
}
19+
}
20+
$sdks
21+
}
22+
23+
Function Install-AndroidSDK() {
24+
[CmdletBinding()]
25+
Param(
26+
[Parameter(Mandatory=$true, Position=0)]
27+
[PSObject[]]$sdks
28+
)
29+
30+
$sdkIndexes = $sdks |% { $_.Index }
31+
$sdkIndexArgument = [string]::Join(',', $sdkIndexes)
32+
Echo 'y' | & $AndroidToolPath update sdk -u -a -t $sdkIndexArgument
33+
}
34+
35+
# Example usage:
36+
# $sdks = Get-AndroidSDKs |? { $_.name -like 'sdk platform*API 10*' -or $_.name -like 'google apis*api 10' }
37+
# Install-AndroidSDK -sdks $sdks
38+
39+
# https://github.com/AArnott

‎src/Mobile/README.md‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ This project exercises the following platforms, frameworks or features:
1616

1717
* Xamarin.Forms
1818
* XAML
19+
* Behaviors
1920
* Bindings
2021
* Converters
2122
* Central Styles
@@ -39,10 +40,10 @@ The app targets **three** platforms:
3940
* iOS
4041
* Android
4142
* Universal Windows Platform (UWP)
42-
* UWP supported only in Visual Studio, not Xamarin Studio
43+
* UWP supported only in Visual Studio, not Xamarin Studio or Visual Studio for MacOS
4344

4445

45-
As of 19/12/2016, eShopOnContainers features **89.2% code share** (7.2% iOS / 16.7% Android / 8.7% Windows).
46+
As of 07/03/2017, eShopOnContainers features **89.2% code share** (7.2% iOS / 16.7% Android / 8.7% Windows).
4647

4748
##Licenses
4849

@@ -55,12 +56,12 @@ This project uses some third-party assets with a license that requires attributi
5556
- [SlideOverKit](https://github.com/XAM-Consulting/SlideOverKit): by XAM-Consulting
5657

5758
## Requirements
58-
### Requirements for Jan. 2017 version of eShopOnContainers
59+
### Requirements for March 2017 version of eShopOnContainers
5960

6061
* [Visual Studio __2015__](https://www.visualstudio.com/en-us/products/vs-2015-product-editions.aspx) (14.0 or higher) to compile C# 6 langage features (or Visual Studio MacOS)
6162
* Xamarin add-ons for Visual Studio (available via the Visual Studio installer)
6263
* __Visual Studio Community Edition is fully supported!__
63-
* Android SDK Tools 25.2.3 or higher
64+
* [Android SDK Tools](https://developer.xamarin.com/guides/android/getting_started/installation/windows/) 25.2.3 or higher
6465
* JDK 8.0
6566

6667
## Setup
@@ -154,4 +155,4 @@ In the configuration window of the machine, go to the Compatibility section and
154155
<img src="Images/set-compatibility-vs-sml.png" alt="Migrate to a physical computer with a different processor version" Width="600" />
155156

156157
## Copyright and license
157-
* Code and documentation copyright 2016 Microsoft Corp. Code released under the [MIT license](https://opensource.org/licenses/MIT).
158+
* Code and documentation copyright 2017 Microsoft Corp. Code released under the [MIT license](https://opensource.org/licenses/MIT).

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@
385385
<Import Project="..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
386386
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
387387
<PropertyGroup>
388-
<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>
388+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
389389
</PropertyGroup>
390390
<Error Condition="!Exists('..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets'))" />
391391
<Error Condition="!Exists('..\..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
<Import Project="..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
171171
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
172172
<PropertyGroup>
173-
<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>
173+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
174174
</PropertyGroup>
175175
<Error Condition="!Exists('..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets'))" />
176176
<Error Condition="!Exists('..\..\..\..\packages\xunit.runner.devices.2.1.0\build\MonoAndroid\xunit.runner.devices.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\xunit.runner.devices.2.1.0\build\MonoAndroid\xunit.runner.devices.targets'))" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@
169169
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
170170
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
171171
<PropertyGroup>
172-
<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>
172+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
173173
</PropertyGroup>
174174
<Error Condition="!Exists('..\..\..\..\packages\xunit.runner.devices.2.1.0\build\Xamarin.iOS\xunit.runner.devices.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\xunit.runner.devices.2.1.0\build\Xamarin.iOS\xunit.runner.devices.targets'))" />
175175
<Error Condition="!Exists('..\..\..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@
433433
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
434434
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
435435
<PropertyGroup>
436-
<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>
436+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
437437
</PropertyGroup>
438438
<Error Condition="!Exists('..\..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
439439
<Error Condition="!Exists('..\..\..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />

0 commit comments

Comments
 (0)