Skip to content

Commit 3d6315a

Browse files
internalautomation[bot]tamarariverabording
authored
GitHubSync update - release-3.0 (#548)
* GitHubSync update - release-3.0 * Consolidate NServiceBus to 9.1.2 * Consolidate NServiceBus.Gateway to 5.0.0 * Bump GitHubActionsTestLogger to 2.4.1 * Bump Microsoft.NET.Test.Sdk to 17.12.0 * Bump NUnit3TestAdapter to 4.6.0 * Bump Particular.Approvals to 2.0.0 * Bump Particular.Packaging to 4.2.0 * Bump PublicApiGenerator to 11.3.0 * Downgrade NUnit to 3.1.4 * Bump Microsoft.Data.SqlClient to 5.2.2 * Bump install-sql-server-action to 1.2.0 * Remove legacy System.Data.SqlClient tests * Update to supported Gateway package * Update README --------- Co-authored-by: internalautomation[bot] <85681268+internalautomation[bot]@users.noreply.github.com> Co-authored-by: Tamara Rivera <tamita.rivera@gmail.com> Co-authored-by: Brandon Ording <bording@gmail.com>
1 parent 84472c1 commit 3d6315a

File tree

16 files changed

+130
-96
lines changed

16 files changed

+130
-96
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
path: nugets/
4343
retention-days: 7
4444
- name: Install SQL Server
45-
uses: Particular/install-sql-server-action@v1.1.0
45+
uses: Particular/install-sql-server-action@v1.2.0
4646
with:
4747
connection-string-env-var: SQLServerConnectionString
4848
catalog: nservicebus

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# NServiceBus.Gateway.Sql
22

3-
NServiceBus.Gateway.Sql is the official [NServiceBus Gateway](https://github.com/Particular/NServiceBus.Gateway) persistence implementation for [Microsoft SQL Server](http://www.microsoft.com/sqlserver), supporting both the [System.Data.SqlClient](https://www.nuget.org/packages/System.Data.SqlClient) and [Microsoft.Data.SqlClient](https://www.nuget.org/packages/Microsoft.Data.SqlClient) packages.
3+
NServiceBus.Gateway.Sql is the official [NServiceBus Gateway](https://github.com/Particular/NServiceBus.Gateway) persistence implementation for [Microsoft SQL Server](http://www.microsoft.com/sqlserver).
44

55
It is part of the [Particular Service Platform](https://particular.net/service-platform), which includes [NServiceBus](https://particular.net/nservicebus) and tools to build, monitor, and debug distributed systems.
66

‎src/Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
<EnableNETAnalyzers>true</EnableNETAnalyzers>
88
<AnalysisLevel Condition="'$(AnalysisLevel)' == ''">5.0</AnalysisLevel>
99
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
10-
<!-- NuGetAuditMode set to 'all' for tool projects in Directory.Build.targets, other project types default to 'direct' -->
1110
<NuGetAuditLevel>low</NuGetAuditLevel>
11+
<NuGetAuditMode Condition="'$(NuGetAuditMode)' == ''">all</NuGetAuditMode>
1212
<!-- To lock the version of Particular.Analyzers, for example, in a release branch, set this property in Custom.Build.props -->
13-
<ParticularAnalyzersVersion Condition="'$(ParticularAnalyzersVersion)' == ''">2.1.2</ParticularAnalyzersVersion>
13+
<ParticularAnalyzersVersion Condition="'$(ParticularAnalyzersVersion)' == ''">2.1.3</ParticularAnalyzersVersion>
1414
<NServiceBusKey>0024000004800000940000000602000000240000525341310004000001000100dde965e6172e019ac82c2639ffe494dd2e7dd16347c34762a05732b492e110f2e4e2e1b5ef2d85c848ccfb671ee20a47c8d1376276708dc30a90ff1121b647ba3b7259a6bc383b2034938ef0e275b58b920375ac605076178123693c6c4f1331661a62eba28c249386855637780e3ff5f23a6d854700eaa6803ef48907513b92</NServiceBusKey>
1515
<NServiceBusTestsKey>00240000048000009400000006020000002400005253413100040000010001007f16e21368ff041183fab592d9e8ed37e7be355e93323147a1d29983d6e591b04282e4da0c9e18bd901e112c0033925eb7d7872c2f1706655891c5c9d57297994f707d16ee9a8f40d978f064ee1ffc73c0db3f4712691b23bf596f75130f4ec978cf78757ec034625a5f27e6bb50c618931ea49f6f628fd74271c32959efb1c5</NServiceBusTestsKey>
1616
</PropertyGroup>

‎src/Directory.Build.targets‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<Project>
22

3-
<PropertyGroup>
4-
<NuGetAuditMode Condition="'$(PackAsTool)' == 'true'">all</NuGetAuditMode>
5-
</PropertyGroup>
3+
<Import Project="msbuild\AutomaticVersionRanges.targets" Condition="Exists('msbuild\AutomaticVersionRanges.targets')" />
64

75
</Project>

src/AcceptanceTestsShared/.editorconfig renamed to src/NServiceBus.Gateway.Sql.AcceptanceTests/.editorconfig

File renamed without changes.

src/AcceptanceTestsShared/DatabaseUtil.cs renamed to src/NServiceBus.Gateway.Sql.AcceptanceTests/DatabaseUtil.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
using System;
2-
#if MicrosoftDataClient
32
using Microsoft.Data.SqlClient;
4-
#elif SystemDataClient
5-
using System.Data.SqlClient;
6-
#endif
73

84
public static class DatabaseUtil
95
{

src/AcceptanceTestsShared/GatewayTestSuiteConstraints.cs renamed to src/NServiceBus.Gateway.Sql.AcceptanceTests/GatewayTestSuiteConstraints.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
namespace NServiceBus.Gateway.AcceptanceTests
22
{
3-
#if MicrosoftDataClient
3+
using System.Text.RegularExpressions;
4+
using System.Threading.Tasks;
45
using Microsoft.Data.SqlClient;
5-
#elif SystemDataClient
6-
using System.Data.SqlClient;
7-
#endif
86
using NServiceBus.AcceptanceTesting.Support;
9-
using System.Threading.Tasks;
10-
using System.Text.RegularExpressions;
117

128
public partial class GatewayTestSuiteConstraints
139
{

src/MicrosoftClientAcceptanceTests/MicrosoftClientAcceptanceTests.csproj renamed to src/NServiceBus.Gateway.Sql.AcceptanceTests/NServiceBus.Gateway.Sql.AcceptanceTests.csproj

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,24 @@
22

33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
5-
<DefineConstants>MicrosoftDataClient</DefineConstants>
65
</PropertyGroup>
76

87
<ItemGroup>
98
<ProjectReference Include="..\NServiceBus.Gateway.Sql\NServiceBus.Gateway.Sql.csproj" />
109
</ItemGroup>
1110

1211
<ItemGroup>
13-
<PackageReference Include="NServiceBus.AcceptanceTesting" Version="9.0.0" />
14-
<PackageReference Include="NServiceBus.Gateway.AcceptanceTests.Sources" Version="5.0.0" />
15-
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
12+
<PackageReference Include="NServiceBus.AcceptanceTesting" Version="9.2.3" />
13+
<PackageReference Include="NServiceBus.Gateway.AcceptanceTests.Sources" Version="5.1.0" />
14+
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
1615
</ItemGroup>
1716

1817
<ItemGroup>
19-
<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
20-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
21-
<PackageReference Include="NUnit" Version="3.14.0" />
22-
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
23-
</ItemGroup>
24-
25-
<ItemGroup>
26-
<Compile Include="..\AcceptanceTestsShared\**\*.cs" LinkBase="Shared" />
18+
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
20+
<PackageReference Include="NUnit" Version="4.3.2" />
21+
<PackageReference Include="NUnit.Analyzers" Version="4.6.0" />
22+
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
2723
</ItemGroup>
2824

2925
</Project>

src/MicrosoftClientAcceptanceTests/SetupFixture.cs renamed to src/NServiceBus.Gateway.Sql.AcceptanceTests/SetupFixture.cs

File renamed without changes.

‎src/NServiceBus.Gateway.Sql.Tests/NServiceBus.Gateway.Sql.Tests.csproj‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,16 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="NServiceBus" Version="9.0.0" />
15-
<PackageReference Include="NServiceBus.Gateway" Version="5.0.0" />
16-
<PackageReference Include="Particular.Approvals" Version="1.0.0" />
17-
<PackageReference Include="PublicApiGenerator" Version="11.1.0" />
14+
<PackageReference Include="Particular.Approvals" Version="2.0.0" />
15+
<PackageReference Include="PublicApiGenerator" Version="11.3.0" />
1816
</ItemGroup>
1917

2018
<ItemGroup>
21-
<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
22-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
23-
<PackageReference Include="NUnit" Version="4.1.0" />
24-
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
19+
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
20+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
21+
<PackageReference Include="NUnit" Version="4.3.2" />
22+
<PackageReference Include="NUnit.Analyzers" Version="4.6.0" />
23+
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
2524
</ItemGroup>
2625

2726
</Project>

0 commit comments

Comments
 (0)