[google] Added a conditional in build.sh file

- Removed a duplicated folder in Maps binding project
- Removed Compression dll workaround in build.sh
- Added a conditional in build.ps1 file
- Bumped Cake version
- Bumped Xamarin Component version
This commit is contained in:
SotoiGhost 2016-09-26 20:13:48 -05:00
Родитель 4110d5570c
Коммит ac8a3be588
5 изменённых файлов: 22 добавлений и 29 удалений

Просмотреть файл

@ -38,7 +38,6 @@
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
<Folder Include="Resources\" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />

Просмотреть файл

@ -52,6 +52,7 @@ $NUGET_EXE = Join-Path $TOOLS_DIR "nuget.exe"
$NUGET_URL = "http://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
$CAKE_EXE = Join-Path $TOOLS_DIR "Cake/Cake.exe"
$PACKAGES_CONFIG = Join-Path $TOOLS_DIR "packages.config"
$CAKE_PACKAGES_CONFIG = Join-Path $PSScriptRoot "cake.packages.config"
# Should we use mono?
$UseMono = "";
@ -81,9 +82,14 @@ if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) {
# Make sure that packages.config exist.
if (!(Test-Path $PACKAGES_CONFIG)) {
Write-Verbose -Message "Downloading packages.config..."
try { Invoke-WebRequest -Uri http://cakebuild.net/bootstrapper/packages -OutFile $PACKAGES_CONFIG } catch {
Throw "Could not download packages.config."
if (!(Test-Path $CAKE_PACKAGES_CONFIG)) {
Write-Verbose -Message "Downloading packages.config..."
try { Invoke-WebRequest -Uri http://cakebuild.net/bootstrapper/packages -OutFile $PACKAGES_CONFIG } catch {
Throw "Could not download packages.config."
}
} else {
Write-Verbose -Message "using local cake.packages.config..."
CopyItem $CAKE_PACKAGES_CONFIG $PACKAGES_CONFIG
}
}

Просмотреть файл

@ -10,10 +10,6 @@ TOOLS_DIR=$SCRIPT_DIR/tools
export NUGET_EXE=$TOOLS_DIR/nuget.exe
CAKE_EXE=$TOOLS_DIR/Cake/Cake.exe
# BEGIN TEMP WORKAROUND
SYSIOCOMP=$TOOLS_DIR/System.IO.Compression.dll
# END TEMP WORKAROUND
# Define default arguments.
SCRIPT="build.cake"
TARGET="Default"
@ -45,11 +41,16 @@ fi
# Make sure that packages.config exist.
if [ ! -f "$TOOLS_DIR/packages.config" ]; then
echo "Downloading packages.config..."
curl -Lsfo "$TOOLS_DIR/packages.config" http://cakebuild.net/download/bootstrapper/packages
if [ $? -ne 0 ]; then
echo "An error occured while downloading packages.config."
exit 1
if [ ! -f "$SCRIPT_DIR/cake.packages.config" ]; then
echo "Downloading packages.config..."
curl -Lsfo "$TOOLS_DIR/packages.config" http://cakebuild.net/bootstrapper/packages
if [ $? -ne 0 ]; then
echo "An error occured while downloading packages.config."
exit 1
fi
else
echo "using local cake.packages.config..."
cp "$SCRIPT_DIR/cake.packages.config" "$TOOLS_DIR/packages.config"
fi
fi
@ -57,26 +58,13 @@ fi
if [ ! -f "$NUGET_EXE" ]; then
echo "Downloading NuGet..."
curl -Lsfo "$NUGET_EXE" https://dist.nuget.org/win-x86-commandline/v3.4.4/NuGet.exe
# v3/Latest URL: https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
if [ $? -ne 0 ]; then
echo "An error occured while downloading nuget.exe."
exit 1
fi
fi
# BEGIN TEMP WORKAROUND
# There is a bug in Mono's System.IO.Compression
# This binary fixes the bug for now
# Download System.IO.Compression if it does not exist.
if [ ! -f "$SYSIOCOMP" ]; then
echo "Downloading System.IO.Compression.dll ..."
curl -Lsfo "$SYSIOCOMP" http://xamarin-components-binaries.s3.amazonaws.com/System.IO.Compression.dll
if [ $? -ne 0 ]; then
echo "An error occured while downloading System.IO.Compression.dll."
exit 1
fi
fi
# END TEMP WORKAROUND
# Restore tools from NuGet.
pushd "$TOOLS_DIR" >/dev/null
mono "$NUGET_EXE" install -ExcludeVersion

Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Cake" version="0.8.0" />
<package id="Cake" version="0.15.2" />
</packages>

Просмотреть файл

@ -1,5 +1,5 @@
#tool nuget:?package=XamarinComponent&version=1.1.0.29
#tool nuget:?package=XamarinComponent&version=1.1.0.42
#addin nuget:?package=Cake.Xamarin.Build&version=1.0.14.0
#addin nuget:?package=Cake.Xamarin