Merge pull request #1738 from dotnet/merges/release/7.x-to-main

dotnet-bot · web-flow · commit 818980d40cad · 2022-10-11T16:24:31.000-07:00
Merge release/7.x to main
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -15,7 +15,7 @@
   <PropertyGroup>
     <MicrosoftBuildVersion>17.3.0-preview-22302-02</MicrosoftBuildVersion>
     <MicrosoftCodeAnalysisAnalyzersVersion>3.3.3</MicrosoftCodeAnalysisAnalyzersVersion>
-    <MicrosoftExtensionsDependencyInjectionVersion>7.0.0-preview.2.22152.2</MicrosoftExtensionsDependencyInjectionVersion>
+    <MicrosoftExtensionsDependencyInjectionVersion>7.0.0-rc.1.22426.10</MicrosoftExtensionsDependencyInjectionVersion>
     <!-- Dependencies from https://github.com/dotnet/roslyn -->
     <MicrosoftNetCompilersToolsetPackageVersion>4.4.0-3.22510.10</MicrosoftNetCompilersToolsetPackageVersion>
     <!-- Dependencies from https://github.com/dotnet/command-line-api -->
diff --git a/src/Logging/SimpleConsoleLogger.cs b/src/Logging/SimpleConsoleLogger.cs
@@ -64,7 +64,7 @@ public bool IsEnabled(LogLevel logLevel)
             return (int)logLevel >= (int)_minimalLogLevel;
         }
 
-        public IDisposable BeginScope<TState>(TState state)
+        public IDisposable? BeginScope<TState>(TState state) where TState : notnull
         {
             return NullScope.Instance;
         }

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public bool IsEnabled(LogLevel logLevel)`
`64`	`64`	`return (int)logLevel >= (int)_minimalLogLevel;`
`65`	`65`	`}`
`66`	`66`
`67`		`- public IDisposable BeginScope<TState>(TState state)`
	`67`	`+ public IDisposable? BeginScope<TState>(TState state) where TState : notnull`
`68`	`68`	`{`
`69`	`69`	`return NullScope.Instance;`
`70`	`70`	`}`