Misc code cleanup (#2063)

* Use global namespaces

* Move class to separate file

* Use file-scoped namespaces

* Don't use global usings in samples

Directory.Build.props

@@ -52,4 +52,9 @@
     <PackageReference Include="Nullable" Version="1.*" PrivateAssets="All" />
   </ItemGroup>
 
+  <!-- Import the root global usings, except for samples. -->
+  <ItemGroup Condition="!$(MSBuildProjectName.Contains('Samples'))">
+    <Compile Include="$(SolutionDir)GlobalUsings.cs" />
+  </ItemGroup>
+
 </Project>

Directory.Build.targets

@@ -34,9 +34,4 @@
     <Compile Remove="**\Tizen\**\*.cs" />
   </ItemGroup>
 
-  <!-- Workaround the fact that http doesnt exist in earlier frameworks -->
-  <ItemGroup>
-    <Using Remove="System.Net.Http" />
-    <Using Remove="System.Net.Http.Json" />
-  </ItemGroup>
 </Project>

GlobalUsings.cs

@@ -0,0 +1,30 @@
+// These are used in all projects except samples.
+
+global using System.Buffers;
+global using System.Collections;
+global using System.Collections.Concurrent;
+global using System.Collections.Immutable;
+global using System.Collections.ObjectModel;
+global using System.ComponentModel;
+global using System.Diagnostics;
+global using System.Diagnostics.CodeAnalysis;
+global using System.Globalization;
+global using System.IO.Compression;
+global using System.Net;
+global using System.Net.Http.Headers;
+global using System.Net.NetworkInformation;
+global using System.Net.Sockets;
+global using System.Reflection;
+global using System.Runtime.CompilerServices;
+global using System.Runtime.ExceptionServices;
+global using System.Runtime.InteropServices;
+global using System.Runtime.Serialization;
+global using System.Security;
+global using System.Security.Authentication;
+global using System.Security.Principal;
+global using System.Security.Claims;
+global using System.Security.Cryptography;
+global using System.Text;
+global using System.Text.Json;
+global using System.Text.Json.Serialization;
+global using System.Text.RegularExpressions;

Sentry.sln

@@ -30,6 +30,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".root", ".root", "{9D7E2F87
 		Directory.Build.targets = Directory.Build.targets
 		README.md = README.md
 		global.json = global.json
+		GlobalUsings.cs = GlobalUsings.cs
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{77454495-55EE-4B40-A089-71B9E8F82E89}"

benchmarks/Sentry.Benchmarks/BackgroundWorkerFlushBenchmarks.cs

@@ -1,7 +1,7 @@
 using BenchmarkDotNet.Attributes;
 using Sentry.Extensibility;
-using Sentry.Internal;
 using Sentry.Protocol.Envelopes;
+using BackgroundWorker = Sentry.Internal.BackgroundWorker;
 
 namespace Sentry.Benchmarks;
 

benchmarks/Sentry.Benchmarks/FakeHttpClientFactory.cs

@@ -1,6 +1,3 @@
-using System.Net;
-using System.Net.Http;
-using System.Net.Http.Headers;
 using Sentry.Http;
 
 namespace Sentry.Benchmarks;

benchmarks/Sentry.Benchmarks/Properties/GlobalSuppressions.cs

@@ -1,3 +1 @@
-using System.Diagnostics.CodeAnalysis;
-
 [assembly: SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "benchmarks", Scope = "module")]

benchmarks/Sentry.Benchmarks/RetryAfterHandlerOverhead.cs

@@ -1,5 +1,3 @@
-using System.Net;
-using System.Net.Http;
 using BenchmarkDotNet.Attributes;
 using Sentry.Internal.Http;
 using static System.Threading.CancellationToken;

samples/Directory.Build.props

@@ -6,10 +6,4 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Using Include="Sentry" />
-    <Using Include="Sentry.Extensibility" />
-    <Using Include="System.Diagnostics" />
-  </ItemGroup>
-
 </Project>

samples/Sentry.Samples.AspNetCore.Blazor.Server/Pages/_Host.cshtml

@@ -1,4 +1,5 @@
 @page "/"
