Skip to content

Commit 8fc40bf

Browse files
samatstariongroupsamatstariongroup
committed
[Update] dependencies
1 parent 713d9fc commit 8fc40bf

21 files changed

+62
-64
lines changed

‎SysML2.NET.CodeGenerator.Tests/Generators/HtmlReportGeneratorTestFixture.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ public void SetUp()
7474
Path.Combine(this.rootDirectory, "PrimitiveTypes.xmi")
7575
};
7676

77-
78-
7977
this.modelFileInfo = new FileInfo(Path.Combine(TestContext.CurrentContext.TestDirectory, "datamodel",
8078
"SysML_xmi.uml"));
8179

@@ -99,8 +97,8 @@ public void verify_HTML_docs_Are_generated()
9997
</div>
10098
""";
10199

102-
Assert.That(() => this.htmlReportGenerator.GenerateReport(this.modelFileInfo, this.rootDirectoryInfo, false, this.pathMaps,
103-
this.outputFileInfo, customHtml),
100+
Assert.That(() => this.htmlReportGenerator.GenerateReport(this.modelFileInfo, this.rootDirectoryInfo, "_h6bQED_xEfCL-qw9_9p9XQ", "SysML",
101+
true, this.pathMaps, this.outputFileInfo, customHtml),
104102
Throws.Nothing);
105103
}
106104
}

‎SysML2.NET.CodeGenerator.Tests/Inspector/UmlModelInspectorTestFixture.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ public void Verify_that_Inspection_report_can_be_generated()
8080
Path.Combine(rootPath, "PrimitiveTypes.xmi")
8181
};
8282

83-
Assert.That(
84-
() => this.modelInspector.GenerateReport(this.modelFileInfo, this.modelFileInfo.Directory, true,
85-
pathMaps, this.reportFileInfo), Throws.Nothing);
83+
Assert.That(() => this.modelInspector.GenerateReport(this.modelFileInfo,
84+
this.modelFileInfo.Directory, "_h6bQED_xEfCL-qw9_9p9XQ", "SysML",
85+
true, pathMaps, this.reportFileInfo), Throws.Nothing);
8686
}
8787
}
8888
}

‎SysML2.NET.CodeGenerator.Tests/SysML2.NET.CodeGenerator.Tests.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1589,11 +1589,11 @@
15891589

15901590
<ItemGroup>
15911591
<PackageReference Include="ECoreNetto.Reporting" Version="7.0.2" />
1592-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.8" />
1593-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1592+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.1" />
1593+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
15941594
<PackageReference Include="NUnit" Version="4.4.0" />
1595-
<PackageReference Include="NUnit.Console" Version="3.20.1" />
1596-
<PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
1595+
<PackageReference Include="NUnit.Console" Version="3.21.1" />
1596+
<PackageReference Include="NUnit3TestAdapter" Version="6.0.1" />
15971597

15981598
<PackageReference Include="coverlet.collector" Version="6.0.4">
15991599
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -1604,8 +1604,8 @@
16041604
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
16051605
</PackageReference>
16061606
<PackageReference Include="Serilog" Version="4.3.0" />
1607-
<PackageReference Include="Serilog.Extensions.Logging" Version="9.0.2" />
1608-
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
1607+
<PackageReference Include="Serilog.Extensions.Logging" Version="10.0.0" />
1608+
<PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
16091609
</ItemGroup>
16101610

16111611
<ItemGroup>

‎SysML2.NET.CodeGenerator/Generators/UmlHandleBarsGenerators/UmlCoreDalFactoryGenerator.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ private async Task GeneratePocoFactoryInternal(XmiReaderResult xmiReaderResult,
120120
{
121121
var template = this.Templates[PocoFactoryTemplateName];
122122

123-
var classes = xmiReaderResult.Root.QueryPackages()
123+
var classes = xmiReaderResult.QueryRoot(null, name: "SysML").QueryPackages()
124124
.SelectMany(x => x.PackagedElement.OfType<IClass>())
125125
.Where(x => !x.IsAbstract)
126126
.ToList();
@@ -173,7 +173,7 @@ private async Task<string> GenerateDalPocoFactoryInternal(XmiReaderResult xmiRea
173173
{
174174
var template = this.Templates[PocoFactoryTemplateName];
175175

176-
var classToGenerate = xmiReaderResult.Root.QueryPackages()
176+
var classToGenerate = xmiReaderResult.QueryRoot(null, name: "SysML").QueryPackages()
177177
.SelectMany(x => x.PackagedElement.OfType<IClass>())
178178
.Single(x => x.Name == className);
179179

@@ -219,7 +219,7 @@ private async Task GenerateElementFactoryInternal(XmiReaderResult xmiReaderResul
219219
{
220220
var template = this.Templates[ElementFactoryTemplateName];
221221

222-
var classes = xmiReaderResult.Root.QueryPackages()
222+
var classes = xmiReaderResult.QueryRoot(null, name: "SysML").QueryPackages()
223223
.SelectMany(x => x.PackagedElement.OfType<IClass>())
224224
.Where(x => !x.IsAbstract)
225225
.OrderBy(x => x.Name)

‎SysML2.NET.CodeGenerator/Generators/UmlHandleBarsGenerators/UmlCoreDalPocoExtensionsGenerator.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ private async Task GeneratePocoExtensionsInternal(XmiReaderResult xmiReaderResul
9898
{
9999
var template = this.Templates[PocoExtensionsTemplateName];
100100

101-
var classes = xmiReaderResult.Root.QueryPackages()
101+
var classes = xmiReaderResult.QueryRoot(null, name: "SysML").QueryPackages()
102102
.SelectMany(x => x.PackagedElement.OfType<IClass>())
103103
.Where(x => !x.IsAbstract)
104104
.ToList();
@@ -151,7 +151,7 @@ private async Task<string> GenerateDalPocoExtensionInternal(XmiReaderResult xmiR
151151
{
152152
var template = this.Templates[PocoExtensionsTemplateName];
153153

154-
var classToGenerate = xmiReaderResult.Root.QueryPackages()
154+
var classToGenerate = xmiReaderResult.QueryRoot(null, name: "SysML").QueryPackages()
155155
.SelectMany(x => x.PackagedElement.OfType<IClass>())
156156
.Single(x => x.Name == className);
157157

@@ -219,7 +219,7 @@ private async Task GenerateElementExtensionsInternal(XmiReaderResult xmiReaderRe
219219
{
220220
var template = this.Templates[ElementExtensionsTemplateName];
221221

222-
var classes = xmiReaderResult.Root.QueryPackages()
222+
var classes = xmiReaderResult.QueryRoot(null, name: "SysML").QueryPackages()
223223
.SelectMany(x => x.PackagedElement.OfType<IClass>())
224224
.Where(x => !x.IsAbstract)
225225
.OrderBy(x => x.Name)

‎SysML2.NET.CodeGenerator/Generators/UmlHandleBarsGenerators/UmlCoreDtoGenerator.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ private async Task GenerateDataTransferObjectInterfacesInternalAsync(XmiReaderRe
200200
{
201201
var template = this.Templates["core-dto-interface-uml-template"];
202202

203-
var classes = xmiReaderResult.Root.QueryPackages()
203+
var classes = xmiReaderResult.QueryRoot(null, name: "SysML").QueryPackages()
204204
.SelectMany(x => x.PackagedElement.OfType<IClass>())
205205
.ToList();
206206

@@ -235,7 +235,7 @@ private async Task<string> GenerateDataTransferObjectInterfaceInternalAsync(XmiR
235235
{
236236
var template = this.Templates["core-dto-interface-uml-template"];
237237

238-
var classes = xmiReaderResult.Root.QueryPackages()
238+
var classes = xmiReaderResult.QueryRoot(null, name: "SysML").QueryPackages()
239239
.SelectMany(x => x.PackagedElement.OfType<IClass>())
240240
.ToList();
241241

@@ -268,7 +268,7 @@ private async Task GenerateDataTransferObjectClassesInternalAsync(XmiReaderResul
268268
{
269269
var template = this.Templates["core-dto-class-uml-template"];
270270

271-
var classes = xmiReaderResult.Root.QueryPackages()
271+
var classes = xmiReaderResult.QueryRoot(null, name: "SysML").QueryPackages()
272272
.SelectMany(x => x.PackagedElement.OfType<IClass>())
273273
.Where(x => !x.IsAbstract)
274274
.ToList();
@@ -304,7 +304,7 @@ private async Task<string> GenerateDataTransferObjectClassInternalAsync(XmiReade
304304
{
305305
var template = this.Templates["core-dto-class-uml-template"];
306306

307-
var classes = xmiReaderResult.Root.QueryPackages()
307+
var classes = xmiReaderResult.QueryRoot(null, name: "SysML").QueryPackages()
308308
.SelectMany(x => x.PackagedElement.OfType<IClass>())
309309
.ToList();
310310

‎SysML2.NET.CodeGenerator/Generators/UmlHandleBarsGenerators/UmlCoreEnumGenerator.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ private async Task GenerateEnumerationsInternalAsync(XmiReaderResult xmiReaderRe
142142
{
143143
var template = this.Templates["core-enumeration-uml-template"];
144144

145-
var enumerations = xmiReaderResult.Root.QueryPackages()
145+
var enumerations = xmiReaderResult.QueryRoot(null, name: "SysML").QueryPackages()
146146
.SelectMany(x => x.PackagedElement.OfType<IEnumeration>())
147147
.ToList();
148148

@@ -177,7 +177,7 @@ private async Task<string> GenerateEnumerationInternalAsync(XmiReaderResult xmiR
177177
{
178178
var template = this.Templates["core-enumeration-uml-template"];
179179

180-
var enumerations = xmiReaderResult.Root.QueryPackages()
180+
var enumerations = xmiReaderResult.QueryRoot(null, name: "SysML").QueryPackages()
181181
.SelectMany(x => x.PackagedElement.OfType<IEnumeration>())
182182
.ToList();
183183

‎SysML2.NET.CodeGenerator/Generators/UmlHandleBarsGenerators/UmlCoreEnumProviderGenerator.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ private async Task GenerateEnumerationProvidersInternalAsync(XmiReaderResult xmi
144144
{
145145
var template = this.Templates["core-enumprovider-uml-template"];
146146

147-
var enumerations = xmiReaderResult.Root.QueryPackages()
147+
var enumerations = xmiReaderResult.QueryRoot(null, name: "SysML").QueryPackages()
148148
.SelectMany(x => x.PackagedElement.OfType<IEnumeration>())
149149
.ToList();
150150

@@ -179,7 +179,7 @@ private async Task<string> GenerateEnumerationProviderInternalAsync(XmiReaderRes
179179
{
180180
var template = this.Templates["core-enumprovider-uml-template"];
181181

182-
var enumerations = xmiReaderResult.Root.QueryPackages()
182+
var enumerations = xmiReaderResult.QueryRoot(null, name: "SysML").QueryPackages()
183183
.SelectMany(x => x.PackagedElement.OfType<IEnumeration>())
184184
.ToList();
185185

‎SysML2.NET.CodeGenerator/Generators/UmlHandleBarsGenerators/UmlCoreJsonDtoDeSerializerGenerator.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ private async Task GenerateEnumJsonDeSerializerInternal(XmiReaderResult xmiReade
105105
{
106106
var template = this.Templates[EnumDeSerializerTemplateName];
107107

108-
var enumerations = xmiReaderResult.Root.QueryPackages()
108+
var enumerations = xmiReaderResult.QueryRoot(null, name: "SysML").QueryPackages()
109109
.SelectMany(x => x.PackagedElement.OfType<IEnumeration>())
110110
.ToList();
111111

@@ -176,7 +176,7 @@ private async Task GenerateDeSerializationProviderInternal(XmiReaderResult xmiRe
176176
{
177177
var template = this.Templates[DtoDeSerializerProviderTemplateName];
178178

179-
var classes = xmiReaderResult.Root.QueryPackages()
179+
var classes = xmiReaderResult.QueryRoot(null, name: "SysML").QueryPackages()
180180
.SelectMany(x => x.PackagedElement.OfType<IClass>())
181181
.Where(x => !x.IsAbstract)
182182
.OrderBy(x => x.Name)
@@ -223,7 +223,7 @@ private async Task GenerateDtoJsonDeSerializerInternal(XmiReaderResult xmiReader
223223
{
224224
var template = this.Templates[DtoDeSerializerTemplateName];
225225

226-
var classes = xmiReaderResult.Root.QueryPackages()
226+
var classes = xmiReaderResult.QueryRoot(null, name: "SysML").QueryPackages()
227227
.SelectMany(x => x.PackagedElement.OfType<IClass>())
228228
.Where(x => !x.IsAbstract)
229229
.ToList();
@@ -276,7 +276,7 @@ private async Task<string> GenerateDtoDeSerializerClassInternal(XmiReaderResult
276276
{
277277
var template = this.Templates[DtoDeSerializerTemplateName];
278278

279-
var classToGenerate = xmiReaderResult.Root.QueryPackages()
279+
var classToGenerate = xmiReaderResult.QueryRoot(null, name: "SysML").QueryPackages()
280280
.SelectMany(x => x.PackagedElement.OfType<IClass>())
281281
.Single(x => x.Name == className);
282282

‎SysML2.NET.CodeGenerator/Generators/UmlHandleBarsGenerators/UmlCoreJsonDtoSerializerGenerator.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ private async Task GenerateSerializationProviderInternal(XmiReaderResult xmiRead
120120
{
121121
var template = this.Templates[DtoSerializerProviderTemplateName];
122122

123-
var classes = xmiReaderResult.Root.QueryPackages()
123+
var classes = xmiReaderResult.QueryRoot(null, name: "SysML").QueryPackages()
124124
.SelectMany(x => x.PackagedElement.OfType<IClass>())
125125
.Where(x => !x.IsAbstract)
126126
.OrderBy(x => x.Name)
@@ -167,7 +167,7 @@ private async Task GenerateDtoJsonSerializerInternal(XmiReaderResult xmiReaderRe
167167
{
168168
var template = this.Templates[DtoSerializerTemplateName];
169169

170-
var classes = xmiReaderResult.Root.QueryPackages()
170+
var classes = xmiReaderResult.QueryRoot(null, name: "SysML").QueryPackages()
171171
.SelectMany(x => x.PackagedElement.OfType<IClass>())
172172
.Where(x => !x.IsAbstract)
173173
.ToList();
@@ -220,7 +220,7 @@ private async Task<string> GenerateDtoSerializerClassInternal(XmiReaderResult xm
220220
{
221221
var template = this.Templates[DtoSerializerTemplateName];
222222

223-
var classToGenerate = xmiReaderResult.Root.QueryPackages()
223+
var classToGenerate = xmiReaderResult.QueryRoot(null, name: "SysML").QueryPackages()
224224
.SelectMany(x => x.PackagedElement.OfType<IClass>())
225225
.Single(x => x.Name == className);
226226

0 commit comments

Comments
 (0)