Merge pull request #84 from Particular/release-3.0

Release 3.0

Author: Scooletz

GitVersion.yml

@@ -1,8 +1,7 @@
 assembly-versioning-scheme: Major
-next-version: 2.0.0
-commit-message-incrementing: Disabled
+next-version: 3.0
 branches:
-  release:
-    tag: rc
   develop:
     tag: beta
+  release:
+    tag: rc

src/Directory.Build.props

@@ -1,40 +1,8 @@
 <Project>
 
   <PropertyGroup>
+    <LangVersion>latest</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
-  
-  <ItemGroup>
-    <PackageReference Include="Terrajobst.PlatformCompat.Analyzers" Version="0.0.95-alpha" PrivateAssets="All" />
-  </ItemGroup>
-
-  <!-- Workaround for GitVersion 4.0 not creating GitVersionInformation by default -->
-  <PropertyGroup>
-    <UpdateAssemblyInfo>true</UpdateAssemblyInfo>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-  </PropertyGroup>
-
-  <!-- Versioning workaround because of https://github.com/NuGet/Home/issues/4790 -->
-  <PropertyGroup>
-    <GitVersionTaskVersion>4.0.0-*</GitVersionTaskVersion>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="GitVersionTask" Version="$(GitVersionTaskVersion)" PrivateAssets="All" />
-  </ItemGroup>
-
-  <ImportGroup Condition="'$(ExcludeRestorePackageImports)' == 'true' And '$(MSBuildRuntimeType)' != 'Core'">
-    <Import
-      Project="$(UserProfile)\.nuget\packages\gitversiontask\$(GitVersionTaskVersion)\buildMultiTargeting\GitVersionTask.targets"
-      Condition="Exists('$(UserProfile)\.nuget\packages\gitversiontask\$(GitVersionTaskVersion)\buildMultiTargeting\GitVersionTask.targets')" />
-  </ImportGroup>
-  <Target
-    Name="FixUpVersion"
-    BeforeTargets="_GenerateRestoreProjectSpec"
-    DependsOnTargets="GetVersion"
-    Condition="'$(GitVersion_Task_targets_Imported)' == 'True'" />
 
 </Project>

src/Directory.Build.targets

@@ -1,52 +1,15 @@
 namespace NServiceBus.AcceptanceTests.EndpointTemplates
 {
-    using System;
-    using System.Threading.Tasks;
     using AcceptanceTesting.Support;
     using ObjectBuilder;
 
     public static class ConfigureExtensions
     {
-        public static Task DefineTransport(this EndpointConfiguration config, RunSettings settings, EndpointCustomizationConfiguration endpointCustomizationConfiguration)
-        {
-            if (TestSuiteConstraints.Current.TransportConfiguration == null)
-            {
-                throw new Exception($"No valid transport configuration found. Configure a transport by assigning {nameof(TestSuiteConstraints)}.{nameof(TestSuiteConstraints.TransportConfiguration)}.");
-            }
-
-            return ConfigureTestExecution(TestSuiteConstraints.Current.TransportConfiguration, config, settings, endpointCustomizationConfiguration.EndpointName, endpointCustomizationConfiguration.PublisherMetadata);
-        }
-
-        public static Task DefinePersistence(this EndpointConfiguration config, RunSettings settings, EndpointCustomizationConfiguration endpointCustomizationConfiguration)
-        {
-            if (TestSuiteConstraints.Current.PersistenceConfiguration == null)
-            {
-                throw new Exception($"No valid persistence configuration found. Configure a persistence by assigning {nameof(TestSuiteConstraints)}.{nameof(TestSuiteConstraints.PersistenceConfiguration)}.");
-            }
-
-            return ConfigureTestExecution(TestSuiteConstraints.Current.PersistenceConfiguration, config, settings, endpointCustomizationConfiguration.EndpointName, endpointCustomizationConfiguration.PublisherMetadata);
-        }
-
         public static void RegisterComponentsAndInheritanceHierarchy(this EndpointConfiguration builder, RunDescriptor runDescriptor)
         {
             builder.RegisterComponents(r => { RegisterInheritanceHierarchyOfContextOnContainer(runDescriptor, r); });
         }
 
-        static async Task ConfigureTestExecution(IConfigureEndpointTestExecution configurer, EndpointConfiguration config, RunSettings settings, string endpointName, PublisherMetadata publisherMetadata)
-        {
-            await configurer.Configure(endpointName, config, settings, publisherMetadata)
-                .ConfigureAwait(false);
-
-            ActiveTestExecutionConfigurer cleaners;
-            var cleanerKey = "ConfigureTestExecution." + endpointName;
-            if (!settings.TryGet(cleanerKey, out cleaners))
-            {
-                cleaners = new ActiveTestExecutionConfigurer();
-                settings.Set(cleanerKey, cleaners);
-            }
-            cleaners.Add(configurer);
-        }
-
         static void RegisterInheritanceHierarchyOfContextOnContainer(RunDescriptor runDescriptor, IConfigureComponents r)
         {
             var type = runDescriptor.ScenarioContext.GetType();
@@ -56,11 +19,5 @@ static void RegisterInheritanceHierarchyOfContextOnContainer(RunDescriptor runDe
                 type = type.BaseType;
             }
         }
-
-        enum TestDependencyType
-        {
-            Transport,
-            Persistence
-        }
     }
 }

