diff --git a/Directory.Build.props b/Directory.Build.props index 9b66839889c196c5cbd5d5e1a85f5bec103816a3..1a2e763e2b05e3fd19bacc56cebeb2cc9940fb7f 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -15,7 +15,8 @@ <AnalysisMode>Default</AnalysisMode> </PropertyGroup> - <PropertyGroup Condition=" '$(BuildingInsideVisualStudio)' == 'true' AND '$(VisualStudioVersion)' == '17.0' "> + <!-- See https://github.com/dotnet/roslyn/issues/54867 for more info. --> + <PropertyGroup Condition="'$(BuildingInsideVisualStudio)' == 'true' AND $([MSBuild]::VersionGreaterThanOrEquals('$(VisualStudioVersion)', '17.0'))"> <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild> <RunAnalyzersDuringLiveAnalysis>false</RunAnalyzersDuringLiveAnalysis> <RunAnalyzers>false</RunAnalyzers> diff --git a/eng/targets/CSharp.Common.targets b/eng/targets/CSharp.Common.targets index 07d91c2aa29349e947a69d19a4abde978c8254aa..a0f01345e619b39838a40eac4e88b10d531057e0 100644 --- a/eng/targets/CSharp.Common.targets +++ b/eng/targets/CSharp.Common.targets @@ -20,7 +20,7 @@ '$(IsImplementationProject)' == 'true' OR '$(IsAnalyzersProject)' == true OR '$(IsSpecificationTestProject)' == 'true') ">enable</Nullable> - + <!-- Strip out non-public nullable annotations for src projects. This should help with size reduction --> <Features Condition=" '$(IsImplementationProject)' == 'true' OR @@ -36,7 +36,8 @@ <!-- Enable .NET code style analysis during build for src projects. --> <!-- Workaround bug where turning this on produces warnings in VS --> - <EnforceCodeStyleInBuild Condition="'$(BuildingInsideVisualStudio)' == 'true' AND '$(VisualStudioVersion)' < '17.0'">false</EnforceCodeStyleInBuild> + <!-- See https://github.com/dotnet/roslyn/issues/54867 for more info. --> + <EnforceCodeStyleInBuild Condition="'$(BuildingInsideVisualStudio)' == 'true' AND $([MSBuild]::VersionGreaterThanOrEquals('$(VisualStudioVersion)', '17.0'))">false</EnforceCodeStyleInBuild> <EnforceCodeStyleInBuild Condition="'$(EnforceCodeStyleInBuild)' == ''">true</EnforceCodeStyleInBuild> </PropertyGroup> diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3TimeoutTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3TimeoutTests.cs index 9ee3cd1346783e6132ae8bf7c1a54f3f75d7be75..32a634dc865f69a2330741667c3b61bc4cc4dc1b 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3TimeoutTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3TimeoutTests.cs @@ -486,6 +486,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests } [Fact] + [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/34903")] public async Task DATA_Received_TooSlowlyOnSecondStream_AbortsConnectionAfterNonAdditiveRateTimeout() { var mockSystemClock = _serviceContext.MockSystemClock;