Suppress [Obsolete] warnings from DiagnosticSource

rynowak · rynowak · commit 9342cb0ab78a · 2015-10-08T12:47:08.000-07:00
diff --git a/src/Microsoft.AspNet.Mvc.Core/Controllers/ControllerActionInvoker.cs b/src/Microsoft.AspNet.Mvc.Core/Controllers/ControllerActionInvoker.cs
@@ -23,7 +23,7 @@ public class ControllerActionInvoker : FilterActionInvoker
         private readonly ControllerActionDescriptor _descriptor;
         private readonly IControllerFactory _controllerFactory;
         private readonly IControllerActionArgumentBinder _argumentBinder;
-
+#pragma warning disable 0618
         public ControllerActionInvoker(
             ActionContext actionContext,
             IReadOnlyList<IFilterProvider> filterProviders,
@@ -129,6 +129,7 @@ public ControllerActionInvoker(
                     "descriptor");
             }
         }
+#pragma warning disable 0618
 
         protected override object CreateInstance()
         {
diff --git a/src/Microsoft.AspNet.Mvc.Core/Controllers/ControllerActionInvokerProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Controllers/ControllerActionInvokerProvider.cs
@@ -18,6 +18,7 @@ namespace Microsoft.AspNet.Mvc.Controllers
 {
     public class ControllerActionInvokerProvider : IActionInvokerProvider
     {
+#pragma warning disable 0618
         private readonly IControllerActionArgumentBinder _argumentBinder;
         private readonly IControllerFactory _controllerFactory;
         private readonly IFilterProvider[] _filterProviders;
@@ -53,6 +54,7 @@ public ControllerActionInvokerProvider(
             _logger = loggerFactory.CreateLogger<ControllerActionInvoker>();
             _telemetry = telemetry;
         }
+#pragma warning restore 0618
 
         public int Order
         {
diff --git a/src/Microsoft.AspNet.Mvc.Core/Controllers/FilterActionInvoker.cs b/src/Microsoft.AspNet.Mvc.Core/Controllers/FilterActionInvoker.cs
@@ -31,7 +31,9 @@ public abstract class FilterActionInvoker : IActionInvoker
         private readonly IReadOnlyList<IValueProviderFactory> _valueProviderFactories;
         private readonly IActionBindingContextAccessor _actionBindingContextAccessor;
         private readonly ILogger _logger;
+#pragma warning disable 0618
         private readonly TelemetrySource _telemetry;
+#pragma warning restore 0618
         private readonly int _maxModelValidationErrors;
 
         private IFilterMetadata[] _filters;
@@ -61,6 +63,7 @@ public abstract class FilterActionInvoker : IActionInvoker
         private const string ResultFilterShortCircuitLogMessage =
             "Request was short circuited at result filter '{ResultFilter}'.";
 
+#pragma warning disable 0618
         public FilterActionInvoker(
             ActionContext actionContext,
             IReadOnlyList<IFilterProvider> filterProviders,
@@ -137,6 +140,7 @@ public FilterActionInvoker(
             _telemetry = telemetry;
             _maxModelValidationErrors = maxModelValidationErrors;
         }
+#pragma warning restore 0618
 
         protected ActionContext ActionContext { get; private set; }
 
@@ -652,6 +656,7 @@ private async Task<ActionExecutedContext> InvokeActionFilterAsync()
 
                     try
                     {
+#pragma warning disable 0618
                         if (_telemetry.IsEnabled("Microsoft.AspNet.Mvc.BeforeActionMethod"))
                         {
                             _telemetry.WriteTelemetry(
@@ -663,11 +668,13 @@ private async Task<ActionExecutedContext> InvokeActionFilterAsync()
                                     controller = _actionExecutingContext.Controller
                                 });
                         }
+#pragma warning restore 0618
 
                         result = await InvokeActionAsync(_actionExecutingContext);
                     }
                     finally
                     {
+#pragma warning disable 0618
                         if (_telemetry.IsEnabled("Microsoft.AspNet.Mvc.AfterActionMethod"))
                         {
                             _telemetry.WriteTelemetry(
@@ -680,6 +687,7 @@ private async Task<ActionExecutedContext> InvokeActionFilterAsync()
                                     result = result
                                 });
                         }
+#pragma warning restore 0618
                     }
 
                     _actionExecutedContext = new ActionExecutedContext(
@@ -827,25 +835,29 @@ private async Task<ResultExecutedContext> InvokeResultFilterAsync()
 
         private async Task InvokeResultAsync(IActionResult result)
         {
+#pragma warning disable 0618
             if (_telemetry.IsEnabled("Microsoft.AspNet.Mvc.BeforeActionResult"))
             {
                 _telemetry.WriteTelemetry(
                     "Microsoft.AspNet.Mvc.BeforeActionResult",
                     new { actionContext = ActionContext, result = result });
             }
+#pragma warning restore 0618
 
             try
             {
                 await result.ExecuteResultAsync(ActionContext);
             }
             finally
             {
+#pragma warning disable 0618
                 if (_telemetry.IsEnabled("Microsoft.AspNet.Mvc.AfterActionResult"))
                 {
                     _telemetry.WriteTelemetry(
                         "Microsoft.AspNet.Mvc.AfterActionResult",
                         new { actionContext = ActionContext, result = result });
                 }
+#pragma warning restore 0618
             }
         }
 
diff --git a/src/Microsoft.AspNet.Mvc.Core/Infrastructure/MvcRouteHandler.cs b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/MvcRouteHandler.cs
@@ -20,7 +20,9 @@ public class MvcRouteHandler : IRouter
         private IActionInvokerFactory _actionInvokerFactory;
         private IActionSelector _actionSelector;
         private ILogger _logger;
+#pragma warning disable 0618
         private TelemetrySource _telemetry;
+#pragma warning restore 0618
 
         public VirtualPathData GetVirtualPath(VirtualPathContext context)
         {
@@ -80,12 +82,14 @@ public async Task RouteAsync(RouteContext context)
             {
                 context.RouteData = newRouteData;
 
+#pragma warning disable 0618
                 if (_telemetry.IsEnabled("Microsoft.AspNet.Mvc.BeforeAction"))
                 {
                     _telemetry.WriteTelemetry(
                         "Microsoft.AspNet.Mvc.BeforeAction",
                         new { actionDescriptor, httpContext = context.HttpContext, routeData = context.RouteData });
                 }
+#pragma warning restore 0618
 
                 using (_logger.BeginScope("ActionId: {ActionId}", actionDescriptor.Id))
                 {
@@ -97,12 +101,14 @@ public async Task RouteAsync(RouteContext context)
             }
             finally
             {
+#pragma warning disable 0618
                 if (_telemetry.IsEnabled("Microsoft.AspNet.Mvc.AfterAction"))
                 {
                     _telemetry.WriteTelemetry(
                         "Microsoft.AspNet.Mvc.AfterAction",
                         new { actionDescriptor, httpContext = context.HttpContext, routeData = context.RouteData });
                 }
+#pragma warning restore 0618
 
                 if (!context.IsHandled)
                 {
@@ -150,10 +156,12 @@ private void EnsureServices(HttpContext context)
                 _logger = factory.CreateLogger<MvcRouteHandler>();
             }
 
+#pragma warning disable 0618
             if (_telemetry == null)
             {
                 _telemetry = context.RequestServices.GetRequiredService<TelemetrySource>();
             }
+#pragma warning restore 0618
         }
     }
 }
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/PartialViewResultExecutor.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/PartialViewResultExecutor.cs
@@ -16,6 +16,7 @@ namespace Microsoft.AspNet.Mvc.ViewFeatures
     /// </summary>
     public class PartialViewResultExecutor : ViewExecutor
     {
+#pragma warning disable 0618
         /// <summary>
         /// Creates a new <see cref="PartialViewResultExecutor"/>.
         /// </summary>
@@ -39,6 +40,7 @@ public PartialViewResultExecutor(
 
             Logger = loggerFactory.CreateLogger<PartialViewResultExecutor>();
         }
+#pragma warning restore 0618
 
         /// <summary>
         /// Gets the <see cref="ILogger"/>.
@@ -69,6 +71,7 @@ public virtual ViewEngineResult FindView(ActionContext actionContext, PartialVie
             var result = viewEngine.FindPartialView(actionContext, viewName);
             if (result.Success)
             {
+#pragma warning disable 0618
                 if (Telemetry.IsEnabled("Microsoft.AspNet.Mvc.ViewFound"))
                 {
                     Telemetry.WriteTelemetry(
@@ -82,11 +85,12 @@ public virtual ViewEngineResult FindView(ActionContext actionContext, PartialVie
                             view = result.View,
                         });
                 }
-
+#pragma warning restore 0618
                 Logger.LogVerbose("The partial view '{PartialViewName}' was found.", viewName);
             }
             else
             {
+#pragma warning disable 0618
                 if (Telemetry.IsEnabled("Microsoft.AspNet.Mvc.ViewNotFound"))
                 {
                     Telemetry.WriteTelemetry(
@@ -100,6 +104,7 @@ public virtual ViewEngineResult FindView(ActionContext actionContext, PartialVie
                             searchedLocations = result.SearchedLocations
                         });
                 }
+#pragma warning restore 0618
 
                 Logger.LogError(
                     "The partial view '{PartialViewName}' was not found. Searched locations: {SearchedViewLocations}",
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewExecutor.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewExecutor.cs
@@ -26,6 +26,7 @@ public class ViewExecutor
             Encoding = Encoding.UTF8
         }.CopyAsReadOnly();
 
+#pragma warning disable 0618
         /// <summary>
         /// Creates a new <see cref="ViewExecutor"/>.
         /// </summary>
@@ -69,6 +70,7 @@ public ViewExecutor(
         /// Gets the <see cref="TelemetrySource"/>.
         /// </summary>
         protected TelemetrySource Telemetry { get; }
+#pragma warning restore 0618
 
         /// <summary>
         /// Gets the default <see cref="IViewEngine"/>.
@@ -158,21 +160,25 @@ public virtual async Task ExecuteAsync(
                     writer,
                     ViewOptions.HtmlHelperOptions);
 
+#pragma warning disable 0618
                 if (Telemetry.IsEnabled("Microsoft.AspNet.Mvc.BeforeView"))
                 {
                     Telemetry.WriteTelemetry(
                         "Microsoft.AspNet.Mvc.BeforeView",
                         new { view = view, viewContext = viewContext, });
                 }
+#pragma warning restore 0618
 
                 await view.RenderAsync(viewContext);
 
+#pragma warning disable 0618
                 if (Telemetry.IsEnabled("Microsoft.AspNet.Mvc.AfterView"))
                 {
                     Telemetry.WriteTelemetry(
                         "Microsoft.AspNet.Mvc.AfterView",
                         new { view = view, viewContext = viewContext, });
                 }
+#pragma warning restore 0618
 
                 // Perf: Invoke FlushAsync to ensure any buffered content is asynchronously written to the underlying
                 // response asynchronously. In the absence of this line, the buffer gets synchronously written to the
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewResultExecutor.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewResultExecutor.cs
@@ -16,6 +16,7 @@ namespace Microsoft.AspNet.Mvc.ViewFeatures
     /// </summary>
     public class ViewResultExecutor : ViewExecutor
     {
+#pragma warning disable 0618
         /// <summary>
         /// Creates a new <see cref="ViewResultExecutor"/>.
         /// </summary>
@@ -39,6 +40,7 @@ public ViewResultExecutor(
 
             Logger = loggerFactory.CreateLogger<ViewResultExecutor>();
         }
+#pragma warning restore 0618
 
         /// <summary>
         /// Gets the <see cref="ILogger"/>.
@@ -69,6 +71,7 @@ public virtual ViewEngineResult FindView(ActionContext actionContext, ViewResult
             var result = viewEngine.FindView(actionContext, viewName);
             if (result.Success)
             {
+#pragma warning disable 0618
                 if (Telemetry.IsEnabled("Microsoft.AspNet.Mvc.ViewFound"))
                 {
                     Telemetry.WriteTelemetry(
@@ -82,11 +85,13 @@ public virtual ViewEngineResult FindView(ActionContext actionContext, ViewResult
                             view = result.View,
                         });
                 }
+#pragma warning restore 0618
 
                 Logger.LogVerbose("The view '{ViewName}' was found.", viewName);
             }
             else
             {
+#pragma warning disable 0618
                 if (Telemetry.IsEnabled("Microsoft.AspNet.Mvc.ViewNotFound"))
                 {
                     Telemetry.WriteTelemetry(
@@ -100,6 +105,7 @@ public virtual ViewEngineResult FindView(ActionContext actionContext, ViewResult
                             searchedLocations = result.SearchedLocations
                         });
                 }
+#pragma warning restore 0618
 
                 Logger.LogError(
                     "The view '{ViewName}' was not found. Searched locations: {SearchedViewLocations}",
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Controllers/ControllerActionInvokerTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Controllers/ControllerActionInvokerTest.cs
@@ -2041,7 +2041,7 @@ private TestControllerActionInvoker CreateInvoker(
             filterProvider
                 .SetupGet(fp => fp.Order)
                 .Returns(-1000);
-
+#pragma warning disable 0618
             var invoker = new TestControllerActionInvoker(
                 actionContext,
                 new[] { filterProvider.Object },
@@ -2057,7 +2057,7 @@ private TestControllerActionInvoker CreateInvoker(
                 new NullLoggerFactory().CreateLogger<ControllerActionInvoker>(),
                 new TelemetryListener("Microsoft.AspNet"),
                 maxAllowedErrorsInModelState);
-
+#pragma warning restore 0618
             return invoker;
         }
 
@@ -2101,6 +2101,7 @@ public async Task Invoke_UsesDefaultValuesIfNotBound()
                              .Returns(new TestController());
 
             var metadataProvider = new EmptyModelMetadataProvider();
+#pragma warning disable 0618
             var invoker = new ControllerActionInvoker(
                 actionContext,
                 new List<IFilterProvider>(),
@@ -2118,6 +2119,7 @@ public async Task Invoke_UsesDefaultValuesIfNotBound()
                 new NullLoggerFactory().CreateLogger<ControllerActionInvoker>(),
                 new TelemetryListener("Microsoft.AspNet"),
                 200);
+#pragma warning restore 0618
 
             // Act
             await invoker.InvokeAsync();
@@ -2204,6 +2206,7 @@ public void Verify()
 
         private class TestControllerActionInvoker : ControllerActionInvoker
         {
+#pragma warning disable 0618
             public TestControllerActionInvoker(
                 ActionContext actionContext,
                 IFilterProvider[] filterProvider,
@@ -2237,6 +2240,7 @@ public TestControllerActionInvoker(
             {
                 ControllerFactory = controllerFactory;
             }
+#pragma warning restore 0618
 
             public MockControllerFactory ControllerFactory { get; }
 
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Infrastructure/MvcRouteHandlerTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Infrastructure/MvcRouteHandlerTests.cs
@@ -242,13 +242,13 @@ private RouteContext CreateRouteContext(
             {
                 optionsAccessor = new TestOptionsManager<MvcOptions>();
             }
-
+#pragma warning disable 0618
             var telemetry = new TelemetryListener("Microsoft.AspNet");
             if (telemetryListener != null)
             {
                 telemetry.SubscribeWithAdapter(telemetryListener);
             }
-
+#pragma warning restore 0618
             var httpContext = new Mock<HttpContext>();
             httpContext.Setup(h => h.RequestServices.GetService(typeof(IActionContextAccessor)))
                 .Returns(new ActionContextAccessor());
@@ -262,9 +262,10 @@ private RouteContext CreateRouteContext(
                  .Returns(new MvcMarkerService());
             httpContext.Setup(h => h.RequestServices.GetService(typeof(IOptions<MvcOptions>)))
                  .Returns(optionsAccessor);
+#pragma warning disable 0618
             httpContext.Setup(h => h.RequestServices.GetService(typeof(TelemetrySource)))
                 .Returns(telemetry);
-
+#pragma warning restore 0618
             return new RouteContext(httpContext.Object);
         }
     }
diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/PartialViewResultTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/PartialViewResultTest.cs
@@ -105,12 +105,14 @@ private ActionContext GetActionContext()
         private HttpContext GetHttpContext()
         {
             var options = new TestOptionsManager<MvcViewOptions>();
+#pragma warning disable 0618
             var viewExecutor = new PartialViewResultExecutor(
                 options,
                 new TestHttpResponseStreamWriterFactory(),
                 new CompositeViewEngine(options),
                 new TelemetryListener("Microsoft.AspNet"),
                 NullLoggerFactory.Instance);
+#pragma warning restore 0618
 
             var services = new ServiceCollection();
             services.AddInstance(viewExecutor);
diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/PartialViewResultExecutorTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/PartialViewResultExecutorTest.cs
diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/ViewExecutorTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/ViewExecutorTest.cs
diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/ViewResultExecutorTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/ViewResultExecutorTest.cs
diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewResultTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewResultTest.cs

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public class ControllerActionInvoker : FilterActionInvoker`
`23`	`23`	`private readonly ControllerActionDescriptor _descriptor;`
`24`	`24`	`private readonly IControllerFactory _controllerFactory;`
`25`	`25`	`private readonly IControllerActionArgumentBinder _argumentBinder;`
`26`		`-`
	`26`	`+#pragma warning disable 0618`
`27`	`27`	`public ControllerActionInvoker(`
`28`	`28`	`ActionContext actionContext,`
`29`	`29`	`IReadOnlyList<IFilterProvider> filterProviders,`
`@@ -129,6 +129,7 @@ public ControllerActionInvoker(`
`129`	`129`	`"descriptor");`
`130`	`130`	`}`
`131`	`131`	`}`
	`132`	`+#pragma warning disable 0618`
`132`	`133`
`133`	`134`	`protected override object CreateInstance()`
`134`	`135`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ namespace Microsoft.AspNet.Mvc.Controllers`
`18`	`18`	`{`
`19`	`19`	`public class ControllerActionInvokerProvider : IActionInvokerProvider`
`20`	`20`	`{`
	`21`	`+#pragma warning disable 0618`
`21`	`22`	`private readonly IControllerActionArgumentBinder _argumentBinder;`
`22`	`23`	`private readonly IControllerFactory _controllerFactory;`
`23`	`24`	`private readonly IFilterProvider[] _filterProviders;`
`@@ -53,6 +54,7 @@ public ControllerActionInvokerProvider(`
`53`	`54`	`_logger = loggerFactory.CreateLogger<ControllerActionInvoker>();`
`54`	`55`	`_telemetry = telemetry;`
`55`	`56`	`}`
	`57`	`+#pragma warning restore 0618`
`56`	`58`
`57`	`59`	`public int Order`
`58`	`60`	`{`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,9 @@ public abstract class FilterActionInvoker : IActionInvoker`
`31`	`31`	`private readonly IReadOnlyList<IValueProviderFactory> _valueProviderFactories;`
`32`	`32`	`private readonly IActionBindingContextAccessor _actionBindingContextAccessor;`
`33`	`33`	`private readonly ILogger _logger;`
	`34`	`+#pragma warning disable 0618`
`34`	`35`	`private readonly TelemetrySource _telemetry;`
	`36`	`+#pragma warning restore 0618`
`35`	`37`	`private readonly int _maxModelValidationErrors;`
`36`	`38`
`37`	`39`	`private IFilterMetadata[] _filters;`
`@@ -61,6 +63,7 @@ public abstract class FilterActionInvoker : IActionInvoker`
`61`	`63`	`private const string ResultFilterShortCircuitLogMessage =`
`62`	`64`	`"Request was short circuited at result filter '{ResultFilter}'.";`
`63`	`65`
	`66`	`+#pragma warning disable 0618`
`64`	`67`	`public FilterActionInvoker(`
`65`	`68`	`ActionContext actionContext,`
`66`	`69`	`IReadOnlyList<IFilterProvider> filterProviders,`
`@@ -137,6 +140,7 @@ public FilterActionInvoker(`
`137`	`140`	`_telemetry = telemetry;`
`138`	`141`	`_maxModelValidationErrors = maxModelValidationErrors;`
`139`	`142`	`}`
	`143`	`+#pragma warning restore 0618`
`140`	`144`
`141`	`145`	`protected ActionContext ActionContext { get; private set; }`
`142`	`146`
`@@ -652,6 +656,7 @@ private async Task<ActionExecutedContext> InvokeActionFilterAsync()`
`652`	`656`
`653`	`657`	`try`
`654`	`658`	`{`
	`659`	`+#pragma warning disable 0618`
`655`	`660`	`if (_telemetry.IsEnabled("Microsoft.AspNet.Mvc.BeforeActionMethod"))`
`656`	`661`	`{`
`657`	`662`	`_telemetry.WriteTelemetry(`
`@@ -663,11 +668,13 @@ private async Task<ActionExecutedContext> InvokeActionFilterAsync()`
`663`	`668`	`controller = _actionExecutingContext.Controller`
`664`	`669`	`});`
`665`	`670`	`}`
	`671`	`+#pragma warning restore 0618`
`666`	`672`
`667`	`673`	`result = await InvokeActionAsync(_actionExecutingContext);`
`668`	`674`	`}`
`669`	`675`	`finally`
`670`	`676`	`{`
	`677`	`+#pragma warning disable 0618`
`671`	`678`	`if (_telemetry.IsEnabled("Microsoft.AspNet.Mvc.AfterActionMethod"))`
`672`	`679`	`{`
`673`	`680`	`_telemetry.WriteTelemetry(`
`@@ -680,6 +687,7 @@ private async Task<ActionExecutedContext> InvokeActionFilterAsync()`
`680`	`687`	`result = result`
`681`	`688`	`});`
`682`	`689`	`}`
	`690`	`+#pragma warning restore 0618`
`683`	`691`	`}`
`684`	`692`
`685`	`693`	`_actionExecutedContext = new ActionExecutedContext(`
`@@ -827,25 +835,29 @@ private async Task<ResultExecutedContext> InvokeResultFilterAsync()`
`827`	`835`
`828`	`836`	`private async Task InvokeResultAsync(IActionResult result)`
`829`	`837`	`{`
	`838`	`+#pragma warning disable 0618`
`830`	`839`	`if (_telemetry.IsEnabled("Microsoft.AspNet.Mvc.BeforeActionResult"))`
`831`	`840`	`{`
`832`	`841`	`_telemetry.WriteTelemetry(`
`833`	`842`	`"Microsoft.AspNet.Mvc.BeforeActionResult",`
`834`	`843`	`new { actionContext = ActionContext, result = result });`
`835`	`844`	`}`
	`845`	`+#pragma warning restore 0618`
`836`	`846`
`837`	`847`	`try`
`838`	`848`	`{`
`839`	`849`	`await result.ExecuteResultAsync(ActionContext);`
`840`	`850`	`}`
`841`	`851`	`finally`
`842`	`852`	`{`
	`853`	`+#pragma warning disable 0618`
`843`	`854`	`if (_telemetry.IsEnabled("Microsoft.AspNet.Mvc.AfterActionResult"))`
`844`	`855`	`{`
`845`	`856`	`_telemetry.WriteTelemetry(`
`846`	`857`	`"Microsoft.AspNet.Mvc.AfterActionResult",`
`847`	`858`	`new { actionContext = ActionContext, result = result });`
`848`	`859`	`}`
	`860`	`+#pragma warning restore 0618`
`849`	`861`	`}`
`850`	`862`	`}`
`851`	`863`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,9 @@ public class MvcRouteHandler : IRouter`
`20`	`20`	`private IActionInvokerFactory _actionInvokerFactory;`
`21`	`21`	`private IActionSelector _actionSelector;`
`22`	`22`	`private ILogger _logger;`
	`23`	`+#pragma warning disable 0618`
`23`	`24`	`private TelemetrySource _telemetry;`
	`25`	`+#pragma warning restore 0618`
`24`	`26`
`25`	`27`	`public VirtualPathData GetVirtualPath(VirtualPathContext context)`
`26`	`28`	`{`
`@@ -80,12 +82,14 @@ public async Task RouteAsync(RouteContext context)`
`80`	`82`	`{`
`81`	`83`	`context.RouteData = newRouteData;`
`82`	`84`
	`85`	`+#pragma warning disable 0618`
`83`	`86`	`if (_telemetry.IsEnabled("Microsoft.AspNet.Mvc.BeforeAction"))`
`84`	`87`	`{`
`85`	`88`	`_telemetry.WriteTelemetry(`
`86`	`89`	`"Microsoft.AspNet.Mvc.BeforeAction",`
`87`	`90`	`new { actionDescriptor, httpContext = context.HttpContext, routeData = context.RouteData });`
`88`	`91`	`}`
	`92`	`+#pragma warning restore 0618`
`89`	`93`
`90`	`94`	`using (_logger.BeginScope("ActionId: {ActionId}", actionDescriptor.Id))`
`91`	`95`	`{`
`@@ -97,12 +101,14 @@ public async Task RouteAsync(RouteContext context)`
`97`	`101`	`}`
`98`	`102`	`finally`
`99`	`103`	`{`
	`104`	`+#pragma warning disable 0618`
`100`	`105`	`if (_telemetry.IsEnabled("Microsoft.AspNet.Mvc.AfterAction"))`
`101`	`106`	`{`
`102`	`107`	`_telemetry.WriteTelemetry(`
`103`	`108`	`"Microsoft.AspNet.Mvc.AfterAction",`
`104`	`109`	`new { actionDescriptor, httpContext = context.HttpContext, routeData = context.RouteData });`
`105`	`110`	`}`
	`111`	`+#pragma warning restore 0618`
`106`	`112`
`107`	`113`	`if (!context.IsHandled)`
`108`	`114`	`{`
`@@ -150,10 +156,12 @@ private void EnsureServices(HttpContext context)`
`150`	`156`	`_logger = factory.CreateLogger<MvcRouteHandler>();`
`151`	`157`	`}`
`152`	`158`
	`159`	`+#pragma warning disable 0618`
`153`	`160`	`if (_telemetry == null)`
`154`	`161`	`{`
`155`	`162`	`_telemetry = context.RequestServices.GetRequiredService<TelemetrySource>();`
`156`	`163`	`}`
	`164`	`+#pragma warning restore 0618`
`157`	`165`	`}`
`158`	`166`	`}`
`159`	`167`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ namespace Microsoft.AspNet.Mvc.ViewFeatures`
`16`	`16`	`/// </summary>`
`17`	`17`	`public class PartialViewResultExecutor : ViewExecutor`
`18`	`18`	`{`
	`19`	`+#pragma warning disable 0618`
`19`	`20`	`/// <summary>`
`20`	`21`	`/// Creates a new <see cref="PartialViewResultExecutor"/>.`
`21`	`22`	`/// </summary>`
`@@ -39,6 +40,7 @@ public PartialViewResultExecutor(`
`39`	`40`
`40`	`41`	`Logger = loggerFactory.CreateLogger<PartialViewResultExecutor>();`
`41`	`42`	`}`
	`43`	`+#pragma warning restore 0618`
`42`	`44`
`43`	`45`	`/// <summary>`
`44`	`46`	`/// Gets the <see cref="ILogger"/>.`
`@@ -69,6 +71,7 @@ public virtual ViewEngineResult FindView(ActionContext actionContext, PartialVie`
`69`	`71`	`var result = viewEngine.FindPartialView(actionContext, viewName);`
`70`	`72`	`if (result.Success)`
`71`	`73`	`{`
	`74`	`+#pragma warning disable 0618`
`72`	`75`	`if (Telemetry.IsEnabled("Microsoft.AspNet.Mvc.ViewFound"))`
`73`	`76`	`{`
`74`	`77`	`Telemetry.WriteTelemetry(`
`@@ -82,11 +85,12 @@ public virtual ViewEngineResult FindView(ActionContext actionContext, PartialVie`
`82`	`85`	`view = result.View,`
`83`	`86`	`});`
`84`	`87`	`}`
`85`		`-`
	`88`	`+#pragma warning restore 0618`
`86`	`89`	`Logger.LogVerbose("The partial view '{PartialViewName}' was found.", viewName);`
`87`	`90`	`}`
`88`	`91`	`else`
`89`	`92`	`{`
	`93`	`+#pragma warning disable 0618`
`90`	`94`	`if (Telemetry.IsEnabled("Microsoft.AspNet.Mvc.ViewNotFound"))`
`91`	`95`	`{`
`92`	`96`	`Telemetry.WriteTelemetry(`
`@@ -100,6 +104,7 @@ public virtual ViewEngineResult FindView(ActionContext actionContext, PartialVie`
`100`	`104`	`searchedLocations = result.SearchedLocations`
`101`	`105`	`});`
`102`	`106`	`}`
	`107`	`+#pragma warning restore 0618`
`103`	`108`
`104`	`109`	`Logger.LogError(`
`105`	`110`	`"The partial view '{PartialViewName}' was not found. Searched locations: {SearchedViewLocations}",`
Original file line number	Diff line number	Diff line change
`@@ -242,13 +242,13 @@ private RouteContext CreateRouteContext(`
`242`	`242`	`{`
`243`	`243`	`optionsAccessor = new TestOptionsManager<MvcOptions>();`
`244`	`244`	`}`
`245`		`-`
	`245`	`+#pragma warning disable 0618`
`246`	`246`	`var telemetry = new TelemetryListener("Microsoft.AspNet");`
`247`	`247`	`if (telemetryListener != null)`
`248`	`248`	`{`
`249`	`249`	`telemetry.SubscribeWithAdapter(telemetryListener);`
`250`	`250`	`}`
`251`		`-`
	`251`	`+#pragma warning restore 0618`
`252`	`252`	`var httpContext = new Mock<HttpContext>();`
`253`	`253`	`httpContext.Setup(h => h.RequestServices.GetService(typeof(IActionContextAccessor)))`
`254`	`254`	`.Returns(new ActionContextAccessor());`
`@@ -262,9 +262,10 @@ private RouteContext CreateRouteContext(`
`262`	`262`	`.Returns(new MvcMarkerService());`
`263`	`263`	`httpContext.Setup(h => h.RequestServices.GetService(typeof(IOptions<MvcOptions>)))`
`264`	`264`	`.Returns(optionsAccessor);`
	`265`	`+#pragma warning disable 0618`
`265`	`266`	`httpContext.Setup(h => h.RequestServices.GetService(typeof(TelemetrySource)))`
`266`	`267`	`.Returns(telemetry);`
`267`		`-`
	`268`	`+#pragma warning restore 0618`
`268`	`269`	`return new RouteContext(httpContext.Object);`
`269`	`270`	`}`
`270`	`271`	`}`