Skip to content

Commit

Permalink
Merge pull request #739 from FirelyTeam/738-47-reduce-amount-of-proje…
Browse files Browse the repository at this point in the history 
…ctspackages-internalize-types-as-much-as-possible

738 47 reduce amount of projects packages
  • Loading branch information
@ewoutkramer
ewoutkramer authored Feb 21, 2025
2 parents c8538d5 + 2d8d68e commit ce60b0a
Show file tree
Hide file tree
Showing 163 changed files with 6,168 additions and 6,683 deletions.
42 changes: 0 additions & 42 deletions Cql-Sdk-All.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elm", "Cql\Elm\Elm.csproj",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Iso8601", "Cql\Iso8601\Iso8601.csproj", "{AB8DB957-28A1-4D39-B924-F8E3E39020E4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cql.Comparers", "Cql\Cql.Comparers\Cql.Comparers.csproj", "{53FC6D68-1234-4395-B2F3-DB9918046053}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cql.Primitives", "Cql\Cql.Primitives\Cql.Primitives.csproj", "{AF505677-1DBE-4268-B6A8-658ABF784F8A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cql.Conversion", "Cql\Cql.Conversion\Cql.Conversion.csproj", "{225B212A-F4EE-4828-96C0-92A7117BA1C1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cql.Operators", "Cql\Cql.Operators\Cql.Operators.csproj", "{3C71FE17-2A9B-40D1-AABF-E4C70165C6C4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cql.ValueSets", "Cql\Cql.ValueSets\Cql.ValueSets.csproj", "{A1F3DE53-D965-4398-AE84-1B066626CDC3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeGeneration.NET", "Cql\CodeGeneration.NET\CodeGeneration.NET.csproj", "{4B05E790-92F8-4F2A-9DF2-B77FDF22B28E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cql.Runtime", "Cql\Cql.Runtime\Cql.Runtime.csproj", "{0BDEB106-877A-40C3-A9DB-6A604F8D873A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cql.Compiler", "Cql\Cql.Compiler\Cql.Compiler.csproj", "{3FEBF95F-0C04-4600-ACD8-7495C24A7908}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cql.Logging", "Cql\Cql.Logging\Cql.Logging.csproj", "{EFE8FB49-8AC1-4C13-93DF-76F2B79CE034}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cql.Model", "Cql\Cql.Model\Cql.Model.csproj", "{A252DF59-263B-46D9-A1E4-48E16D8D0DEC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cql.Firely", "Cql\Cql.Firely\Cql.Firely.csproj", "{399B718D-41C6-4DD9-A7E3-B9758CAAEB89}"
Expand Down Expand Up @@ -147,26 +135,6 @@ Global
{AB8DB957-28A1-4D39-B924-F8E3E39020E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AB8DB957-28A1-4D39-B924-F8E3E39020E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AB8DB957-28A1-4D39-B924-F8E3E39020E4}.Release|Any CPU.Build.0 = Release|Any CPU
{53FC6D68-1234-4395-B2F3-DB9918046053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{53FC6D68-1234-4395-B2F3-DB9918046053}.Debug|Any CPU.Build.0 = Debug|Any CPU
{53FC6D68-1234-4395-B2F3-DB9918046053}.Release|Any CPU.ActiveCfg = Release|Any CPU
{53FC6D68-1234-4395-B2F3-DB9918046053}.Release|Any CPU.Build.0 = Release|Any CPU
{AF505677-1DBE-4268-B6A8-658ABF784F8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AF505677-1DBE-4268-B6A8-658ABF784F8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AF505677-1DBE-4268-B6A8-658ABF784F8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AF505677-1DBE-4268-B6A8-658ABF784F8A}.Release|Any CPU.Build.0 = Release|Any CPU
{225B212A-F4EE-4828-96C0-92A7117BA1C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{225B212A-F4EE-4828-96C0-92A7117BA1C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{225B212A-F4EE-4828-96C0-92A7117BA1C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{225B212A-F4EE-4828-96C0-92A7117BA1C1}.Release|Any CPU.Build.0 = Release|Any CPU
{3C71FE17-2A9B-40D1-AABF-E4C70165C6C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3C71FE17-2A9B-40D1-AABF-E4C70165C6C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3C71FE17-2A9B-40D1-AABF-E4C70165C6C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3C71FE17-2A9B-40D1-AABF-E4C70165C6C4}.Release|Any CPU.Build.0 = Release|Any CPU
{A1F3DE53-D965-4398-AE84-1B066626CDC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A1F3DE53-D965-4398-AE84-1B066626CDC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A1F3DE53-D965-4398-AE84-1B066626CDC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A1F3DE53-D965-4398-AE84-1B066626CDC3}.Release|Any CPU.Build.0 = Release|Any CPU
{4B05E790-92F8-4F2A-9DF2-B77FDF22B28E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4B05E790-92F8-4F2A-9DF2-B77FDF22B28E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4B05E790-92F8-4F2A-9DF2-B77FDF22B28E}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -179,10 +147,6 @@ Global
{3FEBF95F-0C04-4600-ACD8-7495C24A7908}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3FEBF95F-0C04-4600-ACD8-7495C24A7908}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3FEBF95F-0C04-4600-ACD8-7495C24A7908}.Release|Any CPU.Build.0 = Release|Any CPU
{EFE8FB49-8AC1-4C13-93DF-76F2B79CE034}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EFE8FB49-8AC1-4C13-93DF-76F2B79CE034}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EFE8FB49-8AC1-4C13-93DF-76F2B79CE034}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EFE8FB49-8AC1-4C13-93DF-76F2B79CE034}.Release|Any CPU.Build.0 = Release|Any CPU
{A252DF59-263B-46D9-A1E4-48E16D8D0DEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A252DF59-263B-46D9-A1E4-48E16D8D0DEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A252DF59-263B-46D9-A1E4-48E16D8D0DEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -286,15 +250,9 @@ Global
GlobalSection(NestedProjects) = preSolution
{78C3855A-EEE7-4283-BE5F-71F3E3677C11} = {A2259B13-A115-4EA3-9DFB-5411DB88EA6F}
{AB8DB957-28A1-4D39-B924-F8E3E39020E4} = {D0F1B9D3-DD8C-4F25-B7AF-0C2EB4E17AC3}
{53FC6D68-1234-4395-B2F3-DB9918046053} = {D0F1B9D3-DD8C-4F25-B7AF-0C2EB4E17AC3}
{AF505677-1DBE-4268-B6A8-658ABF784F8A} = {D0F1B9D3-DD8C-4F25-B7AF-0C2EB4E17AC3}
{225B212A-F4EE-4828-96C0-92A7117BA1C1} = {D0F1B9D3-DD8C-4F25-B7AF-0C2EB4E17AC3}
{3C71FE17-2A9B-40D1-AABF-E4C70165C6C4} = {D0F1B9D3-DD8C-4F25-B7AF-0C2EB4E17AC3}
{A1F3DE53-D965-4398-AE84-1B066626CDC3} = {D0F1B9D3-DD8C-4F25-B7AF-0C2EB4E17AC3}
{4B05E790-92F8-4F2A-9DF2-B77FDF22B28E} = {39731466-DC8C-4FB2-A4D3-C4212A87700A}
{0BDEB106-877A-40C3-A9DB-6A604F8D873A} = {D0F1B9D3-DD8C-4F25-B7AF-0C2EB4E17AC3}
{3FEBF95F-0C04-4600-ACD8-7495C24A7908} = {39731466-DC8C-4FB2-A4D3-C4212A87700A}
{EFE8FB49-8AC1-4C13-93DF-76F2B79CE034} = {D0F1B9D3-DD8C-4F25-B7AF-0C2EB4E17AC3}
{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}
Expand Down
7 changes: 1 addition & 6 deletions Cql-Sdk.slnf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,15 @@
"Cql\\CodeGeneration.NET\\CodeGeneration.NET.csproj",
"Cql\\CoreTests\\CoreTests.csproj",
"Cql\\Cql.Abstractions\\Cql.Abstractions.csproj",
"Cql\\Cql.Comparers\\Cql.Comparers.csproj",
"Cql\\Cql.Compiler\\Cql.Compiler.csproj",
"Cql\\Cql.Conversion\\Cql.Conversion.csproj",
"Cql\\Cql.CqlToElm\\Cql.CqlToElm.csproj",
"Cql\\Cql.Firely\\Cql.Firely.csproj",
"Cql\\Cql.Grammar\\Cql.Grammar.csproj",
"Cql\\Cql.Logging\\Cql.Logging.csproj",
"Cql\\Cql.Model\\Cql.Model.csproj",
"Cql\\Cql.Operators\\Cql.Operators.csproj",
"Cql\\Cql.Packaging\\Cql.Packaging.csproj",
"Cql\\Cql.Primitives\\Cql.Primitives.csproj",
"Cql\\Cql.Runtime\\Cql.Runtime.csproj",
"Cql\\Cql.ValueSets\\Cql.ValueSets.csproj",
"Cql\\CqlToElmTests\\CqlToElmTests.csproj",
"Cql\\Cql.Invocation\\Cql.Invocation.csproj",
"Cql\\Cql\\Cql.csproj",
"Cql\\Elm\\Elm.csproj",
"Cql\\Iso8601\\Iso8601.csproj",
Expand Down
8 changes: 1 addition & 7 deletions Cql/CodeGeneration.NET/AssemblyCompiler.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
using Hl7.Cql.Abstractions;
using Hl7.Cql.Compiler;
using Hl7.Cql.Runtime;
using Hl7.Cql.ValueSets;
using Hl7.Cql.Elm;

namespace Hl7.Cql.CodeGeneration.NET
Expand All @@ -29,14 +28,9 @@ public AssemblyCompiler(TypeResolver typeResolver)
{ // @formatter off

// Core engine references
typeof(Iso8601.DateIso8601), // Iso8601
typeof(CqlDeclarationAttribute), // Cql.Abstractions
typeof(Comparers.CqlComparers), // Cql.Comparers
typeof(Conversion.IUnitConverter), // Cql.Conversion
typeof(Operators.ICqlOperators), // Cql.Operators
typeof(Primitives.CqlPrimitiveType), // Cql.Primitives
typeof(CqlContext), // Cql.Runtime
typeof(IValueSetDictionary), // Cql.ValueSets
typeof(Iso8601.DateIso8601), // Iso8601

} // @formatter on
.Select(type => type.Assembly)
Expand Down
0 ...l.Abstractions/CqlDeclarationAttribute.cs → ...s/Abstractions/CqlDeclarationAttribute.cs
View file
File renamed without changes.
0 Cql/Cql.Abstractions/CqlLibraryAttribute.cs → ...tions/Abstractions/CqlLibraryAttribute.cs
View file
File renamed without changes.
0 Cql/Cql.Abstractions/CqlTagAttribute.cs → ...tractions/Abstractions/CqlTagAttribute.cs
View file
File renamed without changes.
0 Cql/Cql.Abstractions/CqlValueSetAttribute.cs → ...ions/Abstractions/CqlValueSetAttribute.cs
View file
File renamed without changes.
0 ...ractions/Exceptions/CqlErrorExtensions.cs → ...ractions/Exceptions/CqlErrorExtensions.cs
View file
File renamed without changes.
0 ...l.Abstractions/Exceptions/CqlException.cs → ...s/Abstractions/Exceptions/CqlException.cs
View file
File renamed without changes.
0 Cql/Cql.Abstractions/Exceptions/Errors.cs → ...actions/Abstractions/Exceptions/Errors.cs
View file
File renamed without changes.
0 Cql/Cql.Abstractions/Exceptions/ICqlError.cs → ...ions/Abstractions/Exceptions/ICqlError.cs
View file
File renamed without changes.
0 Cql/Cql.Abstractions/Hasher.cs → Cql/Cql.Abstractions/Abstractions/Hasher.cs
View file
File renamed without changes.
0 Cql/Cql.Abstractions/ICqlComparable.cs → ...stractions/Abstractions/ICqlComparable.cs
View file
File renamed without changes.
0 Cql/Cql.Abstractions/ICqlComparer.cs → ...Abstractions/Abstractions/ICqlComparer.cs
View file
File renamed without changes.
0 Cql/Cql.Abstractions/IEquivalenceComparer.cs → ...ions/Abstractions/IEquivalenceComparer.cs
View file
File renamed without changes.
0 Cql/Cql.Abstractions/IEquivalentable.cs → ...tractions/Abstractions/IEquivalentable.cs
View file
File renamed without changes.
0 Cql/Cql.Abstractions/ILibrary.cs → ...Cql.Abstractions/Abstractions/ILibrary.cs
View file
File renamed without changes.
0 Cql/Cql.Abstractions/ISingleton.cs → ...l.Abstractions/Abstractions/ISingleton.cs
View file
File renamed without changes.
0 ...actions/Infrastructure/CSharpFormatter.cs → ...actions/Infrastructure/CSharpFormatter.cs
View file
File renamed without changes.
0 ....Abstractions/Infrastructure/Comparers.cs → .../Abstractions/Infrastructure/Comparers.cs
View file
File renamed without changes.
0 ...ns/Infrastructure/DictionaryExtensions.cs → ...ns/Infrastructure/DictionaryExtensions.cs
View file
File renamed without changes.
0 ...ns/Infrastructure/EnumerableExtensions.cs → ...ns/Infrastructure/EnumerableExtensions.cs
View file
File renamed without changes.
0 ...ractions/Infrastructure/TypeExtensions.cs → ...ractions/Infrastructure/TypeExtensions.cs
View file
File renamed without changes.
0 Cql/Cql.Abstractions/Mutator.cs → Cql/Cql.Abstractions/Abstractions/Mutator.cs
View file
File renamed without changes.
0 Cql/Cql.Abstractions/TypeResolver.cs → ...Abstractions/Abstractions/TypeResolver.cs
View file
File renamed without changes.
0 Cql/Cql.Abstractions/UCUMUnits.cs → ...ql.Abstractions/Abstractions/UCUMUnits.cs
View file
File renamed without changes.
0 Cql/Cql.Abstractions/Units.cs → Cql/Cql.Abstractions/Abstractions/Units.cs
View file
File renamed without changes.
3 changes: 1 addition & 2 deletions Cql/Cql.Abstractions/Cql.Abstractions.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<PropertyGroup>
<AssemblyName>HL7.Cql.Abstractions</AssemblyName>
<RootNamespace>Hl7.Cql.Abstractions</RootNamespace>
<RootNamespace>Hl7.Cql</RootNamespace>
<Product>CQL</Product>
<Description>Support package for Hl7.Cql. Contains shared interfaces and abstractions for CQL.</Description>
<NoWarn>$(NoWarn);CS8601</NoWarn>
Expand All @@ -21,7 +21,6 @@
<InternalsVisibleTo Include="Hl7.Cql.Fhir" Key="$(LibraryPKHash)" />
<InternalsVisibleTo Include="Hl7.Cql.Model" Key="$(LibraryPKHash)" />
<InternalsVisibleTo Include="Hl7.Cql.Runtime" Key="$(LibraryPKHash)" />
<InternalsVisibleTo Include="Hl7.Cql.Primitives" Key="$(LibraryPKHash)" />
<InternalsVisibleTo Include="Hl7.Cql.Compiler" Key="$(LibraryPKHash)" />
<InternalsVisibleTo Include="Hl7.Cql.Operators" Key="$(LibraryPKHash)" />
<InternalsVisibleTo Include="Hl7.Cql.Comparers" Key="$(LibraryPKHash)" />
Expand Down
1 change: 1 addition & 0 deletions Cql/Cql.Abstractions/GlobalUsings.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
global using System.Collections.Immutable;
global using System.Diagnostics;
global using System.Diagnostics.CodeAnalysis;
global using System.Globalization;
global using System.IO;
global using System.Linq;
global using System.Linq.Expressions;
Expand Down
0 Cql/Cql.Primitives/CqlCode.cs → Cql/Cql.Abstractions/Primitives/CqlCode.cs
View file
File renamed without changes.
0 Cql/Cql.Primitives/CqlCodeSystem.cs → ....Abstractions/Primitives/CqlCodeSystem.cs
View file
File renamed without changes.
0 Cql/Cql.Primitives/CqlConcept.cs → ...Cql.Abstractions/Primitives/CqlConcept.cs
View file
File renamed without changes.
0 Cql/Cql.Primitives/CqlDate.cs → Cql/Cql.Abstractions/Primitives/CqlDate.cs
View file
File renamed without changes.
0 Cql/Cql.Primitives/CqlDateTime.cs → ...ql.Abstractions/Primitives/CqlDateTime.cs
View file
File renamed without changes.
0 Cql/Cql.Primitives/CqlDateTimeMath.cs → ...bstractions/Primitives/CqlDateTimeMath.cs
View file
File renamed without changes.
0 Cql/Cql.Primitives/CqlInterval.cs → ...ql.Abstractions/Primitives/CqlInterval.cs
View file
File renamed without changes.
0 Cql/Cql.Primitives/CqlPrimitiveType.cs → ...stractions/Primitives/CqlPrimitiveType.cs
View file
File renamed without changes.
0 ...l.Primitives/CqlPrimitiveTypeAttribute.cs → ...s/Primitives/CqlPrimitiveTypeAttribute.cs
View file
File renamed without changes.
0 Cql/Cql.Primitives/CqlQuantity.cs → ...ql.Abstractions/Primitives/CqlQuantity.cs
View file
File renamed without changes.
0 Cql/Cql.Primitives/CqlRatio.cs → Cql/Cql.Abstractions/Primitives/CqlRatio.cs
View file
File renamed without changes.
0 Cql/Cql.Primitives/CqlTime.cs → Cql/Cql.Abstractions/Primitives/CqlTime.cs
View file
File renamed without changes.
0 Cql/Cql.Primitives/CqlTupleMetadata.cs → ...stractions/Primitives/CqlTupleMetadata.cs
View file
File renamed without changes.
0 Cql/Cql.Primitives/CqlValueSet.cs → ...ql.Abstractions/Primitives/CqlValueSet.cs
View file
File renamed without changes.
0 Cql/Cql.Primitives/CqlVocabulary.cs → ....Abstractions/Primitives/CqlVocabulary.cs
View file
File renamed without changes.
0 Cql/Cql.Primitives/TupleBaseType.cs → ....Abstractions/Primitives/TupleBaseType.cs
View file
File renamed without changes.
0 Cql/Cql.Primitives/TypeExtensions.cs → ...Abstractions/Primitives/TypeExtensions.cs
View file
File renamed without changes.
Loading

0 comments on commit ce60b0a

Please sign in to comment.