src/NServiceBus.Metrics.AcceptanceTests/ConfigureEndpointInMemoryPersistence.cs

@@ -2,12 +2,12 @@
 {
     using System;
     using System.Collections.Generic;
+    using System.IO;
     using System.Threading.Tasks;
     using AcceptanceTesting.Customization;
     using AcceptanceTesting.Support;
-    using Configuration.AdvanceExtensibility;
+    using Configuration.AdvancedExtensibility;
     using Features;
-    using Config.ConfigurationSource;
 
     public class DefaultServer : IEndpointSetupTemplate
     {
@@ -21,41 +21,35 @@ public DefaultServer(List<Type> typesToInclude)
             this.typesToInclude = typesToInclude;
         }
 
-#pragma warning disable CS0618
-        public async Task<EndpointConfiguration> GetConfiguration(RunDescriptor runDescriptor, EndpointCustomizationConfiguration endpointConfiguration, IConfigurationSource configSource, Action<EndpointConfiguration> configurationBuilderCustomization)
-#pragma warning restore CS0618
+        public Task<EndpointConfiguration> GetConfiguration(RunDescriptor runDescriptor, EndpointCustomizationConfiguration endpointConfiguration, Action<EndpointConfiguration> configurationBuilderCustomization)
         {
-            var settings = runDescriptor.Settings;
-
             var types = endpointConfiguration.GetTypesScopedByTestClass();
 
             typesToInclude.AddRange(types);
 
             var configuration = new EndpointConfiguration(endpointConfiguration.EndpointName);
 
             configuration.TypesToIncludeInScan(typesToInclude);
-            configuration.CustomConfigurationSource(configSource);
             configuration.EnableInstallers();
 
             configuration.DisableFeature<TimeoutManager>();
 
+            configuration.UsePersistence<InMemoryPersistence>();
+            var storageDir = Path.Combine(NServiceBusAcceptanceTest.StorageRootDir, NUnit.Framework.TestContext.CurrentContext.Test.ID);
+            configuration.UseTransport<LearningTransport>()
+                .StorageDirectory(storageDir);
+
             var recoverability = configuration.Recoverability();
             recoverability.Delayed(delayed => delayed.NumberOfRetries(0));
             recoverability.Immediate(immediate => immediate.NumberOfRetries(0));
             configuration.SendFailedMessagesTo("error");
 
-            await configuration.DefineTransport(settings, endpointConfiguration)
-                .ConfigureAwait(false);
-
             configuration.RegisterComponentsAndInheritanceHierarchy(runDescriptor);
 
-            await configuration.DefinePersistence(settings, endpointConfiguration)
-                .ConfigureAwait(false);
-
             configuration.GetSettings().SetDefault("ScaleOut.UseSingleBrokerQueue", true);
             configurationBuilderCustomization(configuration);
 
-            return configuration;
+            return Task.FromResult(configuration);
         }
 
         List<Type> typesToInclude;