mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-26 04:19:53 +08:00
# Description Drops support for **netstandard2.1** and **.NET Framework 4.7.2**. Libraries now target `net48`, `net8.0`, `net9.0` and `net10.0`. `Opc.Ua.Types` and `Opc.Ua.SourceGeneration.Core` still also target `netstandard2.0`, but only because the Roslyn source generators load them. There is no general netstandard2.0 support. **Preprocessor directives** (112 files) - Every `#if`/`#elif` mentioning `NETSTANDARD2_1*`, `NET472*`, `NET_STANDARD_TESTS`, `SKIP_ECC_CERTIFICATE_REQUEST_SIGNING` or `NETSTANDARD*` was evaluated against the remaining TFM set (net48, net8/9/10, plus netstandard2.0 inside `Opc.Ua.Types`/`tools`) and simplified. Dead branches were removed. - Example: `NETSTANDARD2_1 || NET8_0_OR_GREATER` → `NET8_0_OR_GREATER`. - Example: `NET8_0_OR_GREATER || NET472_OR_GREATER` → removed (always true). - Netstandard-only code was removed: `UnixFileModeShim`, the CRDT reflection path in `ReplicatedGossipOptions.CreateReaderOptions`, and the netstandard2.1-only test variants. **Custom test logic** - `targets.props` drops the `net472`, `netstandard2.0` and `netstandard2.1` `CustomTestTarget` profiles, `NetStandardTests` and `SKIP_ECC_CERTIFICATE_REQUEST_SIGNING`. Supported values are now `net48`, `net8.0`, `net9.0`, `net10.0`. - The `NET_STANDARD_TESTS` define is removed from 29 test projects. - The "build netstandard shells as net10.0" overrides are removed from 18 projects. - `RestrictForLegacyTfm` now only applies to `net48`. - `tests/customtest.bat` is updated to the new values. **Build / packaging / CI** - MSBuild TFM conditions are simplified: Kestrel package choice, MQTTnet v4 (net48 only), BouncyCastle, Di/OpenUsd/Vision/Stress test excludes, and `System.IO.FileSystem.AccessControl` (dropped from Core). - The MigrationAnalyzer nuspec drops its net472/netstandard2.1 lib groups. The Azure signing lists are updated. - `get-ci-matrix.ps1` removes the net472/netstandard test profiles (including the PR-gating `linux-netstandard2.1`) and the matching build legs. **Breaking API change (2.0 preview):** removed `HttpsTransportListener.IsWssTransportSupported` and `ReplicatedGossipOptions.IsGossipStateDecodingSupported`. They only returned `false` on netstandard2.1 and are now always `true`. The test guards that used them were removed as well. **Docs** - NuGet READMEs, `README.md`, `DeveloperGuide.md`, `PubSub.md`, the certificate/ECC/identity docs and the 2.0 migration guide (plus its `.agents` skill mirror) are updated. - The migration guide notes that 4.7.2 consumers must move to 4.8 and netstandard2.1 consumers to net8.0+. ### Reviewer notes - The `System.IO.FileSystem.AccessControl` `PackageVersion` pin is left in `Directory.Packages.props`. It has no direct reference any more, but transitive pinning is on, so it was kept to avoid shifting resolved versions. - The `#if` rewrite was done mechanically by a truth-table evaluator. The diff in the `.cs` files is limited to directive lines, removed dead branches, and stale-comment updates. ### Verified locally - `dotnet build UA.slnx -p:CustomTestTarget=net48`: 0 errors. - `dotnet build UA.slnx -p:CustomTestTarget=net10.0`: 0 errors. - Default multi-target builds (no `CustomTestTarget`) of Opc.Ua.Types, Bindings.Https, PubSub.Mqtt and Redundancy.Server succeeded. - net10.0 tests: - Opc.Ua.Redundancy.Server.Tests: 840/840 passed. - Opc.Ua.Types.Tests: 11363 passed, 1 skipped. - ModelDependencyScanner tests: 20/20 passed. - The full test suite was **not** run locally. ## Related Issues - None ## 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. - [ ] I have added tests that prove my fix is effective or that my feature works and increased code coverage. - [x] I have added all necessary documentation. - [ ] I have verified that my changes do not introduce (new) build or analyzer warnings. - [ ] I ran **all** tests locally using the **UA.slnx** solution against at least .net **framework** and .net **10**, and all passed. - [ ] I fixed **all** failing and flaky tests in the CI pipelines and **all** CodeQL warnings. - [ ] I have addressed **all** PR feedback received. 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
184 lines
7.5 KiB
C#
184 lines
7.5 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;
|
|
#if NET9_0_OR_GREATER
|
|
using System.Diagnostics.CodeAnalysis;
|
|
#endif
|
|
using System.IO;
|
|
using System.Reflection;
|
|
#if NET8_0_OR_GREATER
|
|
using System.Runtime.InteropServices;
|
|
using System.Runtime.Loader;
|
|
#endif
|
|
using Opc.Ua.OpenUsd.Client;
|
|
|
|
namespace Opc.Ua.OpenUsd.Connector
|
|
{
|
|
/// <summary>
|
|
/// Finds the optional viewport assembly at run time. Keeping the renderer out of the
|
|
/// connector's own references is what lets the connector package stay small and keep
|
|
/// targeting .NET Framework, while the viewport needs .NET 10, Avalonia, and a
|
|
/// per-architecture native OpenUSD payload.
|
|
/// </summary>
|
|
internal static class UsdViewHostLoader
|
|
{
|
|
#if NET8_0_OR_GREATER
|
|
private const string ViewerAssemblyName = "Opc.Ua.OpenUsd.Connector.Viewer";
|
|
private const string ViewerTypeName =
|
|
"Opc.Ua.OpenUsd.Connector.Viewer.OpenUsdViewHost";
|
|
#endif
|
|
|
|
/// <summary>
|
|
/// Loads the viewport implementation, or explains why it is unavailable.
|
|
/// </summary>
|
|
/// <param name="host">The loaded host, or <c>null</c> when unavailable.</param>
|
|
/// <param name="reason">A user-facing explanation when <paramref name="host"/> is <c>null</c>.</param>
|
|
/// <returns><c>true</c> when a host was loaded.</returns>
|
|
// The trim/AOT annotations are only applied on net9.0 and later; this tool
|
|
// is not trim- or AOT-published.
|
|
#if NET9_0_OR_GREATER
|
|
[RequiresUnreferencedCode(
|
|
"The viewport is discovered by assembly and type name, so trimming cannot see it.")]
|
|
[RequiresDynamicCode(
|
|
"The viewport is instantiated reflectively and is not available in a Native AOT publish.")]
|
|
#endif
|
|
public static bool TryLoad(out IUsdViewHost? host, out string reason)
|
|
{
|
|
host = null;
|
|
#if !NET8_0_OR_GREATER
|
|
reason =
|
|
"Rendering requires .NET 8 or later. Run the connector on a modern " +
|
|
"target framework to use the view option.";
|
|
return false;
|
|
#else
|
|
Assembly assembly;
|
|
try
|
|
{
|
|
assembly = LoadViewerAssembly();
|
|
}
|
|
catch (Exception exception) when (
|
|
exception is System.IO.FileNotFoundException or
|
|
System.IO.FileLoadException or BadImageFormatException)
|
|
{
|
|
reason =
|
|
$"The optional '{ViewerAssemblyName}' assembly was not found next to the " +
|
|
"connector. Install the matching " +
|
|
"OPCFoundation.NetStandard.Opc.Ua.OpenUsd.Connector.Viewer package, or run " +
|
|
"the connector without the view option to author the override layer only.";
|
|
return false;
|
|
}
|
|
|
|
Type? type = assembly.GetType(ViewerTypeName, throwOnError: false);
|
|
if (type is null)
|
|
{
|
|
reason =
|
|
$"'{ViewerAssemblyName}' does not contain '{ViewerTypeName}'. The viewport " +
|
|
"package does not match this connector version.";
|
|
return false;
|
|
}
|
|
|
|
object? instance;
|
|
try
|
|
{
|
|
instance = Activator.CreateInstance(type);
|
|
}
|
|
catch (MissingMethodException)
|
|
{
|
|
reason = $"'{ViewerTypeName}' has no public parameterless constructor.";
|
|
return false;
|
|
}
|
|
catch (TargetInvocationException exception)
|
|
{
|
|
reason = $"The viewport could not be created: {exception.InnerException?.Message}";
|
|
return false;
|
|
}
|
|
|
|
if (instance is not IUsdViewHost loaded)
|
|
{
|
|
reason = $"'{ViewerTypeName}' does not implement IUsdViewHost.";
|
|
return false;
|
|
}
|
|
|
|
host = loaded;
|
|
reason = string.Empty;
|
|
return true;
|
|
#endif
|
|
}
|
|
|
|
#if NET8_0_OR_GREATER
|
|
/// <summary>
|
|
/// Loads the viewport assembly from the connector's own directory and teaches the
|
|
/// default load context to resolve its dependency graph from there too. The
|
|
/// viewport is installed side by side rather than referenced, so it is absent from
|
|
/// the connector's dependency manifest and plain assembly binding cannot find it.
|
|
/// </summary>
|
|
#if NET9_0_OR_GREATER
|
|
[RequiresUnreferencedCode(
|
|
"The viewport and its dependencies are resolved by path, so trimming cannot see them.")]
|
|
#endif
|
|
private static Assembly LoadViewerAssembly()
|
|
{
|
|
string path = Path.Combine(
|
|
AppContext.BaseDirectory, ViewerAssemblyName + ".dll");
|
|
if (!File.Exists(path))
|
|
{
|
|
throw new FileNotFoundException(
|
|
"The optional viewport assembly is not installed.", path);
|
|
}
|
|
|
|
var resolver = new AssemblyDependencyResolver(path);
|
|
AssemblyLoadContext.Default.Resolving += (context, name) =>
|
|
{
|
|
string? resolved = resolver.ResolveAssemblyToPath(name);
|
|
if (resolved is null || !File.Exists(resolved))
|
|
{
|
|
// The publish layout is flat, so fall back to a sibling probe for
|
|
// assemblies the component manifest does not place by path.
|
|
resolved = Path.Combine(AppContext.BaseDirectory, name.Name + ".dll");
|
|
if (!File.Exists(resolved))
|
|
{
|
|
return null;
|
|
}
|
|
}
|
|
return context.LoadFromAssemblyPath(resolved);
|
|
};
|
|
AssemblyLoadContext.Default.ResolvingUnmanagedDll += (_, unmanaged) =>
|
|
{
|
|
string? resolved = resolver.ResolveUnmanagedDllToPath(unmanaged);
|
|
return resolved is not null && File.Exists(resolved)
|
|
? NativeLibrary.Load(resolved)
|
|
: IntPtr.Zero;
|
|
};
|
|
return AssemblyLoadContext.Default.LoadFromAssemblyPath(path);
|
|
}
|
|
#endif
|
|
}
|
|
}
|