Skip to content

Commit 40d97cc

Browse files
author
Jason Zhai
committed
Merge branch 'release/7.0.1xx' into release/7.0.2xx
2 parents 860fd2f + 7620a35 commit 40d97cc

File tree

75 files changed

+1805
-243
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+1805
-243
lines changed

‎eng/Version.Details.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@
105105
<Uri>https://github.com/dotnet/aspnetcore</Uri>
106106
<Sha>d50065c4a4fe31a66a1cc2e1a31896d30464da13</Sha>
107107
</Dependency>
108-
<Dependency Name="NuGet.Build.Tasks" Version="6.4.0-preview.3.107">
108+
<Dependency Name="NuGet.Build.Tasks" Version="6.4.0-rc.117">
109109
<Uri>https://github.com/nuget/nuget.client</Uri>
110-
<Sha>1a082949ae5b6da7ca2cce047396c53ae1afdde7</Sha>
110+
<Sha>125f673fd1cdb3cc012f62aa3ce764d2460b89eb</Sha>
111111
</Dependency>
112112
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.4.0-release-20220926-01">
113113
<Uri>https://github.com/microsoft/vstest</Uri>
@@ -246,13 +246,13 @@
246246
<Sha>9a1c3e1b7f0c8763d4c96e593961a61a72679a7b</Sha>
247247
<SourceBuild RepoName="xdt" ManagedOnly="true" />
248248
</Dependency>
249-
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0-preview1.22504.1">
249+
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0-preview1.22513.1">
250250
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
251-
<Sha>846a766f73caa82608db6fee9f2860004298449f</Sha>
251+
<Sha>ea9fb45000311153bfc91690f306cca2b80e6b83</Sha>
252252
</Dependency>
253-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn-analyzers" Version="3.3.4-beta1.22504.1">
253+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn-analyzers" Version="3.3.4-beta1.22513.1">
254254
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
255-
<Sha>846a766f73caa82608db6fee9f2860004298449f</Sha>
255+
<Sha>ea9fb45000311153bfc91690f306cca2b80e6b83</Sha>
256256
<SourceBuild RepoName="roslyn-analyzers" ManagedOnly="true" />
257257
</Dependency>
258258
<Dependency Name="System.CommandLine" Version="2.0.0-beta4.22504.1">

‎eng/Versions.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<PreReleaseVersionIteration>
1717
</PreReleaseVersionIteration>
1818
<!-- Enable to remove prerelease label. -->
19-
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
19+
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
2020
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
2121
</PropertyGroup>
2222
<!-- Production Dependencies -->
@@ -63,7 +63,7 @@
6363
</PropertyGroup>
6464
<PropertyGroup>
6565
<!-- Dependencies from https://github.com/nuget/nuget.client -->
66-
<NuGetBuildTasksPackageVersion>6.4.0-preview.3.107</NuGetBuildTasksPackageVersion>
66+
<NuGetBuildTasksPackageVersion>6.4.0-rc.117</NuGetBuildTasksPackageVersion>
6767
<NuGetBuildTasksConsolePackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetBuildTasksConsolePackageVersion>
6868
<NuGetLocalizationPackageVersion>6.0.0-rc.278</NuGetLocalizationPackageVersion>
6969
<NuGetBuildTasksPackPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetBuildTasksPackPackageVersion>
@@ -102,7 +102,7 @@
102102
</PropertyGroup>
103103
<PropertyGroup>
104104
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
105-
<MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0-preview1.22504.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
105+
<MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0-preview1.22513.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
106106
</PropertyGroup>
107107
<PropertyGroup>
108108
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
@@ -112,7 +112,7 @@
112112
so target one that matches the version in minimumMSBuildVersion.
113113
114114
This avoids the need to juggle references to packages that have been updated in newer MSBuild. -->
115-
<MicrosoftBuildPackageVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion')">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildPackageVersion>
115+
<MicrosoftBuildPackageVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildPackageVersion>
116116
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
117117
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
118118
<MicrosoftBuildLocalizationPackageVersion>17.5.0-preview-22513-03</MicrosoftBuildLocalizationPackageVersion>

‎src/ApiCompat/Microsoft.DotNet.ApiCompatibility/DiagnosticIds.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ public static class DiagnosticIds
2626
public const string CannotAddAttribute = "CP0016";
2727
public const string CannotChangeParameterName = "CP0017";
2828
public const string CannotAddSealedToInterfaceMember = "CP0018";
29+
public const string CannotReduceVisibility = "CP0019";
30+
public const string CannotExpandVisibility = "CP0020";
2931

3032
// Assembly loading ids
3133
public const string AssemblyNotFound = "CP1001";

‎src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Resources.resx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,4 +240,10 @@
240240
<data name="CannotAddSealedToInterfaceMember" xml:space="preserve">
241241
<value>Cannot add sealed keyword to default interface member '{0}'.</value>
242242
</data>
243+
<data name="CannotExpandVisibility" xml:space="preserve">
244+
<value>Visibility of '{0}' expanded from '{1}' to '{2}'.</value>
245+
</data>
246+
<data name="CannotReduceVisibility" xml:space="preserve">
247+
<value>Visibility of '{0}' reduced from '{1}' to '{2}'.</value>
248+
</data>
243249
</root>

