Skip to content

Commit 5371929

Browse files
seanfarmarandreasohlund
seanfarmar
authored and
andreasohlund
committed
support-6.0-update testing packages (#134)
* Update testing packages * Update NuGetPackager to 0.6.5 * Update GitVersionTask to 3.6.5 * Update Particular.CodeRules to 0.2.1 * Switch to Particular.Approvals
1 parent a090940 commit 5371929

File tree

9 files changed

+232
-234
lines changed

9 files changed

+232
-234
lines changed

src/NServiceBus.Testing.Tests/APIApprovals.ApproveTesting.approved.txt renamed to src/ApprovalFiles/APIApprovals.ApproveTesting.approved.txt

File renamed without changes.

‎src/NServiceBus.Testing.Tests/APIApprovals.cs‎

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,17 @@
11
namespace NServiceBus.Testing.Tests.API
22
{
3-
using System;
4-
using System.IO;
5-
using System.Linq;
6-
using System.Runtime.CompilerServices;
7-
using ApiApprover;
8-
using ApprovalTests;
9-
using Mono.Cecil;
103
using NUnit.Framework;
4+
using Particular.Approvals;
5+
using PublicApiGenerator;
116

127
[TestFixture]
138
public class APIApprovals
149
{
1510
[Test]
16-
[MethodImpl(MethodImplOptions.NoInlining)]
1711
public void ApproveTesting()
1812
{
19-
Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
20-
var assemblyPath = Path.GetFullPath(typeof(Test).Assembly.Location);
21-
var asm = AssemblyDefinition.ReadAssembly(assemblyPath);
22-
var publicApi = Filter(PublicApiGenerator.CreatePublicApiForAssembly(asm));
23-
Approvals.Verify(publicApi);
13+
var publicApi = ApiGenerator.GeneratePublicApi(typeof(Test).Assembly);
14+
Approver.Verify(publicApi);
2415
}
25-
26-
string Filter(string text)
27-
{
28-
return string.Join(Environment.NewLine, text.Split(new[]
29-
{
30-
Environment.NewLine
31-
}, StringSplitOptions.RemoveEmptyEntries)
32-
.Where(l => !l.StartsWith("[assembly: ReleaseDateAttribute("))
33-
.Where(l => !string.IsNullOrWhiteSpace(l))
34-
);
35-
}
36-
3716
}
3817
}

‎src/NServiceBus.Testing.Tests/App_Packages/ApiApprover.3.0.1/PublicApiApprover.cs‎

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

src/NServiceBus.Testing.Tests/App_Packages/ApiApprover.3.0.1/PublicApiGenerator.cs renamed to src/NServiceBus.Testing.Tests/App_Packages/PublicApiGenerator.8.1.0/ApiGenerator.cs

Lines changed: 187 additions & 116 deletions
Large diffs are not rendered by default.

‎src/NServiceBus.Testing.Tests/ApprovalTestConfig.cs‎

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

‎src/NServiceBus.Testing.Tests/NServiceBus.Testing.Tests.csproj‎

Lines changed: 25 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props')" />
4+
<Import Project="..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" />
35
<PropertyGroup>
46
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
57
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -45,51 +47,38 @@
4547
<AssemblyOriginatorKeyFile>..\NServiceBus.snk</AssemblyOriginatorKeyFile>
4648
</PropertyGroup>
4749
<ItemGroup>
48-
<Reference Include="ApprovalTests, Version=3.0.0.0, Culture=neutral, PublicKeyToken=11bd7d124fc62e0f, processorArchitecture=MSIL">
49-
<HintPath>..\packages\ApprovalTests.3.0.11\lib\net40\ApprovalTests.dll</HintPath>
50-
<Private>True</Private>
50+
<Reference Include="Mono.Cecil, Version=0.10.3.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
51+
<HintPath>..\packages\Mono.Cecil.0.10.3\lib\net40\Mono.Cecil.dll</HintPath>
5152
</Reference>
52-
<Reference Include="ApprovalUtilities, Version=3.0.0.0, Culture=neutral, PublicKeyToken=11bd7d124fc62e0f, processorArchitecture=MSIL">
53-
<HintPath>..\packages\ApprovalUtilities.3.0.11\lib\net45\ApprovalUtilities.dll</HintPath>
54-
<Private>True</Private>
53+
<Reference Include="Mono.Cecil.Mdb, Version=0.10.3.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
54+
<HintPath>..\packages\Mono.Cecil.0.10.3\lib\net40\Mono.Cecil.Mdb.dll</HintPath>
5555
</Reference>
56-
<Reference Include="ApprovalUtilities.Net45, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
57-
<HintPath>..\packages\ApprovalUtilities.3.0.11\lib\net45\ApprovalUtilities.Net45.dll</HintPath>
58-
<Private>True</Private>
56+
<Reference Include="Mono.Cecil.Pdb, Version=0.10.3.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
57+
<HintPath>..\packages\Mono.Cecil.0.10.3\lib\net40\Mono.Cecil.Pdb.dll</HintPath>
5958
</Reference>
60-
<Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
61-
<HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.dll</HintPath>
62-
<Private>True</Private>
59+
<Reference Include="Mono.Cecil.Rocks, Version=0.10.3.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
60+
<HintPath>..\packages\Mono.Cecil.0.10.3\lib\net40\Mono.Cecil.Rocks.dll</HintPath>
6361
</Reference>
64-
<Reference Include="Mono.Cecil.Mdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
65-
<HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Mdb.dll</HintPath>
66-
<Private>True</Private>
67-
</Reference>
68-
<Reference Include="Mono.Cecil.Pdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
69-
<HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Pdb.dll</HintPath>
70-
<Private>True</Private>
71-
</Reference>
72-
<Reference Include="Mono.Cecil.Rocks, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
73-
<HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Rocks.dll</HintPath>
74-
<Private>True</Private>
62+
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
63+
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
7564
</Reference>
7665
<Reference Include="NServiceBus.Core, Version=6.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
7766
<HintPath>..\packages\NServiceBus.6.0.0\lib\net452\NServiceBus.Core.dll</HintPath>
7867
<Private>True</Private>
7968
</Reference>
80-
<Reference Include="nunit.framework, Version=3.2.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
81-
<HintPath>..\packages\NUnit.3.2.1\lib\net45\nunit.framework.dll</HintPath>
82-
<Private>True</Private>
69+
<Reference Include="nunit.framework, Version=3.11.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
70+
<HintPath>..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll</HintPath>
71+
</Reference>
72+
<Reference Include="Particular.Approvals, Version=0.2.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
73+
<HintPath>..\packages\Particular.Approvals.0.2.0\lib\net452\Particular.Approvals.dll</HintPath>
8374
</Reference>
8475
<Reference Include="System" />
8576
<Reference Include="System.Core" />
8677
<Reference Include="System.Web.Services" />
8778
</ItemGroup>
8879
<ItemGroup>
8980
<Compile Include="APIApprovals.cs" />
90-
<Compile Include="ApprovalTestConfig.cs" />
91-
<Compile Include="App_Packages\ApiApprover.3.0.1\PublicApiApprover.cs" />
92-
<Compile Include="App_Packages\ApiApprover.3.0.1\PublicApiGenerator.cs" />
81+
<Compile Include="App_Packages\PublicApiGenerator.8.1.0\ApiGenerator.cs" />
9382
<Compile Include="Handler\ExpectDoNotContinueDispatchingCurrentMessageToHandlersTests.cs" />
9483
<Compile Include="Handler\ExpectDeferTests.cs" />
9584
<Compile Include="Handler\ExpectForwardCurrentMessageToTests.cs" />
@@ -120,4 +109,11 @@
120109
<None Include="packages.config" />
121110
</ItemGroup>
122111
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
112+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
113+
<PropertyGroup>
114+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
115+
</PropertyGroup>
116+
<Error Condition="!Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.11.0\build\NUnit.props'))" />
117+
<Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props'))" />
118+
</Target>
123119
</Project>

‎src/NServiceBus.Testing.Tests/packages.config‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="ApiApprover" version="3.0.1" targetFramework="net452" />
4-
<package id="ApprovalTests" version="3.0.11" targetFramework="net452" />
5-
<package id="ApprovalUtilities" version="3.0.11" targetFramework="net452" />
6-
<package id="Mono.Cecil" version="0.9.6.1" targetFramework="net452" />
3+
<package id="Mono.Cecil" version="0.10.3" targetFramework="net452" />
4+
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net452" />
75
<package id="NServiceBus" version="6.0.0" targetFramework="net452" />
8-
<package id="NUnit" version="3.2.1" targetFramework="net452" />
6+
<package id="NUnit" version="3.11.0" targetFramework="net452" />
7+
<package id="NUnit3TestAdapter" version="3.13.0" targetFramework="net452" />
8+
<package id="Particular.Approvals" version="0.2.0" targetFramework="net452" />
9+
<package id="PublicApiGenerator" version="8.1.0" targetFramework="net452" />
910
</packages>

‎src/NServiceBus.Testing/NServiceBus.Testing.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
3-
<Import Project="..\packages\Particular.CodeRules.0.1.1\build\Particular.CodeRules.props" Condition="Exists('..\packages\Particular.CodeRules.0.1.1\build\Particular.CodeRules.props')" />
3+
<Import Project="..\packages\Particular.CodeRules.0.2.1\build\Particular.CodeRules.props" Condition="Exists('..\packages\Particular.CodeRules.0.2.1\build\Particular.CodeRules.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -137,19 +137,19 @@
137137
<Content Include="FodyWeavers.xml" />
138138
</ItemGroup>
139139
<ItemGroup>
140-
<Analyzer Include="..\packages\Particular.CodeRules.0.1.1\tools\..\analyzers\dotnet\cs\Particular.CodeRules.dll" />
140+
<Analyzer Include="..\packages\Particular.CodeRules.0.2.1\analyzers\dotnet\cs\Particular.CodeRules.dll" />
141141
</ItemGroup>
142142
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
143143
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
144144
<PropertyGroup>
145145
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
146146
</PropertyGroup>
147147
<Error Condition="!Exists('..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.4\build\dotnet\Fody.targets'))" />
148-
<Error Condition="!Exists('..\packages\NuGetPackager.0.6.0\build\NuGetPackager.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NuGetPackager.0.6.0\build\NuGetPackager.targets'))" />
149-
<Error Condition="!Exists('..\packages\GitVersionTask.3.6.3\build\dotnet\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.3.6.3\build\dotnet\GitVersionTask.targets'))" />
150-
<Error Condition="!Exists('..\packages\Particular.CodeRules.0.1.1\build\Particular.CodeRules.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Particular.CodeRules.0.1.1\build\Particular.CodeRules.props'))" />
148+
<Error Condition="!Exists('..\packages\NuGetPackager.0.6.5\build\NuGetPackager.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NuGetPackager.0.6.5\build\NuGetPackager.targets'))" />
149+
<Error Condition="!Exists('..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets'))" />
150+
<Error Condition="!Exists('..\packages\Particular.CodeRules.0.2.1\build\Particular.CodeRules.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Particular.CodeRules.0.2.1\build\Particular.CodeRules.props'))" />
151151
</Target>
152152
<Import Project="..\packages\Fody.1.29.4\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" />
153-
<Import Project="..\packages\NuGetPackager.0.6.0\build\NuGetPackager.targets" Condition="Exists('..\packages\NuGetPackager.0.6.0\build\NuGetPackager.targets')" />
154-
<Import Project="..\packages\GitVersionTask.3.6.3\build\dotnet\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.3.6.3\build\dotnet\GitVersionTask.targets')" />
153+
<Import Project="..\packages\NuGetPackager.0.6.5\build\NuGetPackager.targets" Condition="Exists('..\packages\NuGetPackager.0.6.5\build\NuGetPackager.targets')" />
154+
<Import Project="..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets')" />
155155
</Project>

‎src/NServiceBus.Testing/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Fody" version="1.29.4" targetFramework="net452" developmentDependency="true" />
4-
<package id="GitVersionTask" version="3.6.3" targetFramework="net452" developmentDependency="true" />
4+
<package id="GitVersionTask" version="3.6.5" targetFramework="net452" developmentDependency="true" />
55
<package id="NServiceBus" version="6.0.0" targetFramework="net452" />
66
<package id="NServiceBus.Testing.Fakes.Sources" version="6.0.0" targetFramework="net452" />
7-
<package id="NuGetPackager" version="0.6.0" targetFramework="net452" developmentDependency="true" />
7+
<package id="NuGetPackager" version="0.6.5" targetFramework="net452" developmentDependency="true" />
88
<package id="Obsolete.Fody" version="4.1.0" targetFramework="net452" developmentDependency="true" />
9-
<package id="Particular.CodeRules" version="0.1.1" targetFramework="net452" developmentDependency="true" />
9+
<package id="Particular.CodeRules" version="0.2.1" targetFramework="net452" developmentDependency="true" />
1010
</packages>

0 commit comments

Comments
 (0)