From 937780d6ce6b7af9614860e4c93f5e6c8c0fdd82 Mon Sep 17 00:00:00 2001 From: Pierre Chalamet Date: Tue, 12 Feb 2013 23:57:57 +0100 Subject: [PATCH] nuget support in solution --- .gitignore | 1 + .nuget/NuGet.Config | 6 + {ThirdParties/NuGet => .nuget}/NuGet.exe | Bin .nuget/NuGet.targets | 153 ++++++++++++++++++ CassandraSharp/CassandraSharp.csproj | 16 ++ CassandraSharp/packages.config | 8 + .../CassandraSharpUnitTests.csproj | 14 +- CassandraSharpUnitTests/packages.config | 5 + Samples/Samples.csproj | 5 - ThirdParties/Moq/Moq.dll | Bin 488448 -> 0 bytes ThirdParties/NUnit/nunit.framework.dll | Bin 139264 -> 0 bytes cassandra-sharp.sln | 7 + cassandra-sharp.targets | 2 +- 13 files changed, 207 insertions(+), 10 deletions(-) create mode 100644 .nuget/NuGet.Config rename {ThirdParties/NuGet => .nuget}/NuGet.exe (100%) create mode 100644 .nuget/NuGet.targets create mode 100644 CassandraSharp/packages.config create mode 100644 CassandraSharpUnitTests/packages.config delete mode 100644 ThirdParties/Moq/Moq.dll delete mode 100644 ThirdParties/NUnit/nunit.framework.dll diff --git a/.gitignore b/.gitignore index 444e5f3..8a23d81 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ OutDir/ Apache.Cassandra/gen-csharp/ +packages/ cassandra-sharp-version.cs *.suo *.user diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config new file mode 100644 index 0000000..67f8ea0 --- /dev/null +++ b/.nuget/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/ThirdParties/NuGet/NuGet.exe b/.nuget/NuGet.exe similarity index 100% rename from ThirdParties/NuGet/NuGet.exe rename to .nuget/NuGet.exe diff --git a/.nuget/NuGet.targets b/.nuget/NuGet.targets new file mode 100644 index 0000000..2d11ba5 --- /dev/null +++ b/.nuget/NuGet.targets @@ -0,0 +1,153 @@ + + + + $(MSBuildProjectDirectory)\..\ + + + false + + + false + + + true + + + false + + + + + + + + + + + $([System.IO.Path]::Combine($(SolutionDir), ".nuget")) + $([System.IO.Path]::Combine($(ProjectDir), "packages.config")) + $([System.IO.Path]::Combine($(SolutionDir), "packages")) + + + + + $(SolutionDir).nuget + packages.config + $(SolutionDir)packages + + + + + $(NuGetToolsPath)\nuget.exe + @(PackageSource) + + "$(NuGetExePath)" + mono --runtime=v4.0.30319 $(NuGetExePath) + + $(TargetDir.Trim('\\')) + + -RequireConsent + + $(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(RequireConsentSwitch) -o "$(PackagesDir)" + $(NuGetCommand) pack "$(ProjectPath)" -p Configuration=$(Configuration) -o "$(PackageOutputDir)" -symbols + + + + RestorePackages; + $(BuildDependsOn); + + + + + $(BuildDependsOn); + BuildPackage; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/CassandraSharp/CassandraSharp.csproj b/CassandraSharp/CassandraSharp.csproj index 74775b7..5fe5cfd 100644 --- a/CassandraSharp/CassandraSharp.csproj +++ b/CassandraSharp/CassandraSharp.csproj @@ -13,6 +13,8 @@ v4.0 512 + ..\ + true true @@ -40,6 +42,18 @@ + + ..\packages\Rx-Core.2.1.30204.0\lib\Net40\System.Reactive.Core.dll + + + ..\packages\Rx-Interfaces.2.1.30204.0\lib\Net40\System.Reactive.Interfaces.dll + + + ..\packages\Rx-Linq.2.1.30204.0\lib\Net40\System.Reactive.Linq.dll + + + ..\packages\Rx-PlatformServices.2.1.30204.0\lib\Net40\System.Reactive.PlatformServices.dll + @@ -50,8 +64,10 @@ + +