Merge pull request #733 from restsharp/work_in_progress

new nuget targets and other cleanup
restsharp · Aug 19, 2015 · 891e61c · 891e61c
2 parents 1723cd3 + a1c854b
commit 891e61c
Show file tree

Hide file tree

Showing 44 changed files with 1,955 additions and 1,394 deletions.
diff --git a/.nuget/RestSharp.Build.dll b/.nuget/RestSharp.Build.dll
diff --git a/.nuget/Signed/RestSharp.Build.dll b/.nuget/Signed/RestSharp.Build.dll
diff --git a/README.markdown b/README.markdown
@@ -5,7 +5,7 @@
 
 ### Features
 
-* Supports .NET 3.5+, Silverlight 4, Windows Phone 8, Mono, MonoTouch, Mono for Android
+* Supports .NET 3.5+, Silverlight 5, Windows Phone 8, Mono, MonoTouch, Mono for Android
 * Easy installation using [NuGet](http://nuget.org/packages/RestSharp) for most .NET flavors
 * Supports strong naming using [NuGet](http://nuget.org/packages/RestSharpSigned) for most .NET flavors
 * Automatic XML and JSON deserialization

diff --git a/RestSharp.2015.sln b/RestSharp.2015.sln
diff --git a/RestSharp.All.sln b/RestSharp.All.sln
diff --git a/RestSharp.Android/RestSharp.Android.csproj b/RestSharp.Android/RestSharp.Android.csproj
@@ -7,10 +7,11 @@
     <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <RootNamespace>RestSharp</RootNamespace>
-    <AssemblyName>RestSharp.Android</AssemblyName>
+    <AssemblyName>RestSharp</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    <TargetFrameworkVersion>v2.3</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
+    <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -21,6 +22,8 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AndroidLinkMode>None</AndroidLinkMode>
+    <DocumentationFile>bin\Debug\RestSharp.xml</DocumentationFile>
+    <NoWarn>1591,1658,1584,1572,1574</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -30,6 +33,8 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
+    <DocumentationFile>bin\Release\RestSharp.xml</DocumentationFile>
+    <NoWarn>1591,1658,1584,1572,1574</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />

diff --git a/RestSharp.Build/NuSpecUpdateTask.cs b/RestSharp.Build/NuSpecUpdateTask.cs
@@ -64,8 +64,11 @@ private void GenerateComputedSpecFile()
             ReplaceToken(metaNode, "owners", this.Authors);
             ReplaceToken(metaNode, "description", this.Description);
             ReplaceToken(metaNode, "version", this.Version);
-
+#if SIGNED
+            doc.Save(this.SpecFile.Replace(".nuspec", "-signed-computed.nuspec"));
+#else
             doc.Save(this.SpecFile.Replace(".nuspec", "-computed.nuspec"));
+#endif
         }
 
         private static void ReplaceToken(XContainer metaNode, XName name, string value)

diff --git a/RestSharp.Build/RestSharp.Build.Signed.csproj b/RestSharp.Build/RestSharp.Build.Signed.csproj
@@ -63,7 +63,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>copy /Y $(TargetPath) $(SolutionDir).nuget\Signed\$(TargetFileName)</PostBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
   </PropertyGroup>
   <!-- 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.

diff --git a/RestSharp.Build/RestSharp.Build.csproj b/RestSharp.Build/RestSharp.Build.csproj
@@ -50,7 +50,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>copy /Y "$(TargetPath)" "$(SolutionDir).nuget\$(TargetFileName)"</PostBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
   </PropertyGroup>
   <!-- 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.

diff --git a/RestSharp.IntegrationTests/AsyncTests.cs b/RestSharp.IntegrationTests/AsyncTests.cs
@@ -1,10 +1,10 @@
-using System;
+using NUnit.Framework;
+using RestSharp.IntegrationTests.Helpers;
+using System;
 using System.Linq;
 using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
-using NUnit.Framework;
-using RestSharp.IntegrationTests.Helpers;
 
 namespace RestSharp.IntegrationTests
 {
@@ -136,6 +136,7 @@ public void Can_Perform_GetTaskAsync_With_Response_Type()
             }
         }
 
