Skip to content

Commit 39ef4c6

Browse files
bordingbording
authored
Merge pull request #29 from Particular/release-2.0
Release 2.0
2 parents 62e0a3d + 095ca79 commit 39ef4c6

44 files changed

Lines changed: 199 additions & 2653 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitattributes‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,7 @@
6464
*.bat text eol=crlf
6565

6666
# Custom for Visual Studio
67-
*.csproj merge=union
68-
*.vbproj merge=union
69-
*.fsproj merge=union
70-
*.dbproj merge=union
71-
*.sln text eol=crlf merge=union
7267
*.suo -text -diff
7368
*.snk -text -diff
7469
*.cub -text -diff
75-
*.wixlib -text -diff
70+
*.wixlib -text -diff

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ build32
44
binaries
55
*.vshost.*
66
.nu
7+
.learningtransport
78
_UpgradeReport.*
89
*.cache
910
*~
@@ -42,7 +43,6 @@ installer/ServiceControl-cache
4243
# User-specific files
4344
*.suo
4445
*.user
45-
*.json.lock
4646
*.userosscache
4747
*.sln.docstates
4848
.vs/

‎GitVersion.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
assembly-versioning-scheme: Major
2-
next-version: 1.0.0
3-
commit-message-incrementing: Disabled
2+
next-version: 2.0
43
branches:
54
develop:
6-
tag: alpha
5+
tag: beta
6+
release:
7+
tag: rc

‎packaging/nuget/NServiceBus.Encryption.MessageProperty.nuspec‎

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

‎src/AcceptanceTests/Infrastructure/DefaultServer.cs‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
using System.Threading.Tasks;
66
using AcceptanceTesting.Customization;
77
using AcceptanceTesting.Support;
8-
using Config.ConfigurationSource;
9-
using Configuration.AdvanceExtensibility;
8+
using Configuration.AdvancedExtensibility;
109
using Features;
1110

1211
public class DefaultServer : IEndpointSetupTemplate
@@ -21,7 +20,9 @@ public DefaultServer(List<Type> typesToInclude)
2120
this.typesToInclude = typesToInclude;
2221
}
2322

