Skip to content

Commit 7328d2b

Browse files
author
Michael Hallett
committed
fixed breaking unit test from computed nuspec file name change for signed assembly
1 parent 7a2a21c commit 7328d2b

File tree

6 files changed

+22
-6
lines changed

6 files changed

+22
-6
lines changed

RestSharp.IntegrationTests/RestSharp.IntegrationTests.Signed.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,9 @@
102102
<Name>RestSharp.Net4.Signed</Name>
103103
</ProjectReference>
104104
</ItemGroup>
105+
<ItemGroup>
106+
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
107+
</ItemGroup>
105108
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
106109
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
107110
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

RestSharp.IntegrationTests/RestSharp.IntegrationTests.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,9 @@
102102
<Name>RestSharp.Net4</Name>
103103
</ProjectReference>
104104
</ItemGroup>
105+
<ItemGroup>
106+
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
107+
</ItemGroup>
105108
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
106109
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
107110
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

RestSharp.Tests/NuSpecUpdateTask.cs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
using System.IO;
1+
using NUnit.Framework;
2+
using System.IO;
23
using System.Linq;
34
using System.Text.RegularExpressions;
45
using System.Xml.Linq;
5-
using NUnit.Framework;
66

77
namespace RestSharp.Tests
88
{
@@ -14,7 +14,14 @@ public abstract class BaseNuSpecUpdateTest
1414

1515
protected string ComputedFileName
1616
{
17-
get { return this.FileName.Replace(".nuspec", "-computed.nuspec"); }
17+
get
18+
{
19+
#if SIGNED
20+
return this.FileName.Replace(".nuspec", "-signed-computed.nuspec");
21+
#else
22+
return this.FileName.Replace(".nuspec", "-computed.nuspec");
23+
#endif
24+
}
1825
}
1926

2027
protected BaseNuSpecUpdateTest()

RestSharp.Tests/RestSharp.Tests.Signed.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,9 @@
236236
<Name>RestSharp.Net35.Signed</Name>
237237
</ProjectReference>
238238
</ItemGroup>
239+
<ItemGroup>
240+
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
241+
</ItemGroup>
239242
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
240243
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
241244
Other similar extension points exist, see Microsoft.Common.targets.

RestSharp.Tests/RestSharp.Tests.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,5 +234,8 @@
234234
<Name>RestSharp.Net35</Name>
235235
</ProjectReference>
236236
</ItemGroup>
237+
<ItemGroup>
238+
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
239+
</ItemGroup>
237240
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
238241
</Project>

RestSharp.sln

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,6 @@ Global
477477
{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}.Debug.Appveyor|Any CPU.Build.0 = Debug|Any CPU
478478
{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}.Debug.Appveyor|ARM.ActiveCfg = Debug|Any CPU
479479
{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}.Debug.Appveyor|Mixed Platforms.ActiveCfg = Debug|Any CPU
480-
{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}.Debug.Appveyor|Mixed Platforms.Build.0 = Debug|Any CPU
481480
{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}.Debug.Appveyor|x86.ActiveCfg = Debug|Any CPU
482481
{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
483482
{1B662C38-984F-4B6A-89B5-AFF7FCBE43A2}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -493,7 +492,6 @@ Global
493492
{7CBC38E5-BABF-4E79-86CA-41C42222FC85}.Debug.Appveyor|Any CPU.Build.0 = Debug|Any CPU
494493
{7CBC38E5-BABF-4E79-86CA-41C42222FC85}.Debug.Appveyor|ARM.ActiveCfg = Debug|Any CPU
495494
{7CBC38E5-BABF-4E79-86CA-41C42222FC85}.Debug.Appveyor|Mixed Platforms.ActiveCfg = Debug|Any CPU
496-
{7CBC38E5-BABF-4E79-86CA-41C42222FC85}.Debug.Appveyor|Mixed Platforms.Build.0 = Debug|Any CPU
497495
{7CBC38E5-BABF-4E79-86CA-41C42222FC85}.Debug.Appveyor|x86.ActiveCfg = Debug|Any CPU
498496
{7CBC38E5-BABF-4E79-86CA-41C42222FC85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
499497
{7CBC38E5-BABF-4E79-86CA-41C42222FC85}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -509,7 +507,6 @@ Global
509507
{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}.Debug.Appveyor|Any CPU.Build.0 = Debug|Any CPU
510508
{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}.Debug.Appveyor|ARM.ActiveCfg = Debug|Any CPU
511509
{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}.Debug.Appveyor|Mixed Platforms.ActiveCfg = Debug|Any CPU
512-
{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}.Debug.Appveyor|Mixed Platforms.Build.0 = Debug|Any CPU
513510
{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}.Debug.Appveyor|x86.ActiveCfg = Debug|Any CPU
514511
{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
515512
{E9A9D1C5-4E06-4D31-9809-A97188C70B2C}.Debug|ARM.ActiveCfg = Debug|Any CPU

0 commit comments

Comments
 (0)