‎src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Rules/AttributesMustMatch.cs‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,11 @@ private void AddDifference(IList<CompatDifference> differences, DifferenceType d
6262
return;
6363
}
6464

65+
if (!_settings.StrictMode && dt == DifferenceType.Added)
66+
{
67+
return;
68+
}
69+
6570
CompatDifference difference = dt switch
6671
{
6772
DifferenceType.Changed => new CompatDifference(
@@ -167,10 +172,17 @@ private void ReportAttributeDifferences(ISymbol containing,
167172

168173
for (int i = 0; i < rightGroup.Attributes.Count; i++)
169174
{
170-
if (!rightGroup.Seen[i])
175+
if (!rightGroup.Seen[i] && _settings.StrictMode)
171176
{
172177
// Attribute arguments exist on right but not left.
173-
// Issue "changed" diagnostic.
178+
// Left
179+
// [Foo("a")]
180+
// void F()
181+
// Right
182+
// [Foo("a")]
183+
// [Foo("b")]
184+
// void F()
185+
// Issue "changed" diagnostic when in strict mode.
174186
AddDifference(differences, DifferenceType.Changed, leftMetadata, rightMetadata, containing, itemRef, rightGroup.Attributes[i]);
175187
}
176188
}

‎src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Rules/CannotAddOrRemoveVirtualKeyword.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System.Collections.Generic;
55
using Microsoft.CodeAnalysis;
66
using Microsoft.DotNet.ApiCompatibility.Abstractions;
7+
using Microsoft.DotNet.ApiCompatibility.Extensions;
78

89
namespace Microsoft.DotNet.ApiCompatibility.Rules
910
{
@@ -50,6 +51,12 @@ private void RunOnMemberSymbol(ISymbol? left, ISymbol? right, ITypeSymbol leftCo
5051

5152
if (left.IsVirtual)
5253
{
54+
// Removing the virtual keyword from a member in a sealed type won't be a breaking change.
55+
if (leftContainingType.IsEffectivelySealed(_settings.IncludeInternalSymbols))
56+
{
57+
return;
58+
}
59+
5360
// If left is virtual and right is not, then emit a diagnostic
5461
// specifying that the virtual modifier cannot be removed.
5562
if (!right.IsVirtual)

‎src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Rules/CannotChangeVisibility.cs‎

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
// Copyright (c) .NET Foundation and contributors. All rights reserved.
2+
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
3+
4+
using System;
5+
using System.Collections.Generic;
6+
using System.Runtime;
7+
using Microsoft.CodeAnalysis;
8+
using Microsoft.DotNet.ApiCompatibility.Abstractions;
9+
using Microsoft.DotNet.ApiCompatibility.Extensions;
10+
11+
namespace Microsoft.DotNet.ApiCompatibility.Rules
12+
{
13+
/// <summary>
14+
/// This class implements a rule to check that the visibility of symbols is not reduced.
15+
/// In strict mode, it also checks that the visibility isn't expanded.
16+
/// </summary>
17+
public class CannotChangeVisibility : IRule
18+
{
19+
private readonly RuleSettings _settings;
20+
21+
public CannotChangeVisibility(RuleSettings settings, IRuleRegistrationContext context)
22+
{
23+
_settings = settings;
24+
context.RegisterOnMemberSymbolAction(RunOnMemberSymbol);
25+
context.RegisterOnTypeSymbolAction(RunOnTypeSymbol);
26+
}
27+
28+
private static Accessibility NormalizeInternals(Accessibility a) => a switch
29+
{
30+
Accessibility.ProtectedOrInternal => Accessibility.Protected,
31+
Accessibility.ProtectedAndInternal or Accessibility.Internal => Accessibility.Private,
32+
_ => a,
33+
};
34+
35+
private int CompareAccessibility(Accessibility a, Accessibility b)
36+
{
37+
if (!_settings.IncludeInternalSymbols)
38+
{
39+
a = NormalizeInternals(a);
40+
b = NormalizeInternals(b);
41+
}
42+
43+
if (a == b)
44+
{
45+
return 0;
46+
}
47+
48+
return (a, b) switch
49+
{
50+
(Accessibility.Public, _) => 1,
51+
(_, Accessibility.Public) => -1,
52+
(Accessibility.ProtectedOrInternal, _) => 1,
53+
(_, Accessibility.ProtectedOrInternal) => -1,
54+
(Accessibility.Protected or Accessibility.Internal, _) => 1,
55+
(_, Accessibility.Protected or Accessibility.Internal) => -1,
56+
(Accessibility.ProtectedAndInternal, _) => 1,
57+
(_, Accessibility.ProtectedAndInternal) => -1,
58+
_ => throw new NotImplementedException(),
59+
};
60+
}
61+
62+
private void RunOnSymbol(
63+
ISymbol? left,
64+
ISymbol? right,
65+
MetadataInformation leftMetadata,
66+
MetadataInformation rightMetadata,
67+
IList<CompatDifference> differences)
68+
{
69+
// The MemberMustExist rule handles missing symbols and therefore this rule only runs when left and right is not null.
70+
if (left is null || right is null)
71+
{
72+
return;
73+
}
74+
75+
Accessibility leftAccess = left.DeclaredAccessibility;
76+
Accessibility rightAccess = right.DeclaredAccessibility;
77+
int accessComparison = CompareAccessibility(leftAccess, rightAccess);
78+
79+
if (accessComparison > 0)
80+
{
81+
differences.Add(new CompatDifference(leftMetadata,
82+
rightMetadata,
83+
DiagnosticIds.CannotReduceVisibility,
84+
string.Format(Resources.CannotReduceVisibility, left, leftAccess, rightAccess),
85+
DifferenceType.Changed,
86+
left));
87+
}
88+
else if (_settings.StrictMode && accessComparison < 0)
89+
{
90+
differences.Add(new CompatDifference(leftMetadata,
91+
rightMetadata,
92+
DiagnosticIds.CannotExpandVisibility,
93+
string.Format(Resources.CannotExpandVisibility, right, leftAccess, rightAccess),
94+
DifferenceType.Changed,
95+
right));
96+
}
97+
}
98+
99+
private void RunOnTypeSymbol(
100+
ITypeSymbol? left,
101+
ITypeSymbol? right,
102+
MetadataInformation leftMetadata,
103+
MetadataInformation rightMetadata,
104+
IList<CompatDifference> differences) => RunOnSymbol(left, right, leftMetadata, rightMetadata, differences);
105+
106+
private void RunOnMemberSymbol(
107+
ISymbol? left,
108+
ISymbol? right,
109+
ITypeSymbol leftContainingType,
110+
ITypeSymbol rightContainingType,
111+
MetadataInformation leftMetadata,
112+
MetadataInformation rightMetadata,
113+
IList<CompatDifference> differences) => RunOnSymbol(left, right, leftMetadata, rightMetadata, differences);
114+
}
115+
}

‎src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Rules/RuleFactory.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ public IRule[] CreateRules(RuleSettings settings, IRuleRegistrationContext conte
3939
new CannotRemoveBaseTypeOrInterface(settings, context),
4040
new CannotSealType(settings, context),
4141
new EnumsMustMatch(settings, context),
42-
new MembersMustExist(settings, context)
42+
new MembersMustExist(settings, context),
43+
new CannotChangeVisibility(settings, context)
4344
};
4445

4546
if (_enableRuleAttributesMustMatch)

‎src/ApiCompat/Microsoft.DotNet.ApiCompatibility/xlf/Resources.cs.xlf‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,16 @@
8787
<target state="translated">Název parametru u člena {0} se změnil z {1} na {2}.</target>
8888
<note />
8989
</trans-unit>
90+
<trans-unit id="CannotExpandVisibility">
91+
<source>Visibility of '{0}' expanded from '{1}' to '{2}'.</source>
92+
<target state="new">Visibility of '{0}' expanded from '{1}' to '{2}'.</target>
93+
<note />
94+
</trans-unit>
95+
<trans-unit id="CannotReduceVisibility">
96+
<source>Visibility of '{0}' reduced from '{1}' to '{2}'.</source>
97+
<target state="new">Visibility of '{0}' reduced from '{1}' to '{2}'.</target>
98+
<note />
99+
</trans-unit>
90100
<trans-unit id="CannotRemoveAttribute">
91101
<source>Cannot remove attribute '{0}' from '{1}'.</source>
92102
<target state="translated">Atribut {0} nelze odebrat z {1}.</target>

‎src/ApiCompat/Microsoft.DotNet.ApiCompatibility/xlf/Resources.de.xlf‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,16 @@
8787
<target state="translated">Der Parametername des Members "{0}" wurde von "{1}" in "{2}" geändert.</target>
8888
<note />
8989
</trans-unit>
90+
<trans-unit id="CannotExpandVisibility">
91+
<source>Visibility of '{0}' expanded from '{1}' to '{2}'.</source>
92+
<target state="new">Visibility of '{0}' expanded from '{1}' to '{2}'.</target>
93+
<note />
94+
</trans-unit>
95+
<trans-unit id="CannotReduceVisibility">
96+
<source>Visibility of '{0}' reduced from '{1}' to '{2}'.</source>
97+
<target state="new">Visibility of '{0}' reduced from '{1}' to '{2}'.</target>
98+
<note />
99+
</trans-unit>
90100
<trans-unit id="CannotRemoveAttribute">
91101
<source>Cannot remove attribute '{0}' from '{1}'.</source>
92102
<target state="translated">Das Attribut "{0}" kann nicht aus "{1}" entfernt werden.</target>

0 commit comments

Comments
 (0)