Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

697 34 clean up apis names and fluent behavior #709

Open
wants to merge 39 commits into
base: 580-PUBLIC-API
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
b324f3b
Quick and dirty Fhir packager api
baseTwo Jan 23, 2025
9494164
Remove ICqlApiInternal
baseTwo Jan 24, 2025
004464b
Remove IElmApiInternal
baseTwo Jan 24, 2025
fbb0dc3
Create special interface to access cql services for testing purposes
baseTwo Jan 27, 2025
549a2e7
Rename to CqlToolkit
baseTwo Jan 27, 2025
18567a4
Clean up cql and elm apis
baseTwo Jan 27, 2025
ae54a52
Build elm to csharp in release build
baseTwo Jan 27, 2025
dd6a011
cql
baseTwo Jan 27, 2025
51bd309
elm
baseTwo Jan 27, 2025
1d92ecb
Begin naming invocation api
baseTwo Jan 28, 2025
cd8cecb
renames
baseTwo Jan 28, 2025
0413951
renames
baseTwo Jan 28, 2025
7480ed8
split out toolkit for invokers
baseTwo Jan 28, 2025
8fb4af8
cleanu
baseTwo Jan 28, 2025
951a9f0
renames
baseTwo Jan 28, 2025
88f897e
move file
baseTwo Jan 28, 2025
576c6fe
Continue FHIR Packaging API
baseTwo Jan 28, 2025
492ef6b
seal classes
baseTwo Jan 28, 2025
4ce781e
renames
baseTwo Jan 28, 2025
7f83b18
.
baseTwo Jan 28, 2025
4ca464c
cleanup
baseTwo Jan 29, 2025
8501131
Move prototype demo in the API project.
baseTwo Jan 29, 2025
ffd2c2a
Remove generated files from prototype
baseTwo Jan 29, 2025
ed54751
Improve exception handling when adding cql
baseTwo Jan 29, 2025
842e607
Rename API project to CqlApiExamples
baseTwo Jan 29, 2025
913f19a
Remove experimental resource packaging for another PR. Remove config …
baseTwo Jan 29, 2025
5a90047
documentation
baseTwo Jan 29, 2025
4baff6e
Documentation
baseTwo Jan 29, 2025
b938abf
Fix compile error
baseTwo Jan 29, 2025
dafaab5
Add extensions for LibraryInvoker. Will be used in IntegrationRunner
baseTwo Jan 29, 2025
3cd214a
Use invoker toolkit in integration tests
baseTwo Jan 29, 2025
811c08d
Compiler
baseTwo Jan 29, 2025
d27beaa
.
baseTwo Jan 29, 2025
e295747
sm
baseTwo Jan 29, 2025
6be64a7
ouput cms dlls
baseTwo Jan 29, 2025
728c570
,
baseTwo Jan 29, 2025
d0eeaf5
sm
baseTwo Jan 29, 2025
5af414b
Copy CMS MEasures dlls into Integration test Runner repo
baseTwo Jan 30, 2025
020141c
.
baseTwo Jan 30, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ VSWorkspaceState.json
.idea/

# ReSharper Settings
*.DotSettings
*.DotSettings.user


