mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-27 04:59:55 +08:00
# Description
Pure code-style sweep across the repo — no behavioral changes. Drives
`dotnet format` info-level diagnostics down on a large slice of the
codebase (Stack, Libraries, Tests, Tools).
Six commits, applied bottom-up in safety order so each batch leaves the
build green:
1. **`style: fix whitespace and final-newline formatting (WHITESPACE,
FINALNEWLINE)`**
197 hits across ~30 files; pure mechanical cleanup.
2. **`style: apply dotnet format style fixes (IDE rules)`**
IDE-rule batch via `dotnet format style --severity info` —
`var`/explicit type, simplify names, collection expressions, expression
bodies, unused usings, etc.
3. **`style: apply dotnet format analyzers fixes (RCS blank-line
formatting)`**
Roslynator formatting (RCS0xxx) blank-line and punctuation rules.
4. **`style: convert comments to doc comments and inline local vars
(RCS1181, RCS1124)`**
24 files. RCS1181 promotes `// summary`-style comments above
public/internal members to `/// <summary>` doc comments; RCS1124 inlines
locals used exactly once. Generated `Tools/` files were reverted to keep
the source-generator outputs deterministic.
5. **`docs(agent): correct --diagnostics flag form and verify Roslynator
4.x code fixers`**
Updates `.github/agents/opc-ua-codestyle-enforcer.agent.md` with two
corrections discovered while running this sweep:
- `dotnet format --diagnostics "RULE1 RULE2"` (single quoted,
space-separated) silently fixes nothing on `dotnet format` 10.x — it
parses as one unknown ID and exits 0. The correct form is `--diagnostics
RULE1 --diagnostics RULE2 …`, repeated per rule.
- Roslynator 4.15.0 **does** ship code fixers for
RCS1078/1118/1124/1140/1142/1181/1221/1260 (the previous "no auto-fixer"
list was outdated). RCS1140/1142 default to `Hidden` so need `--severity
info` to surface and fire; RCS1078 requires
`roslynator_empty_string_style = field` (already set in
`.editorconfig`). Only NUnit4002/2046/2010 genuinely lack auto-fixers in
this stack.
6. **`style: format new code from master merge (dotnet format sweep)`**
After merging master into the branch (commit `e3ebc8742`), re-ran the
same three-phase format sweep on the 151 .cs files brought in by the
merge, scoped per project via repeated `--include`. 81 files changed;
same rule families as commits 1–4.
- Hand-fixed `Tests/Opc.Ua.MigrationAnalyzer.Tests/AnalyzerHarness.cs`
for `RCS1174` (redundant `async`/`await` removal) because the auto-fixer
didn't apply for that specific case.
- Reverted files that the formatter would break:
- `Libraries/Opc.Ua.Server/Server/ServerInternalData.cs` — multi-TFM
analysis disagreement injected `<<<<<<<` / `=======` / `>>>>>>>`
markers.
-
`Tools/Opc.Ua.MigrationAnalyzer.Core/{Core/Stack/Client/ChannelBase.cs,
Core/Stack/Types/IUserIdentityTokenHandler.cs,
Client/Session/Session.cs}` — IDE0005 removed `using
Opc.Ua.Security.Certificates` that IS used (the files are 1.5.378
reference fixtures for the analyzer).
- `Tests/Opc.Ua.Gds.Tests/PushTest.cs` — IDE0002 over-simplified
`OpcUa.ObjectTypeIds` to `ObjectTypeIds`, which then resolves to a
conflicting type.
### What this PR does **not** touch
- No behavioral or semantic logic changes.
- No `.editorconfig` rule promotions (rules stay at their current
severities; this is a backlog-burndown pass, not a rule tightening).
- Generated source under `Tools/` is intentionally excluded.
- Higher-risk rule families (`RCS1090`/`CA2007` `ConfigureAwait`,
`RCS1249` null-forgiving cleanup, `IDE0270`/`IDE0059`) are left for
follow-up sweeps because they need per-TFM build verification or
semantic review.
## Related Issues
_No tracking issue — this is a non-functional style sweep and the
agent-doc correction is a follow-up to the same work. Happy to open one
if the maintainers prefer._
## Checklist
- [ ] I have signed the
[CLA](https://opcfoundation.org/license/cla/ContributorLicenseAgreementv1.0.pdf)
and read the
[CONTRIBUTING](https://github.com/OPCFoundation/UA-.NETStandard/blob/master/CONTRIBUTING.md)
doc.
- [x] I have added tests that prove my fix is effective or that my
feature works and increased code coverage. _(N/A — style-only, no
behavioral change)_
- [x] I have added all necessary documentation. _(agent doc updated with
the two corrections)_
- [x] I have verified that my changes do not introduce (new) build or
analyzer warnings. _(verified clean on `net10.0` and `net48`; only
pre-existing `NETSDK1005`/`NETSDK1207` failures on Tools/AOT projects)_
- [ ] I ran **all** tests locally using the **UA.slnx** solution against
at least .net **framework** and .net **10**, and all passed. _(build
verified on net10 and net48 per batch; full test suite not yet run
locally — relying on CI)_
- [ ] I fixed **all** failing and flaky tests in the CI pipelines and
**all** CodeQL warnings.
- [ ] I have addressed **all** PR feedback received.
---------
Co-authored-by: agent <agent@local>
382 lines
16 KiB
C#
382 lines
16 KiB
C#
/* ========================================================================
|
|
* Copyright (c) 2005-2025 The OPC Foundation, Inc. All rights reserved.
|
|
*
|
|
* OPC Foundation MIT License 1.00
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person
|
|
* obtaining a copy of this software and associated documentation
|
|
* files (the "Software"), to deal in the Software without
|
|
* restriction, including without limitation the rights to use,
|
|
* copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following
|
|
* conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be
|
|
* included in all copies or substantial portions of the Software.
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
|
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
|
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
|
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* The complete license agreement can be found here:
|
|
* http://opcfoundation.org/License/MIT/1.00/
|
|
* ======================================================================*/
|
|
|
|
using System.Collections.Generic;
|
|
using System.Collections.Immutable;
|
|
using System.IO;
|
|
using System.Linq;
|
|
using Microsoft.CodeAnalysis;
|
|
using Microsoft.CodeAnalysis.CSharp;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.MigrationAnalyzer.Generator;
|
|
|
|
namespace Opc.Ua.MigrationAnalyzer.Tests.Generators
|
|
{
|
|
/// <summary>
|
|
/// Verifies <see cref="MigrationGenerator"/> emits one
|
|
/// <c>internal sealed [Obsolete] class <Name>Collection : List<TElement></c>
|
|
/// per uniquely-referenced legacy wrapper, falls back to semantic lookup for
|
|
/// model-compiled element types, and surfaces <c>MIG01</c> for unresolvable
|
|
/// references.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("Generator")]
|
|
public sealed class MigrationGeneratorTests
|
|
{
|
|
private static readonly ImmutableArray<MetadataReference> s_baseReferences = BuildBaseReferences();
|
|
|
|
private static ImmutableArray<MetadataReference> BuildBaseReferences()
|
|
{
|
|
// On .NET Core / .NET 5+, the runtime exposes the full set of trusted
|
|
// platform assemblies via AppContext.
|
|
string trustedAssemblies = (string?)System.AppContext.GetData("TRUSTED_PLATFORM_ASSEMBLIES") ?? string.Empty;
|
|
string[] tpaList = [.. trustedAssemblies
|
|
.Split(Path.PathSeparator)
|
|
.Where(p => !string.IsNullOrEmpty(p))];
|
|
if (tpaList.Length > 0)
|
|
{
|
|
return [.. tpaList.Select(p => (MetadataReference)MetadataReference.CreateFromFile(p))];
|
|
}
|
|
// On .NET Framework, TPA is not exposed. Fall back to scanning the
|
|
// runtime directory for BCL assemblies (mscorlib, System.*) so that
|
|
// System.Int32 et al. are available for generator semantic lookups.
|
|
string runtimeDir = System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory();
|
|
if (string.IsNullOrEmpty(runtimeDir) || !Directory.Exists(runtimeDir))
|
|
{
|
|
return [];
|
|
}
|
|
return [.. Directory.EnumerateFiles(runtimeDir, "*.dll")
|
|
.Where(IsBclAssembly)
|
|
.Select(p => (MetadataReference)MetadataReference.CreateFromFile(p))];
|
|
}
|
|
|
|
private static bool IsBclAssembly(string path)
|
|
{
|
|
string name = Path.GetFileNameWithoutExtension(path);
|
|
return name.Equals("mscorlib", System.StringComparison.OrdinalIgnoreCase) ||
|
|
name.Equals("netstandard", System.StringComparison.OrdinalIgnoreCase) ||
|
|
name.StartsWith("System", System.StringComparison.OrdinalIgnoreCase) ||
|
|
name.StartsWith("Microsoft.CSharp", System.StringComparison.OrdinalIgnoreCase);
|
|
}
|
|
|
|
private static GeneratorDriverRunResult Run(string userSource, string? extraSource = null)
|
|
{
|
|
var parseOptions = new CSharpParseOptions(LanguageVersion.CSharp13);
|
|
|
|
List<SyntaxTree> trees =
|
|
[
|
|
CSharpSyntaxTree.ParseText(MinimalOpcUaStubs.Source, parseOptions, "OpcUaStubs.cs"),
|
|
CSharpSyntaxTree.ParseText(userSource, parseOptions, "Consumer.cs")
|
|
];
|
|
if (extraSource is not null)
|
|
{
|
|
trees.Add(CSharpSyntaxTree.ParseText(extraSource, parseOptions, "Extra.cs"));
|
|
}
|
|
|
|
var compilation = CSharpCompilation.Create(
|
|
"GeneratorTestAssembly",
|
|
trees,
|
|
s_baseReferences,
|
|
new CSharpCompilationOptions(
|
|
OutputKind.DynamicallyLinkedLibrary,
|
|
nullableContextOptions: NullableContextOptions.Enable));
|
|
|
|
GeneratorDriver driver = CSharpGeneratorDriver.Create(new MigrationGenerator());
|
|
driver = driver.RunGeneratorsAndUpdateCompilation(
|
|
compilation,
|
|
out _,
|
|
out _);
|
|
return driver.GetRunResult();
|
|
}
|
|
|
|
private static IEnumerable<TestCaseData> WellKnownOverridesCases()
|
|
{
|
|
// Catalog override entries: each one is an element-type RENAME the
|
|
// semantic-lookup fallback couldn't infer correctly. Everything else
|
|
// (primitives, built-in unrenamed types, model-compiled user types)
|
|
// resolves via semantic lookup, exercised by separate test cases below.
|
|
foreach (KeyValuePair<string, string> entry in CollectionShimCatalog.WellKnownOverrides)
|
|
{
|
|
yield return new TestCaseData(entry.Key, entry.Value).SetName($"WellKnown_{entry.Key}");
|
|
}
|
|
}
|
|
|
|
[TestCaseSource(nameof(WellKnownOverridesCases))]
|
|
public void WellKnownOverrideEmitsExpectedShimType(string shortName, string elementDisplay)
|
|
{
|
|
string user = $$"""
|
|
using Opc.Ua;
|
|
public static class Use
|
|
{
|
|
public static void M({{shortName}} arg) { }
|
|
}
|
|
""";
|
|
|
|
GeneratorDriverRunResult result = Run(user);
|
|
GeneratedSourceResult? generated = result.Results
|
|
.SelectMany(r => r.GeneratedSources)
|
|
.Cast<GeneratedSourceResult?>()
|
|
.FirstOrDefault(s => s!.Value.HintName == $"{shortName}.g.cs");
|
|
|
|
Assert.That(generated, Is.Not.Null, $"No generated file for '{shortName}.g.cs'");
|
|
string text = generated!.Value.SourceText.ToString();
|
|
Assert.That(text, Does.Contain("namespace Opc.Ua"));
|
|
Assert.That(text, Does.Contain($"internal sealed class {shortName} : global::System.Collections.Generic.List<{elementDisplay}>"));
|
|
Assert.That(text, Does.Contain("[global::System.Obsolete("));
|
|
Assert.That(text, Does.Contain("(UA0002)"));
|
|
Assert.That(text, Does.Contain($"implicit operator global::Opc.Ua.ArrayOf<{elementDisplay}>"));
|
|
}
|
|
|
|
[Test]
|
|
public void ModelCompiledUserTypeResolvesViaSemanticLookup()
|
|
{
|
|
const string user = """
|
|
using Acme;
|
|
using Opc.Ua;
|
|
public static class Use
|
|
{
|
|
public static void M(WaterPumpCollection arg) { }
|
|
}
|
|
""";
|
|
const string extra = """
|
|
namespace Acme
|
|
{
|
|
public sealed class WaterPump { }
|
|
}
|
|
""";
|
|
|
|
GeneratorDriverRunResult result = Run(user, extra);
|
|
GeneratedSourceResult? generated = result.Results
|
|
.SelectMany(r => r.GeneratedSources)
|
|
.Cast<GeneratedSourceResult?>()
|
|
.FirstOrDefault(s => s!.Value.HintName == "WaterPumpCollection.g.cs");
|
|
|
|
Assert.That(generated, Is.Not.Null);
|
|
string text = generated!.Value.SourceText.ToString();
|
|
Assert.That(text, Does.Contain("internal sealed class WaterPumpCollection : global::System.Collections.Generic.List<global::Acme.WaterPump>"));
|
|
}
|
|
|
|
[Test]
|
|
public void BuiltInUnrenamedTypeResolvesViaSemanticLookup()
|
|
{
|
|
// NodeIdCollection is NOT in CollectionShimCatalog any more because
|
|
// the bare short name 'NodeId' resolves uniquely to Opc.Ua.NodeId via
|
|
// semantic lookup. Verify the fall-through path emits the right shim.
|
|
const string user = """
|
|
using Opc.Ua;
|
|
public static class Use
|
|
{
|
|
public static NodeIdCollection BuildNodes() => new NodeIdCollection();
|
|
}
|
|
""";
|
|
|
|
GeneratorDriverRunResult result = Run(user);
|
|
GeneratedSourceResult? generated = result.Results
|
|
.SelectMany(r => r.GeneratedSources)
|
|
.Cast<GeneratedSourceResult?>()
|
|
.FirstOrDefault(s => s!.Value.HintName == "NodeIdCollection.g.cs");
|
|
|
|
Assert.That(generated, Is.Not.Null, "Semantic-lookup fallback must emit NodeIdCollection");
|
|
string text = generated!.Value.SourceText.ToString();
|
|
Assert.That(text, Does.Contain("internal sealed class NodeIdCollection : global::System.Collections.Generic.List<global::Opc.Ua.NodeId>"));
|
|
}
|
|
|
|
[Test]
|
|
public void PrimitiveTypedCollectionResolvesViaSemanticLookup()
|
|
{
|
|
// Int32Collection is NOT in CollectionShimCatalog any more because
|
|
// the bare short name 'Int32' resolves uniquely to System.Int32 via
|
|
// semantic lookup. The generated element type is global::System.Int32
|
|
// (equivalent to 'int', just more verbose) — confirm the path works.
|
|
const string user = """
|
|
using Opc.Ua;
|
|
public static class Use
|
|
{
|
|
public static Int32Collection BuildInts() => new Int32Collection { 1, 2, 3 };
|
|
}
|
|
""";
|
|
|
|
GeneratorDriverRunResult result = Run(user);
|
|
GeneratedSourceResult? generated = result.Results
|
|
.SelectMany(r => r.GeneratedSources)
|
|
.Cast<GeneratedSourceResult?>()
|
|
.FirstOrDefault(s => s!.Value.HintName == "Int32Collection.g.cs");
|
|
|
|
Assert.That(generated, Is.Not.Null, "Semantic-lookup fallback must emit Int32Collection");
|
|
string text = generated!.Value.SourceText.ToString();
|
|
// FullyQualifiedFormat uses C# keyword aliases for primitives, so
|
|
// System.Int32 is rendered as `int` — that's intentional, the emitted
|
|
// shim is consumer-facing and reads more naturally with the alias.
|
|
Assert.That(text, Does.Contain("internal sealed class Int32Collection : global::System.Collections.Generic.List<int>"));
|
|
}
|
|
|
|
[Test]
|
|
public void ExistingTypeProducesNoShim()
|
|
{
|
|
// Consumer already declares a type called 'AlreadyDefinedCollection';
|
|
// the generator must NOT emit a shim for it.
|
|
const string user = """
|
|
public sealed class AlreadyDefinedCollection { }
|
|
public static class Use
|
|
{
|
|
public static void M(AlreadyDefinedCollection arg) { }
|
|
}
|
|
""";
|
|
|
|
GeneratorDriverRunResult result = Run(user);
|
|
bool emitted = result.Results
|
|
.SelectMany(r => r.GeneratedSources)
|
|
.Any(s => s.HintName == "AlreadyDefinedCollection.g.cs");
|
|
Assert.That(emitted, Is.False);
|
|
}
|
|
|
|
[Test]
|
|
public void UnresolvableElementTypeReportsMig01AndEmitsNothing()
|
|
{
|
|
const string user = """
|
|
using Opc.Ua;
|
|
public static class Use
|
|
{
|
|
public static void M(NeverDefinedCollection arg) { }
|
|
}
|
|
""";
|
|
|
|
GeneratorDriverRunResult result = Run(user);
|
|
bool emitted = result.Results
|
|
.SelectMany(r => r.GeneratedSources)
|
|
.Any(s => s.HintName == "NeverDefinedCollection.g.cs");
|
|
Assert.That(emitted, Is.False, "MIG01 path must not emit a shim type");
|
|
|
|
ImmutableArray<Diagnostic> diagnostics = result.Diagnostics;
|
|
Assert.That(diagnostics.Any(d => d.Id == "MIG01"), Is.True,
|
|
$"Expected MIG01 diagnostic; saw: {string.Join(", ", diagnostics.Select(d => d.Id))}");
|
|
}
|
|
|
|
[Test]
|
|
public void MultipleReferencesProduceSingleDeduplicatedEmission()
|
|
{
|
|
const string user = """
|
|
using Opc.Ua;
|
|
public static class Use1
|
|
{
|
|
public static Int32Collection First() => new();
|
|
public static void Second(Int32Collection arg) { }
|
|
public static System.Type Third() => typeof(Int32Collection);
|
|
}
|
|
""";
|
|
|
|
GeneratorDriverRunResult result = Run(user);
|
|
int count = result.Results
|
|
.SelectMany(r => r.GeneratedSources)
|
|
.Count(s => s.HintName == "Int32Collection.g.cs");
|
|
Assert.That(count, Is.EqualTo(1));
|
|
}
|
|
|
|
[Test]
|
|
public void NonCollectionIdentifiersIgnored()
|
|
{
|
|
// Identifier that ends in "Collection" but isn't in a type position
|
|
// (variable name) must not trigger emission or diagnostics.
|
|
const string user = """
|
|
using System.Collections.Generic;
|
|
public static class Use
|
|
{
|
|
public static void M()
|
|
{
|
|
var fooCollection = new List<int>();
|
|
}
|
|
}
|
|
""";
|
|
|
|
GeneratorDriverRunResult result = Run(user);
|
|
Assert.That(result.GeneratedTrees, Is.Empty);
|
|
Assert.That(result.Diagnostics, Is.Empty);
|
|
}
|
|
|
|
[Test]
|
|
public void NoReferencesProducesNoEmission()
|
|
{
|
|
const string user = """
|
|
public static class Use
|
|
{
|
|
public static int M() => 42;
|
|
}
|
|
""";
|
|
|
|
GeneratorDriverRunResult result = Run(user);
|
|
Assert.That(result.GeneratedTrees, Is.Empty);
|
|
Assert.That(result.Diagnostics, Is.Empty);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Minimal stub surface that defines just enough of Opc.Ua to exercise the
|
|
/// generator: an <c>ArrayOf<T></c> type with a <c>ToArrayOf()</c>
|
|
/// extension so the generated implicit conversion body compiles, and the
|
|
/// handful of 2.0-only element types referenced by the catalog overrides.
|
|
/// </summary>
|
|
private static class MinimalOpcUaStubs
|
|
{
|
|
public const string Source = """
|
|
#nullable enable
|
|
using System.Collections.Generic;
|
|
|
|
namespace Opc.Ua
|
|
{
|
|
public readonly struct ArrayOf<T>
|
|
{
|
|
public static ArrayOf<T> Empty => default;
|
|
}
|
|
|
|
public static class ArrayOfExtensions
|
|
{
|
|
public static ArrayOf<T> ToArrayOf<T>(this IEnumerable<T> source) => default;
|
|
}
|
|
|
|
public readonly struct DateTimeUtc { }
|
|
public readonly struct Uuid { }
|
|
public readonly struct ByteString { }
|
|
public readonly struct NodeId { }
|
|
public readonly struct ExpandedNodeId { }
|
|
public readonly struct QualifiedName { }
|
|
public readonly struct LocalizedText { }
|
|
public readonly struct StatusCode { }
|
|
public readonly struct Variant { }
|
|
public readonly struct DiagnosticInfo { }
|
|
public readonly struct DataValue { }
|
|
public readonly struct ExtensionObject { }
|
|
public sealed class Argument { }
|
|
public sealed class ServerSecurityPolicy { }
|
|
public sealed class TransportConfiguration { }
|
|
public sealed class ReverseConnectClient { }
|
|
}
|
|
""";
|
|
}
|
|
}
|
|
}
|