Merge pull request dotnet#8422 from dotnet/binding-redirect

Update binding redirects for Microsoft.Extensions.* dependencies
jjonescz · Mar 15, 2023 · bf5d35e · bf5d35e
2 parents c12b6f3 + 24d5080
commit bf5d35e
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 28 deletions.
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -76,7 +76,7 @@
     <MicrosoftNetCompilersToolsetVersion>4.6.0-2.23128.3</MicrosoftNetCompilersToolsetVersion>
     <MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>$(RoslynPackageVersion)</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
     <!-- dotnet/runtime packages -->
-    <MicrosoftExtensionsPackageVersion>6.0.0</MicrosoftExtensionsPackageVersion>
+    <MicrosoftExtensionsPackageVersion>7.0.0</MicrosoftExtensionsPackageVersion>
     <SystemCollectionsImmutablePackageVersion>6.0.0</SystemCollectionsImmutablePackageVersion>
     <SystemCompositionPackageVersion>6.0.0</SystemCompositionPackageVersion>
     <SystemDiagnosticsDiagnosticSourcePackageVersion>6.0.0</SystemDiagnosticsDiagnosticSourcePackageVersion>

diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/LoggerAdapter.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/LoggerAdapter.cs
@@ -24,13 +24,16 @@ public LoggerAdapter(IEnumerable<ILogger> loggers, ITelemetryReporter? telemetry
         _telemetryReporter = telemetryReporter;
     }
 
-    public IDisposable BeginScope<TState>(TState state)
+    public IDisposable? BeginScope<TState>(TState state) where TState : notnull
     {
         var compositeDisposable = new CompositeDisposable();
         foreach (var logger in _loggers)
         {
             var disposable = logger.BeginScope(state);
-            compositeDisposable.AddDisposable(disposable);
+            if (disposable != null)
+            {
+                compositeDisposable.AddDisposable(disposable);
+            }
         }
 
         return compositeDisposable;

diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/LspLogger.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/LspLogger.cs
@@ -30,7 +30,7 @@ public void Initialize(ClientNotifierServiceBase serviceBase)
         _serviceBase = serviceBase;
     }
 
-    public IDisposable BeginScope<TState>(TState state)
+    public IDisposable? BeginScope<TState>(TState state) where TState : notnull
     {
         return new Disposable();
     }

diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLSPOptionsMonitor.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLSPOptionsMonitor.cs
@@ -34,7 +34,7 @@ public RazorLSPOptionsMonitor(IConfigurationSyncService configurationService, IO
 
     public RazorLSPOptions CurrentValue => Get(Options.DefaultName);
 
-    public RazorLSPOptions Get(string name)
+    public RazorLSPOptions Get(string? name)
     {
         name ??= Options.DefaultName;
         return _cache.GetOrAdd(name, () => _currentValue);

diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServerClient.Razor/Logging/LogHubLogger.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServerClient.Razor/Logging/LogHubLogger.cs
@@ -29,7 +29,7 @@ public LogHubLogger(string categoryName, LogHubLogWriter feedbackFileLogWriter)
         _noopScope = new Scope();
     }
 
-    public IDisposable BeginScope<TState>(TState state) => _noopScope;
+    public IDisposable? BeginScope<TState>(TState state) where TState : notnull => _noopScope;
 
     public bool IsEnabled(LogLevel logLevel) => true;
 

diff --git a/...zor/src/Microsoft.VisualStudio.LanguageServerClient.Razor/Logging/LogHubLoggerProvider.cs b/...zor/src/Microsoft.VisualStudio.LanguageServerClient.Razor/Logging/LogHubLoggerProvider.cs
@@ -50,7 +50,7 @@ public void Dispose()
 
     private class NoopLogger : ILogger
     {
-        public IDisposable BeginScope<TState>(TState state) => Scope.Instance;
+        public IDisposable? BeginScope<TState>(TState state) where TState : notnull => Scope.Instance;
 
         public bool IsEnabled(LogLevel logLevel) => false;
 

diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServerClient.Razor/RazorLanguageServerClient.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServerClient.Razor/RazorLanguageServerClient.cs
@@ -7,6 +7,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor;
 using Microsoft.AspNetCore.Razor.LanguageServer;
 using Microsoft.AspNetCore.Razor.LanguageServer.Common;
 using Microsoft.AspNetCore.Razor.Telemetry;
@@ -259,7 +260,7 @@ private void ConfigureLanguageServer(IServiceCollection serviceCollection)
         serviceCollection.AddLogging(logging =>
         {
             logging.AddFilter<LogHubLoggerProvider>(level => true);
-            logging.AddProvider(_loggerProvider);
+            logging.AddProvider(_loggerProvider.AssumeNotNull());
         });
 
         if (_vsHostWorkspaceServicesProvider is not null)

diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Logging/OutputWindowLogger.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Logging/OutputWindowLogger.cs
@@ -32,7 +32,7 @@ internal OutputWindowLogger()
     {
     }
 
-    public IDisposable BeginScope<TState>(TState state) => Scope.Instance;
+    public IDisposable? BeginScope<TState>(TState state) where TState : notnull => Scope.Instance;
 
     public bool IsEnabled(LogLevel logLevel)
     {

diff --git a/src/Razor/src/Microsoft.VisualStudio.RazorExtension/AssemblyBindingRedirects.cs b/src/Razor/src/Microsoft.VisualStudio.RazorExtension/AssemblyBindingRedirects.cs
@@ -8,61 +8,61 @@
     GenerateCodeBase = true,
     PublicKeyToken = "adb9793829ddae60",
     OldVersionLowerBound = "0.0.0.0",
-    OldVersionUpperBound = "6.0.0.0",
-    NewVersion = "6.0.0.0")]
+    OldVersionUpperBound = "7.0.0.0",
+    NewVersion = "7.0.0.0")]
 [assembly: ProvideBindingRedirection(
     AssemblyName = "Microsoft.Extensions.Logging",
     GenerateCodeBase = true,
     PublicKeyToken = "adb9793829ddae60",
     OldVersionLowerBound = "0.0.0.0",
-    OldVersionUpperBound = "6.0.0.0",
-    NewVersion = "6.0.0.0")]
+    OldVersionUpperBound = "7.0.0.0",
+    NewVersion = "7.0.0.0")]
 [assembly: ProvideBindingRedirection(
     AssemblyName = "Microsoft.Extensions.DependencyInjection",
     GenerateCodeBase = true,
     PublicKeyToken = "adb9793829ddae60",
     OldVersionLowerBound = "0.0.0.0",
-    OldVersionUpperBound = "6.0.0.0",
-    NewVersion = "6.0.0.0")]
+    OldVersionUpperBound = "7.0.0.0",
+    NewVersion = "7.0.0.0")]
 [assembly: ProvideBindingRedirection(
     AssemblyName = "Microsoft.Extensions.DependencyInjection.Abstractions",
     GenerateCodeBase = true,
     PublicKeyToken = "adb9793829ddae60",
     OldVersionLowerBound = "0.0.0.0",
-    OldVersionUpperBound = "6.0.0.0",
-    NewVersion = "6.0.0.0")]
+    OldVersionUpperBound = "7.0.0.0",
+    NewVersion = "7.0.0.0")]
 [assembly: ProvideBindingRedirection(
     AssemblyName = "Microsoft.Extensions.ObjectPool",
     GenerateCodeBase = true,
     PublicKeyToken = "adb9793829ddae60",
     OldVersionLowerBound = "0.0.0.0",
-    OldVersionUpperBound = "6.0.0.0",
-    NewVersion = "6.0.0.0")]
+    OldVersionUpperBound = "7.0.0.0",
+    NewVersion = "7.0.0.0")]
 [assembly: ProvideBindingRedirection(
     AssemblyName = "Microsoft.Extensions.Options",
     GenerateCodeBase = true,
     PublicKeyToken = "adb9793829ddae60",
     OldVersionLowerBound = "0.0.0.0",
-    OldVersionUpperBound = "6.0.0.0",
-    NewVersion = "6.0.0.0")]
+    OldVersionUpperBound = "7.0.0.0",
+    NewVersion = "7.0.0.0")]
 [assembly: ProvideBindingRedirection(
     AssemblyName = "Microsoft.Extensions.Configuration.Abstractions",
     GenerateCodeBase = true,
     PublicKeyToken = "adb9793829ddae60",
     OldVersionLowerBound = "0.0.0.0",
-    OldVersionUpperBound = "6.0.0.0",
-    NewVersion = "6.0.0.0")]
+    OldVersionUpperBound = "7.0.0.0",
+    NewVersion = "7.0.0.0")]
 [assembly: ProvideBindingRedirection(
     AssemblyName = "Microsoft.Extensions.Configuration",
     GenerateCodeBase = true,
     PublicKeyToken = "adb9793829ddae60",
     OldVersionLowerBound = "0.0.0.0",
-    OldVersionUpperBound = "6.0.0.0",
-    NewVersion = "6.0.0.0")]
+    OldVersionUpperBound = "7.0.0.0",
+    NewVersion = "7.0.0.0")]
 [assembly: ProvideBindingRedirection(
     AssemblyName = "Microsoft.Extensions.Primitives",
     GenerateCodeBase = true,
     PublicKeyToken = "adb9793829ddae60",
     OldVersionLowerBound = "0.0.0.0",
-    OldVersionUpperBound = "6.0.0.0",
-    NewVersion = "6.0.0.0")]
+    OldVersionUpperBound = "7.0.0.0",
+    NewVersion = "7.0.0.0")]
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Logging/TestOutputLogger.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Logging/TestOutputLogger.cs
@@ -29,7 +29,7 @@ public TestOutputLogger(
         LogLevel = logLevel;
     }
 
-    public IDisposable BeginScope<TState>(TState state)
+    public IDisposable? BeginScope<TState>(TState state) where TState : notnull
         => NoOpDisposable.Instance;
 
     public bool IsEnabled(LogLevel logLevel)
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,7 +32,7 @@ internal OutputWindowLogger() @@
         {
         }
-        public IDisposable BeginScope<TState>(TState state) => Scope.Instance;
+        public IDisposable? BeginScope<TState>(TState state) where TState : notnull => Scope.Instance;
         public bool IsEnabled(LogLevel logLevel)
         {
@@ Expand Down @@