Merge pull request #937 from FirelyTeam/copilot/fix-924

924 Fix cross-platform build failures and extract shared code generation logic into reusable .targets file

Author: alexzautke

Cql-Sdk-All.sln

@@ -121,6 +121,9 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ncqa.HT.Infrastructure", "submodules\Ncqa.DQIC\Ncqa.HT.Infrastructure\Ncqa.HT.Infrastructure.csproj", "{BAEF695A-5581-B3EE-B352-CBF447240E55}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{14ED22C5-F918-42DB-A301-04B3AED51EBC}"
+	ProjectSection(SolutionItems) = preProject
+		Examples\CqlSdkExamplesCodeGeneration.targets = Examples\CqlSdkExamplesCodeGeneration.targets
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8EC462FD-D22E-90A8-E5CE-7E832BA40C5D}"
 	ProjectSection(SolutionItems) = preProject

Cql-Sdk-Demos-Examples.slnf

@@ -0,0 +1,32 @@
+{
+  "solution": {
+    "path": "Cql-Sdk-All.sln",
+    "projects": [
+      "Cql\\Benchmarks\\Benchmarks.csproj",
+      "Cql\\CodeGeneration.NET\\CodeGeneration.NET.csproj",
+      "Cql\\CoreTests\\CoreTests.csproj",
+      "Cql\\Cql.Abstractions\\Cql.Abstractions.csproj",
+      "Cql\\Cql.Compiler\\Cql.Compiler.csproj",
+      "Cql\\Cql.CqlToElm\\Cql.CqlToElm.csproj",
+      "Cql\\Cql.Firely\\Cql.Firely.csproj",
+      "Cql\\Cql.Grammar\\Cql.Grammar.csproj",
+      "Cql\\Cql.Invocation\\Cql.Invocation.csproj",
+      "Cql\\Cql.Model\\Cql.Model.csproj",
+      "Cql\\Cql.Packaging\\Cql.Packaging.csproj",
+      "Cql\\Cql.Runtime\\Cql.Runtime.csproj",
+      "Cql\\CqlToElmTests\\CqlToElmTests.csproj",
+      "Cql\\Cql\\Cql.csproj",
+      "Cql\\Elm\\Elm.csproj",
+      "Cql\\Iso8601\\Iso8601.csproj",
+      "Cql\\PackagerCLI\\PackagerCLI.csproj",
+      "Demo\\CLI\\CLI.csproj",
+      "Demo\\Cql\\Cql.csproj",
+      "Demo\\Measures.Authoring\\Measures.Authoring.csproj",
+      "Demo\\Measures.CMS\\Measures.CMS.csproj",
+      "Demo\\Measures.Demo\\Measures.Demo.csproj",
+      "Demo\\Test.Measures.Demo\\Test.Measures.Demo.csproj",
+      "Examples\\CqlSdkExamplesPreview\\CqlSdkExamplesPreview.csproj",
+      "Examples\\CqlSdkExamples\\CqlSdkExamples.csproj"
+    ]
+  }
+}

Cql/CoreTests/CoreTests.csproj

@@ -45,7 +45,7 @@
 		<LibrarySet>CoreTests.HL7</LibrarySet>
 		<CqlDirectory>$(MSBuildProjectDirectory)/input/elm/hl7</CqlDirectory>
 		<ElmDirectory>$(MSBuildProjectDirectory)/input/elm/hl7</ElmDirectory>
-		<DllDirectory>$(MSBuildProjectDirectory)/Dlls</DllDirectory>
+		<!-- <DllDirectory>$(MSBuildProjectDirectory)/Dlls</DllDirectory> -->
 		<!-- <ResourcesDirectory>$(MSBuildProjectDirectory)/Resources</ResourcesDirectory> -->
 		<!-- <TestResultsDirectory>$(MSBuildProjectDirectory)/input/tests/results</TestResultsDirectory> -->
 		<!-- <CqlToElmEnabled>true</CqlToElmEnabled> -->

Cql/CoreTests/ElmPreprocessorTest.cs

