Skip to content

Commit 897aa84

Browse files
buyaa-nbuyaa-n
authored
[release/7.0] Fix bugs found in MAUI repo (#6405)
* Update md files
1 parent 5766f0b commit 897aa84

File tree

5 files changed

+77
-12
lines changed

5 files changed

+77
-12
lines changed

‎src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/InteropServices/PlatformCompatibilityAnalyzer.cs

+10-4
Original file line numberDiff line numberDiff line change
@@ -563,10 +563,13 @@ static bool IsKnownValueGuarded(
563563
}
564564
}
565565

566-
if (attribute.SupportedFirst != null &&
567-
info.Version.IsGreaterThanOrEqualTo(attribute.SupportedFirst))
566+
var checkVersion = attribute.SupportedSecond ?? attribute.SupportedFirst;
567+
568+
if (checkVersion != null &&
569+
info.Version.IsGreaterThanOrEqualTo(checkVersion))
568570
{
569571
attribute.SupportedFirst = null;
572+
attribute.SupportedSecond = null;
570573
RemoveUnsupportedWithLessVersion(info.Version, attribute);
571574
RemoveOtherSupportsOnDifferentPlatforms(attributes, info.PlatformName);
572575
}
@@ -816,8 +819,11 @@ static void ReportSupportedDiagnostic(IOperation operation, OperationBlockAnalys
816819
csPlatformNames = string.Join(CommaSeparator, csPlatformNames, PlatformCompatibilityAllPlatforms);
817820
}
818821

819-
var rule = supportedRule ? SwitchSupportedRule(callsite) : SwitchRule(callsite, true);
820-
context.ReportDiagnostic(operation.CreateDiagnostic(rule, operationName, JoinNames(platformNames), csPlatformNames));
822+
if (!platformNames.IsEmpty)
823+
{
824+
var rule = supportedRule ? SwitchSupportedRule(callsite) : SwitchRule(callsite, true);
825+
context.ReportDiagnostic(operation.CreateDiagnostic(rule, operationName, JoinNames(platformNames), csPlatformNames));
826+
}
821827