+@using Microsoft.AspNetCore.Mvc.TagHelpers
 @namespace Sentry.Samples.AspNetCore.Blazor.Server.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 @{

samples/Sentry.Samples.AspNetCore.Blazor.Server/Pages/_Layout.cshtml

@@ -1,4 +1,5 @@
 @using Microsoft.AspNetCore.Components.Web
+@using Microsoft.AspNetCore.Mvc.TagHelpers
 @namespace Sentry.Samples.AspNetCore.Blazor.Server.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 

samples/Sentry.Samples.AspNetCore.Blazor.Wasm/Program.cs

@@ -1,5 +1,6 @@
-using System.Net.Http;
+using System.Diagnostics;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+using Sentry;
 using Sentry.Samples.AspNetCore.Blazor.Wasm;
 
 // Capture blazor bootstrapping errors

samples/Sentry.Samples.AspNetCore.Grpc/GameService.cs

@@ -1,5 +1,4 @@
 using System.Data;
-using System.Net.Http;
 using Google.Protobuf.WellKnownTypes;
 using Grpc.Core;
 using Sentry.AspNetCore.Samples.Grpc;

samples/Sentry.Samples.AspNetCore.Mvc/Controllers/HomeController.cs

@@ -1,5 +1,7 @@
+using System.Diagnostics;
 using Microsoft.AspNetCore.Mvc;
 using Samples.AspNetCore.Mvc.Models;
+using Sentry;
 
 namespace Samples.AspNetCore.Mvc.Controllers;
 

samples/Sentry.Samples.AspNetCore.Mvc/ExampleEventProcessor.cs

@@ -1,3 +1,6 @@
+using Sentry;
+using Sentry.Extensibility;
+
 namespace Samples.AspNetCore.Mvc;
 
 public class ExampleEventProcessor : ISentryEventProcessor

samples/Sentry.Samples.AspNetCore.Mvc/GameService.cs

@@ -1,5 +1,4 @@
 using System.Data;
-using System.Net.Http;
 
 namespace Samples.AspNetCore.Mvc;
 

samples/Sentry.Samples.AspNetCore.Mvc/SpecialExceptionProcessor.cs

@@ -1,3 +1,6 @@
+using Sentry;
+using Sentry.Extensibility;
+
 namespace Samples.AspNetCore.Mvc;
 
 public class SpecialExceptionProcessor : SentryEventExceptionProcessor<SpecialException>

samples/Sentry.Samples.AspNetCore.Mvc/Startup.cs

@@ -1,3 +1,5 @@
+using Sentry.Extensibility;
+
 namespace Samples.AspNetCore.Mvc;
 
 public class Startup

samples/Sentry.Samples.AspNetCore.Mvc/Views/Home/Contact.cshtml

@@ -1,4 +1,5 @@
-@{
+@using Sentry
+@{
     ViewData["Title"] = "Contact";
 }
 <h2>@ViewData["Title"]</h2>

samples/Sentry.Samples.AspNetCore.Mvc/Views/Home/Index.cshtml

@@ -1,4 +1,5 @@
-@{
+@using Microsoft.AspNetCore.Mvc.TagHelpers
+@{
     ViewData["Title"] = "Home Page";
 }
 

samples/Sentry.Samples.AspNetCore.Mvc/Views/Shared/_Layout.cshtml

@@ -1,4 +1,5 @@
-<!DOCTYPE html>
+@using Microsoft.AspNetCore.Mvc.TagHelpers
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="utf-8" />

samples/Sentry.Samples.AspNetCore.Mvc/Views/Shared/_ValidationScriptsPartial.cshtml

@@ -1,3 +1,4 @@
+@using Microsoft.AspNetCore.Mvc.TagHelpers
 <environment include="Development">
     <script src="~/lib/jquery-validation/dist/jquery.validate.js"></script>
     <script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script>

samples/Sentry.Samples.Console.Basic/Program.cs

@@ -1,3 +1,5 @@
+using Sentry;
+
 using (SentrySdk.Init("https://[email protected]/5428537"))
 {
     // The following exception is captured and sent to Sentry

samples/Sentry.Samples.Console.Customized/Program.cs

@@ -1,6 +1,7 @@
-using System.Net.Http;
 using System.Reflection;
 using System.Xml.Xsl;
+using Sentry;
+using Sentry.Extensibility;
 
 // One of the ways to set your DSN is via an attribute:
 // It could be set via AssemblyInfo.cs and patched via CI.

samples/Sentry.Samples.EntityFramework/Program.cs

@@ -1,6 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Data.Common;
 using System.Data.Entity;
+using Sentry;
 
 using var _ = SentrySdk.Init(o =>
 {

samples/Sentry.Samples.GenericHost/SampleHostedService.cs

@@ -1,5 +1,6 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
+using Sentry;
 
 internal class SampleHostedService : IHostedService
 {

src/Sentry.AspNet/HttpContextExtensions.cs

@@ -1,5 +1,3 @@
-using System.ComponentModel;
-using System.Web;
 using Sentry.Extensibility;
 
 namespace Sentry.AspNet;

src/Sentry.AspNet/Internal/HttpContextScopeStackContainer.cs

@@ -1,4 +1,3 @@
-using System.Web;
 using Sentry.Internal.ScopeStack;
 
 namespace Sentry.AspNet.Internal;

src/Sentry.AspNet/Internal/SystemWebHttpRequest.cs

@@ -1,4 +1,3 @@
-using System.Web;
 using Sentry.Extensibility;
 
 namespace Sentry.AspNet.Internal;

src/Sentry.AspNet/Internal/SystemWebRequestEventProcessor.cs

@@ -1,5 +1,3 @@
-using System.Security.Claims;
-using System.Web;
 using Sentry.Extensibility;
 using Sentry.Reflection;
 

src/Sentry.AspNet/Internal/SystemWebVersionLocator.cs

@@ -1,4 +1,3 @@
-using System.Web;
 using Sentry.Internal;
 
 namespace Sentry.AspNet.Internal;

src/Sentry.AspNet/Properties/AssemblyInfo.cs

@@ -1,3 +1 @@
-using System.Runtime.CompilerServices;
-
 [assembly: InternalsVisibleTo("Sentry.AspNet.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010059964a931488bcdbd14657f1ee0df32df61b57b3d14d7290c262c2cc9ddaad6ec984044f761f778e1823049d2cb996a4f58c8ea5b46c37891414cb34b4036b1c178d7b582289d2eef3c0f1e9b692c229a306831ee3d371d9e883f0eb0f74aeac6c6ab8c85fd1ec04b267e15a31532c4b4e2191f5980459db4dce0081f1050fb8")]

src/Sentry.AspNet/Sentry.AspNet.csproj

@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <Reference Include="System.Web" />
+    <Using Include="System.Web" />
   </ItemGroup>
 
   <ItemGroup>

src/Sentry.AspNet/SentryAspNetOptionsExtensions.cs

@@ -1,5 +1,3 @@
-using System.ComponentModel;
-using System.Web;
 using Sentry.AspNet.Internal;
 using Sentry.Extensibility;
 using Sentry.Infrastructure;

src/Sentry.AspNet/SentryHttpServerUtilityExtensions.cs

@@ -1,5 +1,3 @@
-using System.ComponentModel;
-using System.Web;
 using Sentry.Extensibility;
 using Sentry.Protocol;
 

src/Sentry.AspNetCore.Grpc/Properties/AssemblyInfo.cs

@@ -1,4 +1,2 @@
-using System.Runtime.CompilerServices;
-
 [assembly: InternalsVisibleTo("Sentry.AspNetCore.Grpc.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010059964a931488bcdbd14657f1ee0df32df61b57b3d14d7290c262c2cc9ddaad6ec984044f761f778e1823049d2cb996a4f58c8ea5b46c37891414cb34b4036b1c178d7b582289d2eef3c0f1e9b692c229a306831ee3d371d9e883f0eb0f74aeac6c6ab8c85fd1ec04b267e15a31532c4b4e2191f5980459db4dce0081f1050fb8")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]

src/Sentry.AspNetCore.Grpc/ScopeExtensions.cs

@@ -1,4 +1,3 @@
-using System.ComponentModel;
 using Google.Protobuf;
 using Grpc.Core;
 using Microsoft.Extensions.DependencyInjection;

src/Sentry.AspNetCore.Grpc/SentryBuilderExtensions.cs

@@ -1,4 +1,3 @@
-using System.ComponentModel;
 using Microsoft.Extensions.DependencyInjection;
 using Sentry.Extensibility;
 using Sentry.Reflection;

src/Sentry.AspNetCore.Grpc/SentryGrpcInterceptor.cs

@@ -1,4 +1,3 @@
-using System.Runtime.ExceptionServices;
 using Grpc.Core;
 using Grpc.Core.Interceptors;
 using Microsoft.Extensions.Options;

src/Sentry.AspNetCore/ApplicationBuilderExtensions.cs

@@ -1,4 +1,3 @@
-using System.ComponentModel;
 #if NETSTANDARD2_0
 using IHostApplicationLifetime = Microsoft.AspNetCore.Hosting.IApplicationLifetime;
 #else

src/Sentry.AspNetCore/DefaultUserFactory.cs

@@ -1,4 +1,3 @@
-using System.Security.Claims;
 using Microsoft.AspNetCore.Http;
 
 namespace Sentry.AspNetCore;

src/Sentry.AspNetCore/Extensions/DependencyInjection/ServiceCollectionExtensions.cs

@@ -1,4 +1,3 @@
-using System.ComponentModel;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Sentry.AspNetCore;
 using Sentry.Extensibility;