Expand Down Expand Up @@ -408,4 +407,3 @@ VSCodeExtension/ncqa-cql-engine-workspace/test/*/*/results/*.json
/Demo/**/Resources/*.*
#remove global.json for testing dotnet sdk updates
global.json
/Cql/CqlSdkPrototype/generated
32 changes: 21 additions & 11 deletions Cql-Sdk-All.sln
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "50 CLI Packaging Tools", "5
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CqlSdkPrototype", "Cql\CqlSdkPrototype\CqlSdkPrototype.csproj", "{67D0864B-5682-E701-002E-587BEB5DA60F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "API", "Demo\API\API.csproj", "{C667CF52-C1E9-41C0-9723-C2DC46C21B46}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{360E03FF-3AA0-4619-ACCA-93E78265F6DD}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "60 Public API Prototype", "60 Public API Prototype", "{A474C299-9204-4344-B248-1F2FB2CF1830}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CqlApiExamples", "Demo\CqlApiExamples\CqlApiExamples.csproj", "{6165AC8C-733D-9679-5A47-978E61B742FB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cql", "Demo\Cql\Cql.csproj", "{A50AA2A0-7868-73A7-2E02-E810842576F9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -265,10 +269,14 @@ Global
{67D0864B-5682-E701-002E-587BEB5DA60F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{67D0864B-5682-E701-002E-587BEB5DA60F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{67D0864B-5682-E701-002E-587BEB5DA60F}.Release|Any CPU.Build.0 = Release|Any CPU
{C667CF52-C1E9-41C0-9723-C2DC46C21B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C667CF52-C1E9-41C0-9723-C2DC46C21B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C667CF52-C1E9-41C0-9723-C2DC46C21B46}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C667CF52-C1E9-41C0-9723-C2DC46C21B46}.Release|Any CPU.Build.0 = Release|Any CPU
{6165AC8C-733D-9679-5A47-978E61B742FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6165AC8C-733D-9679-5A47-978E61B742FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6165AC8C-733D-9679-5A47-978E61B742FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6165AC8C-733D-9679-5A47-978E61B742FB}.Release|Any CPU.Build.0 = Release|Any CPU
{A50AA2A0-7868-73A7-2E02-E810842576F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A50AA2A0-7868-73A7-2E02-E810842576F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A50AA2A0-7868-73A7-2E02-E810842576F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A50AA2A0-7868-73A7-2E02-E810842576F9}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -288,7 +296,7 @@ Global
{A252DF59-263B-46D9-A1E4-48E16D8D0DEC} = {F2ADD1CA-E231-4E88-B0EE-5C6885422629}
{399B718D-41C6-4DD9-A7E3-B9758CAAEB89} = {F2ADD1CA-E231-4E88-B0EE-5C6885422629}
{02DCA9CB-92A1-47C9-BF40-97DDD56DEFF3} = {D0F1B9D3-DD8C-4F25-B7AF-0C2EB4E17AC3}
{8FF55BB5-6004-4461-B8EA-19E9F41B970B} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
{8FF55BB5-6004-4461-B8EA-19E9F41B970B} = {F2ADD1CA-E231-4E88-B0EE-5C6885422629}
{50590B39-F376-4E96-92CF-67F84C149E86} = {97D67019-21A7-4591-A216-1B76BD0E68A4}
{FEF0C134-505D-4206-8630-569A6762F787} = {295F5788-3893-4794-A574-4B0A75A3A4BC}
{A7111722-6C8F-42AA-8CDD-732D34FB678A} = {85401759-2C64-414D-9882-4DB1EA41C2ED}
Expand All @@ -306,7 +314,7 @@ Global
{AF223BDF-576D-45FD-9A33-483BAFE1BB75} = {A2259B13-A115-4EA3-9DFB-5411DB88EA6F}
{BF2C14B3-EF9B-4BE9-A843-EAA05368BD5A} = {A2259B13-A115-4EA3-9DFB-5411DB88EA6F}
{F2ADD1CA-E231-4E88-B0EE-5C6885422629} = {4B5D75F5-E2FC-4CCB-90EF-6DC4A0193032}
{BF5D524C-0582-4471-BC79-B04B2D8DFCDB} = {295F5788-3893-4794-A574-4B0A75A3A4BC}
{BF5D524C-0582-4471-BC79-B04B2D8DFCDB} = {360E03FF-3AA0-4619-ACCA-93E78265F6DD}
{0E5F5704-5289-4C65-AD4E-364CD5F60C44} = {D33B7DF4-8AC5-47D1-A782-AC5078FFDEC7}
{2929117D-FB33-4BD6-8F20-4B623C114438} = {0E5F5704-5289-4C65-AD4E-364CD5F60C44}
{1AF2E4B2-99C5-4678-B926-D224CC83A8F7} = {D33B7DF4-8AC5-47D1-A782-AC5078FFDEC7}
Expand All @@ -317,11 +325,13 @@ Global
{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {B00E560D-AE0C-48E1-9013-57115AF05F41}
{85401759-2C64-414D-9882-4DB1EA41C2ED} = {B00E560D-AE0C-48E1-9013-57115AF05F41}
{295F5788-3893-4794-A574-4B0A75A3A4BC} = {4B5D75F5-E2FC-4CCB-90EF-6DC4A0193032}
{67D0864B-5682-E701-002E-587BEB5DA60F} = {295F5788-3893-4794-A574-4B0A75A3A4BC}
{C667CF52-C1E9-41C0-9723-C2DC46C21B46} = {7D787B73-D44A-4B65-B83F-4AF4A752F26C}
{67D0864B-5682-E701-002E-587BEB5DA60F} = {A474C299-9204-4344-B248-1F2FB2CF1830}
{A474C299-9204-4344-B248-1F2FB2CF1830} = {4B5D75F5-E2FC-4CCB-90EF-6DC4A0193032}
{6165AC8C-733D-9679-5A47-978E61B742FB} = {A474C299-9204-4344-B248-1F2FB2CF1830}
{A50AA2A0-7868-73A7-2E02-E810842576F9} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
FileExplorer = |build\|docs\|LibrarySets\|submodules\Firely.Cql.Sdk.Integration.Runner\NodeJsUtils\
SolutionGuid = {366252DE-C2FB-4EAC-96EE-22210BD43DE2}
FileExplorer = |build\|docs\|LibrarySets\|submodules\Firely.Cql.Sdk.Integration.Runner\NodeJsUtils\
EndGlobalSection
EndGlobal
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
namespace Hl7.Cql.CodeGeneration.NET;

/// <summary>
/// Stores information about a dynamically generated assembly.
/// Contains the binary data for an assembly, and optionally its debug symbols.
/// </summary>
/// <param name="AssemblyBytes">This assembly's binary data.</param>
/// <param name="DebugSymbolsBytes">The assembly's debug symbols in binary data.</param>
public record AssemblyData(
/// <param name="DebugSymbolsBytes">The assembly's debug symbols.</param>
public record AssemblyBinary(
byte[]? AssemblyBytes,
byte[]? DebugSymbolsBytes = null)
{
/// <summary>
/// An empty instance of <see cref="AssemblyData"/>.
/// An empty instance of <see cref="AssemblyBinary"/>.
/// </summary>
public static AssemblyData Default { get; } = new(null!, null!);
public static AssemblyBinary Default { get; } = new(null!, null!);
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@
namespace Hl7.Cql.CodeGeneration.NET;

/// <summary>
/// Extension methods for <see cref="AssemblyData"/>.
/// Extension methods for <see cref="AssemblyBinary"/>.
/// </summary>
public static class AssemblyDataExtensions
public static class AssemblyBinaryExtensions
{
/// <summary>
/// Writes the assembly data to disk.
/// </summary>
/// <param name="self">The assembly data to write.</param>
/// <param name="assemblyFile">The path to write the assembly to.</param>
/// <param name="debugSymbolsFile">The path to write the debug symbols to.</param>
public static TAssemblyData SaveToFiles<TAssemblyData>(
this TAssemblyData self,
public static TAssemblyBinary SaveToFile<TAssemblyBinary>(
this TAssemblyBinary self,
FileInfo? assemblyFile = null,
FileInfo? debugSymbolsFile = null)
where TAssemblyData : AssemblyData
where TAssemblyBinary : AssemblyBinary
{
if (assemblyFile is { } asmFile && self.AssemblyBytes is { Length: > 0 } asmBytes)
{
Expand All @@ -43,16 +43,16 @@ public static TAssemblyData SaveToFiles<TAssemblyData>(
/// <summary>
/// Loads assembly data from files and returns a new instance.
/// </summary>
/// <typeparam name="TAssemblyData"></typeparam>
/// <typeparam name="TAssemblyBinary"></typeparam>
/// <param name="self">The assembly data to start from</param>
/// <param name="assemblyFile">The path to read the assembly from.</param>
/// <param name="debugSymbolsFile">The path to read the debug symbols from.</param>
/// <returns></returns>
public static TAssemblyData LoadFromFiles<TAssemblyData>(
this TAssemblyData self,
public static TAssemblyBinary LoadFromFile<TAssemblyBinary>(
this TAssemblyBinary self,
FileInfo? assemblyFile = null,
FileInfo? debugSymbolsFile = null)
where TAssemblyData : AssemblyData
where TAssemblyBinary : AssemblyBinary
{
var assemblyBytes = assemblyFile is {} f1 ? File.ReadAllBytes(f1.FullName) : self.AssemblyBytes;
var debugSymbolsBytes = debugSymbolsFile is {} f2 ? File.ReadAllBytes(f2.FullName) : self.DebugSymbolsBytes;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,24 @@ namespace Hl7.Cql.CodeGeneration.NET;
/// <param name="AssemblyBytes">This assembly's binary data.</param>
/// <param name="SourceCode">The collection of source code files that contributed to this assembly.</param>
/// <param name="DebugSymbolsBytes">The assembly's debug symbols in binary data.</param>
internal record AssemblyDataWithSourceCode(
internal record AssemblyBinaryWithSourceCode(
byte[]? AssemblyBytes,
IReadOnlyDictionary<string, string>? SourceCode,
byte[]? DebugSymbolsBytes = null) : AssemblyData(AssemblyBytes, DebugSymbolsBytes)
byte[]? DebugSymbolsBytes = null) : AssemblyBinary(AssemblyBytes, DebugSymbolsBytes)
{
/// <summary>
/// An empty instance of <see cref="AssemblyDataWithSourceCode"/>.
/// An empty instance of <see cref="AssemblyBinaryWithSourceCode"/>.
/// </summary>
public new static AssemblyDataWithSourceCode Default { get; } = new(null, null, null);
public new static AssemblyBinaryWithSourceCode Default { get; } = new(null, null, null);

/// <summary>
/// Initializes a new instance of the <see cref="AssemblyDataWithSourceCode"/> class.
/// Initializes a new instance of the <see cref="AssemblyBinaryWithSourceCode"/> class.
/// </summary>
/// <param name="assemblyBytes">This assembly's binary data.</param>
/// <param name="sourceCodeFileName"></param>
/// <param name="sourceCode"></param>
/// <param name="debugSymbolsBytes">The assembly's debug symbols in binary data.</param>
public AssemblyDataWithSourceCode(
public AssemblyBinaryWithSourceCode(
byte[]? assemblyBytes,
string? sourceCodeFileName,
string? sourceCode,
Expand Down
14 changes: 7 additions & 7 deletions Cql/CodeGeneration.NET/AssemblyCompiler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ public AssemblyCompiler(TypeResolver typeResolver)
});
}

public IEnumerable<(Library library, Func<AssemblyDataWithSourceCode> generateAssemblyDataWithSourceCode)> CompileDeferred(
public IEnumerable<(Library library, Func<AssemblyBinaryWithSourceCode> generateAssemblyBinaryWithSourceCode)> CompileDeferred(
LibrarySet librarySet,
IEnumerable<(Library Library, string CSharp)> input,
AssemblyCompilerDebugInformationFormat debugInformationFormat = AssemblyCompilerDebugInformationFormat.None)
{
Dictionary<string, AssemblyDataWithSourceCode> results = new();
Dictionary<string, AssemblyBinaryWithSourceCode> results = new();
Assembly[] assemblyReferences = _referencesLazy.Value;
foreach (var (library, cSharp) in input)
yield return (library, () =>
Expand All @@ -74,9 +74,9 @@ private static CSharpCompilationOptions CreateCSharpCompilationOptions(
sourceReferenceResolver: new SourceFileResolver(ImmutableArray<string>.Empty, null)
);

private AssemblyDataWithSourceCode CompileNode(
private AssemblyBinaryWithSourceCode CompileNode(
string librarySourceString,
Dictionary<string, AssemblyDataWithSourceCode> assemblies,
Dictionary<string, AssemblyBinaryWithSourceCode> assemblies,
LibrarySet librarySet,
Library library,
IEnumerable<Assembly> assemblyReferences,
Expand Down Expand Up @@ -152,7 +152,7 @@ private AssemblyDataWithSourceCode CompileNode(
}
var bytes = codeStream.ToArray();
var debugSymbols = pdbStream?.ToArray();
var asmData = new AssemblyDataWithSourceCode(bytes, new Dictionary<string, string> { { libraryVersionedIdentifier!, librarySourceString }}, debugSymbols);
var asmData = new AssemblyBinaryWithSourceCode(bytes, new Dictionary<string, string> { { libraryVersionedIdentifier!, librarySourceString }}, debugSymbols);
return asmData;
}

Expand Down Expand Up @@ -231,15 +231,15 @@ private static void AddNetCoreReferences(List<MetadataReference> metadataReferen

internal static class AssemblyCompilerExtensions
{
public static IEnumerable<(Library library, AssemblyDataWithSourceCode assemblyDataWithSourceCode)> Compile(
public static IEnumerable<(Library library, AssemblyBinaryWithSourceCode assemblyBinaryWithSourceCode)> Compile(
this AssemblyCompiler compiler,
LibrarySet librarySet,
IEnumerable<(Library Library, string CSharp)> input,
AssemblyCompilerDebugInformationFormat debugInformationFormat = AssemblyCompilerDebugInformationFormat.None)
{
return compiler
.CompileDeferred(librarySet, input, debugInformationFormat)
.Select(x => (x.library, x.generateAssemblyDataWithSourceCode()));
.Select(x => (x.library, x.generateAssemblyBinaryWithSourceCode()));
}

}
Expand Down
42 changes: 21 additions & 21 deletions Cql/CodeGeneration.NET/PublicAPI.Unshipped.txt
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
#nullable enable
Hl7.Cql.CodeGeneration.NET.AssemblyBinary
Hl7.Cql.CodeGeneration.NET.AssemblyBinary.AssemblyBinary(byte[]? AssemblyBytes, byte[]? DebugSymbolsBytes = null) -> void
Hl7.Cql.CodeGeneration.NET.AssemblyBinary.AssemblyBinary(Hl7.Cql.CodeGeneration.NET.AssemblyBinary! original) -> void
Hl7.Cql.CodeGeneration.NET.AssemblyBinary.AssemblyBytes.get -> byte[]?
Hl7.Cql.CodeGeneration.NET.AssemblyBinary.AssemblyBytes.init -> void
Hl7.Cql.CodeGeneration.NET.AssemblyBinary.DebugSymbolsBytes.get -> byte[]?
Hl7.Cql.CodeGeneration.NET.AssemblyBinary.DebugSymbolsBytes.init -> void
Hl7.Cql.CodeGeneration.NET.AssemblyBinary.Deconstruct(out byte[]? AssemblyBytes, out byte[]? DebugSymbolsBytes) -> void
Hl7.Cql.CodeGeneration.NET.AssemblyCompilerDebugInformationFormat
Hl7.Cql.CodeGeneration.NET.AssemblyCompilerDebugInformationFormat.Embedded = 3 -> Hl7.Cql.CodeGeneration.NET.AssemblyCompilerDebugInformationFormat
Hl7.Cql.CodeGeneration.NET.AssemblyCompilerDebugInformationFormat.None = 0 -> Hl7.Cql.CodeGeneration.NET.AssemblyCompilerDebugInformationFormat
Hl7.Cql.CodeGeneration.NET.AssemblyCompilerDebugInformationFormat.PortablePdb = 2 -> Hl7.Cql.CodeGeneration.NET.AssemblyCompilerDebugInformationFormat
Hl7.Cql.CodeGeneration.NET.AssemblyData
Hl7.Cql.CodeGeneration.NET.AssemblyData.AssemblyBytes.get -> byte[]?
Hl7.Cql.CodeGeneration.NET.AssemblyData.AssemblyBytes.init -> void
Hl7.Cql.CodeGeneration.NET.AssemblyData.AssemblyData(byte[]? AssemblyBytes, byte[]? DebugSymbolsBytes = null) -> void
Hl7.Cql.CodeGeneration.NET.AssemblyData.AssemblyData(Hl7.Cql.CodeGeneration.NET.AssemblyData! original) -> void
Hl7.Cql.CodeGeneration.NET.AssemblyData.DebugSymbolsBytes.get -> byte[]?
Hl7.Cql.CodeGeneration.NET.AssemblyData.DebugSymbolsBytes.init -> void
Hl7.Cql.CodeGeneration.NET.AssemblyData.Deconstruct(out byte[]? AssemblyBytes, out byte[]? DebugSymbolsBytes) -> void
Hl7.Cql.CodeGeneration.NET.AssemblyDataExtensions
override Hl7.Cql.CodeGeneration.NET.AssemblyData.Equals(object? obj) -> bool
override Hl7.Cql.CodeGeneration.NET.AssemblyData.GetHashCode() -> int
override Hl7.Cql.CodeGeneration.NET.AssemblyData.ToString() -> string!
static Hl7.Cql.CodeGeneration.NET.AssemblyData.Default.get -> Hl7.Cql.CodeGeneration.NET.AssemblyData!
static Hl7.Cql.CodeGeneration.NET.AssemblyData.operator !=(Hl7.Cql.CodeGeneration.NET.AssemblyData? left, Hl7.Cql.CodeGeneration.NET.AssemblyData? right) -> bool
static Hl7.Cql.CodeGeneration.NET.AssemblyData.operator ==(Hl7.Cql.CodeGeneration.NET.AssemblyData? left, Hl7.Cql.CodeGeneration.NET.AssemblyData? right) -> bool
static Hl7.Cql.CodeGeneration.NET.AssemblyDataExtensions.LoadFromFiles<TAssemblyData>(this TAssemblyData! self, System.IO.FileInfo? assemblyFile = null, System.IO.FileInfo? debugSymbolsFile = null) -> TAssemblyData!
static Hl7.Cql.CodeGeneration.NET.AssemblyDataExtensions.SaveToFiles<TAssemblyData>(this TAssemblyData! self, System.IO.FileInfo? assemblyFile = null, System.IO.FileInfo? debugSymbolsFile = null) -> TAssemblyData!
virtual Hl7.Cql.CodeGeneration.NET.AssemblyData.<Clone>$() -> Hl7.Cql.CodeGeneration.NET.AssemblyData!
virtual Hl7.Cql.CodeGeneration.NET.AssemblyData.EqualityContract.get -> System.Type!
virtual Hl7.Cql.CodeGeneration.NET.AssemblyData.Equals(Hl7.Cql.CodeGeneration.NET.AssemblyData? other) -> bool
virtual Hl7.Cql.CodeGeneration.NET.AssemblyData.PrintMembers(System.Text.StringBuilder! builder) -> bool
Hl7.Cql.CodeGeneration.NET.AssemblyBinaryExtensions
override Hl7.Cql.CodeGeneration.NET.AssemblyBinary.Equals(object? obj) -> bool
override Hl7.Cql.CodeGeneration.NET.AssemblyBinary.GetHashCode() -> int
override Hl7.Cql.CodeGeneration.NET.AssemblyBinary.ToString() -> string!
static Hl7.Cql.CodeGeneration.NET.AssemblyBinary.Default.get -> Hl7.Cql.CodeGeneration.NET.AssemblyBinary!
static Hl7.Cql.CodeGeneration.NET.AssemblyBinary.operator !=(Hl7.Cql.CodeGeneration.NET.AssemblyBinary? left, Hl7.Cql.CodeGeneration.NET.AssemblyBinary? right) -> bool
static Hl7.Cql.CodeGeneration.NET.AssemblyBinary.operator ==(Hl7.Cql.CodeGeneration.NET.AssemblyBinary? left, Hl7.Cql.CodeGeneration.NET.AssemblyBinary? right) -> bool
static Hl7.Cql.CodeGeneration.NET.AssemblyBinaryExtensions.LoadFromFile<TAssemblyBinary>(this TAssemblyBinary! self, System.IO.FileInfo? assemblyFile = null, System.IO.FileInfo? debugSymbolsFile = null) -> TAssemblyBinary!
static Hl7.Cql.CodeGeneration.NET.AssemblyBinaryExtensions.SaveToFile<TAssemblyBinary>(this TAssemblyBinary! self, System.IO.FileInfo? assemblyFile = null, System.IO.FileInfo? debugSymbolsFile = null) -> TAssemblyBinary!
virtual Hl7.Cql.CodeGeneration.NET.AssemblyBinary.<Clone>$() -> Hl7.Cql.CodeGeneration.NET.AssemblyBinary!
virtual Hl7.Cql.CodeGeneration.NET.AssemblyBinary.EqualityContract.get -> System.Type!
virtual Hl7.Cql.CodeGeneration.NET.AssemblyBinary.Equals(Hl7.Cql.CodeGeneration.NET.AssemblyBinary? other) -> bool
virtual Hl7.Cql.CodeGeneration.NET.AssemblyBinary.PrintMembers(System.Text.StringBuilder! builder) -> bool
4 changes: 2 additions & 2 deletions Cql/CoreTests/ExpressionBuilderContextTests.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using CqlSdkPrototype.Elm;
using CqlSdkPrototype.Elm.Internal;
using Hl7.Cql.Abstractions;
using Hl7.Cql.Compiler;
using Hl7.Cql.Runtime.Hosting;
Expand All @@ -13,7 +13,7 @@ public class ExpressionBuilderContextTests
[TestMethod]
public void Get_Property_Uses_TypeResolver()
{
using var serviceProvider = ElmApiState.AddCqlCompilerServices(new ServiceCollection().AddDebugLogging()).BuildServiceProvider(validateScopes: true);
using var serviceProvider = ElmToAssemblyProcessorServices.AddCqlCompilerServices(new ServiceCollection().AddDebugLogging()).BuildServiceProvider(validateScopes: true);
var property = ExpressionBuilderContext.GetProperty(typeof(MeasureReport.PopulationComponent), "id", serviceProvider.GetRequiredService<TypeResolver>())!;
Assert.AreEqual(typeof(Element), property.DeclaringType);
Assert.AreEqual(nameof(Element.ElementId), property.Name);
Expand Down
4 changes: 2 additions & 2 deletions Cql/CoreTests/ExpressionBuilderTests.cs
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
using Hl7.Fhir.Model;
using CqlSdkPrototype.Elm;
using Hl7.Cql.Compiler;
using Hl7.Cql.Runtime.Hosting;
using CqlSdkPrototype.Elm.Internal;

namespace CoreTests
{
[TestClass]
public class LibraryExpressionBuilderTests
{
private static ServiceProvider BuildServiceProvider() => ElmApiState.AddCqlCompilerServices(new ServiceCollection().AddDebugLogging()).BuildServiceProvider(validateScopes: true);
private static ServiceProvider BuildServiceProvider() => ElmToAssemblyProcessorServices.AddCqlCompilerServices(new ServiceCollection().AddDebugLogging()).BuildServiceProvider(validateScopes: true);

[TestMethod]
public void AggregateQueries_1_0_0()
Expand Down
Loading