fixed breaking unit test from computed nuspec file name change for si…

…gned assembly
netbear1230 · Aug 19, 2015 · 7328d2b · 7328d2b
1 parent 7a2a21c
commit 7328d2b
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 6 deletions.
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
@@ -102,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.Tests/NuSpecUpdateTask.cs b/RestSharp.Tests/NuSpecUpdateTask.cs
@@ -1,8 +1,8 @@
-using System.IO;
+using NUnit.Framework;
+using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Xml.Linq;
-using NUnit.Framework;
 
 namespace RestSharp.Tests
 {
@@ -14,7 +14,14 @@ public abstract class BaseNuSpecUpdateTest
 
             protected string ComputedFileName
             {
-                get { return this.FileName.Replace(".nuspec", "-computed.nuspec"); }
+                get
+                {
+#if SIGNED
+                    return this.FileName.Replace(".nuspec", "-signed-computed.nuspec");
+#else
+                    return this.FileName.Replace(".nuspec", "-computed.nuspec");
+#endif
+                }
             }
 
             protected BaseNuSpecUpdateTest()

diff --git a/RestSharp.Tests/RestSharp.Tests.Signed.csproj b/RestSharp.Tests/RestSharp.Tests.Signed.csproj
@@ -236,6 +236,9 @@
       <Name>RestSharp.Net35.Signed</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- 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.Tests/RestSharp.Tests.csproj b/RestSharp.Tests/RestSharp.Tests.csproj
@@ -234,5 +234,8 @@
       <Name>RestSharp.Net35</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
 </Project>
diff --git a/RestSharp.sln b/RestSharp.sln
@@ -477,7 +477,6 @@ Global
 		{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}.Debug.Appveyor|Any CPU.Build.0 = Debug|Any CPU
 		{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}.Debug.Appveyor|ARM.ActiveCfg = Debug|Any CPU
 		{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}.Debug.Appveyor|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}.Debug.Appveyor|Mixed Platforms.Build.0 = Debug|Any CPU
 		{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}.Debug.Appveyor|x86.ActiveCfg = Debug|Any CPU
 		{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -493,7 +492,6 @@ Global
 		{7CBC38E5-BABF-4E79-86CA-41C42222FC85}.Debug.Appveyor|Any CPU.Build.0 = Debug|Any CPU
 		{7CBC38E5-BABF-4E79-86CA-41C42222FC85}.Debug.Appveyor|ARM.ActiveCfg = Debug|Any CPU
 		{7CBC38E5-BABF-4E79-86CA-41C42222FC85}.Debug.Appveyor|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7CBC38E5-BABF-4E79-86CA-41C42222FC85}.Debug.Appveyor|Mixed Platforms.Build.0 = Debug|Any CPU
 		{7CBC38E5-BABF-4E79-86CA-41C42222FC85}.Debug.Appveyor|x86.ActiveCfg = Debug|Any CPU
 		{7CBC38E5-BABF-4E79-86CA-41C42222FC85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7CBC38E5-BABF-4E79-86CA-41C42222FC85}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -509,7 +507,6 @@ Global
 		{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}.Debug.Appveyor|Any CPU.Build.0 = Debug|Any CPU
 		{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}.Debug.Appveyor|ARM.ActiveCfg = Debug|Any CPU
 		{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}.Debug.Appveyor|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}.Debug.Appveyor|Mixed Platforms.Build.0 = Debug|Any CPU
 		{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}.Debug.Appveyor|x86.ActiveCfg = Debug|Any CPU
 		{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}.Debug|ARM.ActiveCfg = Debug|Any CPU