Merge pull request #45 from AppMetrics/dev

3.0.0 release

AspNetCore.sln

@@ -19,6 +19,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{DD2E4647-7125-4CE3-9BA5-B45A26113A31}"
+	ProjectSection(SolutionItems) = preProject
+		test\Directory.Build.props = test\Directory.Build.props
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "App.Metrics.AspNetCore.Mvc", "src\App.Metrics.AspNetCore.Mvc\App.Metrics.AspNetCore.Mvc.csproj", "{21C3203D-DC15-4435-84D7-E6F2FDD71C2C}"
 EndProject
@@ -40,6 +43,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Git", "Git", "{3B3721C0-41F
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sandbox", "sandbox", "{C0BC96C5-46E1-4323-9C5D-58D9A96549CD}"
+	ProjectSection(SolutionItems) = preProject
+		sandbox\Directory.Build.props = sandbox\Directory.Build.props
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sanbox", "Sanbox", "{F1ECA197-26EE-4A52-8026-D906C14685A2}"
 	ProjectSection(SolutionItems) = preProject
@@ -76,6 +82,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "App.Metrics.AspNetCore.Repo
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MetricsReportingSandboxMvc", "sandbox\MetricsReportingSandboxMvc\MetricsReportingSandboxMvc.csproj", "{6B54766A-C439-47AB-B44A-887396E203E5}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "App.Metrics.AspNetCore.Mvc.Core", "src\App.Metrics.AspNetCore.Mvc.Core\App.Metrics.AspNetCore.Mvc.Core.csproj", "{8FC832BB-1EDB-43E6-9844-05CB949ADCA7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "App.Metrics.AspNetCore.Tracking.Facts", "test\App.Metrics.AspNetCore.Tracking.Facts\App.Metrics.AspNetCore.Tracking.Facts.csproj", "{32DD796A-48CD-4622-B0A1-B889A4661D88}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -134,6 +144,14 @@ Global
 		{6B54766A-C439-47AB-B44A-887396E203E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6B54766A-C439-47AB-B44A-887396E203E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6B54766A-C439-47AB-B44A-887396E203E5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8FC832BB-1EDB-43E6-9844-05CB949ADCA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8FC832BB-1EDB-43E6-9844-05CB949ADCA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8FC832BB-1EDB-43E6-9844-05CB949ADCA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8FC832BB-1EDB-43E6-9844-05CB949ADCA7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{32DD796A-48CD-4622-B0A1-B889A4661D88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{32DD796A-48CD-4622-B0A1-B889A4661D88}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{32DD796A-48CD-4622-B0A1-B889A4661D88}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{32DD796A-48CD-4622-B0A1-B889A4661D88}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -156,6 +174,8 @@ Global
 		{7306534E-B6D0-4064-B051-F97647FD2EA2} = {2D805782-756E-4C98-B22E-F502BEE95318}
 		{63F67AF0-939C-4E32-A901-405F4E8E405E} = {2D805782-756E-4C98-B22E-F502BEE95318}
 		{6B54766A-C439-47AB-B44A-887396E203E5} = {C0BC96C5-46E1-4323-9C5D-58D9A96549CD}
+		{8FC832BB-1EDB-43E6-9844-05CB949ADCA7} = {2D805782-756E-4C98-B22E-F502BEE95318}
+		{32DD796A-48CD-4622-B0A1-B889A4661D88} = {DD2E4647-7125-4CE3-9BA5-B45A26113A31}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {A8699A1D-0BA1-403C-86E9-C789CD2645EB}

README.md

@@ -19,6 +19,7 @@ App Metrics is an open-source and cross-platform .NET library used to record met
 |App.Metrics.AspNetCore.Core|[![MyGet Status](https://img.shields.io/myget/appmetrics/v/App.Metrics.AspNetCore.Core.svg?style=flat-square0)](https://www.myget.org/feed/appmetrics/package/nuget/App.Metrics.AspNetCore.Core)|[![NuGet Status](https://img.shields.io/nuget/vpre/App.Metrics.AspNetCore.Core.svg?style=flat-square)](https://www.nuget.org/packages/App.Metrics.AspNetCore.Core/)|[![NuGet Status](https://img.shields.io/nuget/v/App.Metrics.AspNetCore.Core.svg?style=flat-square)](https://www.nuget.org/packages/App.Metrics.AspNetCore.Core/)
 |App.Metrics.AspNetCore.Hosting|[![MyGet Status](https://img.shields.io/myget/appmetrics/v/App.Metrics.AspNetCore.Hosting.svg?style=flat-square&maxAge=7200)](https://www.myget.org/feed/appmetrics/package/nuget/App.Metrics.AspNetCore.Hosting)|[![NuGet Status](https://img.shields.io/nuget/vpre/App.Metrics.AspNetCore.Hosting.svg?style=flat-square)](https://www.nuget.org/packages/App.Metrics.AspNetCore.Hosting/)|[![NuGet Status](https://img.shields.io/nuget/v/App.Metrics.AspNetCore.Hosting.svg)](https://www.nuget.org/packages/App.Metrics.AspNetCore.Hosting/)
 |App.Metrics.AspNetCore.Mvc|[![MyGet Status](https://img.shields.io/myget/appmetrics/v/App.Metrics.AspNetCore.Mvc.svg?style=flat-square)](https://www.myget.org/feed/appmetrics/package/nuget/App.Metrics.AspNetCore.Mvc)|[![NuGet Status](https://img.shields.io/nuget/vpre/App.Metrics.AspNetCore.Mvc.svg?style=flat-square)](https://www.nuget.org/packages/App.Metrics.AspNetCore/)|[![NuGet Status](https://img.shields.io/nuget/v/App.Metrics.AspNetCore.Mvc.svg?style=flat-square)](https://www.nuget.org/packages/App.Metrics.AspNetCore.Mvc/)
+|App.Metrics.AspNetCore.Mvc.Core|[![MyGet Status](https://img.shields.io/myget/appmetrics/v/App.Metrics.AspNetCore.Mvc.Core.svg?style=flat-square)](https://www.myget.org/feed/appmetrics/package/nuget/App.Metrics.AspNetCore.Mvc.Core)|[![NuGet Status](https://img.shields.io/nuget/vpre/App.Metrics.AspNetCore.Mvc.Core.svg?style=flat-square)](https://www.nuget.org/packages/App.Metrics.AspNetCore.Core/)|[![NuGet Status](https://img.shields.io/nuget/v/App.Metrics.AspNetCore.Mvc.Core.svg?style=flat-square)](https://www.nuget.org/packages/App.Metrics.AspNetCore.Mvc.Core/)
 |App.Metrics.AspNetCore.Tracking|[![MyGet Status](https://img.shields.io/myget/appmetrics/v/App.Metrics.AspNetCore.Tracking.svg?style=flat-square)](https://www.myget.org/feed/appmetrics/package/nuget/App.Metrics.AspNetCore.Tracking)|[![NuGet Status](https://img.shields.io/nuget/vpre/App.Metrics.AspNetCore.Tracking.svg?style=flat-square)](https://www.nuget.org/packages/App.Metrics.AspNetCore.Tracking/)|[![NuGet Status](https://img.shields.io/nuget/v/App.Metrics.AspNetCore.Tracking.svg?style=flat-square)](https://www.nuget.org/packages/App.Metrics.AspNetCore.Tracking/)|
 |App.Metrics.AspNetCore.Endpoints|[![MyGet Status](https://img.shields.io/myget/appmetrics/v/App.Metrics.AspNetCore.Endpoints.svg?style=flat-square)](https://www.myget.org/feed/appmetrics/package/nuget/App.Metrics.AspNetCore.Endpoints)|[![NuGet Status](https://img.shields.io/nuget/vpre/App.Metrics.AspNetCore.Endpoints.svg?style=flat-square)](https://www.nuget.org/packages/App.Metrics.AspNetCore.Endpoints/)|[![NuGet Status](https://img.shields.io/nuget/v/App.Metrics.AspNetCore.Endpoints.svg?style=flat-square)](https://www.nuget.org/packages/App.Metrics.AspNetCore.Endpoints/)|
 |App.Metrics.AspNetCore.Reporting|[![MyGet Status](https://img.shields.io/myget/appmetrics/v/App.Metrics.AspNetCore.Reporting.svg?style=flat-square)](https://www.myget.org/feed/appmetrics/package/nuget/App.Metrics.AspNetCore.Reporting)|[![NuGet Status](https://img.shields.io/nuget/vpre/App.Metrics.AspNetCore.Reporting.svg?style=flat-square)](https://www.nuget.org/packages/App.Metrics.AspNetCore.Reporting/)|[![NuGet Status](https://img.shields.io/nuget/v/App.Metrics.AspNetCore.Reporting.svg?style=flat-square)](https://www.nuget.org/packages/App.Metrics.AspNetCore.Reporting/)|

appveyor.yml

@@ -32,9 +32,6 @@ deploy:
     secure: gIAiACgNj+JzXyLLTe3rLxZyrAB9RpC8Lw81xEjdOLXqotprqEwGiFWRipEqkpps
   skip_symbols: true
   symbol_server: https://www.myget.org/F/appmetrics/symbol
-install:
-  - cmd: curl -O https://download.microsoft.com/download/0/F/D/0FD852A4-7EA1-4E2A-983A-0484AC19B92C/dotnet-sdk-2.0.0-win-x64.exe
-  - cmd: dotnet-sdk-2.0.0-win-x64.exe /install /quiet /norestart /log install.log 
 skip_commits:
   files:    
     - '**/*.md'

build.cake

@@ -44,6 +44,7 @@ var packDirs                    = new [] {
 											Directory("./src/App.Metrics.AspNetCore.Endpoints"),
 											Directory("./src/App.Metrics.AspNetCore.Hosting"),
 											Directory("./src/App.Metrics.AspNetCore.Mvc"),
+											Directory("./src/App.Metrics.AspNetCore.Mvc.Core"),
 											Directory("./src/App.Metrics.AspNetCore.Reporting"),
 											Directory("./src/App.Metrics.AspNetCore.Routing"),	
 											Directory("./src/App.Metrics.AspNetCore.Tracking")
@@ -74,23 +75,36 @@ var coverExcludeFilter			= "-:*.Facts";
 var excludeFromCoverage			= "*.ExcludeFromCodeCoverage*";
 string versionSuffix			= null;
 
-if (!string.IsNullOrEmpty(preReleaseSuffix))
+if (AppVeyor.IsRunningOnAppVeyor)
 {
-	if (packageRelease && AppVeyor.IsRunningOnAppVeyor && AppVeyor.Environment.Repository.Tag.IsTag)
+	if (AppVeyor.Environment.Repository.Tag.IsTag)
 	{
-		versionSuffix = preReleaseSuffix;
+		// Stable release package, pushed to nuget
+	}
+	else if (string.IsNullOrEmpty(preReleaseSuffix))
+	{
+		// Next stable release development package, not pushed to nuget
+		versionSuffix = buildNumber.ToString("D4");
 	}
 	else
 	{
-		versionSuffix = preReleaseSuffix + "-" + buildNumber.ToString("D4");
+		if (packageRelease)
+		{
+			// Pre-release package, set version suffix without build number, not tagged until stable release but pushed to nuget
+			versionSuffix = preReleaseSuffix;
+		}
+		else
+		{
+			// Pre-release development package, set version suffix with build number, not pushed to nuget
+			versionSuffix = preReleaseSuffix + "-" + buildNumber.ToString("D4");
+		}
 	}
 }
-else if (AppVeyor.IsRunningOnAppVeyor && !AppVeyor.Environment.Repository.Tag.IsTag && !packageRelease)
+else
 {
-	versionSuffix = buildNumber.ToString("D4");
+	versionSuffix = preReleaseSuffix + "-" + buildNumber.ToString("D4");
 }
 
-
 //////////////////////////////////////////////////////////////////////
 // TASKS
 //////////////////////////////////////////////////////////////////////

build/common.props

@@ -1,9 +1,9 @@
 <Project>
-  <Import Project="dependencies.props" />
+	<Import Project="dependencies.props" />
 	<Import Project="..\version.props" />
 
 	<PropertyGroup>
-	  <Product>App Metrics</Product>
+		<Product>App Metrics</Product>
 		<Copyright>Allan Hardy 2016</Copyright>
 		<Authors>Allan Hardy</Authors>
 		<NoWarn>$(NoWarn);1701;1702;1705;CS1591;CS1570</NoWarn>
@@ -18,22 +18,21 @@
 		<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
 		<GenerateNeutralResourcesLanguageAttribute>false</GenerateNeutralResourcesLanguageAttribute>
 		<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-	  <LangVersion>latest</LangVersion>
+		<LangVersion>latest</LangVersion>
 		<CodeAnalysisRuleSet>..\..\AppMetrics.ruleset</CodeAnalysisRuleSet>
-	  <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Key.snk</AssemblyOriginatorKeyFile>
-	  <SignAssembly>true</SignAssembly>
-	  <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
-	  <DebugType>embedded</DebugType>
+		<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Key.snk</AssemblyOriginatorKeyFile>
+		<SignAssembly>true</SignAssembly>
+		<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<AdditionalFiles Include="..\..\stylecop.json" Link="stylecop.json" />		
 	</ItemGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="StyleCop.Analyzers" Version="$(StyleCopAnalyzersVersion)">
-	    <PrivateAssets>All</PrivateAssets>
-	  </PackageReference>
+		<PackageReference Include="StyleCop.Analyzers" Version="$(StyleCopAnalyzersVersion)">
+			<PrivateAssets>All</PrivateAssets>
+		</PackageReference>
 	</ItemGroup>
-  
+	
 </Project>

build/dependencies.props

@@ -1,19 +1,16 @@
 <Project>
   <PropertyGroup>
-    <AppMetricsCoreVersion>2.0.0-*</AppMetricsCoreVersion>
-    <AppMetricsMicrosoftExtensionsVersion>2.0.0-*</AppMetricsMicrosoftExtensionsVersion>
-    <AspNetCoreVersion>2.0.1</AspNetCoreVersion>
-    <AspNetCoreMvcVersion>2.0.2</AspNetCoreMvcVersion>
-    <MicrosoftExtensionsVersion>2.0.0</MicrosoftExtensionsVersion>
-    <CoreFxVersion>4.4.0-*</CoreFxVersion>
-    <DependencyModelVersion>2.0.0-*</DependencyModelVersion>
-    <MoqVersion>4.8.1</MoqVersion>
-    <NewtonsoftVersion>10.0.2</NewtonsoftVersion>
-    <NETStandardLibraryNETFrameworkVersion>2.0.0-*</NETStandardLibraryNETFrameworkVersion>
-    <RuntimeFrameworkVersion Condition="'$(TargetFramework)'=='netcoreapp2.0'">2.0.0-*</RuntimeFrameworkVersion>
-    <TestSdkVersion>15.5.0</TestSdkVersion>
-    <XunitVersion>2.3.1</XunitVersion>
-    <FluentAssertionsVersion>5.0.0</FluentAssertionsVersion>
+    <AppMetricsCoreVersion>3.0.0-*</AppMetricsCoreVersion>
+    <AppMetricsMicrosoftExtensionsVersion>3.0.0-*</AppMetricsMicrosoftExtensionsVersion>
+    <AspNetCoreVersion>2.1.6</AspNetCoreVersion>
+    <AspNetCoreMvcVersion>2.1.3</AspNetCoreMvcVersion>
+    <MicrosoftExtensionsVersion>2.1.1</MicrosoftExtensionsVersion>
+    <CoreFxVersion>4.4.0</CoreFxVersion>
+    <DependencyModelVersion>2.1.1</DependencyModelVersion>
+    <MoqVersion>4.10.0</MoqVersion>
+    <TestSdkVersion>15.9.0</TestSdkVersion>
+    <XunitVersion>2.4.1</XunitVersion>
+    <FluentAssertionsVersion>5.5.3</FluentAssertionsVersion>
     <FluentAssertionsJsonVersion>5.0.0</FluentAssertionsJsonVersion>
     <StyleCopAnalyzersVersion>1.0.0</StyleCopAnalyzersVersion>
   </PropertyGroup>

global.json

@@ -1,6 +1,6 @@
 {
   "projects": [ "src", "test", "sandbox" ],
   "sdk": {
-    "version": "2.0.0"
+    "version": "2.1.301"
   }
 }

sandbox/Directory.Build.props

@@ -0,0 +1,20 @@
+<Project>
+
+  <Import Project="..\build\common.props" />
+
+  <PropertyGroup>
+    <OutputType>exe</OutputType>
+    <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net461</TargetFrameworks>
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsVersion)" />
+    <PackageReference Include="Serilog.Sinks.Literate" Version="3.0.1-dev-00044*" />
+    <PackageReference Include="Serilog.Sinks.Seq" Version="4.0.1-dev-00155" />
+    <PackageReference Include="Serilog.AspNetCore " Version="2.1.2-dev-00024" />
+  </ItemGroup>
+
+</Project>

sandbox/MetricsReportingSandboxMvc/Controllers/FileController.cs

@@ -1,5 +1,5 @@
-// <copyright file="FileController.cs" company="Allan Hardy">
-// Copyright (c) Allan Hardy. All rights reserved.
+// <copyright file="FileController.cs" company="App Metrics Contributors">
+// Copyright (c) App Metrics Contributors. All rights reserved.
 // </copyright>
 
 using System;
@@ -9,7 +9,7 @@
 namespace MetricsReportingSandboxMvc.Controllers
 {
     [Route("api/[controller]")]
-    public class FileController : Controller
+    public class FileController : ControllerBase
     {
         [HttpPost]
         public IActionResult Post(IFormFile file)

sandbox/MetricsReportingSandboxMvc/Controllers/FrustratingController.cs

@@ -1,5 +1,5 @@
-// <copyright file="FrustratingController.cs" company="Allan Hardy">
-// Copyright (c) Allan Hardy. All rights reserved.
+// <copyright file="FrustratingController.cs" company="App Metrics Contributors">
+// Copyright (c) App Metrics Contributors. All rights reserved.
 // </copyright>
 
 using System.Threading.Tasks;
@@ -9,7 +9,7 @@
 namespace MetricsReportingSandboxMvc.Controllers
 {
     [Route("api/[controller]")]
-    public class FrustratingController : Controller
+    public class FrustratingController : ControllerBase
     {
         private readonly RequestDurationForApdexTesting _durationForApdexTesting;
 

sandbox/MetricsReportingSandboxMvc/Controllers/RandomExceptionController.cs

@@ -1,5 +1,5 @@
-// <copyright file="RandomExceptionController.cs" company="Allan Hardy">
-// Copyright (c) Allan Hardy. All rights reserved.
+// <copyright file="RandomExceptionController.cs" company="App Metrics Contributors">
+// Copyright (c) App Metrics Contributors. All rights reserved.
 // </copyright>
 
 using MetricsReportingSandboxMvc.JustForTesting;
@@ -8,7 +8,7 @@
 namespace MetricsReportingSandboxMvc.Controllers
 {
     [Route("api/[controller]")]
-    public class RandomExceptionController : Controller
+    public class RandomExceptionController : ControllerBase
     {
         private readonly RandomValuesForTesting _randomValuesForTesting;
 

sandbox/MetricsReportingSandboxMvc/Controllers/RandomStatusCodeController.cs

@@ -1,5 +1,5 @@
-// <copyright file="RandomStatusCodeController.cs" company="Allan Hardy">
-// Copyright (c) Allan Hardy. All rights reserved.
+// <copyright file="RandomStatusCodeController.cs" company="App Metrics Contributors">
+// Copyright (c) App Metrics Contributors. All rights reserved.
 // </copyright>
 
 using MetricsReportingSandboxMvc.JustForTesting;
@@ -8,7 +8,7 @@
 namespace MetricsReportingSandboxMvc.Controllers
 {
     [Route("api/[controller]")]
-    public class RandomStatusCodeController : Controller
+    public class RandomStatusCodeController : ControllerBase
     {
         private readonly RandomValuesForTesting _randomValuesForTesting;
 

sandbox/MetricsReportingSandboxMvc/Controllers/SatisfyingController.cs

@@ -1,5 +1,5 @@
-// <copyright file="SatisfyingController.cs" company="Allan Hardy">
-// Copyright (c) Allan Hardy. All rights reserved.
+// <copyright file="SatisfyingController.cs" company="App Metrics Contributors">
+// Copyright (c) App Metrics Contributors. All rights reserved.
 // </copyright>
 
 using System;
@@ -12,7 +12,7 @@
 namespace MetricsReportingSandboxMvc.Controllers
 {
     [Route("api/[controller]")]
-    public class SatisfyingController : Controller
+    public class SatisfyingController : ControllerBase
     {
         private readonly RequestDurationForApdexTesting _durationForApdexTesting;
 

sandbox/MetricsReportingSandboxMvc/Controllers/SlaTestController.cs

@@ -1,5 +1,5 @@
-// <copyright file="SlaTestController.cs" company="Allan Hardy">
-// Copyright (c) Allan Hardy. All rights reserved.
+// <copyright file="SlaTestController.cs" company="App Metrics Contributors">
+// Copyright (c) App Metrics Contributors. All rights reserved.
 // </copyright>
 
 using System;
@@ -11,7 +11,7 @@
 namespace MetricsReportingSandboxMvc.Controllers
 {
     [Route("api/[controller]")]
-    public class SlaTestController : Controller
+    public class SlaTestController : ControllerBase
     {
         private static readonly Random Rnd = new Random();
         private readonly IMetrics _metrics;

sandbox/MetricsReportingSandboxMvc/Controllers/TestController.cs

@@ -1,13 +1,13 @@
-// <copyright file="TestController.cs" company="Allan Hardy">
-// Copyright (c) Allan Hardy. All rights reserved.
+// <copyright file="TestController.cs" company="App Metrics Contributors">
+// Copyright (c) App Metrics Contributors. All rights reserved.
 // </copyright>
 
 using Microsoft.AspNetCore.Mvc;
 
 namespace MetricsReportingSandboxMvc.Controllers
 {
     [Route("api/[controller]")]
-    public class TestController : Controller
+    public class TestController : ControllerBase
     {
         [HttpGet]
         public IActionResult Get()

sandbox/MetricsReportingSandboxMvc/Controllers/ToleratingController.cs

@@ -1,5 +1,5 @@
-// <copyright file="ToleratingController.cs" company="Allan Hardy">
-// Copyright (c) Allan Hardy. All rights reserved.
+// <copyright file="ToleratingController.cs" company="App Metrics Contributors">
+// Copyright (c) App Metrics Contributors. All rights reserved.
 // </copyright>
 
 using System.Threading.Tasks;
@@ -9,7 +9,7 @@
 namespace MetricsReportingSandboxMvc.Controllers
 {
     [Route("api/[controller]")]
-    public class ToleratingController : Controller
+    public class ToleratingController : ControllerBase
     {
         private readonly RequestDurationForApdexTesting _durationForApdexTesting;
 

sandbox/MetricsReportingSandboxMvc/GlobalSuppressions.cs

@@ -1,5 +1,5 @@
-// <copyright file="GlobalSuppressions.cs" company="Allan Hardy">
-// Copyright (c) Allan Hardy. All rights reserved.
+// <copyright file="GlobalSuppressions.cs" company="App Metrics Contributors">
+// Copyright (c) App Metrics Contributors. All rights reserved.
 // </copyright>
 
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1123:Do not place regions within elements", Justification = "Sample app", Scope = "member", Target = "~M:MetricsReportingSandboxMvc.Host.BuildWebHost(System.String[])~Microsoft.AspNetCore.Hosting.IWebHost")]