Skip to content

Commit 891e61c

Browse files
committed
Merge pull request restsharp#733 from restsharp/work_in_progress
new nuget targets and other cleanup
2 parents 1723cd3 + a1c854b commit 891e61c

Some content is hidden

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

44 files changed

+1955
-1394
lines changed

.nuget/RestSharp.Build.dll

-512 Bytes
Binary file not shown.

.nuget/Signed/RestSharp.Build.dll

0 Bytes
Binary file not shown.

README.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
### Features
77

8-
* Supports .NET 3.5+, Silverlight 4, Windows Phone 8, Mono, MonoTouch, Mono for Android
8+
* Supports .NET 3.5+, Silverlight 5, Windows Phone 8, Mono, MonoTouch, Mono for Android
99
* Easy installation using [NuGet](http://nuget.org/packages/RestSharp) for most .NET flavors
1010
* Supports strong naming using [NuGet](http://nuget.org/packages/RestSharpSigned) for most .NET flavors
1111
* Automatic XML and JSON deserialization

RestSharp.2015.sln

Lines changed: 0 additions & 277 deletions
This file was deleted.

RestSharp.All.sln

Lines changed: 0 additions & 451 deletions
This file was deleted.

RestSharp.Android/RestSharp.Android.csproj

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@
77
<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
88
<OutputType>Library</OutputType>
99
<RootNamespace>RestSharp</RootNamespace>
10-
<AssemblyName>RestSharp.Android</AssemblyName>
10+
<AssemblyName>RestSharp</AssemblyName>
1111
<FileAlignment>512</FileAlignment>
1212
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
13-
<TargetFrameworkVersion>v2.3</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
14+
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
1415
</PropertyGroup>
1516
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1617
<DebugSymbols>true</DebugSymbols>
@@ -21,6 +22,8 @@
2122
<ErrorReport>prompt</ErrorReport>
2223
<WarningLevel>4</WarningLevel>
2324
<AndroidLinkMode>None</AndroidLinkMode>
25+
<DocumentationFile>bin\Debug\RestSharp.xml</DocumentationFile>
26+
<NoWarn>1591,1658,1584,1572,1574</NoWarn>
2427
</PropertyGroup>
2528
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2629
<DebugType>pdbonly</DebugType>
@@ -30,6 +33,8 @@
3033
<ErrorReport>prompt</ErrorReport>
3134
<WarningLevel>4</WarningLevel>
3235
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
36+
<DocumentationFile>bin\Release\RestSharp.xml</DocumentationFile>
37+
<NoWarn>1591,1658,1584,1572,1574</NoWarn>
3338
</PropertyGroup>
3439
<ItemGroup>
3540
<Reference Include="mscorlib" />

RestSharp.Build/NuSpecUpdateTask.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,11 @@ private void GenerateComputedSpecFile()
6464
ReplaceToken(metaNode, "owners", this.Authors);
6565
ReplaceToken(metaNode, "description", this.Description);
6666
ReplaceToken(metaNode, "version", this.Version);
67-
67+
#if SIGNED
68+
doc.Save(this.SpecFile.Replace(".nuspec", "-signed-computed.nuspec"));
69+
#else
6870
doc.Save(this.SpecFile.Replace(".nuspec", "-computed.nuspec"));
71+
#endif
6972
}
7073

7174
private static void ReplaceToken(XContainer metaNode, XName name, string value)

RestSharp.Build/RestSharp.Build.Signed.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@
6363
</ItemGroup>
6464
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
6565
<PropertyGroup>
66-
<PostBuildEvent>copy /Y $(TargetPath) $(SolutionDir).nuget\Signed\$(TargetFileName)</PostBuildEvent>
66+
<PostBuildEvent>
67+
</PostBuildEvent>
6768
</PropertyGroup>
6869
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
6970
Other similar extension points exist, see Microsoft.Common.targets.

RestSharp.Build/RestSharp.Build.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@
5050
</ItemGroup>
5151
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
5252
<PropertyGroup>
53-
<PostBuildEvent>copy /Y "$(TargetPath)" "$(SolutionDir).nuget\$(TargetFileName)"</PostBuildEvent>
53+
<PostBuildEvent>
54+
</PostBuildEvent>
5455
</PropertyGroup>
5556
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
5657
Other similar extension points exist, see Microsoft.Common.targets.

RestSharp.IntegrationTests/AsyncTests.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
using System;
1+
using NUnit.Framework;
2+
using RestSharp.IntegrationTests.Helpers;
3+
using System;
24
using System.Linq;
35
using System.Net;
46
using System.Threading;
57
using System.Threading.Tasks;
6-
using NUnit.Framework;
7-
using RestSharp.IntegrationTests.Helpers;
88

99
namespace RestSharp.IntegrationTests
1010
{
@@ -136,6 +136,7 @@ public void Can_Perform_GetTaskAsync_With_Response_Type()
136136
}
137137
}
138138

139+
#if !APPVEYOR
139140
[Test]
140141
public void Can_Cancel_GET_TaskAsync()
141142
{
@@ -154,6 +155,7 @@ public void Can_Cancel_GET_TaskAsync()
154155
Assert.True(task.IsCanceled);
155156
}
156157
}
158+
#endif
157159

158160
[Test]
159161
public void Can_Cancel_GET_TaskAsync_With_Response_Type()

0 commit comments

Comments
 (0)