+#if !APPVEYOR
         [Test]
         public void Can_Cancel_GET_TaskAsync()
         {
@@ -154,6 +155,7 @@ public void Can_Cancel_GET_TaskAsync()
                 Assert.True(task.IsCanceled);
             }
         }
+#endif
 
         [Test]
         public void Can_Cancel_GET_TaskAsync_With_Response_Type()

diff --git a/RestSharp.IntegrationTests/RestSharp.IntegrationTests.Signed.csproj b/RestSharp.IntegrationTests/RestSharp.IntegrationTests.Signed.csproj
@@ -102,6 +102,9 @@
       <Name>RestSharp.Net4.Signed</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/RestSharp.IntegrationTests/RestSharp.IntegrationTests.csproj b/RestSharp.IntegrationTests/RestSharp.IntegrationTests.csproj
@@ -43,24 +43,15 @@
     <NoWarn>
     </NoWarn>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugAppveyor|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug.Appveyor|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\DebugAppveyor\</OutputPath>
+    <OutputPath>bin\Debug.Appveyor\</OutputPath>
     <DefineConstants>TRACE;DEBUG;FRAMEWORK, NET4, APPVEYOR</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseAppveyor|AnyCPU'">
-    <OutputPath>bin\ReleaseAppveyor\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
@@ -111,6 +102,9 @@
       <Name>RestSharp.Net4</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/RestSharp.Mono.sln b/RestSharp.Mono.sln
diff --git a/RestSharp.MonoTouch/RestSharp.MonoTouch.csproj b/RestSharp.MonoTouch/RestSharp.MonoTouch.csproj
@@ -9,7 +9,7 @@
     <RootNamespace>RestSharp</RootNamespace>
     <MtouchSdkVersion>3.2</MtouchSdkVersion>
     <MtouchMinimumOS>3.0</MtouchMinimumOS>
-    <AssemblyName>RestSharp.MonoTouch</AssemblyName>
+    <AssemblyName>RestSharp</AssemblyName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -23,6 +23,8 @@
     <ConsolePause>false</ConsolePause>
     <MtouchArch>ARMv6</MtouchArch>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <DocumentationFile>bin\Debug\RestSharp.xml</DocumentationFile>
+    <NoWarn>1591,1658,1584,1572,1574</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
@@ -34,6 +36,8 @@
     <DefineConstants>MONOTOUCH;FRAMEWORK</DefineConstants>
     <MtouchArch>ARMv6</MtouchArch>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <DocumentationFile>bin\Release\RestSharp.xml</DocumentationFile>
+    <NoWarn>1591,1658,1584,1572,1574</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

diff --git a/RestSharp.Net4.Client/Properties/AssemblyInfo.cs b/RestSharp.Net4.Client/Properties/AssemblyInfo.cs
@@ -0,0 +1,24 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("RestSharp")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("97044cbf-6c9d-4b08-87e3-bf30fbde1933")]
+
+#if SIGNED
+[assembly: InternalsVisibleTo("RestSharp.IntegrationTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fda57af14a288d46e3efea89617037585c4de57159cd536ca6dff792ea1d6addc665f2fccb4285413d9d44db5a1be87cb82686db200d16325ed9c42c89cd4824d8cc447f7cee2ac000924c3bceeb1b7fcb5cc1a3901785964d48ce14172001084134f4dcd9973c3776713b595443b1064bb53e2eeb924969244d354e46495e9d"),
+           InternalsVisibleTo("RestSharp.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fda57af14a288d46e3efea89617037585c4de57159cd536ca6dff792ea1d6addc665f2fccb4285413d9d44db5a1be87cb82686db200d16325ed9c42c89cd4824d8cc447f7cee2ac000924c3bceeb1b7fcb5cc1a3901785964d48ce14172001084134f4dcd9973c3776713b595443b1064bb53e2eeb924969244d354e46495e9d")]
+#else
+[assembly: InternalsVisibleTo("RestSharp.IntegrationTests"),
+           InternalsVisibleTo("RestSharp.Tests")]
+#endif