Merge pull request #55 from Particular/release-3.0

Release 3.0
Particular · May 14, 2018 · 1e16a38 · 1e16a38
2 parents d10061c + d82e65c
commit 1e16a38
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 28 deletions.
diff --git a/GitVersion.yml b/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: beta
   develop:
-    tag: alpha
+    tag: beta
+  release:
+    tag: rc
diff --git a/src/NServiceBus.Metrics.PerformanceCounters.Tests/APIApprovals.Approve.approved.txt b/src/NServiceBus.Metrics.PerformanceCounters.Tests/APIApprovals.Approve.approved.txt
@@ -20,8 +20,5 @@ namespace NServiceBus
     public class PerformanceCountersSettings
     {
         public void EnableSLAPerformanceCounters(System.TimeSpan sla) { }
-        [System.ObsoleteAttribute("This interval is no longer used for reporting. Counters values are updated as soo" +
-            "n as they are reported. Will be removed in version 3.0.0.", true)]
-        public void UpdateCounterEvery(System.TimeSpan updateInterval) { }
     }
 }
diff --git a/...us.Metrics.PerformanceCounters.Tests/NServiceBus.Metrics.PerformanceCounters.Tests.csproj b/...us.Metrics.PerformanceCounters.Tests/NServiceBus.Metrics.PerformanceCounters.Tests.csproj
@@ -12,8 +12,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="NServiceBus" Version="6.4.2" />
-    <PackageReference Include="NServiceBus.Metrics" Version="2.0.0" />
+    <PackageReference Include="NServiceBus" Version="7.0.0" />
+    <PackageReference Include="NServiceBus.Metrics" Version="3.0.0" />
     <PackageReference Include="NUnit" Version="3.7.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0-alpha1" />
   </ItemGroup>

diff --git a/src/NServiceBus.Metrics.PerformanceCounters/NServiceBus.Metrics.PerformanceCounters.csproj b/src/NServiceBus.Metrics.PerformanceCounters/NServiceBus.Metrics.PerformanceCounters.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NServiceBus.Metrics" Version="[2.0.0, 3.0.0)" />
+    <PackageReference Include="NServiceBus.Metrics" Version="[3.0.0, 4.0.0)" />
     <PackageReference Include="Fody" Version="2.2.0" PrivateAssets="All" />
     <PackageReference Include="Obsolete.Fody" Version="4.3.2" PrivateAssets="All" />
     <PackageReference Include="Particular.CodeRules" Version="0.2.0" PrivateAssets="All" />

diff --git a/src/NServiceBus.Metrics.PerformanceCounters/PerformanceCountersFeature.cs b/src/NServiceBus.Metrics.PerformanceCounters/PerformanceCountersFeature.cs
@@ -16,6 +16,8 @@ public PerformanceCountersFeature()
 
     protected override void Setup(FeatureConfigurationContext context)
     {
+        context.ThrowIfSendOnly();
+
         var endpoint = context.Settings.LogicalAddress().EndpointInstance.Endpoint;
 
         var legacyInstanceNameMap = new Dictionary<string, CounterInstanceName?>

diff --git a/src/NServiceBus.Metrics.PerformanceCounters/PerformanceCountersSettings.cs b/src/NServiceBus.Metrics.PerformanceCounters/PerformanceCountersSettings.cs
@@ -1,7 +1,7 @@
 namespace NServiceBus
 {
     using System;
-    using Configuration.AdvanceExtensibility;
+    using Configuration.AdvancedExtensibility;
 
     /// <summary>
     /// Windows performance counter configuration instance.
@@ -26,14 +26,5 @@ public void EnableSLAPerformanceCounters(TimeSpan sla)
             endpointConfiguration.GetSettings().Set(SLAMonitoringFeature.EndpointSLAKey, sla);
             endpointConfiguration.EnableFeature<SLAMonitoringFeature>();
         }
-
-        /// <summary>
-        /// Sets the update interval.
-        /// </summary>
-        /// <param name="updateInterval"></param>
-        [ObsoleteEx(Message = "This interval is no longer used for reporting. Counters values are updated as soon as they are reported", RemoveInVersion = "3.0")]
-        public void UpdateCounterEvery(TimeSpan updateInterval)
-        {
-        }
     }
 }
diff --git a/src/ScriptBuilderTask.Tests/ScriptBuilderTask.Tests.csproj b/src/ScriptBuilderTask.Tests/ScriptBuilderTask.Tests.csproj
@@ -10,16 +10,10 @@
     <ProjectReference Include="..\ScriptBuilderTask\ScriptBuilderTask.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Remove="CSharpCodeGenerationTests.Generates.approved.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Remove="PowershellCodeGenerationTests.Generates.approved.ps1" />
-  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ApprovalTests" Version="3.0.13" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="NServiceBus.Metrics" Version="2.0.0" />
+    <PackageReference Include="NServiceBus.Metrics" Version="3.0.0" />
     <PackageReference Include="NUnit" Version="3.7.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0-alpha1" />
   </ItemGroup>