Merge branch 'develop-2.0' into docs/packagerReadme

FirelyTeam · Sep 24, 2024 · 40b35d2 · 40b35d2
2 parents 755978d + afa28b1
commit 40b35d2
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 4 deletions.
diff --git a/Cql/CoreTests/CoreTests.csproj b/Cql/CoreTests/CoreTests.csproj
@@ -35,7 +35,7 @@
 		<ProjectReference Include="..\Cql.Model\Cql.Model.csproj" />
 		<ProjectReference Include="..\Cql.Packaging\Cql.Packaging.csproj" />
 		<ProjectReference Include="..\Cql.Runtime\Cql.Runtime.csproj" />
-		<ProjectReference Include="..\ELM\ELM.csproj" />
+		<ProjectReference Include="..\Elm\Elm.csproj" />
 		<ProjectReference Include="..\Iso8601\Iso8601.csproj" />
 	</ItemGroup>
 

diff --git a/Cql/Cql.Compiler/Cql.Compiler.csproj b/Cql/Cql.Compiler/Cql.Compiler.csproj
@@ -20,7 +20,7 @@
 		<ProjectReference Include="..\Cql.Operators\Cql.Operators.csproj" />
 		<ProjectReference Include="..\Cql.ValueSets\Cql.ValueSets.csproj" />
 		<ProjectReference Include="..\Cql.Runtime\Cql.Runtime.csproj" />
-		<ProjectReference Include="..\ELM\ELM.csproj" />
+		<ProjectReference Include="..\Elm\Elm.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/Cql/Cql.CqlToElm/CqlToElmConverter.cs b/Cql/Cql.CqlToElm/CqlToElmConverter.cs
@@ -13,18 +13,27 @@ namespace Hl7.Cql.CqlToElm
     /// <summary>
     /// Converts CQL To ELM.
     /// </summary>
-    internal class CqlToElmConverter
+    public class CqlToElmConverter
     {
+        /// <summary>
+        /// Converts CQL To ELM.
+        /// </summary>
         public CqlToElmConverter(IServiceProvider services,
             ILogger<CqlToElmConverter> logger)
         {
             Services = services;
             Logger = logger;
         }
 
+        /// <summary>
+        /// CQL to Elm IServiceProvider
+        /// </summary>
         public IServiceProvider Services { get; }
+        /// <summary>
+        /// CQL to Elm Logger
+        /// </summary>
         public ILogger<CqlToElmConverter> Logger { get; }
-
+            
         /// <summary>
         /// Converts the CQL contained in <paramref name="cqlLibrary"/> to an ELM <see cref="Library"/>.
         /// </summary>

diff --git a/Cql/Cql.CqlToElm/PublicAPI.Unshipped.txt b/Cql/Cql.CqlToElm/PublicAPI.Unshipped.txt
@@ -3,6 +3,13 @@ Hl7.Cql.CqlToElm.AmbiguousTypeBehavior
 Hl7.Cql.CqlToElm.AmbiguousTypeBehavior.Error = 0 -> Hl7.Cql.CqlToElm.AmbiguousTypeBehavior
 Hl7.Cql.CqlToElm.AmbiguousTypeBehavior.PreferModel = 2 -> Hl7.Cql.CqlToElm.AmbiguousTypeBehavior
 Hl7.Cql.CqlToElm.AmbiguousTypeBehavior.PreferSystem = 1 -> Hl7.Cql.CqlToElm.AmbiguousTypeBehavior
+Hl7.Cql.CqlToElm.CqlToElmConverter
+Hl7.Cql.CqlToElm.CqlToElmConverter.ConvertLibrary(string! cql) -> Hl7.Cql.Elm.Library!
+Hl7.Cql.CqlToElm.CqlToElmConverter.ConvertLibrary(System.IO.Stream! cqlLibrary) -> Hl7.Cql.Elm.Library!
+Hl7.Cql.CqlToElm.CqlToElmConverter.ConvertLibrary(System.IO.TextReader! cqlLibrary) -> Hl7.Cql.Elm.Library!
+Hl7.Cql.CqlToElm.CqlToElmConverter.CqlToElmConverter(System.IServiceProvider! services, Microsoft.Extensions.Logging.ILogger<Hl7.Cql.CqlToElm.CqlToElmConverter!>! logger) -> void
+Hl7.Cql.CqlToElm.CqlToElmConverter.Logger.get -> Microsoft.Extensions.Logging.ILogger<Hl7.Cql.CqlToElm.CqlToElmConverter!>!
+Hl7.Cql.CqlToElm.CqlToElmConverter.Services.get -> System.IServiceProvider!
 Hl7.Cql.CqlToElm.CqlToElmOptions
 Hl7.Cql.CqlToElm.CqlToElmOptions.AllowNullIntervals.get -> bool?
 Hl7.Cql.CqlToElm.CqlToElmOptions.AllowNullIntervals.set -> void

diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml
@@ -23,6 +23,7 @@ trigger:
     - develop-2.0*
     - release*
     - refs/tags/v*
+    - spike*
 
 stages:
 - stage: build