Skip to content

Commit 4924380

Browse files
committed
Removing packages folder. NuGet will regenerate on first build.
1 parent 0c307ee commit 4924380

File tree

56 files changed

+111
-95513
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+111
-95513
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
packages
12

23
#ignore thumbnails created by windows
34
Thumbs.db

.nuget/NuGet.Config

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<solution>
4+
<add key="disableSourceControlIntegration" value="true" />
5+
</solution>
6+
</configuration>

.nuget/NuGet.exe

554 KB
Binary file not shown.

.nuget/NuGet.targets

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
5+
6+
<!-- Windows specific commands -->
7+
<NuGetToolsPath Condition=" '$(OS)' == 'Windows_NT'">$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
8+
<PackagesConfig Condition=" '$(OS)' == 'Windows_NT'">$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
9+
<PackagesDir Condition=" '$(OS)' == 'Windows_NT'">$([System.IO.Path]::Combine($(SolutionDir), "packages"))</PackagesDir>
10+
11+
<!-- We need to launch nuget.exe with the mono command if we're not on windows -->
12+
<NuGetToolsPath Condition=" '$(OS)' != 'Windows_NT'">$(SolutionDir).nuget</NuGetToolsPath>
13+
<PackagesConfig Condition=" '$(OS)' != 'Windows_NT' ">packages.config</PackagesConfig>
14+
<PackagesDir Condition=" '$(OS)' != 'Windows_NT'">$(SolutionDir)packages</PackagesDir>
15+
16+
<!-- NuGet command -->
17+
<NuGetExePath>$(NuGetToolsPath)\nuget.exe</NuGetExePath>
18+
<NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
19+
<NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
20+
21+
<PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
22+
23+
<!-- Package sources used to restore packages. By default will used the registered sources under %APPDATA%\NuGet\NuGet.Config -->
24+
<PackageSources>""</PackageSources>
25+
26+
<!-- Enable the restore command to run before builds -->
27+
<RestorePackages Condition="$(RestorePackages) == ''">false</RestorePackages>
28+
29+
<!-- Property that enables building a package from a project -->
30+
<BuildPackage Condition="$(BuildPackage) == ''">false</BuildPackage>
31+
32+
<!-- Commands -->
33+
<RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source $(PackageSources) -o "$(PackagesDir)"</RestoreCommand>
34+
<BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -p Configuration=$(Configuration) -o "$(PackageOutputDir)" -symbols</BuildCommand>
35+
36+
<!-- Make the build depend on restore packages -->
37+
<BuildDependsOn Condition="$(RestorePackages) == 'true'">
38+
RestorePackages;
39+
$(BuildDependsOn);
40+
</BuildDependsOn>
41+
42+
<!-- Make the build depend on restore packages -->
43+
<BuildDependsOn Condition="$(BuildPackage) == 'true'">
44+
$(BuildDependsOn);
45+
BuildPackage;
46+
</BuildDependsOn>
47+
</PropertyGroup>
48+
49+
<Target Name="CheckPrerequisites">
50+
<!-- Raise an error if we're unable to locate nuget.exe -->
51+
<Error Condition="!Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
52+
</Target>
53+
54+
<Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
55+
<Exec Command="$(RestoreCommand)"
56+
Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
57+
58+
<Exec Command="$(RestoreCommand)"
59+
LogStandardErrorAsError="true"
60+
Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
61+
</Target>
62+
63+
<Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
64+
<Exec Command="$(BuildCommand)"
65+
Condition=" '$(OS)' != 'Windows_NT' " />
66+
67+
<Exec Command="$(BuildCommand)"
68+
LogStandardErrorAsError="true"
69+
Condition=" '$(OS)' == 'Windows_NT' " />
70+
</Target>
71+
</Project>

RestSharp.IntegrationTests/RestSharp.IntegrationTests.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
<OldToolsVersion>3.5</OldToolsVersion>
1818
<UpgradeBackupLocation />
1919
<TargetFrameworkProfile />
20+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
21+
<RestorePackages>true</RestorePackages>
2022
</PropertyGroup>
2123
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2224
<DebugSymbols>true</DebugSymbols>
@@ -85,6 +87,7 @@
8587
</ProjectReference>
8688
</ItemGroup>
8789
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
90+
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
8891
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
8992
Other similar extension points exist, see Microsoft.Common.targets.
9093
<Target Name="BeforeBuild">

RestSharp.Net4/RestSharp.Net4.csproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
<AssemblyName>RestSharp</AssemblyName>
1313
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
15+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
16+
<RestorePackages>true</RestorePackages>
1517
</PropertyGroup>
1618
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1719
<DebugSymbols>true</DebugSymbols>
@@ -255,7 +257,13 @@
255257
<Compile Include="Extensions\RestClientExtensions.cs" />
256258
<Compile Include="Properties\AssemblyInfo.cs" />
257259
</ItemGroup>
260+
<ItemGroup>
261+
<None Include="packages.config">
262+
<SubType>Designer</SubType>
263+
</None>
264+
</ItemGroup>
258265
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
266+
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
259267
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
260268
Other similar extension points exist, see Microsoft.Common.targets.
261269
<Target Name="BeforeBuild">

RestSharp.Net4/packages.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="SimpleJson" version="0.15.0.0" />
4+
</packages>

RestSharp.Silverlight/RestSharp.Silverlight.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
<SilverlightApplication>false</SilverlightApplication>
1818
<ValidateXaml>true</ValidateXaml>
1919
<ThrowErrorsInValidation>true</ThrowErrorsInValidation>
20+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
21+
<RestorePackages>true</RestorePackages>
2022
</PropertyGroup>
2123
<!-- This property group is only here to support building this project using the
2224
MSBuild 3.5 toolset. In order to work correctly with this older toolset, it needs
@@ -218,6 +220,7 @@
218220
</FlavorProperties>
219221
</VisualStudio>
220222
</ProjectExtensions>
223+
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
221224
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
222225
Other similar extension points exist, see Microsoft.Common.targets.
223226
<Target Name="BeforeBuild">

RestSharp.Tests/RestSharp.Tests.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
<IsWebBootstrapper>false</IsWebBootstrapper>
3232
<UseApplicationTrust>false</UseApplicationTrust>
3333
<BootstrapperEnabled>true</BootstrapperEnabled>
34+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
35+
<RestorePackages>true</RestorePackages>
3436
</PropertyGroup>
3537
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3638
<DebugSymbols>true</DebugSymbols>
@@ -193,4 +195,5 @@
193195
<Name>RestSharp</Name>
194196
</ProjectReference>
195197
</ItemGroup>
198+
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
196199
</Project>

RestSharp.WindowsPhone/RestSharp.WindowsPhone.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
<SilverlightApplication>false</SilverlightApplication>
1919
<ValidateXaml>true</ValidateXaml>
2020
<ThrowErrorsInValidation>true</ThrowErrorsInValidation>
21+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
22+
<RestorePackages>true</RestorePackages>
2123
</PropertyGroup>
2224
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2325
<DebugSymbols>true</DebugSymbols>
@@ -286,6 +288,7 @@
286288
<Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets" />
287289
<Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.CSharp.targets" />
288290
<ProjectExtensions />
291+
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
289292
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
290293
Other similar extension points exist, see Microsoft.Common.targets.
291294
<Target Name="BeforeBuild">

0 commit comments

Comments
 (0)