24-
public Task<EndpointConfiguration> GetConfiguration(RunDescriptor runDescriptor, EndpointCustomizationConfiguration endpointConfiguration, IConfigurationSource configSource, Action<EndpointConfiguration> configurationBuilderCustomization)
23+
#pragma warning disable 618
24+
public Task<EndpointConfiguration> GetConfiguration(RunDescriptor runDescriptor, EndpointCustomizationConfiguration endpointConfiguration, Action<EndpointConfiguration> configurationBuilderCustomization)
25+
#pragma warning restore 618
2526
{
2627
var types = endpointConfiguration.GetTypesScopedByTestClass();
2728

@@ -30,7 +31,6 @@ public Task<EndpointConfiguration> GetConfiguration(RunDescriptor runDescriptor,
3031
var configuration = new EndpointConfiguration(endpointConfiguration.EndpointName);
3132

3233
configuration.TypesToIncludeInScan(typesToInclude);
33-
configuration.CustomConfigurationSource(configSource);
3434
configuration.EnableInstallers();
3535

3636
configuration.DisableFeature<TimeoutManager>();
@@ -39,16 +39,7 @@ public Task<EndpointConfiguration> GetConfiguration(RunDescriptor runDescriptor,
3939
recoverability.Delayed(delayed => delayed.NumberOfRetries(0));
4040
recoverability.Immediate(immediate => immediate.NumberOfRetries(0));
4141

42-
var transportConfig = configuration.UseTransport<MsmqTransport>();
43-
var routingConfig = transportConfig.Routing();
44-
45-
foreach (var publisher in endpointConfiguration.PublisherMetadata.Publishers)
46-
{
47-
foreach (var eventType in publisher.Events)
48-
{
49-
routingConfig.RegisterPublisher(eventType, publisher.PublisherName);
50-
}
51-
}
42+
configuration.UseTransport<LearningTransport>();
5243

5344
configuration.RegisterComponents(r =>
5445
{

‎src/AcceptanceTests/Infrastructure/EndpointConfigurationExtensions.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
namespace NServiceBus.Encryption.MessageProperty.AcceptanceTests
2+
{
3+
using Configuration.AdvancedExtensibility;
4+
5+
public static class EndpointConfigurationExtensions
6+
{
7+
public static TransportExtensions ConfigureTransport(this EndpointConfiguration endpointConfiguration)
8+
{
9+
return new TransportExtensions(endpointConfiguration.GetSettings());
10+
}
11+
}
12+
}

‎src/AcceptanceTests/NServiceBus.Encryption.MessageProperty.AcceptanceTests.csproj‎

Lines changed: 12 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,19 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{322DD595-9FF9-4A48-82F0-74BE4A8833E2}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>NServiceBus.Encryption.MessageProperty.AcceptanceTests</RootNamespace>
11-
<AssemblyName>NServiceBus.Encryption.MessageProperty.AcceptanceTests</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<SignAssembly>false</SignAssembly>
15-
<AssemblyOriginatorKeyFile>..\NServiceBus.snk</AssemblyOriginatorKeyFile>
4+
<TargetFrameworks>net452;netcoreapp2.0</TargetFrameworks>
5+
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
166
</PropertyGroup>
17-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
18-
<DebugSymbols>true</DebugSymbols>
19-
<DebugType>full</DebugType>
20-
<Optimize>false</Optimize>
21-
<OutputPath>bin\Debug\</OutputPath>
22-
<DefineConstants>DEBUG;TRACE</DefineConstants>
23-
<ErrorReport>prompt</ErrorReport>
24-
<WarningLevel>4</WarningLevel>
25-
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<DebugType>pdbonly</DebugType>
28-
<Optimize>true</Optimize>
29-
<OutputPath>bin\Release\</OutputPath>
30-
<DefineConstants>TRACE</DefineConstants>
31-
<ErrorReport>prompt</ErrorReport>
32-
<WarningLevel>4</WarningLevel>
33-
</PropertyGroup>
34-
<ItemGroup>
35-
<Reference Include="NServiceBus.AcceptanceTesting, Version=6.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
36-
<HintPath>..\packages\NServiceBus.AcceptanceTesting.6.2.0-alpha0166\lib\net452\NServiceBus.AcceptanceTesting.dll</HintPath>
37-
<Private>True</Private>
38-
</Reference>
39-
<Reference Include="NServiceBus.Core, Version=6.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
40-
<HintPath>..\packages\NServiceBus.6.2.0-alpha0166\lib\net452\NServiceBus.Core.dll</HintPath>
41-
<Private>True</Private>
42-
</Reference>
43-
<Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
44-
<HintPath>..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll</HintPath>
45-
<Private>True</Private>
46-
</Reference>
47-
<Reference Include="System" />
48-
<Reference Include="System.Core" />
49-
<Reference Include="Microsoft.CSharp" />
50-
</ItemGroup>
51-
<ItemGroup>
52-
<Compile Include="Infrastructure\DefaultServer.cs" />
53-
<Compile Include="Infrastructure\EndpointCustomizationConfigurationExtensions.cs" />
54-
<Compile Include="Infrastructure\NServiceBusAcceptanceTest.cs" />
55-
<Compile Include="When_enabling_core_encryption_feature.cs" />
56-
<Compile Include="When_receiving_from_legacy_endpoint_using_conventions.cs" />
57-
<Compile Include="When_receiving_legacy_type.cs" />
58-
<Compile Include="When_sending_legacy_type.cs" />
59-
<Compile Include="When_sending_to_legacy_endpoint_using_conventions.cs" />
60-
<Compile Include="When_using_encryption_with_custom_service.cs" />
61-
<Compile Include="When_using_Rijndael_without_incoming_key_identifier.cs" />
62-
<Compile Include="When_using_Rijndael_with_custom.cs" />
63-
<Compile Include="When_using_Rijndael_with_multikey.cs" />
64-
<Compile Include="When_using_Rijndael_with_unobtrusive_mode.cs" />
65-
</ItemGroup>
7+
668
<ItemGroup>
67-
<None Include="packages.config" />
9+
<ProjectReference Include="..\MessageProperty\NServiceBus.Encryption.MessageProperty.csproj" />
6810
</ItemGroup>
11+
6912
<ItemGroup>
70-
<ProjectReference Include="..\MessageProperty\NServiceBus.Encryption.MessageProperty.csproj">
71-
<Project>{63ee7112-93f3-43b9-9895-d593eaadea9b}</Project>
72-
<Name>NServiceBus.Encryption.MessageProperty</Name>
73-
</ProjectReference>
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
14+
<PackageReference Include="NServiceBus.AcceptanceTesting" Version="7.0.0" />
15+
<PackageReference Include="NUnit" Version="3.7.1" />
16+
<PackageReference Include="NUnit3TestAdapter" Version="3.8.0-alpha1" />
7417
</ItemGroup>
75-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
18+
7619
</Project>

‎src/AcceptanceTests/When_enabling_core_encryption_feature.cs‎

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

‎src/AcceptanceTests/When_receiving_from_legacy_endpoint_using_conventions.cs‎

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

0 commit comments

Comments
 (0)