From acad26ac4f6fe41bd5c5fe53636c7d15982a5ed3 Mon Sep 17 00:00:00 2001 From: naveen Date: Sat, 12 Dec 2015 12:14:31 -0500 Subject: [PATCH 1/8] Included System.Net.Http to get tests to work on mono --- .travis.yml | 3 ++- Octokit.Tests/packages.Octokit.Tests-Portable.config | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2950150f..2873bcfa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,4 +9,5 @@ install: script: - mono tools/nuget/NuGet.exe restore Octokit-Mono.sln - ./build.sh BuildMono - - ./build.sh + - ./build.sh ConventionTests + - ./build.sh UnitTests diff --git a/Octokit.Tests/packages.Octokit.Tests-Portable.config b/Octokit.Tests/packages.Octokit.Tests-Portable.config index 88ad4be6..e22e1bc8 100644 --- a/Octokit.Tests/packages.Octokit.Tests-Portable.config +++ b/Octokit.Tests/packages.Octokit.Tests-Portable.config @@ -3,6 +3,7 @@ + @@ -13,4 +14,4 @@ - \ No newline at end of file + From 857b8fdbf53f295464bf6037d123c9d35b67f8ac Mon Sep 17 00:00:00 2001 From: naveen Date: Sat, 12 Dec 2015 12:31:22 -0500 Subject: [PATCH 2/8] changes for fixing references --- Octokit.Tests/Octokit.Tests-Portable.csproj | 21 +++++++++------------ Octokit.Tests/app.config | 8 ++++++-- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Octokit.Tests/Octokit.Tests-Portable.csproj b/Octokit.Tests/Octokit.Tests-Portable.csproj index 0362b293..54fcc789 100644 --- a/Octokit.Tests/Octokit.Tests-Portable.csproj +++ b/Octokit.Tests/Octokit.Tests-Portable.csproj @@ -1,5 +1,5 @@  - + @@ -36,25 +36,22 @@ 4014, 1998 - - False - ../packages/NSubstitute.1.8.0.0/lib/net40/NSubstitute.dll - - - + + ..\packages\NSubstitute.1.8.0.0\lib\net40\NSubstitute.dll + + + ..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll - - False + ..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll - - False + ..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll @@ -175,7 +172,7 @@ - {ddb20481-e17d-4e0a-b2c0-ffff78d4ed71} + {DDB20481-E17D-4E0A-B2C0-FFFF78D4ED71} Octokit-Portable diff --git a/Octokit.Tests/app.config b/Octokit.Tests/app.config index 393911e6..ba29a2b9 100644 --- a/Octokit.Tests/app.config +++ b/Octokit.Tests/app.config @@ -13,7 +13,11 @@ - + + + + + - \ No newline at end of file + From aea22cce2391e5fd883e9b0d4f4b1459dc67b2f8 Mon Sep 17 00:00:00 2001 From: naveen Date: Sat, 12 Dec 2015 13:35:45 -0500 Subject: [PATCH 3/8] trying osx --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 2873bcfa..63c55991 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,8 @@ language: csharp sudo: false # use the new container-based Travis infrastructure +os: + - osx install: - curl -sS http://storage.bos.xamarin.com/bot-provisioning/PortableReferenceAssemblies-2014-04-14.zip > /tmp/pcl-assemblies.zip - unzip /tmp/pcl-assemblies.zip -d /tmp/pcl-assemblies && mv /tmp/pcl-assemblies/PortableReferenceAssemblies-2014-04-14 /tmp/pcl-assemblies/.NETPortable From 4032e17f648ec944ccebd28cf3b9546d72812e78 Mon Sep 17 00:00:00 2001 From: naveen Date: Sat, 12 Dec 2015 15:47:55 -0500 Subject: [PATCH 4/8] Made it into a local copy --- Octokit.Tests/Octokit.Tests-Portable.csproj | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Octokit.Tests/Octokit.Tests-Portable.csproj b/Octokit.Tests/Octokit.Tests-Portable.csproj index 54fcc789..489ad5be 100644 --- a/Octokit.Tests/Octokit.Tests-Portable.csproj +++ b/Octokit.Tests/Octokit.Tests-Portable.csproj @@ -39,7 +39,9 @@ - + + True + ..\packages\NSubstitute.1.8.0.0\lib\net40\NSubstitute.dll From 1b3210e3373525c98df552a72b81262d695b826a Mon Sep 17 00:00:00 2001 From: naveen Date: Sat, 12 Dec 2015 16:02:07 -0500 Subject: [PATCH 5/8] Included Specific references --- Octokit.Tests/Octokit.Tests-Portable.csproj | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Octokit.Tests/Octokit.Tests-Portable.csproj b/Octokit.Tests/Octokit.Tests-Portable.csproj index 489ad5be..1b283b2d 100644 --- a/Octokit.Tests/Octokit.Tests-Portable.csproj +++ b/Octokit.Tests/Octokit.Tests-Portable.csproj @@ -56,6 +56,13 @@ ..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll + + ..\packages\Microsoft.Net.Http.2.2.18\lib\net45\System.Net.Http.Primitives.dll + + + ..\packages\Microsoft.Net.Http.2.2.18\lib\net45\System.Net.Http.Extensions.dll + + From 54e6e76a6995bac41d0b69b645d26f3c16204075 Mon Sep 17 00:00:00 2001 From: naveen Date: Sat, 12 Dec 2015 16:10:49 -0500 Subject: [PATCH 6/8] Clean up --- build.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/build.sh b/build.sh index 907b1b01..c4e4bf01 100755 --- a/build.sh +++ b/build.sh @@ -12,7 +12,5 @@ else mono "./tools/nuget/NuGet.exe" "install" "xunit.runner.console" "-OutputDirectory" "tools" "-ExcludeVersion" "-version" "2.0.0" mono "./tools/nuget/NuGet.exe" "install" "FAKE.Core" "-OutputDirectory" "tools" "-ExcludeVersion" "-version" "4.4.2" mono "./tools/nuget/NuGet.exe" "install" "SourceLink.Fake" "-OutputDirectory" "tools" "-ExcludeVersion" "-version" "1.1.0" -mono "./tools/nuget/NuGet.exe" "install" "System.Net.Http" "-OutputDirectory" "tools" -mono "./tools/nuget/NuGet.exe" "install" "Microsoft.Net.Http" "-OutputDirectory" "tools" mono ./tools/FAKE.Core/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx fi From 5bbffd4980fb298c7a5ff7ec07e2332e530835b8 Mon Sep 17 00:00:00 2001 From: naveen Date: Sat, 12 Dec 2015 16:14:57 -0500 Subject: [PATCH 7/8] cleaning up travis and including linux --- .travis.yml | 4 ++-- build.sh | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 63c55991..cc3ced7c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ language: csharp sudo: false # use the new container-based Travis infrastructure os: - osx + - linux install: - curl -sS http://storage.bos.xamarin.com/bot-provisioning/PortableReferenceAssemblies-2014-04-14.zip > /tmp/pcl-assemblies.zip - unzip /tmp/pcl-assemblies.zip -d /tmp/pcl-assemblies && mv /tmp/pcl-assemblies/PortableReferenceAssemblies-2014-04-14 /tmp/pcl-assemblies/.NETPortable @@ -11,5 +12,4 @@ install: script: - mono tools/nuget/NuGet.exe restore Octokit-Mono.sln - ./build.sh BuildMono - - ./build.sh ConventionTests - - ./build.sh UnitTests + - ./build.sh diff --git a/build.sh b/build.sh index c4e4bf01..907b1b01 100755 --- a/build.sh +++ b/build.sh @@ -12,5 +12,7 @@ else mono "./tools/nuget/NuGet.exe" "install" "xunit.runner.console" "-OutputDirectory" "tools" "-ExcludeVersion" "-version" "2.0.0" mono "./tools/nuget/NuGet.exe" "install" "FAKE.Core" "-OutputDirectory" "tools" "-ExcludeVersion" "-version" "4.4.2" mono "./tools/nuget/NuGet.exe" "install" "SourceLink.Fake" "-OutputDirectory" "tools" "-ExcludeVersion" "-version" "1.1.0" +mono "./tools/nuget/NuGet.exe" "install" "System.Net.Http" "-OutputDirectory" "tools" +mono "./tools/nuget/NuGet.exe" "install" "Microsoft.Net.Http" "-OutputDirectory" "tools" mono ./tools/FAKE.Core/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx fi From 10b31d3fa04a6f2f2ec5a0658818a56fc148d418 Mon Sep 17 00:00:00 2001 From: naveen Date: Sat, 12 Dec 2015 16:32:12 -0500 Subject: [PATCH 8/8] Fixed the tools version that was changed by XS --- Octokit.Tests/Octokit.Tests-Portable.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Octokit.Tests/Octokit.Tests-Portable.csproj b/Octokit.Tests/Octokit.Tests-Portable.csproj index 1b283b2d..5fb37353 100644 --- a/Octokit.Tests/Octokit.Tests-Portable.csproj +++ b/Octokit.Tests/Octokit.Tests-Portable.csproj @@ -1,5 +1,5 @@  - +