zoriya/octokit.net
1
0
Fork 0
mirror of https://github.com/zoriya/octokit.net.git synced 2025-12-05 23:06:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for mono

Browse Source 
removed DocPlagiarizer

Fixed tests

removed unused variable

removed unused variable that was causing the build to fail

fixed the file name casing.

updated the nugget.exe to download System.Net.Http

PCL is required for mono

more fixes for travis
This commit is contained in:
naveen
2015-12-11 19:58:46 -05:00
parent db81924abe
commit 85e520d5d6
11 changed files with 93 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml Normal file
View File

@@ -0,0 +1,10 @@
language: csharp
sudo: false # use the new container-based Travis infrastructure
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
- export XBUILD_FRAMEWORK_FOLDERS_PATH=/tmp/pcl-assemblies/
script:
- ./build.sh BuildMono
- ./build.sh

59
Octokit-Mono.sln Normal file
View File

@@ -0,0 +1,59 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit", "Octokit\Octokit.csproj", "{08DD4305-7787-4823-A53F-4D0F725A07F3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit-Portable", "Octokit\Octokit-Portable.csproj", "{DDB20481-E17D-4E0A-B2C0-FFFF78D4ED71}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit-Mono", "Octokit\Octokit-Mono.csproj", "{49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit.Reactive", "Octokit.Reactive\Octokit.Reactive.csproj", "{674B69B8-0780-4D54-AE2B-C15821FA51CB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit.Reactive-Mono", "Octokit.Reactive\Octokit.Reactive-Mono.csproj", "{59AB16A2-5ED1-480F-80A1-D1D05D6C1BE4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit.Tests", "Octokit.Tests\Octokit.Tests.csproj", "{149448D4-C2F2-4DF9-86BD-03E3272F093B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit.Tests-Portable", "Octokit.Tests\Octokit.Tests-Portable.csproj", "{CBE29DDD-F15C-46CC-A250-E6ECF55BEED4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit.Tests.Conventions", "Octokit.Tests.Conventions\Octokit.Tests.Conventions.csproj", "{5345E2E6-4E7C-40F8-831B-E491F6051D3C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x86 = Debug|x86
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{08DD4305-7787-4823-A53F-4D0F725A07F3}.Debug|x86.ActiveCfg = Debug|Any CPU
{08DD4305-7787-4823-A53F-4D0F725A07F3}.Debug|x86.Build.0 = Debug|Any CPU
{08DD4305-7787-4823-A53F-4D0F725A07F3}.Release|x86.ActiveCfg = Release|Any CPU
{08DD4305-7787-4823-A53F-4D0F725A07F3}.Release|x86.Build.0 = Release|Any CPU
{149448D4-C2F2-4DF9-86BD-03E3272F093B}.Debug|x86.ActiveCfg = Debug|Any CPU
{149448D4-C2F2-4DF9-86BD-03E3272F093B}.Debug|x86.Build.0 = Debug|Any CPU
{149448D4-C2F2-4DF9-86BD-03E3272F093B}.Release|x86.ActiveCfg = Release|Any CPU
{149448D4-C2F2-4DF9-86BD-03E3272F093B}.Release|x86.Build.0 = Release|Any CPU
{49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Debug|x86.ActiveCfg = Debug|Any CPU
{49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Debug|x86.Build.0 = Debug|Any CPU
{49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Release|x86.ActiveCfg = Release|Any CPU
{49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Release|x86.Build.0 = Release|Any CPU
{5345E2E6-4E7C-40F8-831B-E491F6051D3C}.Debug|x86.ActiveCfg = Debug|Any CPU
{5345E2E6-4E7C-40F8-831B-E491F6051D3C}.Debug|x86.Build.0 = Debug|Any CPU
{5345E2E6-4E7C-40F8-831B-E491F6051D3C}.Release|x86.ActiveCfg = Release|Any CPU
{5345E2E6-4E7C-40F8-831B-E491F6051D3C}.Release|x86.Build.0 = Release|Any CPU
{59AB16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Debug|x86.ActiveCfg = Debug|Any CPU
{59AB16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Debug|x86.Build.0 = Debug|Any CPU
{59AB16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Release|x86.ActiveCfg = Release|Any CPU
{59AB16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Release|x86.Build.0 = Release|Any CPU
{674B69B8-0780-4D54-AE2B-C15821FA51CB}.Debug|x86.ActiveCfg = Debug|Any CPU
{674B69B8-0780-4D54-AE2B-C15821FA51CB}.Debug|x86.Build.0 = Debug|Any CPU
{674B69B8-0780-4D54-AE2B-C15821FA51CB}.Release|x86.ActiveCfg = Release|Any CPU
{674B69B8-0780-4D54-AE2B-C15821FA51CB}.Release|x86.Build.0 = Release|Any CPU
{CBE29DDD-F15C-46CC-A250-E6ECF55BEED4}.Debug|x86.ActiveCfg = Debug|Any CPU
{CBE29DDD-F15C-46CC-A250-E6ECF55BEED4}.Debug|x86.Build.0 = Debug|Any CPU
{CBE29DDD-F15C-46CC-A250-E6ECF55BEED4}.Release|x86.ActiveCfg = Release|Any CPU
{CBE29DDD-F15C-46CC-A250-E6ECF55BEED4}.Release|x86.Build.0 = Release|Any CPU
{DDB20481-E17D-4E0A-B2C0-FFFF78D4ED71}.Debug|x86.ActiveCfg = Debug|Any CPU
{DDB20481-E17D-4E0A-B2C0-FFFF78D4ED71}.Debug|x86.Build.0 = Debug|Any CPU
{DDB20481-E17D-4E0A-B2C0-FFFF78D4ED71}.Release|x86.ActiveCfg = Release|Any CPU
{DDB20481-E17D-4E0A-B2C0-FFFF78D4ED71}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal

7
Octokit.Reactive/Octokit.Reactive.csproj
View File

@@ -180,7 +180,6 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="DocPlagiarizer.README.md" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
@@ -195,10 +194,6 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<UsingTask TaskName="DocPlagiarizerTask" AssemblyFile="..\packages\DocPlagiarizer.0.1.2\tools\DocPlagiarizer.dll" />
<Target Name="DocPlagiarizerTarget" BeforeTargets="Build">
<DocPlagiarizerTask />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
@@ -206,4 +201,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>

3
Octokit.Tests/packages.Octokit.Tests-Portable.config
View File

@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Bcl" version="1.1.6" targetFramework="net45" />
<package id="Microsoft.Bcl.Build" version="1.0.13" targetFramework="net45" />
<package id="Microsoft.Net.Http" version="2.2.18" targetFramework="net45" />
<package id="NSubstitute" version="1.8.0.0" targetFramework="net45" />
<package id="Rx-Core" version="2.2.5" targetFramework="net45" />
<package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />

3
Octokit.Tests/packages.Octokit.Tests.config
View File

@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Bcl" version="1.1.6" targetFramework="net45" />
<package id="Microsoft.Bcl.Build" version="1.0.13" targetFramework="net45" />
<package id="Microsoft.Net.Http" version="2.2.18" targetFramework="net45" />
<package id="NSubstitute" version="1.8.0.0" targetFramework="net45" />
<package id="Rx-Core" version="2.2.5" targetFramework="net45" />
<package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />

0
Octokit/Exceptions/InvalidGitignoreTemplateException.cs → Octokit/Exceptions/InvalidGitIgnoreTemplateException.cs
View File

6
Octokit/Octokit.csproj
View File

@@ -439,14 +439,10 @@
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<UsingTask TaskName="DocPlagiarizerTask" AssemblyFile="..\packages\DocPlagiarizer.0.1.2\tools\DocPlagiarizer.dll" />
<Target Name="DocPlagiarizerTarget" BeforeTargets="Build">
<DocPlagiarizerTask />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. -->
<!--
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>

1
Octokit/SimpleJson.cs
View File

@@ -523,7 +523,6 @@ namespace Octokit
'\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17',
'\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f'
};
private static readonly string EscapeCharactersString = new string(EscapeCharacters);
static SimpleJson()
{

14
build.fsx
View File

@@ -94,14 +94,20 @@ let setParams defaults = {
]
}
let Exec command args =
let result = Shell.Exec(command, args)
if result <> 0 then failwithf "%s exited with error %d" command result
Target "BuildApp" (fun _ ->
build setParams "./Octokit.sln"
|> DoNothing
)
Target "BuildXSApp" (fun _ ->
build setParams "./Octokit-XamarinStudio.sln"
|> DoNothing
Target "BuildMono" (fun _ ->
// xbuild does not support msbuild tools version 14.0 and that is the reason
// for using the xbuild command directly instead of using msbuild
Exec "xbuild" "./Octokit-Mono.sln /t:Build /tv:12.0 /v:m /p:RestorePackages='False' /p:Configuration='Release' /logger:Fake.MsBuildLogger+ErrorLogger,'../octokit.net/tools/FAKE.Core/tools/FakeLib.dll'"
)
Target "ConventionTests" (fun _ ->
!! (sprintf "./Octokit.Tests.Conventions/bin/%s/**/Octokit.Tests.Conventions.dll" buildMode)
@@ -228,7 +234,7 @@ Target "CreatePackages" DoNothing
"Clean"
==> "AssemblyInfo"
==> "CheckProjects"
==> "BuildXSApp"
==> "BuildMono"
"UnitTests"
==> "Default"

10
build.sh
View File

@@ -9,8 +9,10 @@ then
packages/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx
else
# use mono
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/FAKE.Core/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx
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

BIN
tools/nuget/NuGet.exe
View File

Binary file not shown.