Skip to content
This repository was archived by the owner on Jun 20, 2023. It is now read-only.

Commit cca7c9c

Browse files
bholmesbholmes
authored
Merge pull request #7 from xamarin/v23.4.0
V23.4.0
2 parents 7cdfa51 + 4cf4063 commit cca7c9c

23 files changed

+55
-36
lines changed

‎SupportConsts.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
static class __SupportConsts {
2-
public const string Url = "https://dl-ssl.google.com/android/repository/android_m2repository_r29.zip";
3-
public const string Version = "23.3.0.0";
4-
public const string AarVersion = "23.3.0";
2+
public const string Url = "https://dl-ssl.google.com/android/repository/android_m2repository_r32.zip";
3+
public const string Version = "23.4.0.0";
4+
public const string AarVersion = "23.4.0";
55
}

‎animated-vector-drawable/nuget/Xamarin.Android.Support.Animated.Vector.Drawable.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
</dependencies>
1919
</metadata>
2020
<files>
21-
<file src="output/Xamarin.Android.Support.Animated.Vector.Drawable.dll" target="lib\MonoAndroid403" />
21+
<file src="output/Xamarin.Android.Support.Animated.Vector.Drawable.dll" target="lib/MonoAndroid403" />
2222
</files>
2323
</package>

‎build.cake‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
#tool nuget:?package=ILRepack&version=2.0.10
2-
#tool nuget:?package=XamarinComponent&version=1.1.0.29
2+
#tool nuget:?package=XamarinComponent
33

4-
#addin nuget:?package=Cake.XCode&version=1.0.4.0
5-
#addin nuget:?package=Cake.Xamarin&version=1.3.0.1
6-
#addin nuget:?package=Cake.Xamarin.Build&version=1.0.11.0
7-
#addin nuget:?package=Cake.FileHelpers&version=1.0.3.2
4+
#addin nuget:?package=Cake.XCode
5+
#addin nuget:?package=Cake.Xamarin
6+
#addin nuget:?package=Cake.Xamarin.Build
7+
#addin nuget:?package=Cake.FileHelpers
88

99
var TARGET = Argument ("t", Argument ("target", "Default"));
1010

11-
var NUGET_VERSION = "23.3.0-beta1";
12-
var COMPONENT_VERSION = "23.3.0";
13-
var AAR_VERSION = "23.3.0";
11+
var NUGET_VERSION = "23.4.0";
12+
var COMPONENT_VERSION = "23.4.0";
13+
var AAR_VERSION = "23.4.0";
1414

1515
// FROM: https://dl.google.com/android/repository/addon.xml
16-
var M2_REPOSITORY_URL = "https://dl-ssl.google.com/android/repository/android_m2repository_r29.zip";
16+
var M2_REPOSITORY_URL = "https://dl-ssl.google.com/android/repository/android_m2repository_r32.zip";
1717
var BUILD_TOOLS_URL = "https://dl-ssl.google.com/android/repository/build-tools_r23-macosx.zip";
1818
var DOCS_URL = "https://dl-ssl.google.com/android/repository/docs-23_r01.zip";
1919

