Permalink
Browse files

bugfix: resolved issues with continuous integration pipeline

1) bugfix: removed windows phone silverlight from nuspec
This should have been removed in a previous commit but was missed.

2) bugfix: resolved nuget packaging defect where `reactiveui` meta package was packaging up 108mb of build artifacts.

These artifacts aren't used and should never have been distributed. As it turns out NuGet v3 needs at-least one <file/> include otherwise this happens. Was 108mb now 2.7kb.

3) refactor: changed all android projects to compile with latest SDK (always) and Android SDK installation is now handled via `appveyor.yml` instead of `bootstrap.ps1` as AppVeyor does not currently have build-tools 24 installed in their base image.

4) bugfix: resolved ci problem where builds were showing as failed when the build was actually successful.
  • Loading branch information...
1 parent 40680b7 commit 4ffcdaa59547a0dfaa2f30729b197689b317fbe6 @ghuntley ghuntley committed on GitHub Oct 25, 2016
View
@@ -1,34 +1,47 @@
version: 1.0.{build}
+
branches:
only:
- rxui7-master
+
environment:
+ ANDROID_HOME: "C:\\android-sdk-windows"
+
MYGET_API_KEY:
secure: YP/3KxC2ffsuHNaolPXj66JVGzSjON9FcR2S2OEzn9c6SV14oPzUh1ySyeT+G+aA
SONAR_API_KEY:
secure: 1WyG/T61dXeEzB33DQE5M7qDMwiJ2tALpRF9jJlK3f6oiv6K+L4gp+q8llYh4951
-install:
-- cmd: >-
- set JAVA_HOME=C:\Program Files\Java\jdk1.8.0
- curl -L https://github.com/SonarSource-VisualStudio/sonar-msbuild-runner/releases/download/2.0/MSBuild.SonarQube.Runner-2.0.zip > MSBuild.SonarQube.Runner.zip
-
- unzip MSBuild.SonarQube.Runner.zip
xamarin:
email: ghuntley@ghuntley.com
password:
secure: 9PLfbvP3ON+Xk17Yd4rJag==
android: true
ios: true
-build_script:
-- ps: >-
- ./bootstrap.ps1
+init:
+ - cd \
+ - appveyor DownloadFile http://dl.google.com/android/android-sdk_r24.4.1-windows.zip
+ - 7z x android-sdk_r24.4.1-windows.zip > nul
+ - cd "C:\projects\reactiveui"
+install:
+
+ - echo y | "%ANDROID_HOME%\tools\android.bat" update sdk -u -a -t tools
+ - echo y | "%ANDROID_HOME%\tools\android.bat" update sdk -u -a -t platform-tools
+ - echo y | "%ANDROID_HOME%\tools\android.bat" update sdk -u -a -t build-tools-24.0.2
+ - echo y | "%ANDROID_HOME%\tools\android.bat" update sdk -u -a -t android-24
+ - echo y | "%ANDROID_HOME%\tools\android.bat" update sdk -u -a -t extra-google-m2repository
+ - echo y | "%ANDROID_HOME%\tools\android.bat" update sdk -u -a -t extra-android-m2repository
+
+build_script:
+- ps: >-
./build.cmd
+
test: off
+
artifacts:
-- path: '**/bin/*'
-- path: src/ReactiveUI.Events/Events_*.cs
-- path: artifacts/*
+ - path: '**/bin/*'
+ - path: src/ReactiveUI.Events/Events_*.cs
+ - path: artifacts/*
View
@@ -38,18 +38,19 @@ Function Install-AndroidSDK
Execute-AndroidSDKInstall -sdks $sdks
}
-Install-AndroidSDK 10
-Install-AndroidSDK 11
-Install-AndroidSDK 12
-Install-AndroidSDK 13
-Install-AndroidSDK 14
-Install-AndroidSDK 15
+#Install-AndroidSDK 10
+#Install-AndroidSDK 11
+#Install-AndroidSDK 12
+#Install-AndroidSDK 13
+#Install-AndroidSDK 14
+#Install-AndroidSDK 15
Install-AndroidSDK 16
-Install-AndroidSDK 18
-Install-AndroidSDK 19
-Install-AndroidSDK 20
-Install-AndroidSDK 21
-Install-AndroidSDK 20
-Install-AndroidSDK 21
-Install-AndroidSDK 22
-Install-AndroidSDK 23
+#Install-AndroidSDK 18
+#Install-AndroidSDK 19
+#Install-AndroidSDK 20
+#Install-AndroidSDK 21
+#Install-AndroidSDK 20
+#Install-AndroidSDK 21
+#Install-AndroidSDK 22
+#Install-AndroidSDK 23
+Install-AndroidSDK 24
View
@@ -16,6 +16,11 @@
//////////////////////////////////////////////////////////////////////
var target = Argument("target", "Default");
+if (string.IsNullOrWhiteSpace(target))
+{
+ target = "Default";
+}
+
var configuration = Argument("configuration", "Release");
//////////////////////////////////////////////////////////////////////
@@ -243,7 +248,7 @@ Task("BuildEvents")
};
build("ReactiveUI.Events_Android.sln");
-// build("ReactiveUI.Events_iOS.sln");
+ build("ReactiveUI.Events_iOS.sln");
build("ReactiveUI.Events_MAC.sln");
build("ReactiveUI.Events_XamForms.sln");
@@ -408,9 +413,14 @@ Task("Publish")
// TASK TARGETS
//////////////////////////////////////////////////////////////////////
+Task("Default")
+ .IsDependentOn("Publish")
+ .Does (() =>
+{
+});
//////////////////////////////////////////////////////////////////////
// EXECUTION
//////////////////////////////////////////////////////////////////////
-RunTarget("Publish");
+RunTarget(target);
View
@@ -3,6 +3,6 @@ tools\nuget\nuget.exe update -self
tools\nuget\nuget.exe install xunit.runner.console -OutputDirectory tools -ExcludeVersion
tools\nuget\nuget.exe install Cake -OutputDirectory tools -ExcludeVersion
-tools\Cake\Cake.exe build.cake
+tools\Cake\Cake.exe build.cake --target=%1
exit /b %errorlevel%
@@ -14,9 +14,10 @@
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<AssemblyName>Microsoft.Reactive.Testing</AssemblyName>
- <TargetFrameworkVersion>v4.0.3</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
+ <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -33,8 +33,6 @@
</dependencies>
</metadata>
<files>
- <!-- Windows Phone Silverlight -->
- <file src="bin/Release/WP8/ReactiveUI.Blend.dll" target="lib/WP8/ReactiveUI.Blend.dll" />
<!-- Windows Store 8.1 -->
<file src="bin/Release/Portable-Win81+WPA81/ReactiveUI.Blend.dll" target="lib/Portable-Win81+WPA81/ReactiveUI.Blend.dll" />
<!-- Windows Universal -->
@@ -13,7 +13,7 @@
<RootNamespace>ReactiveUI.Android.Support</RootNamespace>
<AssemblyName>ReactiveUI.AndroidSupport</AssemblyName>
<FileAlignment>512</FileAlignment>
- <TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
@@ -15,7 +15,7 @@
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
- <TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<NuGetPackageImportStamp>
@@ -105,4 +105,4 @@
</PropertyGroup>
<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'))" />
</Target>
-</Project>
+</Project>
@@ -12,9 +12,10 @@
<RootNamespace>ReactiveUI.Testing</RootNamespace>
<AssemblyName>ReactiveUI.Testing</AssemblyName>
<FileAlignment>512</FileAlignment>
- <TargetFrameworkVersion>v4.0.3</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
+ <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
@@ -97,4 +98,4 @@
</Target>
-->
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-</Project>
+</Project>
@@ -9,4 +9,7 @@
<dependency id="reactiveui-core" version="$version$" />
</dependencies>
</metadata>
+ <files>
+ <file src="RELEASENOTES.MD" />
+ </files>
</package>
@@ -12,9 +12,10 @@
<RootNamespace>ReactiveUI</RootNamespace>
<AssemblyName>ReactiveUI</AssemblyName>
<FileAlignment>512</FileAlignment>
- <TargetFrameworkVersion>v4.0.3</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
+ <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -159,4 +160,4 @@
</Target>
-->
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-</Project>
+</Project>
View
Binary file not shown.

0 comments on commit 4ffcdaa

Please sign in to comment.