@@ -15,12 +15,12 @@ namespace CoreTests
     public class ElmPreprocessorTest
     {
         private Library FHIRHelpers() =>
-            Library.LoadFromJson(new FileInfo(@"..\..\..\..\..\LibrarySets\Demo\Elm\FHIRHelpers.json"));
+            Library.LoadFromJson(new FileInfo(Path.Combine("..", "..", "..", "..", "..", "LibrarySets", "Demo", "Elm", "FHIRHelpers.json")));
 
         [TestMethod]
         public void MATGlobal_Add_ResultTypeSpecifier()
         {
-            var file = new FileInfo(@"..\..\..\..\..\LibrarySets\Demo\Elm\MATGlobalCommonFunctionsFHIR4.json");
+            var file = new FileInfo(Path.Combine("..", "..", "..", "..", "..", "LibrarySets", "Demo", "Elm", "MATGlobalCommonFunctionsFHIR4.json"));
             file.Exists.Should().BeTrue();
 
             var lib = Library.LoadFromJson(file);

Cql/CoreTests/ElmSerializerTests.cs

@@ -43,7 +43,7 @@ public void Elm_Deserialize_TupleTypeSpecifier()
         [TestMethod]
         public void Elm_Deserialize_FhirHelpers()
         {
-            var originalElm = File.ReadAllText(@"Input\ELM\Libs\FHIRHelpers-4.0.1.json");
+            var originalElm = File.ReadAllText(Path.Combine("Input", "ELM", "Libs", "FHIRHelpers-4.0.1.json"));
             var lib = Library.ParseFromJson(originalElm);
             var elm = lib.SerializeToJson();
 
@@ -88,7 +88,7 @@ public void DeserializeFieldSpecifiedElement()
         [TestMethod]
         public void Elm_Deserialize_MixedXmlAnnotations()
         {
-            var originalElm = File.ReadAllText(@"Input\ELM\Test\CqlWithAnnotations.xml");
+            var originalElm = File.ReadAllText(Path.Combine("Input", "ELM", "Test", "CqlWithAnnotations.xml"));
             var x = new XmlSerializer(typeof(Library));
             var lib = (Library)x.Deserialize(new StringReader(originalElm))!;
             var annotation = lib.usings[1].annotation[0].Should().BeOfType<Annotation>().Subject;

Cql/CoreTests/ExpressionBuilderTests.cs

@@ -33,7 +33,7 @@ public void AggregateQueries_1_0_0()
         {
             using var serviceProvider = BuildServiceProvider();
             using var servicesScope = serviceProvider.CreateScope();
-            var elm = new FileInfo(@"Input\ELM\Test\Aggregates-1.0.0.json");
+            var elm = new FileInfo(Path.Combine("Input", "ELM", "Test", "Aggregates-1.0.0.json"));
             var elmPackage = Hl7.Cql.Elm.Library.LoadFromJson(elm);
             var definitions = servicesScope.ServiceProvider.GetRequiredService<LibraryExpressionBuilder>().ProcessLibrary(elmPackage);
             Assert.IsNotNull(definitions);
@@ -45,7 +45,7 @@ public void FHIRConversionTest_1_0_0()
         {
             using var serviceProvider = BuildServiceProvider();
             using var servicesScope = serviceProvider.CreateScope();
-            var elm = new FileInfo(@"Input\ELM\HL7\FHIRConversionTest.json");
+            var elm = new FileInfo(Path.Combine("Input", "ELM", "HL7", "FHIRConversionTest.json"));
             var elmPackage = Hl7.Cql.Elm.Library.LoadFromJson(elm);
             var definitions = servicesScope.ServiceProvider.GetRequiredService<LibraryExpressionBuilder>().ProcessLibrary(elmPackage);
             Assert.IsNotNull(definitions);
@@ -57,7 +57,7 @@ public void QueriesTest_1_0_0()
         {
             using var serviceProvider = BuildServiceProvider();
             using var servicesScope = serviceProvider.CreateScope();
-            var elm = new FileInfo(@"Input\ELM\Test\QueriesTest-1.0.0.json");
+            var elm = new FileInfo(Path.Combine("Input", "ELM", "Test", "QueriesTest-1.0.0.json"));
             var elmPackage = Hl7.Cql.Elm.Library.LoadFromJson(elm);
             var definitions = servicesScope.ServiceProvider.GetRequiredService<LibraryExpressionBuilder>().ProcessLibrary(elmPackage);
             Assert.IsNotNull(definitions);
@@ -72,8 +72,8 @@ public void Medication_Request_Example_Test()
             using var servicesScope = serviceProvider.CreateScope();
             FileInfo[] files =
             [
-                new(@"Input\ELM\Test\Medication_Request_Example.json"),
-                new(@"Input\ELM\Libs\FHIRHelpers-4.0.1.json")
+                new(Path.Combine("Input", "ELM", "Test", "Medication_Request_Example.json")),
+                new(Path.Combine("Input", "ELM", "Libs", "FHIRHelpers-4.0.1.json"))
             ];
             var librarySet = new LibrarySet();
             librarySet.LoadLibraries(files);

Cql/CoreTests/PrimitiveTests.cs

@@ -3407,7 +3407,7 @@ public void Collapse_Containing_Null()
         public void Aggregate_Query_Test()
         {
             var librarySet = new LibrarySet();
-            librarySet.LoadLibraryAndDependencies(new DirectoryInfo("Input\\ELM\\Test"), "Aggregates", "1.0.0");
+            librarySet.LoadLibraryAndDependencies(new DirectoryInfo(Path.Combine("Input", "ELM", "Test")), "Aggregates", "1.0.0");
 
             var loggerFactory = new ServiceCollection()
                                 .AddDebugLogging()

Cql/CoreTests/QueriesTest.cs

@@ -27,8 +27,8 @@ public static void Initialize(TestContext context)
         {
             _librarySetInvoker = new ElmToolkit()
                                  .AddElmFiles((FileInfo[])[
-                                     new(@"Input\ELM\Test\QueriesTest-1.0.0.json"),
-                                     new(@"Input\ELM\Test\Aggregates-1.0.0.json")])
+                                     new(Path.Combine("Input", "ELM", "Test", "QueriesTest-1.0.0.json")),
+                                     new(Path.Combine("Input", "ELM", "Test", "Aggregates-1.0.0.json"))])
                                  .CreateLibrarySetInvoker();
 
             QueriesDefinitions = _librarySetInvoker.LibraryInvokers[(CqlVersionedLibraryIdentifier)"QueriesTest-1.0.0"]!;

Cql/CoreTests/ToolkitTests.cs

@@ -8,15 +8,13 @@
 
 #nullable enable
 using Hl7.Cql.Abstractions;
-using Hl7.Cql.CodeGeneration.NET;
 using Hl7.Cql.CodeGeneration.NET.Toolkit;
 using Hl7.Cql.CodeGeneration.NET.Toolkit.Extensions;
 using Hl7.Cql.CqlToElm;
 using Hl7.Cql.CqlToElm.Toolkit;
 using Hl7.Cql.CqlToElm.Toolkit.Extensions;
 using Hl7.Cql.Elm;
 using Hl7.Cql.Fhir;
-using Hl7.Cql.Invocation.Toolkit;
 using Hl7.Cql.Invocation.Toolkit.Extensions;
 using Hl7.Cql.Runtime;
 
@@ -26,28 +24,46 @@ namespace CoreTests;
 public class ToolkitTests
 {
     [TestMethod]
-    public void TestRuntimeScopeAgainstLibraryDefinitionResults()
+    public void TestNestedTupleResult_ToString_MatchesExpectedFormat()
     {
         // Arrange
-        var filePath = new DirectoryInfo(Directory.GetCurrentDirectory())
-                       .SelfAndParents()
-                       .Select(dir => Path.GetFullPath(Path.Combine(dir.FullName, "Dlls", "CqlNestedTupleTest-1.0.0.dll")))
-                       .First(File.Exists);
+        var cqlNestedTuples =
+            (CqlLibraryString)"""
+                              library CqlNestedTupleTest version '1.0.0'
+
+                              define "Result":
+                                Tuple{
+                                  status: 'success',
+                                  result: Tuple{
+                                      result1: 'some first result',
+                                      result2: 'some second result'
+                                      }
+                                }
+                              """;
+
         var ctx = FhirCqlContext.ForBundle();
-        using var librarySetInvoker = new InvocationToolkit()
-                                      .AddAssemblyBinaries(AssemblyBinary.Default.LoadFromFile(new FileInfo(filePath)))
-                                      .CreateLibrarySetInvoker();
+        using var librarySetInvoker =
+            new CqlToolkit()
+                .AddCqlLibraries(cqlNestedTuples)
+                .CreateLibrarySetInvoker();
 
         // Act
-        var result = librarySetInvoker
+        var results = librarySetInvoker
                      .SelectExpressionsForLibrary(CqlVersionedLibraryIdentifier.Parse("CqlNestedTupleTest-1.0.0"))
                      .SelectResults(ctx)
                      .ToDictionary(t => t.definitionInvoker.DefinitionName);
 
         // Assert
-        Assert.IsNotNull(result);
-        result.TryGetValue("Result", out var obj);
+        Assert.IsNotNull(results);
+        results.TryGetValue("Result", out var obj);
         Assert.IsNotNull(obj);
+        Assert.IsNotNull(obj.invocationResult);
+        Assert.AreEqual(
+            // NOTE: This is the raw ToString() output of the value tuple returned from the CQL library.
+            // It is not a JSON string, but a C# value tuple string representation.
+            """
+            (["result", "status"], (["result1", "result2"], some first result, some second result), success)
+            """, obj.invocationResult.ToString());
     }
 
     [TestMethod]
@@ -220,8 +236,8 @@ context Patient
 
         // Act: Get expressions and functions using the new method
         var expressionsAndFunctions = libraryInvoker.SelectExpressions(DefinitionPredicates.ExpressionsAndFunctions)
-            .Where(d => d.DefinitionName != "Patient") // Filter out the automatic Patient context definition
-            .ToList();
+                                                    .Where(d => d.DefinitionName != "Patient") // Filter out the automatic Patient context definition
+                                                    .ToList();
 
         // Assert: Should include both expressions and functions
         expressionsAndFunctions.Should().HaveCount(5, "Should include 2 expressions and 3 functions");
@@ -337,8 +353,8 @@ public void DefinitionInvokerParameters_Tests()
 
         // Act: Generate C# code and compile to assembly using ElmToolkit
         var elmToolkit = new ElmToolkit()
-            .AddElmLibraries([elmLibrary])
-            .CompileToAssemblies();
+                         .AddElmLibraries([elmLibrary])
+                         .CompileToAssemblies();
 
         var assemblyResult = elmToolkit.GetElmToAssemblyResults().First();
         var assemblyBinary = assemblyResult.assemblyBinary;
@@ -376,5 +392,4 @@ public void DefinitionInvokerParameters_Tests()
         keywordTestInvoker.Parameters[1].Name.Should().Be("ref", "Second parameter should preserve original CQL name even if it's a C# keyword");
         keywordTestInvoker.Parameters[2].Name.Should().Be("class", "Third parameter should preserve original CQL name even if it's a C# keyword");
     }
-
-}
+}

Cql/CoreTests/ValueSetTests.cs

@@ -93,7 +93,7 @@ public void HashDictonaryInternsCodes()
     [TestMethod]
     public void Intensional_Value_Set()
     {
-        var resolver = new DirectorySource(@"Input\ValueSets");
+        var resolver = new DirectorySource(Path.Combine("Input", "ValueSets"));
         var vsd = new ValueSetSource(resolver);
 
         Assert.IsTrue(vsd.TryGetCodesInValueSet("https://www.ncqa.org/fhir/valueset/2.16.840.1.113883.3.464.1004.1009", out var codes1009));
@@ -109,7 +109,7 @@ public void Intensional_Value_Set()
     [TestMethod]
     public void Intensional_Value_Set_2_Levels()
     {
-        var resolver = new DirectorySource(@"Input\ValueSets");
+        var resolver = new DirectorySource(Path.Combine("Input", "ValueSets"));
         var vsd = new ValueSetSource(resolver);
 
         Assert.IsTrue(vsd.TryGetCodesInValueSet("https://www.ncqa.org/fhir/valueset/2.16.840.1.113883.3.464.1004.1009", out var codes1009));
@@ -130,7 +130,7 @@ public void Intensional_Value_Set_2_Levels()
     [TestMethod]
     public void Intensional_Value_Set_Cycle()
     {
-        var resolver = new DirectorySource(@"Input\ValueSets");
+        var resolver = new DirectorySource(Path.Combine("Input", "ValueSets"));
         var vsd = new ValueSetSource(resolver);
 
         Assert.ThrowsException<TerminologyServiceException>(() => vsd.TryGetCodesInValueSet("https://www.ncqa.org/fhir/valueset/intensional-value-set-3", out _));