diff --git a/.gitignore b/.gitignore index 842317924..6dd2401d3 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,5 @@ LibGit2Sharp/Core/UniqueIdentifier.cs !Lib/NativeBinaries/*/*.pdb !nuget.package/build/ _NCrunch_LibGit2Sharp/ + +!packages/** diff --git a/.nuget/packages.config b/.nuget/packages.config new file mode 100644 index 000000000..23d730daf --- /dev/null +++ b/.nuget/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/CI/travis.osx.install.deps.sh b/CI/travis.osx.install.deps.sh index c6621b735..fa8467d11 100755 --- a/CI/travis.osx.install.deps.sh +++ b/CI/travis.osx.install.deps.sh @@ -1,7 +1,7 @@ #!/bin/bash set -ev -MONO_VER=3.6.0 +MONO_VER=3.10.0 brew update which cmake || brew install cmake diff --git a/LibGit2Sharp.sln b/LibGit2Sharp.sln index dd357bcc9..4124dabb2 100644 --- a/LibGit2Sharp.sln +++ b/LibGit2Sharp.sln @@ -2,9 +2,19 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibGit2Sharp", "LibGit2Sharp\LibGit2Sharp.csproj", "{EE6ED99F-CB12-4683-B055-D28FC7357A34}" + ProjectSection(ProjectDependencies) = postProject + {9C38E2A8-8ACF-431F-A2EA-A7A9A7CCCB4E} = {9C38E2A8-8ACF-431F-A2EA-A7A9A7CCCB4E} + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibGit2Sharp.Tests", "LibGit2Sharp.Tests\LibGit2Sharp.Tests.csproj", "{286E63EB-04DD-4ADE-88D6-041B57800761}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NativeNuGet", "NativeNuGet\NativeNuGet.proj", "{9C38E2A8-8ACF-431F-A2EA-A7A9A7CCCB4E}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{5CB88E5F-0230-4B33-AF3B-6BE5B0CD9A78}" + ProjectSection(SolutionItems) = preProject + .nuget\packages.config = .nuget\packages.config + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -19,6 +29,10 @@ Global {286E63EB-04DD-4ADE-88D6-041B57800761}.Debug|Any CPU.Build.0 = Debug|Any CPU {286E63EB-04DD-4ADE-88D6-041B57800761}.Release|Any CPU.ActiveCfg = Release|Any CPU {286E63EB-04DD-4ADE-88D6-041B57800761}.Release|Any CPU.Build.0 = Release|Any CPU + {9C38E2A8-8ACF-431F-A2EA-A7A9A7CCCB4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9C38E2A8-8ACF-431F-A2EA-A7A9A7CCCB4E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9C38E2A8-8ACF-431F-A2EA-A7A9A7CCCB4E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9C38E2A8-8ACF-431F-A2EA-A7A9A7CCCB4E}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/LibGit2Sharp/LibGit2Sharp.csproj b/LibGit2Sharp/LibGit2Sharp.csproj index 347c8ea97..7c8b0b9dd 100644 --- a/LibGit2Sharp/LibGit2Sharp.csproj +++ b/LibGit2Sharp/LibGit2Sharp.csproj @@ -13,6 +13,7 @@ v4.0 512 + a1631da7 true @@ -342,6 +343,11 @@ + + + + + @@ -353,6 +359,13 @@ + + + + This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + - + \ No newline at end of file diff --git a/LibGit2Sharp/LibGit2Sharp.nuspec b/LibGit2Sharp/LibGit2Sharp.nuspec new file mode 100644 index 000000000..67aa0df77 --- /dev/null +++ b/LibGit2Sharp/LibGit2Sharp.nuspec @@ -0,0 +1,27 @@ + + + + $id$ + $version$ + $author$ + nulltoken + https://github.com/libgit2/libgit2sharp/raw/master/LICENSE.md + https://github.com/libgit2/libgit2sharp/raw/master/square-logo.png + https://github.com/libgit2/libgit2sharp/ + https://github.com/libgit2/libgit2sharp/blob/master/CHANGES.md#libgit2sharp-changes + false + $description$ + libgit2 git wrapper bindings API dvcs vcs + + + + + + + + + + + + + diff --git a/LibGit2Sharp/NuGet.targets b/LibGit2Sharp/NuGet.targets new file mode 100644 index 000000000..a019fdad3 --- /dev/null +++ b/LibGit2Sharp/NuGet.targets @@ -0,0 +1,9 @@ + + + + + + true + + + diff --git a/LibGit2Sharp/packages.config b/LibGit2Sharp/packages.config new file mode 100644 index 000000000..cbecd5c92 --- /dev/null +++ b/LibGit2Sharp/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/NativeNuGet/LibGit2.Native.targets b/NativeNuGet/LibGit2.Native.targets new file mode 100644 index 000000000..0bd99a115 --- /dev/null +++ b/NativeNuGet/LibGit2.Native.targets @@ -0,0 +1,21 @@ + + + + + $(BuildDependsOn); + CopyNativeBinaries; + + + + + + + + + + diff --git a/NativeNuGet/NativeNuGet.nuspec b/NativeNuGet/NativeNuGet.nuspec new file mode 100644 index 000000000..7507a5311 --- /dev/null +++ b/NativeNuGet/NativeNuGet.nuspec @@ -0,0 +1,26 @@ + + + + LibGit2.Native + 0.21.3 + The LibGit2 Authors + nulltoken + https://github.com/libgit2/objective-git/blob/master/LICENSE + https://github.com/libgit2/libgit2/ + https://github.com/libgit2/libgit2sharp/raw/master/square-logo.png + false + Native libraries for LibGit2, primarily for use with LibGit2Sharp. + libgit2 libgit2sharp git wrapper bindings API dvcs vcs + + + + + + + + + + + + + diff --git a/NativeNuGet/NativeNuGet.proj b/NativeNuGet/NativeNuGet.proj new file mode 100644 index 000000000..daabf4430 --- /dev/null +++ b/NativeNuGet/NativeNuGet.proj @@ -0,0 +1,61 @@ + + + + Debug + AnyCPU + {9C38E2A8-8ACF-431F-A2EA-A7A9A7CCCB4E} + 2fcb7f08 + + + bin\Debug\ + + + bin\Release\ + + + + + Designer + + + Designer + + + + + true + $(OutputPath) + $(OutDir)\ + $(MSBuildProjectName) + $(MSBuildProjectFile) + $(MSBuildProjectExtension) + $([MSBuild]::Escape($([System.IO.Path]::GetFullPath(`$([System.IO.Path]::Combine(`$(MSBuildProjectDirectory)`, `$(OutDir)`))`)))) + $(MSBuildProjectDirectory)\ + $(ProjectDir)$(ProjectFileName) + $(Platform) + + + + + PrepareForBuild; + + + + + + + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file diff --git a/NativeNuGet/NativeNuGet.targets b/NativeNuGet/NativeNuGet.targets new file mode 100644 index 000000000..4b369ddac --- /dev/null +++ b/NativeNuGet/NativeNuGet.targets @@ -0,0 +1,6 @@ + + + true + -NoPackageAnalysis + + diff --git a/NativeNuGet/packages.config b/NativeNuGet/packages.config new file mode 100644 index 000000000..cbecd5c92 --- /dev/null +++ b/NativeNuGet/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/packages/NuGet.CommandLine.2.8.0/NuGet.CommandLine.2.8.0.nupkg b/packages/NuGet.CommandLine.2.8.0/NuGet.CommandLine.2.8.0.nupkg new file mode 100644 index 000000000..4d2e6a8a2 Binary files /dev/null and b/packages/NuGet.CommandLine.2.8.0/NuGet.CommandLine.2.8.0.nupkg differ diff --git a/packages/NuGet.CommandLine.2.8.0/tools/NuGet.exe b/packages/NuGet.CommandLine.2.8.0/tools/NuGet.exe new file mode 100644 index 000000000..9cba6edbf Binary files /dev/null and b/packages/NuGet.CommandLine.2.8.0/tools/NuGet.exe differ diff --git a/packages/NuGet.for.MSBuild.1.4.3/NuGet.for.MSBuild.1.4.3.nupkg b/packages/NuGet.for.MSBuild.1.4.3/NuGet.for.MSBuild.1.4.3.nupkg new file mode 100644 index 000000000..0d54aa3e7 Binary files /dev/null and b/packages/NuGet.for.MSBuild.1.4.3/NuGet.for.MSBuild.1.4.3.nupkg differ diff --git a/packages/NuGet.for.MSBuild.1.4.3/build/NuGet.MSBuild.Tools.dll b/packages/NuGet.for.MSBuild.1.4.3/build/NuGet.MSBuild.Tools.dll new file mode 100644 index 000000000..32384c9a8 Binary files /dev/null and b/packages/NuGet.for.MSBuild.1.4.3/build/NuGet.MSBuild.Tools.dll differ diff --git a/packages/NuGet.for.MSBuild.1.4.3/build/NuGet.for.MSBuild.targets b/packages/NuGet.for.MSBuild.1.4.3/build/NuGet.for.MSBuild.targets new file mode 100644 index 000000000..767a26feb --- /dev/null +++ b/packages/NuGet.for.MSBuild.1.4.3/build/NuGet.for.MSBuild.targets @@ -0,0 +1,316 @@ + + + + + + + + true + + + false + + + true + + + true + + + true + + $(ProjectName).nuspec + + $(ProjectDir)$(NuspecManifestFileName) + + + + + true + + + + + + + + + + + + + + + + + + + + + GenerateNuspecManifest; + ReadNuspecManifest; + CleanNuspecManifest; + + + + + + + + + + + + + + + + + + + + + + + + + + ResolveNuGetPath; + HarvestNuspecManifest; + ReadAssemblyMetadata; + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + ResolveNuGetPath; + + + + + + + + + + HarvestPackageMetadata; + PackNuGetPackage; + + + + + + + + + + HarvestPackageMetadata; + + + + + + + + + + + + + + + HarvestPackageMetadata; + + + + + + + + + + + + + + + + + + + BeforeCleanNuGetPackage; + CoreCleanNuGetPackage; + AfterCleanNuGetPackage; + + + + + + + + + + + ResolveNuGetPath; + + + + + + + + + + HarvestPackageMetadata; + DeleteNuGetPackages; + + + + + + + + + + + + + + + + + + + + + BeforeCreateNuGetPackage; + CoreCreateNuGetPackage; + AfterCreateNuGetPackage; + + + + + + + + + + + + + $(CoreCleanDependsOn); + CleanNuGetPackage; + + + + + + $(BuildDependsOn); + CreateNuGetPackage; + + + + \ No newline at end of file diff --git a/packages/NuGet.for.MSBuild.1.4.3/build/NuGet.for.MSBuild.tasks b/packages/NuGet.for.MSBuild.1.4.3/build/NuGet.for.MSBuild.tasks new file mode 100644 index 000000000..b510e493f --- /dev/null +++ b/packages/NuGet.for.MSBuild.1.4.3/build/NuGet.for.MSBuild.tasks @@ -0,0 +1,22 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/NuGet.for.MSBuild.1.4.3/docs/NuGet.for.MSBuild.chm b/packages/NuGet.for.MSBuild.1.4.3/docs/NuGet.for.MSBuild.chm new file mode 100644 index 000000000..7af382c78 Binary files /dev/null and b/packages/NuGet.for.MSBuild.1.4.3/docs/NuGet.for.MSBuild.chm differ diff --git a/packages/repositories.config b/packages/repositories.config new file mode 100644 index 000000000..01adf7d04 --- /dev/null +++ b/packages/repositories.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file