From d3809261742823a3f64c7acb97eac0c2e29e5a74 Mon Sep 17 00:00:00 2001 From: Daniel Svensson Date: Tue, 7 Apr 2026 18:36:44 +0200 Subject: [PATCH 01/12] Update test SDKs, tooling packages, Upgraded Microsoft.NET.Test.Sdk to 18.4.0 across all test projects. Updated Microsoft.Build.Locator, System.CommandLine, coverlet.collector, and System.Management --- .../OpenRiaServices.Client.External.Test.csproj | 2 +- .../Test/Client.Test/OpenRiaServices.Client.Test.csproj | 2 +- .../Client.Vb.Test/OpenRiaServices.Client.Vb.Test.csproj | 2 +- .../OpenRiaServices.Hosting.AspNetCore.Test.csproj | 2 +- .../Test/OpenRiaServices.Hosting.Local.Test.csproj | 2 +- .../OpenRiaServices.Hosting.Wcf.Endpoint.Test.csproj | 2 +- .../Test/OpenRiaServices.Hosting.Wcf.Test.csproj | 2 +- ...es.Server.Authentication.AspNetMembership.Test.csproj | 2 +- ...penRiaServices.Server.EntityFrameworkCore.Test.csproj | 4 ++-- .../Test/OpenRiaServices.Server.UnitTesting.Test.csproj | 2 +- .../Test/OpenRiaServices.Server.Test.csproj | 2 +- .../OpenRiaServices.Tools.CodeGenTask.csproj | 4 ++-- .../Properties/launchSettings.json | 9 +++++++++ .../Test/OpenRiaServices.Tools.TextTemplate.Test.csproj | 4 ++-- .../Test/OpenRiaServices.Tools.Test.csproj | 4 ++-- .../OpenRiaServices.Common.Test.csproj | 2 +- .../OpenRiaservices.EndToEnd.AspNetCore.Test.csproj | 2 +- .../OpenRiaservices.EndToEnd.Wcf.Test.csproj | 2 +- ...ervices.VisualStudio.DomainServices.Tools.Test.csproj | 2 +- 19 files changed, 31 insertions(+), 22 deletions(-) create mode 100644 src/OpenRiaServices.Tools.CodeGenTask/Properties/launchSettings.json diff --git a/src/OpenRiaServices.Client/Test/Client.External.Test/OpenRiaServices.Client.External.Test.csproj b/src/OpenRiaServices.Client/Test/Client.External.Test/OpenRiaServices.Client.External.Test.csproj index 48b91f431..5298c025d 100644 --- a/src/OpenRiaServices.Client/Test/Client.External.Test/OpenRiaServices.Client.External.Test.csproj +++ b/src/OpenRiaServices.Client/Test/Client.External.Test/OpenRiaServices.Client.External.Test.csproj @@ -4,7 +4,7 @@ 1.0.0.0 - + diff --git a/src/OpenRiaServices.Client/Test/Client.Test/OpenRiaServices.Client.Test.csproj b/src/OpenRiaServices.Client/Test/Client.Test/OpenRiaServices.Client.Test.csproj index ed9985d1a..07fcfaf1c 100644 --- a/src/OpenRiaServices.Client/Test/Client.Test/OpenRiaServices.Client.Test.csproj +++ b/src/OpenRiaServices.Client/Test/Client.Test/OpenRiaServices.Client.Test.csproj @@ -6,7 +6,7 @@ $(DefineConstants);HAS_COLLECTIONVIEW - + diff --git a/src/OpenRiaServices.Client/Test/Client.Vb.Test/OpenRiaServices.Client.Vb.Test.csproj b/src/OpenRiaServices.Client/Test/Client.Vb.Test/OpenRiaServices.Client.Vb.Test.csproj index 93a7a1ba6..c60a63025 100644 --- a/src/OpenRiaServices.Client/Test/Client.Vb.Test/OpenRiaServices.Client.Vb.Test.csproj +++ b/src/OpenRiaServices.Client/Test/Client.Vb.Test/OpenRiaServices.Client.Vb.Test.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/OpenRiaServices.Hosting.AspNetCore/Test/OpenRiaServices.Hosting.AspNetCore.Test/OpenRiaServices.Hosting.AspNetCore.Test.csproj b/src/OpenRiaServices.Hosting.AspNetCore/Test/OpenRiaServices.Hosting.AspNetCore.Test/OpenRiaServices.Hosting.AspNetCore.Test.csproj index 3b397bed3..fc2a09bb3 100644 --- a/src/OpenRiaServices.Hosting.AspNetCore/Test/OpenRiaServices.Hosting.AspNetCore.Test/OpenRiaServices.Hosting.AspNetCore.Test.csproj +++ b/src/OpenRiaServices.Hosting.AspNetCore/Test/OpenRiaServices.Hosting.AspNetCore.Test/OpenRiaServices.Hosting.AspNetCore.Test.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/OpenRiaServices.Hosting.Local/Test/OpenRiaServices.Hosting.Local.Test.csproj b/src/OpenRiaServices.Hosting.Local/Test/OpenRiaServices.Hosting.Local.Test.csproj index ff477a345..1ccd04013 100644 --- a/src/OpenRiaServices.Hosting.Local/Test/OpenRiaServices.Hosting.Local.Test.csproj +++ b/src/OpenRiaServices.Hosting.Local/Test/OpenRiaServices.Hosting.Local.Test.csproj @@ -3,7 +3,7 @@ net472 - + diff --git a/src/OpenRiaServices.Hosting.Wcf.Endpoint/Test/OpenRiaServices.Hosting.Wcf.Endpoint.Test.csproj b/src/OpenRiaServices.Hosting.Wcf.Endpoint/Test/OpenRiaServices.Hosting.Wcf.Endpoint.Test.csproj index ff7df96b9..00ef9c1a7 100644 --- a/src/OpenRiaServices.Hosting.Wcf.Endpoint/Test/OpenRiaServices.Hosting.Wcf.Endpoint.Test.csproj +++ b/src/OpenRiaServices.Hosting.Wcf.Endpoint/Test/OpenRiaServices.Hosting.Wcf.Endpoint.Test.csproj @@ -5,7 +5,7 @@ 1.0.0.0 - + diff --git a/src/OpenRiaServices.Hosting.Wcf/Test/OpenRiaServices.Hosting.Wcf.Test.csproj b/src/OpenRiaServices.Hosting.Wcf/Test/OpenRiaServices.Hosting.Wcf.Test.csproj index 0593598cf..d64f419a7 100644 --- a/src/OpenRiaServices.Hosting.Wcf/Test/OpenRiaServices.Hosting.Wcf.Test.csproj +++ b/src/OpenRiaServices.Hosting.Wcf/Test/OpenRiaServices.Hosting.Wcf.Test.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/OpenRiaServices.Server.Authentication.AspNetMembership/Test/OpenRiaServices.Server.Authentication.AspNetMembership.Test.csproj b/src/OpenRiaServices.Server.Authentication.AspNetMembership/Test/OpenRiaServices.Server.Authentication.AspNetMembership.Test.csproj index 38d029f71..58fb70cd2 100644 --- a/src/OpenRiaServices.Server.Authentication.AspNetMembership/Test/OpenRiaServices.Server.Authentication.AspNetMembership.Test.csproj +++ b/src/OpenRiaServices.Server.Authentication.AspNetMembership/Test/OpenRiaServices.Server.Authentication.AspNetMembership.Test.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/OpenRiaServices.Server.EntityFrameworkCore/Test/OpenRiaServices.Server.EntityFrameworkCore.Test/OpenRiaServices.Server.EntityFrameworkCore.Test.csproj b/src/OpenRiaServices.Server.EntityFrameworkCore/Test/OpenRiaServices.Server.EntityFrameworkCore.Test/OpenRiaServices.Server.EntityFrameworkCore.Test.csproj index 97f693451..ee0acd581 100644 --- a/src/OpenRiaServices.Server.EntityFrameworkCore/Test/OpenRiaServices.Server.EntityFrameworkCore.Test/OpenRiaServices.Server.EntityFrameworkCore.Test.csproj +++ b/src/OpenRiaServices.Server.EntityFrameworkCore/Test/OpenRiaServices.Server.EntityFrameworkCore.Test/OpenRiaServices.Server.EntityFrameworkCore.Test.csproj @@ -10,11 +10,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/OpenRiaServices.Server.UnitTesting/Test/OpenRiaServices.Server.UnitTesting.Test.csproj b/src/OpenRiaServices.Server.UnitTesting/Test/OpenRiaServices.Server.UnitTesting.Test.csproj index 6cfdc1c5c..a19b45029 100644 --- a/src/OpenRiaServices.Server.UnitTesting/Test/OpenRiaServices.Server.UnitTesting.Test.csproj +++ b/src/OpenRiaServices.Server.UnitTesting/Test/OpenRiaServices.Server.UnitTesting.Test.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/OpenRiaServices.Server/Test/OpenRiaServices.Server.Test.csproj b/src/OpenRiaServices.Server/Test/OpenRiaServices.Server.Test.csproj index 7b5ebb86b..e570b446e 100644 --- a/src/OpenRiaServices.Server/Test/OpenRiaServices.Server.Test.csproj +++ b/src/OpenRiaServices.Server/Test/OpenRiaServices.Server.Test.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/OpenRiaServices.Tools.CodeGenTask/OpenRiaServices.Tools.CodeGenTask.csproj b/src/OpenRiaServices.Tools.CodeGenTask/OpenRiaServices.Tools.CodeGenTask.csproj index 70d926bd8..eaf050895 100644 --- a/src/OpenRiaServices.Tools.CodeGenTask/OpenRiaServices.Tools.CodeGenTask.csproj +++ b/src/OpenRiaServices.Tools.CodeGenTask/OpenRiaServices.Tools.CodeGenTask.csproj @@ -17,8 +17,8 @@ - - + + diff --git a/src/OpenRiaServices.Tools.CodeGenTask/Properties/launchSettings.json b/src/OpenRiaServices.Tools.CodeGenTask/Properties/launchSettings.json new file mode 100644 index 000000000..ca8075518 --- /dev/null +++ b/src/OpenRiaServices.Tools.CodeGenTask/Properties/launchSettings.json @@ -0,0 +1,9 @@ +{ + "profiles": { + "OpenRiaServices.Tools.CodeGenTask": { + "commandName": "Project", + "commandLineArgs": "@C:\\Users\\crmdas\\AppData\\Local\\Temp\\openria-codegen-20240426-104447-077.tmp", + "workingDirectory": "C:\\dev\\net\\production\\Finance\\Client\\CRM.Finance.Client.Model\\" + } + } +} \ No newline at end of file diff --git a/src/OpenRiaServices.Tools.TextTemplate/Test/OpenRiaServices.Tools.TextTemplate.Test.csproj b/src/OpenRiaServices.Tools.TextTemplate/Test/OpenRiaServices.Tools.TextTemplate.Test.csproj index a06f1d4f6..8cc622bed 100644 --- a/src/OpenRiaServices.Tools.TextTemplate/Test/OpenRiaServices.Tools.TextTemplate.Test.csproj +++ b/src/OpenRiaServices.Tools.TextTemplate/Test/OpenRiaServices.Tools.TextTemplate.Test.csproj @@ -27,7 +27,7 @@ - + @@ -35,7 +35,7 @@ - + diff --git a/src/OpenRiaServices.Tools/Test/OpenRiaServices.Tools.Test.csproj b/src/OpenRiaServices.Tools/Test/OpenRiaServices.Tools.Test.csproj index e39bad34d..a1905115c 100644 --- a/src/OpenRiaServices.Tools/Test/OpenRiaServices.Tools.Test.csproj +++ b/src/OpenRiaServices.Tools/Test/OpenRiaServices.Tools.Test.csproj @@ -20,10 +20,10 @@ - + - + diff --git a/src/Test/Desktop/OpenRiaServices.Common.Test/OpenRiaServices.Common.Test.csproj b/src/Test/Desktop/OpenRiaServices.Common.Test/OpenRiaServices.Common.Test.csproj index bdb5baadc..2176ce9f5 100644 --- a/src/Test/Desktop/OpenRiaServices.Common.Test/OpenRiaServices.Common.Test.csproj +++ b/src/Test/Desktop/OpenRiaServices.Common.Test/OpenRiaServices.Common.Test.csproj @@ -14,6 +14,6 @@ - + \ No newline at end of file diff --git a/src/Test/OpenRiaservices.EndToEnd.AspNetCore.Test/OpenRiaservices.EndToEnd.AspNetCore.Test.csproj b/src/Test/OpenRiaservices.EndToEnd.AspNetCore.Test/OpenRiaservices.EndToEnd.AspNetCore.Test.csproj index d3b7871a1..d333a3edf 100644 --- a/src/Test/OpenRiaservices.EndToEnd.AspNetCore.Test/OpenRiaservices.EndToEnd.AspNetCore.Test.csproj +++ b/src/Test/OpenRiaservices.EndToEnd.AspNetCore.Test/OpenRiaservices.EndToEnd.AspNetCore.Test.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Test/OpenRiaservices.EndToEnd.Wcf.Test/OpenRiaservices.EndToEnd.Wcf.Test.csproj b/src/Test/OpenRiaservices.EndToEnd.Wcf.Test/OpenRiaservices.EndToEnd.Wcf.Test.csproj index 47f7357cf..e03bdf08a 100644 --- a/src/Test/OpenRiaservices.EndToEnd.Wcf.Test/OpenRiaservices.EndToEnd.Wcf.Test.csproj +++ b/src/Test/OpenRiaservices.EndToEnd.Wcf.Test/OpenRiaservices.EndToEnd.Wcf.Test.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/VisualStudio/Tools/Test/OpenRiaServices.VisualStudio.DomainServices.Tools.Test.csproj b/src/VisualStudio/Tools/Test/OpenRiaServices.VisualStudio.DomainServices.Tools.Test.csproj index 59d7c19a7..c32769dc2 100644 --- a/src/VisualStudio/Tools/Test/OpenRiaServices.VisualStudio.DomainServices.Tools.Test.csproj +++ b/src/VisualStudio/Tools/Test/OpenRiaServices.VisualStudio.DomainServices.Tools.Test.csproj @@ -11,7 +11,7 @@ - + compile; build; native; contentfiles; analyzers; buildtransitive From b959d17c26e537d4834175be5f2c293fe65455ad Mon Sep 17 00:00:00 2001 From: Daniel Svensson Date: Tue, 7 Apr 2026 19:17:00 +0200 Subject: [PATCH 02/12] Delete src/OpenRiaServices.Tools.CodeGenTask/Properties/launchSettings.json --- .../Properties/launchSettings.json | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 src/OpenRiaServices.Tools.CodeGenTask/Properties/launchSettings.json diff --git a/src/OpenRiaServices.Tools.CodeGenTask/Properties/launchSettings.json b/src/OpenRiaServices.Tools.CodeGenTask/Properties/launchSettings.json deleted file mode 100644 index ca8075518..000000000 --- a/src/OpenRiaServices.Tools.CodeGenTask/Properties/launchSettings.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "profiles": { - "OpenRiaServices.Tools.CodeGenTask": { - "commandName": "Project", - "commandLineArgs": "@C:\\Users\\crmdas\\AppData\\Local\\Temp\\openria-codegen-20240426-104447-077.tmp", - "workingDirectory": "C:\\dev\\net\\production\\Finance\\Client\\CRM.Finance.Client.Model\\" - } - } -} \ No newline at end of file From 044d76ee3d8a49d473227152a327ba482ce6d6e2 Mon Sep 17 00:00:00 2001 From: Daniel Svensson Date: Tue, 7 Apr 2026 19:18:41 +0200 Subject: [PATCH 03/12] Apply suggestion from @Daniel-Svensson --- .../OpenRiaServices.Common.Test.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Test/Desktop/OpenRiaServices.Common.Test/OpenRiaServices.Common.Test.csproj b/src/Test/Desktop/OpenRiaServices.Common.Test/OpenRiaServices.Common.Test.csproj index 2176ce9f5..bdb5baadc 100644 --- a/src/Test/Desktop/OpenRiaServices.Common.Test/OpenRiaServices.Common.Test.csproj +++ b/src/Test/Desktop/OpenRiaServices.Common.Test/OpenRiaServices.Common.Test.csproj @@ -14,6 +14,6 @@ - + \ No newline at end of file From 2582ef440b6688bcea62adc699be9f5cead2d9ef Mon Sep 17 00:00:00 2001 From: Daniel Svensson Date: Tue, 7 Apr 2026 20:14:40 +0200 Subject: [PATCH 04/12] downgrade msbuild locator --- .../OpenRiaServices.Tools.CodeGenTask.csproj | 2 +- .../Test/OpenRiaServices.Tools.TextTemplate.Test.csproj | 2 +- .../Test/OpenRiaServices.Tools.Test.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/OpenRiaServices.Tools.CodeGenTask/OpenRiaServices.Tools.CodeGenTask.csproj b/src/OpenRiaServices.Tools.CodeGenTask/OpenRiaServices.Tools.CodeGenTask.csproj index eaf050895..1b4da2730 100644 --- a/src/OpenRiaServices.Tools.CodeGenTask/OpenRiaServices.Tools.CodeGenTask.csproj +++ b/src/OpenRiaServices.Tools.CodeGenTask/OpenRiaServices.Tools.CodeGenTask.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/OpenRiaServices.Tools.TextTemplate/Test/OpenRiaServices.Tools.TextTemplate.Test.csproj b/src/OpenRiaServices.Tools.TextTemplate/Test/OpenRiaServices.Tools.TextTemplate.Test.csproj index 8cc622bed..db375e06e 100644 --- a/src/OpenRiaServices.Tools.TextTemplate/Test/OpenRiaServices.Tools.TextTemplate.Test.csproj +++ b/src/OpenRiaServices.Tools.TextTemplate/Test/OpenRiaServices.Tools.TextTemplate.Test.csproj @@ -27,7 +27,7 @@ - + diff --git a/src/OpenRiaServices.Tools/Test/OpenRiaServices.Tools.Test.csproj b/src/OpenRiaServices.Tools/Test/OpenRiaServices.Tools.Test.csproj index a1905115c..56de6a082 100644 --- a/src/OpenRiaServices.Tools/Test/OpenRiaServices.Tools.Test.csproj +++ b/src/OpenRiaServices.Tools/Test/OpenRiaServices.Tools.Test.csproj @@ -23,7 +23,7 @@ - + From 3d5769628c9555bd12d39c0b1ecd17bdadc716d4 Mon Sep 17 00:00:00 2001 From: Daniel Svensson Date: Tue, 7 Apr 2026 20:19:03 +0200 Subject: [PATCH 05/12] update MetadataLoadContext for test projects --- .../Test/OpenRiaServices.Tools.TextTemplate.Test.csproj | 2 +- .../Test/OpenRiaServices.Tools.Test.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/OpenRiaServices.Tools.TextTemplate/Test/OpenRiaServices.Tools.TextTemplate.Test.csproj b/src/OpenRiaServices.Tools.TextTemplate/Test/OpenRiaServices.Tools.TextTemplate.Test.csproj index db375e06e..7dba40271 100644 --- a/src/OpenRiaServices.Tools.TextTemplate/Test/OpenRiaServices.Tools.TextTemplate.Test.csproj +++ b/src/OpenRiaServices.Tools.TextTemplate/Test/OpenRiaServices.Tools.TextTemplate.Test.csproj @@ -32,7 +32,7 @@ - + diff --git a/src/OpenRiaServices.Tools/Test/OpenRiaServices.Tools.Test.csproj b/src/OpenRiaServices.Tools/Test/OpenRiaServices.Tools.Test.csproj index 56de6a082..ef9eea49c 100644 --- a/src/OpenRiaServices.Tools/Test/OpenRiaServices.Tools.Test.csproj +++ b/src/OpenRiaServices.Tools/Test/OpenRiaServices.Tools.Test.csproj @@ -29,7 +29,7 @@ - + From 30fc198e288ce41b43862b2c941ff04c24fb8a2c Mon Sep 17 00:00:00 2001 From: Daniel Svensson Date: Tue, 7 Apr 2026 22:24:02 +0200 Subject: [PATCH 06/12] update frozen collections nuget to see if msbuild related build errors are resolved --- .../Test/OpenRiaServices.Tools.TextTemplate.Test.csproj | 1 + src/OpenRiaServices.Tools/Test/OpenRiaServices.Tools.Test.csproj | 1 + 2 files changed, 2 insertions(+) diff --git a/src/OpenRiaServices.Tools.TextTemplate/Test/OpenRiaServices.Tools.TextTemplate.Test.csproj b/src/OpenRiaServices.Tools.TextTemplate/Test/OpenRiaServices.Tools.TextTemplate.Test.csproj index 7dba40271..062717b3d 100644 --- a/src/OpenRiaServices.Tools.TextTemplate/Test/OpenRiaServices.Tools.TextTemplate.Test.csproj +++ b/src/OpenRiaServices.Tools.TextTemplate/Test/OpenRiaServices.Tools.TextTemplate.Test.csproj @@ -32,6 +32,7 @@ + diff --git a/src/OpenRiaServices.Tools/Test/OpenRiaServices.Tools.Test.csproj b/src/OpenRiaServices.Tools/Test/OpenRiaServices.Tools.Test.csproj index ef9eea49c..dc1cdb8b9 100644 --- a/src/OpenRiaServices.Tools/Test/OpenRiaServices.Tools.Test.csproj +++ b/src/OpenRiaServices.Tools/Test/OpenRiaServices.Tools.Test.csproj @@ -29,6 +29,7 @@ + From 4d9ad1a1c42c74f8e374b12934a8c231d5e708a0 Mon Sep 17 00:00:00 2001 From: Daniel Svensson Date: Tue, 7 Apr 2026 22:37:59 +0200 Subject: [PATCH 07/12] revert commandline update --- src/OpenRiaServices.Tools.CodeGenTask/ConsoleLogger.cs | 2 +- .../OpenRiaServices.Tools.CodeGenTask.csproj | 2 +- .../SharedCodeServiceParametersBinder.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/OpenRiaServices.Tools.CodeGenTask/ConsoleLogger.cs b/src/OpenRiaServices.Tools.CodeGenTask/ConsoleLogger.cs index c3d60b44c..62063a362 100644 --- a/src/OpenRiaServices.Tools.CodeGenTask/ConsoleLogger.cs +++ b/src/OpenRiaServices.Tools.CodeGenTask/ConsoleLogger.cs @@ -5,7 +5,7 @@ namespace OpenRiaServices.Tools.CodeGenTask; -class ConsoleLogger : ILoggingService +sealed class ConsoleLogger : ILoggingService { public bool HasLoggedErrors { get; private set; } diff --git a/src/OpenRiaServices.Tools.CodeGenTask/OpenRiaServices.Tools.CodeGenTask.csproj b/src/OpenRiaServices.Tools.CodeGenTask/OpenRiaServices.Tools.CodeGenTask.csproj index 1b4da2730..70d926bd8 100644 --- a/src/OpenRiaServices.Tools.CodeGenTask/OpenRiaServices.Tools.CodeGenTask.csproj +++ b/src/OpenRiaServices.Tools.CodeGenTask/OpenRiaServices.Tools.CodeGenTask.csproj @@ -18,7 +18,7 @@ - + diff --git a/src/OpenRiaServices.Tools.CodeGenTask/SharedCodeServiceParametersBinder.cs b/src/OpenRiaServices.Tools.CodeGenTask/SharedCodeServiceParametersBinder.cs index c87326231..b43356035 100644 --- a/src/OpenRiaServices.Tools.CodeGenTask/SharedCodeServiceParametersBinder.cs +++ b/src/OpenRiaServices.Tools.CodeGenTask/SharedCodeServiceParametersBinder.cs @@ -8,7 +8,7 @@ namespace OpenRiaServices.Tools.CodeGenTask; /// /// Binder class for . Used to bind arguments to handlers /// -internal class SharedCodeServiceParametersBinder : BinderBase +internal sealed class SharedCodeServiceParametersBinder : BinderBase { private readonly Option> _sharedSourceFiles; private readonly Option> _symbolSearchPaths; From 177fb62d560a0f6dc879441529a26ca7e0d7f644 Mon Sep 17 00:00:00 2001 From: Daniel Svensson Date: Wed, 8 Apr 2026 08:40:00 +0200 Subject: [PATCH 08/12] Update System.CommandLine nuget --- .../ClientCodeGenerationOptionsBinder.cs | 52 ------------------ .../OpenRiaServices.Tools.CodeGenTask.csproj | 4 +- .../Program.cs | 55 ++++++++++++------- .../SharedCodeServiceParametersBinder.cs | 46 ---------------- 4 files changed, 36 insertions(+), 121 deletions(-) delete mode 100644 src/OpenRiaServices.Tools.CodeGenTask/ClientCodeGenerationOptionsBinder.cs delete mode 100644 src/OpenRiaServices.Tools.CodeGenTask/SharedCodeServiceParametersBinder.cs diff --git a/src/OpenRiaServices.Tools.CodeGenTask/ClientCodeGenerationOptionsBinder.cs b/src/OpenRiaServices.Tools.CodeGenTask/ClientCodeGenerationOptionsBinder.cs deleted file mode 100644 index 5219d3b0a..000000000 --- a/src/OpenRiaServices.Tools.CodeGenTask/ClientCodeGenerationOptionsBinder.cs +++ /dev/null @@ -1,52 +0,0 @@ -using System.CommandLine; -using System.CommandLine.Binding; - -namespace OpenRiaServices.Tools.CodeGenTask; - -/// -/// Binder class for . Used to bind arguments to handlers -/// -public class ClientCodeGenerationOptionsBinder : BinderBase -{ - private readonly Option _language; - private readonly Option _clientFrameworkPath; - private readonly Option _serverProjectPath; - private readonly Option _clientProjectPath; - private readonly Option _clientRootNamespace; - private readonly Option _serverRootNamespace; - private readonly Option _isApplicationContextGenerationEnabled; - private readonly Option _useFullTypeNames; - - /// - /// Constructor that sets all arguments - /// - public ClientCodeGenerationOptionsBinder(Option language, Option clientFrameworkPath, Option serverProjectPath, Option clientProjectPath, Option clientRootNamespace, Option serverRootNamespace, Option isApplicationContextGenerationEnabled, Option useFullTypeNames) - { - _language = language; - _clientFrameworkPath = clientFrameworkPath; - _serverProjectPath = serverProjectPath; - _clientProjectPath = clientProjectPath; - _clientRootNamespace = clientRootNamespace; - _serverRootNamespace = serverRootNamespace; - _isApplicationContextGenerationEnabled = isApplicationContextGenerationEnabled; - _useFullTypeNames = useFullTypeNames; - } - - /// - /// Parse result in binding context to create and return - /// - protected override ClientCodeGenerationOptions GetBoundValue(BindingContext bindingContext) - { - return new ClientCodeGenerationOptions - { - Language = bindingContext.ParseResult.GetValueForOption(_language), - ClientFrameworkPath = bindingContext.ParseResult.GetValueForOption(_clientFrameworkPath), - ServerProjectPath = bindingContext.ParseResult.GetValueForOption(_serverProjectPath), - ClientProjectPath = bindingContext.ParseResult.GetValueForOption(_clientProjectPath), - ClientRootNamespace = bindingContext.ParseResult.GetValueForOption(_clientRootNamespace), - ServerRootNamespace = bindingContext.ParseResult.GetValueForOption(_serverRootNamespace), - IsApplicationContextGenerationEnabled = bindingContext.ParseResult.GetValueForOption(_isApplicationContextGenerationEnabled), - UseFullTypeNames = bindingContext.ParseResult.GetValueForOption(_useFullTypeNames), - }; - } -} diff --git a/src/OpenRiaServices.Tools.CodeGenTask/OpenRiaServices.Tools.CodeGenTask.csproj b/src/OpenRiaServices.Tools.CodeGenTask/OpenRiaServices.Tools.CodeGenTask.csproj index 70d926bd8..eaf050895 100644 --- a/src/OpenRiaServices.Tools.CodeGenTask/OpenRiaServices.Tools.CodeGenTask.csproj +++ b/src/OpenRiaServices.Tools.CodeGenTask/OpenRiaServices.Tools.CodeGenTask.csproj @@ -17,8 +17,8 @@ - - + + diff --git a/src/OpenRiaServices.Tools.CodeGenTask/Program.cs b/src/OpenRiaServices.Tools.CodeGenTask/Program.cs index ed0042e83..3148185be 100644 --- a/src/OpenRiaServices.Tools.CodeGenTask/Program.cs +++ b/src/OpenRiaServices.Tools.CodeGenTask/Program.cs @@ -1,8 +1,9 @@ using System; +using System.Collections.Generic; +using System.CommandLine; using System.IO; using System.Linq; -using System.CommandLine; -using System.Collections.Generic; +using OpenRiaServices.Tools.SharedTypes; namespace OpenRiaServices.Tools.CodeGenTask; @@ -34,10 +35,7 @@ static int Main(string[] args) var codeGeneratorName = new Option(name: "--codeGeneratorName") { }; - var generatedFileName = new Option(name: "--generatedFileName") - { - IsRequired = true - }; + var generatedFileName = new Option(name: "--generatedFileName"); var loggingPipe = new Option(name: "--loggingPipe"); @@ -61,23 +59,38 @@ static int Main(string[] args) loggingPipe, }; - bool success = false; + rootCommand.SetAction(parseResult => + { + var clientOptions = new ClientCodeGenerationOptions + { + Language = parseResult.GetRequiredValue(languageOption), + ClientFrameworkPath = parseResult.GetRequiredValue(clientFrameworkOption), + ServerProjectPath = parseResult.GetRequiredValue(serverProjectPathOption), + ClientProjectPath = parseResult.GetRequiredValue(clientProjectPathOption), + ClientRootNamespace = parseResult.GetRequiredValue(clientRootNamespaceOption), + ServerRootNamespace = parseResult.GetRequiredValue(serverRootNamespaceOption), + IsApplicationContextGenerationEnabled = parseResult.GetValue(isApplicationContextGenerationEnabledOption), + UseFullTypeNames = parseResult.GetValue(useFullTypeNamesOption), + }; - rootCommand.SetHandler((clientCodeGenerationOptionValue, sharedCodeServiceParametersValue, codeGeneratorName, generatedFileName, pipeName) - => success = RunCodeGenForNet6(clientCodeGenerationOptionValue, sharedCodeServiceParametersValue, codeGeneratorName, generatedFileName, pipeName), - new ClientCodeGenerationOptionsBinder( - languageOption, clientFrameworkOption, serverProjectPathOption, clientProjectPathOption, clientRootNamespaceOption, serverRootNamespaceOption, - isApplicationContextGenerationEnabledOption, useFullTypeNamesOption), - new SharedCodeServiceParametersBinder(sharedSourceFilesOption, symbolSearchPathsOption, serverAssembliesOption, clientAssembliesOption, clientAssemblyPathsNormalizedOption), - codeGeneratorName, - generatedFileName, - loggingPipe); + var sharedCodeServiceParametersValue = new SharedCodeServiceParameters + { + // TODO: should we use default names such as "--shared-source-files" + SharedSourceFiles = parseResult.GetRequiredValue(sharedSourceFilesOption).ToArray(), + SymbolSearchPaths = parseResult.GetRequiredValue(symbolSearchPathsOption).ToArray(), + ServerAssemblies = parseResult.GetRequiredValue(serverAssembliesOption).ToArray(), + ClientAssemblies = parseResult.GetRequiredValue(clientAssembliesOption).ToArray(), + ClientAssemblyPathsNormalized = parseResult.GetRequiredValue(clientAssemblyPathsNormalizedOption).ToArray(), + }; + + string codeGenName = parseResult.GetValue(codeGeneratorName); + string outFileName = parseResult.GetRequiredValue(generatedFileName); + string pipeName = parseResult.GetValue(loggingPipe); + bool success = RunCodeGenForNet6(clientOptions, sharedCodeServiceParametersValue, codeGenName, outFileName, pipeName); + + }); - rootCommand.Invoke(args); - if (success) - return 0; - else - return -1; + return rootCommand.Parse(args).Invoke(); } private static bool RunCodeGenForNet6(ClientCodeGenerationOptions clientCodeGenerationOption, SharedCodeServiceParameters sharedCodeServiceParameters, string codeGeneratorName, string generatedFileName, string loggingPipe) diff --git a/src/OpenRiaServices.Tools.CodeGenTask/SharedCodeServiceParametersBinder.cs b/src/OpenRiaServices.Tools.CodeGenTask/SharedCodeServiceParametersBinder.cs deleted file mode 100644 index b43356035..000000000 --- a/src/OpenRiaServices.Tools.CodeGenTask/SharedCodeServiceParametersBinder.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System.Linq; -using System.CommandLine; -using System.Collections.Generic; -using System.CommandLine.Binding; - -namespace OpenRiaServices.Tools.CodeGenTask; - -/// -/// Binder class for . Used to bind arguments to handlers -/// -internal sealed class SharedCodeServiceParametersBinder : BinderBase -{ - private readonly Option> _sharedSourceFiles; - private readonly Option> _symbolSearchPaths; - private readonly Option> _serverAssemblies; - private readonly Option> _clientAssemblies; - private readonly Option> _clientAssemblyPathsNomalized; - - /// - /// Constructor that sets all arguments - /// - internal SharedCodeServiceParametersBinder(Option> sharedSourceFiles, Option> symbolSearchPaths, Option> serverAssemblies, Option> clientAssemblies, Option> clientAssemblyPathsNomalized) - { - _sharedSourceFiles = sharedSourceFiles; - _symbolSearchPaths = symbolSearchPaths; - _serverAssemblies = serverAssemblies; - _clientAssemblies = clientAssemblies; - _clientAssemblyPathsNomalized = clientAssemblyPathsNomalized; - } - - /// - /// Parse result in binding context to create and return - /// - protected override SharedCodeServiceParameters GetBoundValue(BindingContext bindingContext) - { - return new SharedCodeServiceParameters - { - // TODO: should we use default names such as "--shared-source-files" - SharedSourceFiles = bindingContext.ParseResult.GetValueForOption(_sharedSourceFiles).ToArray(), - SymbolSearchPaths = bindingContext.ParseResult.GetValueForOption(_symbolSearchPaths).ToArray(), - ServerAssemblies = bindingContext.ParseResult.GetValueForOption(_serverAssemblies).ToArray(), - ClientAssemblies = bindingContext.ParseResult.GetValueForOption(_clientAssemblies).ToArray(), - ClientAssemblyPathsNormalized = bindingContext.ParseResult.GetValueForOption(_clientAssemblyPathsNomalized).ToArray(), - }; - } -} From f8c412dde11afbb63fe8663249978dafd7ba4901 Mon Sep 17 00:00:00 2001 From: Daniel Svensson Date: Wed, 8 Apr 2026 08:40:17 +0200 Subject: [PATCH 09/12] remove unused reference --- .../Framework/OpenRiaServices.Hosting.AspNetCore.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/OpenRiaServices.Hosting.AspNetCore/Framework/OpenRiaServices.Hosting.AspNetCore.csproj b/src/OpenRiaServices.Hosting.AspNetCore/Framework/OpenRiaServices.Hosting.AspNetCore.csproj index c09e769e5..ec0573ca2 100644 --- a/src/OpenRiaServices.Hosting.AspNetCore/Framework/OpenRiaServices.Hosting.AspNetCore.csproj +++ b/src/OpenRiaServices.Hosting.AspNetCore/Framework/OpenRiaServices.Hosting.AspNetCore.csproj @@ -26,7 +26,6 @@ - From e1624aab9ddecc2af22c31a9bf03a737f78b0e6c Mon Sep 17 00:00:00 2001 From: Daniel Svensson Date: Wed, 8 Apr 2026 09:05:23 +0200 Subject: [PATCH 10/12] update msbuild version compiled against in tests to last .NET 8 releae --- .../OpenRiaServices.Tools.CodeGenTask.csproj | 2 +- .../OpenRiaServices.Tools.TextTemplate.Test.csproj | 10 +++++----- .../Test/OpenRiaServices.Tools.Test.csproj | 10 +++++----- ...vices.VisualStudio.DomainServices.Tools.Test.csproj | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/OpenRiaServices.Tools.CodeGenTask/OpenRiaServices.Tools.CodeGenTask.csproj b/src/OpenRiaServices.Tools.CodeGenTask/OpenRiaServices.Tools.CodeGenTask.csproj index eaf050895..1b4da2730 100644 --- a/src/OpenRiaServices.Tools.CodeGenTask/OpenRiaServices.Tools.CodeGenTask.csproj +++ b/src/OpenRiaServices.Tools.CodeGenTask/OpenRiaServices.Tools.CodeGenTask.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/OpenRiaServices.Tools.TextTemplate/Test/OpenRiaServices.Tools.TextTemplate.Test.csproj b/src/OpenRiaServices.Tools.TextTemplate/Test/OpenRiaServices.Tools.TextTemplate.Test.csproj index 062717b3d..06bc430e0 100644 --- a/src/OpenRiaServices.Tools.TextTemplate/Test/OpenRiaServices.Tools.TextTemplate.Test.csproj +++ b/src/OpenRiaServices.Tools.TextTemplate/Test/OpenRiaServices.Tools.TextTemplate.Test.csproj @@ -28,10 +28,10 @@ - - - - + + + + @@ -48,4 +48,4 @@ - \ No newline at end of file + diff --git a/src/OpenRiaServices.Tools/Test/OpenRiaServices.Tools.Test.csproj b/src/OpenRiaServices.Tools/Test/OpenRiaServices.Tools.Test.csproj index dc1cdb8b9..3b5d07a57 100644 --- a/src/OpenRiaServices.Tools/Test/OpenRiaServices.Tools.Test.csproj +++ b/src/OpenRiaServices.Tools/Test/OpenRiaServices.Tools.Test.csproj @@ -24,10 +24,10 @@ - - - - + + + + @@ -87,4 +87,4 @@ - \ No newline at end of file + diff --git a/src/VisualStudio/Tools/Test/OpenRiaServices.VisualStudio.DomainServices.Tools.Test.csproj b/src/VisualStudio/Tools/Test/OpenRiaServices.VisualStudio.DomainServices.Tools.Test.csproj index c32769dc2..38f3310c6 100644 --- a/src/VisualStudio/Tools/Test/OpenRiaServices.VisualStudio.DomainServices.Tools.Test.csproj +++ b/src/VisualStudio/Tools/Test/OpenRiaServices.VisualStudio.DomainServices.Tools.Test.csproj @@ -12,7 +12,7 @@ - + compile; build; native; contentfiles; analyzers; buildtransitive @@ -47,4 +47,4 @@ - \ No newline at end of file + From c51a1e79500060aced84462d64258bbd37082799 Mon Sep 17 00:00:00 2001 From: Daniel Svensson Date: Wed, 8 Apr 2026 10:03:53 +0200 Subject: [PATCH 11/12] Update nuget packages, net4 build needs latest msbuild --- .../OpenRiaServices.Server.nuspec | 10 +--------- .../Framework/OpenRiaServices.Server.csproj | 2 +- ...RiaServices.Tools.TextTemplate.Test.csproj | 19 ++++++++++++++----- .../Framework/OpenRiaServices.Tools.csproj | 8 ++++---- .../Test/OpenRiaServices.Tools.Test.csproj | 17 ++++++++++++----- .../Test/TestWap/TestWap.csproj | 2 +- src/Test/WebsiteFullTrust/Web.config | 4 ++-- .../WebsiteFullTrust/WebsiteFullTrust.csproj | 2 +- ...ualStudio.DomainServices.Tools.Test.csproj | 2 +- 9 files changed, 37 insertions(+), 29 deletions(-) diff --git a/NuGet/OpenRiaServices.Server/OpenRiaServices.Server.nuspec b/NuGet/OpenRiaServices.Server/OpenRiaServices.Server.nuspec index 728b500a0..c12d6295b 100644 --- a/NuGet/OpenRiaServices.Server/OpenRiaServices.Server.nuspec +++ b/NuGet/OpenRiaServices.Server/OpenRiaServices.Server.nuspec @@ -23,16 +23,8 @@ - + - diff --git a/src/OpenRiaServices.Server/Framework/OpenRiaServices.Server.csproj b/src/OpenRiaServices.Server/Framework/OpenRiaServices.Server.csproj index 1b01bbceb..024d7750b 100644 --- a/src/OpenRiaServices.Server/Framework/OpenRiaServices.Server.csproj +++ b/src/OpenRiaServices.Server/Framework/OpenRiaServices.Server.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/OpenRiaServices.Tools.TextTemplate/Test/OpenRiaServices.Tools.TextTemplate.Test.csproj b/src/OpenRiaServices.Tools.TextTemplate/Test/OpenRiaServices.Tools.TextTemplate.Test.csproj index 06bc430e0..2b21f2150 100644 --- a/src/OpenRiaServices.Tools.TextTemplate/Test/OpenRiaServices.Tools.TextTemplate.Test.csproj +++ b/src/OpenRiaServices.Tools.TextTemplate/Test/OpenRiaServices.Tools.TextTemplate.Test.csproj @@ -28,10 +28,6 @@ - - - - @@ -40,12 +36,25 @@ - + + + + + + + + + + + + + + diff --git a/src/OpenRiaServices.Tools/Framework/OpenRiaServices.Tools.csproj b/src/OpenRiaServices.Tools/Framework/OpenRiaServices.Tools.csproj index 80f113329..d3fbfd438 100644 --- a/src/OpenRiaServices.Tools/Framework/OpenRiaServices.Tools.csproj +++ b/src/OpenRiaServices.Tools/Framework/OpenRiaServices.Tools.csproj @@ -44,9 +44,9 @@ - - - + + + @@ -99,4 +99,4 @@ - \ No newline at end of file + diff --git a/src/OpenRiaServices.Tools/Test/OpenRiaServices.Tools.Test.csproj b/src/OpenRiaServices.Tools/Test/OpenRiaServices.Tools.Test.csproj index 3b5d07a57..0fc8b423d 100644 --- a/src/OpenRiaServices.Tools/Test/OpenRiaServices.Tools.Test.csproj +++ b/src/OpenRiaServices.Tools/Test/OpenRiaServices.Tools.Test.csproj @@ -24,23 +24,30 @@ - - - - - + + + + + + + + + + + + Unused diff --git a/src/OpenRiaServices.Tools/Test/TestWap/TestWap.csproj b/src/OpenRiaServices.Tools/Test/TestWap/TestWap.csproj index 648e1d55a..e5bf1db14 100644 --- a/src/OpenRiaServices.Tools/Test/TestWap/TestWap.csproj +++ b/src/OpenRiaServices.Tools/Test/TestWap/TestWap.csproj @@ -108,7 +108,7 @@ - 4.6.0 + 4.6.3 diff --git a/src/Test/WebsiteFullTrust/Web.config b/src/Test/WebsiteFullTrust/Web.config index 4dd76726a..d3de5d9c3 100644 --- a/src/Test/WebsiteFullTrust/Web.config +++ b/src/Test/WebsiteFullTrust/Web.config @@ -83,7 +83,7 @@ - + @@ -103,7 +103,7 @@ - + diff --git a/src/Test/WebsiteFullTrust/WebsiteFullTrust.csproj b/src/Test/WebsiteFullTrust/WebsiteFullTrust.csproj index 0ce7d4289..16ec03e3f 100644 --- a/src/Test/WebsiteFullTrust/WebsiteFullTrust.csproj +++ b/src/Test/WebsiteFullTrust/WebsiteFullTrust.csproj @@ -153,7 +153,7 @@ 9.0.0 - 4.6.0 + 4.6.3 diff --git a/src/VisualStudio/Tools/Test/OpenRiaServices.VisualStudio.DomainServices.Tools.Test.csproj b/src/VisualStudio/Tools/Test/OpenRiaServices.VisualStudio.DomainServices.Tools.Test.csproj index 38f3310c6..2c2002d0a 100644 --- a/src/VisualStudio/Tools/Test/OpenRiaServices.VisualStudio.DomainServices.Tools.Test.csproj +++ b/src/VisualStudio/Tools/Test/OpenRiaServices.VisualStudio.DomainServices.Tools.Test.csproj @@ -12,7 +12,7 @@ - + compile; build; native; contentfiles; analyzers; buildtransitive From c8a69a3db4efb10816dc0235dd42363e07ff3c9f Mon Sep 17 00:00:00 2001 From: Daniel Svensson Date: Wed, 8 Apr 2026 11:28:00 +0200 Subject: [PATCH 12/12] Fix codegen task --- src/OpenRiaServices.Tools.CodeGenTask/Program.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/OpenRiaServices.Tools.CodeGenTask/Program.cs b/src/OpenRiaServices.Tools.CodeGenTask/Program.cs index 3148185be..7ed427a0a 100644 --- a/src/OpenRiaServices.Tools.CodeGenTask/Program.cs +++ b/src/OpenRiaServices.Tools.CodeGenTask/Program.cs @@ -67,7 +67,7 @@ static int Main(string[] args) ClientFrameworkPath = parseResult.GetRequiredValue(clientFrameworkOption), ServerProjectPath = parseResult.GetRequiredValue(serverProjectPathOption), ClientProjectPath = parseResult.GetRequiredValue(clientProjectPathOption), - ClientRootNamespace = parseResult.GetRequiredValue(clientRootNamespaceOption), + ClientRootNamespace = parseResult.GetValue(clientRootNamespaceOption), ServerRootNamespace = parseResult.GetRequiredValue(serverRootNamespaceOption), IsApplicationContextGenerationEnabled = parseResult.GetValue(isApplicationContextGenerationEnabledOption), UseFullTypeNames = parseResult.GetValue(useFullTypeNamesOption), @@ -76,18 +76,18 @@ static int Main(string[] args) var sharedCodeServiceParametersValue = new SharedCodeServiceParameters { // TODO: should we use default names such as "--shared-source-files" - SharedSourceFiles = parseResult.GetRequiredValue(sharedSourceFilesOption).ToArray(), - SymbolSearchPaths = parseResult.GetRequiredValue(symbolSearchPathsOption).ToArray(), + SharedSourceFiles = parseResult.GetValue(sharedSourceFilesOption)?.ToArray() ?? [], + SymbolSearchPaths = parseResult.GetValue(symbolSearchPathsOption)?.ToArray() ?? [], ServerAssemblies = parseResult.GetRequiredValue(serverAssembliesOption).ToArray(), ClientAssemblies = parseResult.GetRequiredValue(clientAssembliesOption).ToArray(), - ClientAssemblyPathsNormalized = parseResult.GetRequiredValue(clientAssemblyPathsNormalizedOption).ToArray(), + ClientAssemblyPathsNormalized = parseResult.GetValue(clientAssemblyPathsNormalizedOption)?.ToArray() ?? [], }; string codeGenName = parseResult.GetValue(codeGeneratorName); string outFileName = parseResult.GetRequiredValue(generatedFileName); string pipeName = parseResult.GetValue(loggingPipe); bool success = RunCodeGenForNet6(clientOptions, sharedCodeServiceParametersValue, codeGenName, outFileName, pipeName); - + return success ? 0 : -1; }); return rootCommand.Parse(args).Invoke();