@@ -268,7 +268,7 @@ Task ("component-docs").Does (() =>
268268
foreach (var compDir in componentDirs) {
269269

270270
var f = compDir.CombineWithFilePath ("./component/GettingStarted.template.md");
271-
271+
272272
if (!FileExists (f))
273273
continue;
274274

@@ -300,7 +300,7 @@ Task ("component-docs").Does (() =>
300300
foreach (var compDir in componentDirs) {
301301

302302
var f = compDir.CombineWithFilePath ("./component/Details.template.md");
303-
303+
304304
if (!FileExists (f))
305305
continue;
306306

‎build.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) {
8282
# Make sure that packages.config exist.
8383
if (!(Test-Path $PACKAGES_CONFIG)) {
8484
Write-Verbose -Message "Downloading packages.config..."
85-
try { Invoke-WebRequest -Uri http://cakebuild.net/bootstrapper/packages -OutFile $PACKAGES_CONFIG } catch {
85+
try { Invoke-WebRequest -Uri http://cakebuild.net/download/bootstrapper/packages -OutFile $PACKAGES_CONFIG } catch {
8686
Throw "Could not download packages.config."
8787
}
8888
}

‎build.sh‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ TOOLS_DIR=$SCRIPT_DIR/tools
1010
NUGET_EXE=$TOOLS_DIR/nuget.exe
1111
CAKE_EXE=$TOOLS_DIR/Cake/Cake.exe
1212

13+
# BEGIN TEMP WORKAROUND
14+
SYSIOCOMP=$TOOLS_DIR/System.IO.Compression.dll
15+
# END TEMP WORKAROUND
16+
1317
# Define default arguments.
1418
SCRIPT="build.cake"
1519
TARGET="Default"
@@ -42,7 +46,7 @@ fi
4246
# Make sure that packages.config exist.
4347
if [ ! -f "$TOOLS_DIR/packages.config" ]; then
4448
echo "Downloading packages.config..."
45-
curl -Lsfo "$TOOLS_DIR/packages.config" http://cakebuild.net/bootstrapper/packages
49+
curl -Lsfo "$TOOLS_DIR/packages.config" http://cakebuild.net/download/bootstrapper/packages
4650
if [ $? -ne 0 ]; then
4751
echo "An error occured while downloading packages.config."
4852
exit 1
@@ -52,7 +56,8 @@ fi
5256
# Download NuGet if it does not exist.
5357
if [ ! -f "$NUGET_EXE" ]; then
5458
echo "Downloading NuGet..."
55-
curl -Lsfo "$NUGET_EXE" https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
59+
# For now grab explicit 3.4.4 version instead of: https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
60+
curl -Lsfo "$NUGET_EXE" https://dist.nuget.org/win-x86-commandline/v3.4.4/NuGet.exe
5661
if [ $? -ne 0 ]; then
5762
echo "An error occured while downloading nuget.exe."
5863
exit 1
@@ -68,6 +73,20 @@ if [ $? -ne 0 ]; then
6873
fi
6974
popd >/dev/null
7075

76+
# BEGIN TEMP WORKAROUND
77+
# There is a bug in Mono's System.IO.Compression
78+
# This binary fixes the bug for now
79+
# Download System.IO.Compression if it does not exist.
80+
if [ ! -f "$SYSIOCOMP" ]; then
81+
echo "Downloading System.IO.Compression.dll ..."
82+
curl -Lsfo "$SYSIOCOMP" http://xamarin-components-binaries.s3.amazonaws.com/System.IO.Compression.dll
83+
if [ $? -ne 0 ]; then
84+
echo "An error occured while downloading System.IO.Compression.dll."
85+
exit 1
86+
fi
87+
fi
88+
# END TEMP WORKAROUND
89+
7190
# Make sure that Cake has been installed.
7291
if [ ! -f "$CAKE_EXE" ]; then
7392
echo "Could not find Cake.exe at '$CAKE_EXE'."

‎customtabs/nuget/Xamarin.Android.Support.CustomTabs.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
</dependencies>
1818
</metadata>
1919
<files>
20-
<file src="output/Xamarin.Android.Support.CustomTabs.dll" target="lib\MonoAndroid403" />
20+
<file src="output/Xamarin.Android.Support.CustomTabs.dll" target="lib/MonoAndroid403" />
2121
</files>
2222
</package>

‎design/nuget/Xamarin.Android.Support.Design.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919
</dependencies>
2020
</metadata>
2121
<files>
22-
<file src="output/Xamarin.Android.Support.Design.dll" target="lib\MonoAndroid43" />
22+
<file src="output/Xamarin.Android.Support.Design.dll" target="lib/MonoAndroid43" />
2323
</files>
2424
</package>

‎percent/nuget/Xamarin.Android.Support.Percent.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
</dependencies>
1818
</metadata>
1919
<files>
20-
<file src="output/Xamarin.Android.Support.Percent.dll" target="lib\MonoAndroid403" />
20+
<file src="output/Xamarin.Android.Support.Percent.dll" target="lib/MonoAndroid403" />
2121
</files>
2222
</package>

‎recommendation/nuget/Xamarin.Android.Support.Recommendation.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
</dependencies>
1818
</metadata>
1919
<files>
20-
<file src="output/Xamarin.Android.Support.Recommendation.dll" target="lib\MonoAndroid50" />
20+
<file src="output/Xamarin.Android.Support.Recommendation.dll" target="lib/MonoAndroid50" />
2121
</files>
2222
</package>

‎v13/nuget/Xamarin.Android.Support.v13.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
</dependencies>
1818
</metadata>
1919
<files>
20-
<file src="output/Xamarin.Android.Support.v13.dll" target="lib\MonoAndroid403" />
20+
<file src="output/Xamarin.Android.Support.v13.dll" target="lib/MonoAndroid403" />
2121
</files>
2222
</package>

0 commit comments

Comments
 (0)