Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for Microsoft.Data.SqlClient and System.Data.SqClient #543

Merged
merged 37 commits into from Jan 29, 2020
Merged
Show file tree
Hide file tree
Changes from 36 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
417b0f7
Move from NServiceBus.Transport.SQLServer to NServiceBus.Transport.Sq…
danielmarbach Jan 24, 2020
3a63dcb
Bump major
danielmarbach Jan 24, 2020
03ab0a2
Remove obsoletes but keep empty file
danielmarbach Jan 24, 2020
cec487a
Remove SqlConstants from public API
danielmarbach Jan 24, 2020
28f7b7f
Approve API
danielmarbach Jan 24, 2020
ce5f4c7
Net461 for all but compatibility tests
danielmarbach Jan 24, 2020
a7675de
Remove partial
danielmarbach Jan 24, 2020
7cefdd4
Define SYSTEMDATASQLCLIENT
danielmarbach Jan 24, 2020
aa3273d
Switch to NETFRAMEWORK
danielmarbach Jan 24, 2020
1a2f4a3
Transport.SqlServer package that references Microsoft.Data.SqlClient
danielmarbach Jan 24, 2020
6b768b3
Introduce acceptance tests and remove assembly name override
danielmarbach Jan 24, 2020
c2eecdf
Bring in assembly name override and reintroduce binaries folder
danielmarbach Jan 24, 2020
6d003d3
Convert remaining NET452 ifdefs
bording Jan 24, 2020
7deadb9
Misc project file cleanup
bording Jan 24, 2020
486e90e
Simplify exclusion
bording Jan 24, 2020
f4a9ba9
Simplify test exclusion
bording Jan 24, 2020
4d202b5
Organize compat test projects
bording Jan 24, 2020
43c2046
Move existing projects into Legacy VS folder
bording Jan 24, 2020
9164164
Add remaining test projects
bording Jan 24, 2020
59ac34e
Move source files
bording Jan 24, 2020
f7234d7
Move AcceptanceTests source files
bording Jan 24, 2020
a7511da
Move IntegrationTests source files
bording Jan 24, 2020
ca58e73
Move TransportTests source files
bording Jan 24, 2020
e2c59aa
Move UnitTests source files
bording Jan 24, 2020
aca04f0
Copy approval files
bording Jan 24, 2020
4bb9e85
Update nuget.config from RepoStandards
bording Jan 24, 2020
e459911
Move acceptance tests into correct namespace
danielmarbach Jan 27, 2020
47d13ed
Move transport tests into correct namespace
danielmarbach Jan 27, 2020
da89065
Move Unit Tests into correct namespace
danielmarbach Jan 27, 2020
ea6b162
Explicitly setting the transport transaction connection and transacti…
danielmarbach Jan 28, 2020
f074fa7
Fixing the dispatcher to rely on the settings key to get the connecti…
danielmarbach Jan 28, 2020
e550bd6
Try to remove error spy name endpoint
danielmarbach Jan 29, 2020
ce765ec
Cleanup async
danielmarbach Jan 29, 2020
098849e
Build command text for cleanup
danielmarbach Jan 29, 2020
e26a27b
those -> these
bording Jan 29, 2020
5c0c9b1
Avoid race on error spy creation with multi catalog
danielmarbach Jan 29, 2020
7dd67af
Remove queue cleanup from When_configured_error_queue_includes_catalog
danielmarbach Jan 29, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion GitVersion.yml
@@ -1,5 +1,5 @@
assembly-versioning-scheme: Major
next-version: 5.0.0
next-version: 6.0.0
branches:
master:
mode: ContinuousDeployment
Expand Down
@@ -1,10 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net452;netcoreapp2.1</TargetFrameworks>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>AcceptanceTests.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>..\NServiceBus.Transport.SqlServer.AcceptanceTests\AcceptanceTests.snk</AssemblyOriginatorKeyFile>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<DefineConstants>$(DefineConstants);SYSTEMDATASQLCLIENT</DefineConstants>
</PropertyGroup>

<ItemGroup>
Expand All @@ -18,4 +19,8 @@
<PackageReference Include="NUnit3TestAdapter" Version="3.11.2" />
</ItemGroup>

