Skip to content

Commit 6246543

Browse files
authored
Merge branch 'main' into fix-tasks-GetPropertyListValue
2 parents 0844476 + c7b89e7 commit 6246543

File tree

18 files changed

+507
-26
lines changed

18 files changed

+507
-26
lines changed

eng/Version.Details.props

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<?xml version="1.0" encoding="utf-8"?>
21
<!--
32
This file is auto-generated by the Maestro dependency flow system.
43
Do not edit it manually, as it will get overwritten by automation.
@@ -34,8 +33,8 @@ This file should be imported by eng/Versions.props
3433
<MicrosofttvOSSdknet80_180PackageVersion>18.0.8324</MicrosofttvOSSdknet80_180PackageVersion>
3534
<MicrosofttvOSSdknet90_180PackageVersion>18.0.9617</MicrosofttvOSSdknet90_180PackageVersion>
3635
<!-- dotnet/arcade dependencies -->
37-
<MicrosoftDotNetArcadeSdkPackageVersion>9.0.0-beta.25415.3</MicrosoftDotNetArcadeSdkPackageVersion>
38-
<MicrosoftDotNetBuildTasksFeedPackageVersion>9.0.0-beta.25415.3</MicrosoftDotNetBuildTasksFeedPackageVersion>
36+
<MicrosoftDotNetArcadeSdkPackageVersion>9.0.0-beta.25428.3</MicrosoftDotNetArcadeSdkPackageVersion>
37+
<MicrosoftDotNetBuildTasksFeedPackageVersion>9.0.0-beta.25428.3</MicrosoftDotNetBuildTasksFeedPackageVersion>
3938
<!-- dotnet/templating dependencies -->
4039
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksPackageVersion>
4140
<!-- dotnet/xharness dependencies -->

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@
8787
</Dependency>
8888
</ProductDependencies>
8989
<ToolsetDependencies>
90-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.25415.3">
90+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.25428.3">
9191
<Uri>https://github.com/dotnet/arcade</Uri>
92-
<Sha>d87d66c43d0660e5c8e84e667c5c8a8140bce888</Sha>
92+
<Sha>5fe939db0a156be6f10e17c105b1842c0c8c8bdc</Sha>
9393
</Dependency>
9494
<Dependency Name="Microsoft.TemplateEngine.Tasks" Version="7.0.100-alpha.1.21601.1">
9595
<Uri>https://github.com/dotnet/templating</Uri>
@@ -99,9 +99,9 @@
9999
<Uri>https://github.com/dotnet/xharness</Uri>
100100
<Sha>dbb478b6aafa222529ae95be344a1b91485c4adf</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25415.3">
102+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25428.3">
103103
<Uri>https://github.com/dotnet/arcade</Uri>
104-
<Sha>d87d66c43d0660e5c8e84e667c5c8a8140bce888</Sha>
104+
<Sha>5fe939db0a156be6f10e17c105b1842c0c8c8bdc</Sha>
105105
<SourceBuild RepoName="arcade" ManagedOnly="true" />
106106
</Dependency>
107107
</ToolsetDependencies>

eng/common/core-templates/job/source-build.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ parameters:
3333
# container and pool.
3434
platform: {}
3535

36+
# Optional list of directories to ignore for component governance scans.
37+
componentGovernanceIgnoreDirectories: []
38+
3639
is1ESPipeline: ''
3740

3841
# If set to true and running on a non-public project,
@@ -93,3 +96,4 @@ jobs:
9396
parameters:
9497
is1ESPipeline: ${{ parameters.is1ESPipeline }}
9598
platform: ${{ parameters.platform }}
99+
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}

eng/common/core-templates/jobs/source-build.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ parameters:
2121
# one job runs on 'defaultManagedPlatform'.
2222
platforms: []
2323

24+
# Optional list of directories to ignore for component governance scans.
25+
componentGovernanceIgnoreDirectories: []
26+
2427
is1ESPipeline: ''
2528

2629
# If set to true and running on a non-public project,
@@ -47,6 +50,7 @@ jobs:
4750
is1ESPipeline: ${{ parameters.is1ESPipeline }}
4851
jobNamePrefix: ${{ parameters.jobNamePrefix }}
4952
platform: ${{ platform }}
53+
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
5054
enableInternalSources: ${{ parameters.enableInternalSources }}
5155