822828
if (!obsoletedPlatforms.IsEmpty)
823829
{

‎src/NetAnalyzers/Microsoft.CodeAnalysis.NetAnalyzers.sarif

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{
66
"tool": {
77
"name": "Microsoft.CodeAnalysis.CSharp.NetAnalyzers",
8-
"version": "7.0.0",
8+
"version": "7.0.1",
99
"language": "en-US"
1010
},
1111
"rules": {
@@ -538,7 +538,7 @@
538538
{
539539
"tool": {
540540
"name": "Microsoft.CodeAnalysis.NetAnalyzers",
541-
"version": "7.0.0",
541+
"version": "7.0.1",
542542
"language": "en-US"
543543
},
544544
"rules": {
@@ -5815,7 +5815,7 @@
58155815
{
58165816
"tool": {
58175817
"name": "Microsoft.CodeAnalysis.VisualBasic.NetAnalyzers",
5818-
"version": "7.0.0",
5818+
"version": "7.0.1",
58195819
"language": "en-US"
58205820
},
58215821
"rules": {

‎src/NetAnalyzers/RulesMissingDocumentation.md

-5
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,3 @@
22

33
Rule ID | Missing Help Link | Title |
44
--------|-------------------|-------|
5-
CA1311 | <https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1311> | Specify a culture or use an invariant version |
6-
CA1421 | <https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1421> | This method uses runtime marshalling even when the 'DisableRuntimeMarshallingAttribute' is applied |
7-
CA1852 | <https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1852> | Seal internal types |
8-
CA1853 | <https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1853> | Unnecessary call to 'Dictionary.ContainsKey(key)' |
9-
CA1855 | <https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1855> | Prefer 'Clear' over 'Fill' |

‎src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/InteropServices/PlatformCompatibilityAnalyzer.ObsoletedOSPlatformTests.cs

+31
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,37 @@ public void ObsoletedOnLinuxAndWindows10() { }
454454
await VerifyAnalyzerCSAsync(csSource, s_msBuildPlatforms);
455455
}
456456

457+
[Fact]
458+
public async Task CalledApiHasSupportedAndObsoletedAttributes_CallsiteSupressesSupportedAttributeWarnsForObsoletedOnly()
459+
{
460+
var source = @"
461+
using System;
462+
using System.Runtime.Versioning;
463+
464+
class Program
465+
{
466+
[Mock.ObsoletedOSPlatform(""ios7.0"", ""Use 'NSString.GetBoundingRect (CGSize, NSStringDrawingOptions, UIStringAttributes, NSStringDrawingContext)' instead."")]
467+
[Mock.ObsoletedOSPlatform(""maccatalyst7.0"", ""Use 'NSString.GetBoundingRect (CGSize, NSStringDrawingOptions, UIStringAttributes, NSStringDrawingContext)' instead."")]
468+
[SupportedOSPlatform(""ios"")]
469+
[SupportedOSPlatform(""maccatalyst"")]
470+
public static void M3() { }
471+
472+
[SupportedOSPlatform(""ios"")]
473+
public static void M1()
474+
{
475+
{|CA1422:M3()|}; // This call site is reachable on: 'ios', 'maccatalyst'. 'Program.M3()' is obsoleted on: 'ios' 7.0 and later (Use 'NSString.GetBoundingRect (CGSize, NSStringDrawingOptions, UIStringAttributes, NSStringDrawingContext)' instead.), 'maccatalyst' 7.0 and later (Use 'NSString.GetBoundingRect (CGSize, NSStringDrawingOptions, UIStringAttributes, NSStringDrawingContext)' instead.).
476+
}
477+
478+
[SupportedOSPlatform(""ios10.0"")]
479+
public static void M2()
480+
{
481+
{|CA1422:M3()|}; // This call site is reachable on: 'ios' 10.0 and later, 'maccatalyst' 10.0 and later. 'Program.M3()' is obsoleted on: 'ios' 7.0 and later (Use 'NSString.GetBoundingRect (CGSize, NSStringDrawingOptions, UIStringAttributes, NSStringDrawingContext)' instead.), 'maccatalyst' 7.0 and later (Use 'NSString.GetBoundingRect (CGSize, NSStringDrawingOptions, UIStringAttributes, NSStringDrawingContext)' instead.).
482+
}
483+
}" + MockObsoletedAttributeCS;
484+
485+
await VerifyAnalyzerCSAsync(source);
486+
}
487+
457488
private readonly string MockObsoletedAttributeCS = @"
458489
namespace Mock
459490
{

‎src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/InteropServices/PlatformCompatibilityAnalyzerTests.GuardedCallsTests.cs

+33
Original file line numberDiff line numberDiff line change
@@ -4968,6 +4968,39 @@ void M1()
49684968
await VerifyAnalyzerCSAsync(source);
49694969
}
49704970

4971+
[Fact, WorkItem(4372, "https://github.com/dotnet/roslyn-analyzers/issues/6158")]
4972+
public async Task ChildApiNarrowedParentSupport_GuardingVersionShouldBeComparedWithChildVersion()
4973+
{
4974+
var source = @"
4975+
using System;
4976+
using System.Runtime.Versioning;
4977+
4978+
[SupportedOSPlatform(""ios"")]
4979+
[SupportedOSPlatform(""tvos"")]
4980+
[SupportedOSPlatform(""maccatalyst"")]
4981+
class Program
4982+
{
4983+
[SupportedOSPlatform(""tvos10.2"")]
4984+
[SupportedOSPlatform(""ios10.3"")]
4985+
[SupportedOSPlatform(""maccatalyst10.3"")]
4986+
public static int P1 => 1;
4987+
}
4988+
class Test
4989+
{
4990+
[SupportedOSPlatform(""ios10.0"")]
4991+
public void M1()
4992+
{
4993+
var rate = (OperatingSystem.IsIOSVersionAtLeast(10, 3) || OperatingSystem.IsMacCatalystVersionAtLeast(10, 3) || OperatingSystem.IsTvOSVersionAtLeast(10, 3))
4994+
? Program.P1 : 0; // guarded
4995+
4996+
if (OperatingSystem.IsIOSVersionAtLeast(10, 3) || OperatingSystem.IsMacCatalystVersionAtLeast(10, 3) || OperatingSystem.IsTvOSVersionAtLeast(10))
4997+
rate = [|Program.P1|]; // version of TvOS is not guarded
4998+
}
4999+
}";
5000+
5001+
await VerifyAnalyzerCSAsync(source);
5002+
}
5003+
49715004
[Fact]
49725005
public async Task ApiAndGuardAttributeBothHasVersions_AttributeVersionWins()
49735006
{

0 commit comments

Comments
 (0)