<ItemGroup>
<Compile Include="..\NServiceBus.Transport.SqlServer.AcceptanceTests\**\*.cs" Exclude="**\obj\**" />
</ItemGroup>

</Project>
@@ -1,10 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net452;netcoreapp2.1</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\NServiceBus.snk</AssemblyOriginatorKeyFile>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<DefineConstants>$(DefineConstants);SYSTEMDATASQLCLIENT</DefineConstants>
</PropertyGroup>

<ItemGroup>
Expand All @@ -18,4 +19,8 @@
<PackageReference Include="NUnit3TestAdapter" Version="3.11.2" />
</ItemGroup>

<ItemGroup>
<Compile Include="..\NServiceBus.Transport.SqlServer.IntegrationTests\**\*.cs" Exclude="**\obj\**" />
</ItemGroup>

</Project>
@@ -1,10 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net46;netcoreapp2.1</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\NServiceBus.snk</AssemblyOriginatorKeyFile>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<DefineConstants>$(DefineConstants);SYSTEMDATASQLCLIENT</DefineConstants>
</PropertyGroup>

<ItemGroup>
Expand All @@ -19,6 +20,7 @@
</ItemGroup>

<ItemGroup>
<Compile Include="..\NServiceBus.Transport.SqlServer.TransportTests\**\*.cs" Exclude="**\obj\**" />
<Compile Remove="\**\When_modifying_incoming_headers.cs" />
</ItemGroup>
</Project>
Expand Up @@ -5,22 +5,6 @@
[assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)]
namespace NServiceBus
{
public class static MessageDrivenPubSubCompatibility
{
[System.ObsoleteAttribute("Publishing can not be disabled in version 5.0 and above. The transport handles pu" +
"blish-subscribe natively and does not require a separate subscription persistenc" +
"e. The member currently throws a NotImplementedException. Will be removed in ver" +
"sion 6.0.0.", true)]
public static void DisablePublishing(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions) { }
[System.ObsoleteAttribute(@"Publisher registration has been moved to message-driven pub-sub migration mode.\r\n\r\nvar compatMode = transport.EnableMessageDrivenPubSubCompatibilityMode();\r\ncompatMode.RegisterPublisher(eventType, publisherEndpoint);. Use `SubscriptionMigrationModeSettings.RegisterPublisher(routingSettings, eventType, publisherEndpoint)` instead. The member currently throws a NotImplementedException. Will be removed in version 6.0.0.", true)]
public static void RegisterPublisher(this NServiceBus.RoutingSettings<NServiceBus.SqlServerTransport> routingSettings, System.Type eventType, string publisherEndpoint) { }
[System.ObsoleteAttribute(@"Publisher registration has been moved to message-driven pub-sub migration mode.\r\n\r\nvar compatMode = transport.EnableMessageDrivenPubSubCompatibilityMode();\r\ncompatMode.RegisterPublisher(assembly, publisherEndpoint);. Use `SubscriptionMigrationModeSettings.RegisterPublisher(routingSettings, assembly, publisherEndpoint)` instead. The member currently throws a NotImplementedException. Will be removed in version 6.0.0.", true)]
public static void RegisterPublisher(this NServiceBus.RoutingSettings<NServiceBus.SqlServerTransport> routingSettings, System.Reflection.Assembly assembly, string publisherEndpoint) { }
[System.ObsoleteAttribute(@"Publisher registration has been moved to message-driven pub-sub migration mode.\r\n\r\nvar compatMode = transport.EnableMessageDrivenPubSubCompatibilityMode();\r\ncompatMode.RegisterPublisher(assembly, namespace, publisherEndpoint);. Use `SubscriptionMigrationModeSettings.RegisterPublisher(routingSettings, assembly, namespace, publisherEndpoint)` instead. The member currently throws a NotImplementedException. Will be removed in version 6.0.0.", true)]
public static void RegisterPublisher(this NServiceBus.RoutingSettings<NServiceBus.SqlServerTransport> routingSettings, System.Reflection.Assembly assembly, string @namespace, string publisherEndpoint) { }
[System.ObsoleteAttribute(@"Subscription authorization has been moved to message-driven pub-sub migration mode. \r\n\r\nvar compatMode = transport.EnableMessageDrivenPubSubCompatibilityMode();\r\ncompatMode.SubscriptionAuthorizer(authorizer);. Use `SubscriptionMigrationModeSettings.SubscriptionAuthorizer(transportExtensions, authorizer)` instead. The member currently throws a NotImplementedException. Will be removed in version 6.0.0.", true)]
public static void SubscriptionAuthorizer(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions, System.Func<NServiceBus.Pipeline.IIncomingPhysicalMessageContext, bool> authorizer) { }
}
public class SqlServerTransport : NServiceBus.Transport.TransportDefinition
{
public SqlServerTransport() { }
Expand All @@ -29,7 +13,7 @@ namespace NServiceBus
public override NServiceBus.Transport.TransportInfrastructure Initialize(NServiceBus.Settings.SettingsHolder settings, string connectionString) { }
}
}
namespace NServiceBus.Transport.SQLServer
namespace NServiceBus.Transport.SqlServer
{
public class DelayedDeliverySettings
{
Expand All @@ -45,48 +29,20 @@ namespace NServiceBus.Transport.SQLServer
}
public class static SendOptionsExtensions
{
[System.ObsoleteAttribute("The connection parameter is no longer required. Use `UseCustomSqlTransaction` ins" +
"tead. The member currently throws a NotImplementedException. Will be removed in " +
"version 6.0.0.", true)]
public static void UseCustomSqlConnectionAndTransaction(this NServiceBus.SendOptions options, System.Data.SqlClient.SqlConnection connection, System.Data.SqlClient.SqlTransaction transaction) { }
public static void UseCustomSqlTransaction(this NServiceBus.SendOptions options, System.Data.SqlClient.SqlTransaction transaction) { }
}
[System.ObsoleteAttribute("Not for public use.")]
public class static SqlConstants
{
public static readonly string AddMessageBodyStringColumn;
public static readonly string CheckHeadersColumnType;
public static readonly string CheckIfExpiresIndexIsPresent;
public static readonly string CreateDelayedMessageStoreText;
public static readonly string CreateQueueText;
public static readonly string CreateSubscriptionTableText;
public static readonly string GetSubscribersText;
public static readonly string MoveDueDelayedMessageText;
public static readonly string PeekText;
public static readonly string PurgeBatchOfExpiredMessagesText;
public static readonly string PurgeText;
public static readonly string ReceiveText;
public static readonly string SendText;
public static readonly string StoreDelayedMessageText;
public static readonly string SubscribeText;
public static readonly string UnsubscribeText;
}
public class static SqlServerTransportSettingsExtensions
{
public static NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> CreateMessageBodyComputedColumn(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions) { }
public static NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> DefaultSchema(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions, string schemaName) { }
public static NServiceBus.Transport.SQLServer.DelayedDeliverySettings NativeDelayedDelivery(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions) { }
public static NServiceBus.Transport.SqlServer.DelayedDeliverySettings NativeDelayedDelivery(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions) { }
public static NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> PurgeExpiredMessagesOnStartup(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions, System.Nullable<int> purgeBatchSize) { }
public static NServiceBus.Transport.SQLServer.SubscriptionSettings SubscriptionSettings(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions) { }
public static NServiceBus.Transport.SqlServer.SubscriptionSettings SubscriptionSettings(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions) { }
public static NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> TimeToWaitBeforeTriggeringCircuitBreaker(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions, System.TimeSpan waitTime) { }
public static NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> TransactionScopeOptions(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions, System.Nullable<System.TimeSpan> timeout = null, System.Nullable<System.Transactions.IsolationLevel> isolationLevel = null) { }
public static NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> UseCatalogForEndpoint(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions, string endpointName, string catalog) { }
public static NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> UseCatalogForQueue(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions, string queueName, string catalog) { }
public static NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> UseCustomSqlConnectionFactory(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions, System.Func<System.Threading.Tasks.Task<System.Data.SqlClient.SqlConnection>> sqlConnectionFactory) { }
[System.ObsoleteAttribute("Starting from version 5 native delayed delivery is always enabled. It can be conf" +
"igured via NativeDelayedDelivery. Use `NativeDelayedDelivery` instead. The membe" +
"r currently throws a NotImplementedException. Will be removed in version 6.0.0.", true)]
public static NServiceBus.Transport.SQLServer.DelayedDeliverySettings UseNativeDelayedDelivery(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions) { }
public static NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> UseSchemaForEndpoint(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions, string endpointName, string schema) { }
public static NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> UseSchemaForQueue(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions, string queueName, string schema) { }
public static NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> WithPeekDelay(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions, System.Nullable<System.TimeSpan> delay = null) { }
Expand Down
@@ -1,10 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net452;netcoreapp2.1</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\NServiceBus.snk</AssemblyOriginatorKeyFile>
<Optimize>False</Optimize>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
</PropertyGroup>

Expand All @@ -21,4 +20,8 @@
<PackageReference Include="PublicApiGenerator" Version="8.0.1" />
</ItemGroup>

<ItemGroup>
<Compile Include="..\NServiceBus.Transport.SqlServer.UnitTests\**\*.cs" Exclude="**\obj\**" />
</ItemGroup>

</Project>
45 changes: 42 additions & 3 deletions src/NServiceBus.SqlServer.sln
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26730.12
# Visual Studio Version 16
VisualStudioVersion = 16.0.29709.97
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus.SqlServer", "NServiceBus.SqlServer\NServiceBus.SqlServer.csproj", "{FA1193BF-325C-4201-BB78-484032E09809}"
EndProject
Expand All @@ -12,7 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
Scripts\Create-Databases.sql = Scripts\Create-Databases.sql
Directory.Build.props = Directory.Build.props
..\GitVersion.yml = ..\GitVersion.yml
NuGet.Config = NuGet.Config
nuget.config = nuget.config
Scripts\Reset-Database.sql = Scripts\Reset-Database.sql
EndProjectSection
EndProject
Expand All @@ -36,6 +36,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Facade_3_0", "Compatibility
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Facade_3_1", "CompatibilityTests\Facade_3.1\Facade_3_1.csproj", "{66D10F43-3859-4F55-B8A8-60E32AD6B813}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus.Transport.SqlServer", "NServiceBus.Transport.SqlServer\NServiceBus.Transport.SqlServer.csproj", "{F24C4DFD-A8DF-4053-A367-DF80F601230F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus.Transport.SqlServer.AcceptanceTests", "NServiceBus.Transport.SqlServer.AcceptanceTests\NServiceBus.Transport.SqlServer.AcceptanceTests.csproj", "{1AD1139F-771B-4993-8EFD-62600702DC54}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Legacy", "Legacy", "{9FC1126B-8F97-465D-8C1C-9279C46E87EA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus.Transport.SqlServer.IntegrationTests", "NServiceBus.Transport.SqlServer.IntegrationTests\NServiceBus.Transport.SqlServer.IntegrationTests.csproj", "{A4E324C5-ADE4-411A-AFFC-5DD5F4DE8087}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus.Transport.SqlServer.TransportTests", "NServiceBus.Transport.SqlServer.TransportTests\NServiceBus.Transport.SqlServer.TransportTests.csproj", "{9F898130-3550-49D3-9990-C11F192C9322}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus.Transport.SqlServer.UnitTests", "NServiceBus.Transport.SqlServer.UnitTests\NServiceBus.Transport.SqlServer.UnitTests.csproj", "{F08C8BAB-C329-4F96-A6AF-F25419C623FD}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -86,11 +98,38 @@ Global
{66D10F43-3859-4F55-B8A8-60E32AD6B813}.Debug|Any CPU.Build.0 = Debug|Any CPU
{66D10F43-3859-4F55-B8A8-60E32AD6B813}.Release|Any CPU.ActiveCfg = Release|Any CPU
{66D10F43-3859-4F55-B8A8-60E32AD6B813}.Release|Any CPU.Build.0 = Release|Any CPU
{F24C4DFD-A8DF-4053-A367-DF80F601230F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F24C4DFD-A8DF-4053-A367-DF80F601230F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F24C4DFD-A8DF-4053-A367-DF80F601230F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F24C4DFD-A8DF-4053-A367-DF80F601230F}.Release|Any CPU.Build.0 = Release|Any CPU
{1AD1139F-771B-4993-8EFD-62600702DC54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1AD1139F-771B-4993-8EFD-62600702DC54}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1AD1139F-771B-4993-8EFD-62600702DC54}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1AD1139F-771B-4993-8EFD-62600702DC54}.Release|Any CPU.Build.0 = Release|Any CPU
{A4E324C5-ADE4-411A-AFFC-5DD5F4DE8087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A4E324C5-ADE4-411A-AFFC-5DD5F4DE8087}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A4E324C5-ADE4-411A-AFFC-5DD5F4DE8087}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A4E324C5-ADE4-411A-AFFC-5DD5F4DE8087}.Release|Any CPU.Build.0 = Release|Any CPU
{9F898130-3550-49D3-9990-C11F192C9322}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9F898130-3550-49D3-9990-C11F192C9322}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9F898130-3550-49D3-9990-C11F192C9322}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9F898130-3550-49D3-9990-C11F192C9322}.Release|Any CPU.Build.0 = Release|Any CPU
{F08C8BAB-C329-4F96-A6AF-F25419C623FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F08C8BAB-C329-4F96-A6AF-F25419C623FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F08C8BAB-C329-4F96-A6AF-F25419C623FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F08C8BAB-C329-4F96-A6AF-F25419C623FD}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{FA1193BF-325C-4201-BB78-484032E09809} = {9FC1126B-8F97-465D-8C1C-9279C46E87EA}
{6A9E04E7-6229-4A3E-B94A-DA168E962B5A} = {9FC1126B-8F97-465D-8C1C-9279C46E87EA}
{9FD87362-6F80-495C-B5F0-CA84CA40DE02} = {9FC1126B-8F97-465D-8C1C-9279C46E87EA}
{BEFACD2C-02EC-488B-9FB7-696A5EAF4FEB} = {9FC1126B-8F97-465D-8C1C-9279C46E87EA}
{165C21AA-A7ED-48F2-A122-C2418B2DEB59} = {9FC1126B-8F97-465D-8C1C-9279C46E87EA}
{531AB217-EFFE-428C-8CA0-A8A70C907992} = {08C78355-DA03-4ED5-B0FC-20229979AE52}
{937A1BF0-12F4-442A-B2F0-ACF57DF73C23} = {08C78355-DA03-4ED5-B0FC-20229979AE52}
{B5D74165-91F9-46CF-8523-1775598F5EE6} = {08C78355-DA03-4ED5-B0FC-20229979AE52}
{EEAE4525-249C-4AEE-BE10-BD338D537594} = {08C78355-DA03-4ED5-B0FC-20229979AE52}
{FEC856E8-44EE-4E93-8964-32FD236E9DF7} = {08C78355-DA03-4ED5-B0FC-20229979AE52}
Expand Down
11 changes: 8 additions & 3 deletions src/NServiceBus.SqlServer/NServiceBus.SqlServer.csproj
@@ -1,11 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
<AssemblyName>NServiceBus.Transport.SqlServer</AssemblyName>
<RootNamespace>NServiceBus.Transport.SqlServer</RootNamespace>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\NServiceBus.snk</AssemblyOriginatorKeyFile>
<OutputPath>..\..\binaries\</OutputPath>
<DefineConstants>$(DefineConstants);SYSTEMDATASQLCLIENT</DefineConstants>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -23,4 +24,8 @@
<PackageReference Include="System.Data.SqlClient" Version="4.4.3" />
</ItemGroup>

</Project>
<ItemGroup>
<Compile Include="..\NServiceBus.Transport.SqlServer\**\*.cs" Exclude="**\obj\**;..\NServiceBus.Transport.SqlServer\InternalsVisibleTo.cs" />
</ItemGroup>

</Project>