5256
- ${{ if eq(length(parameters.platforms), 0) }}:
@@ -55,4 +59,5 @@ jobs:
5559
is1ESPipeline: ${{ parameters.is1ESPipeline }}
5660
jobNamePrefix: ${{ parameters.jobNamePrefix }}
5761
platform: ${{ parameters.defaultManagedPlatform }}
62+
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
5863
enableInternalSources: ${{ parameters.enableInternalSources }}

eng/common/core-templates/steps/source-build.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ parameters:
1111
# for details. The entire object is described in the 'job' template for simplicity, even though
1212
# the usage of the properties on this object is split between the 'job' and 'steps' templates.
1313
platform: {}
14+
15+
# Optional list of directories to ignore for component governance scans.
16+
componentGovernanceIgnoreDirectories: []
17+
1418
is1ESPipeline: false
1519

1620
steps:
@@ -126,5 +130,8 @@ steps:
126130
parameters:
127131
displayName: Component Detection (Exclude upstream cache)
128132
is1ESPipeline: ${{ parameters.is1ESPipeline }}
129-
componentGovernanceIgnoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache'
133+
${{ if eq(length(parameters.componentGovernanceIgnoreDirectories), 0) }}:
134+
componentGovernanceIgnoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache'
135+
${{ else }}:
136+
componentGovernanceIgnoreDirectories: ${{ join(',', parameters.componentGovernanceIgnoreDirectories) }}
130137
disableComponentGovernance: ${{ eq(variables['System.TeamProject'], 'public') }}

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
"dotnet": "9.0.110-servicing.25418.5"
77
},
88
"msbuild-sdks": {
9-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25415.3"
9+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25428.3"
1010
}
1111
}

src/rgen/Microsoft.Macios.Bindings.Analyzer/Resources.Designer.cs

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/rgen/Microsoft.Macios.Bindings.Analyzer/Resources.resx

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -380,4 +380,17 @@
380380
<value>Bad method name</value>
381381
</data>
382382

383+
<!-- RBI0028 -->
384+
385+
<data name="RBI0028Description" xml:space="preserve">
386+
<value>A flag value was used on an attribute that does not support it and will be ignored.</value>
387+
</data>
388+
<data name="RBI0028MessageFormat" xml:space="preserve">
389+
<value>The flag '{0}' is not supported on '{1}' and will be ignored</value>
390+
<comment>The {0} is the name of the flag, {1} is the name of the attribute.</comment>
391+
</data>
392+
<data name="RBI0028Title" xml:space="preserve">
393+
<value>Ignored flag</value>
394+
</data>
395+
383396
</root>

src/rgen/Microsoft.Macios.Bindings.Analyzer/RgenDiagnostics.cs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,4 +421,19 @@ public static class RgenDiagnostics {
421421
description: new LocalizableResourceString (nameof (Resources.RBI0027Description), Resources.ResourceManager,
422422
typeof (Resources))
423423
);
424+
425+
/// <summary>
426+
/// Diagnostic descriptor for when a flag is ignored because the attribute is not used in the right context.
427+
/// </summary>
428+
internal static readonly DiagnosticDescriptor RBI0028 = new (
429+
"RBI0028",
430+
new LocalizableResourceString (nameof (Resources.RBI0028Title), Resources.ResourceManager, typeof (Resources)),
431+
new LocalizableResourceString (nameof (Resources.RBI0028MessageFormat), Resources.ResourceManager,
432+
typeof (Resources)),
433+
"Usage",
434+
DiagnosticSeverity.Warning,
435+
isEnabledByDefault: true,
436+
description: new LocalizableResourceString (nameof (Resources.RBI0028Description), Resources.ResourceManager,
437+
typeof (Resources))
438+
);
424439
}

src/rgen/Microsoft.Macios.Bindings.Analyzer/Validators/CategoryValidator.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Licensed under the MIT License.
33

44
using Microsoft.Macios.Generator;
5+
using static Microsoft.Macios.Generator.RgenDiagnostics;
56

67
namespace Microsoft.Macios.Bindings.Analyzer.Validators;
78

@@ -17,8 +18,8 @@ public CategoryValidator ()
1718
{
1819

1920
// all bindings must be partial
20-
AddGlobalStrategy (RgenDiagnostics.RBI0001, IsPartial);
21+
AddGlobalStrategy (RBI0001, IsPartial);
2122
// categories must be static
22-
AddGlobalStrategy (RgenDiagnostics.RBI0004, IsStatic);
23+
AddGlobalStrategy (RBI0004, IsStatic);
2324
}
2425
}

0 commit comments

Comments
 (0)