Skip to content

Commit b056596

Browse files
committed
Revert "Update packages from CESMII.OpcUa... for previously supported (.NET 6 instead of .NET 8) version of .NET"
This reverts commit d5ed3bf.
1 parent 69bb3a9 commit b056596

File tree

6 files changed

+13
-21
lines changed

6 files changed

+13
-21
lines changed

api/CESMII.OpcUa.CloudLibraryResolver.DependencyInjection/CESMII.OpcUa.CloudLibraryResolver.DependencyInjection.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,15 @@
1717
</PropertyGroup>
1818

1919
<ItemGroup>
20-
<None Include=".\..\cesmii.png" Pack="true" PackagePath="" />
20+
<None Include=".\..\cesmii.png" Pack="true" PackagePath=""/>
2121
</ItemGroup>
2222

2323

2424
<ItemGroup>
25-
<PackageReference Include="CESMII.OpcUa.NodeSetModel" Version="2.1.2" />
2625
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
2726
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
2827
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
29-
<PackageReference Include="CESMII.OpcUa.NodeSetImporter" Version="2.1.2" />
28+
<PackageReference Include="CESMII.OpcUa.NodeSetImporter" Version="2.1.1" />
3029
</ItemGroup>
3130

3231
<ItemGroup>

api/CESMII.OpcUa.CloudLibraryResolver/CESMII.OpcUa.CloudLibraryResolver.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="CESMII.OpcUa.NodeSetModel" Version="2.1.2" />
2524
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Core" Version="1.5.374.78" />
2625
<!--<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.CloudLib.Client" Version="*-*" />-->
2726
</ItemGroup>
2827

2928
<ItemGroup>
30-
<PackageReference Include="CESMII.OpcUa.NodeSetImporter" Version="2.1.2" />
29+
<PackageReference Include="CESMII.OpcUa.NodeSetImporter" Version="2.1.1" />
3130
<ProjectReference Include="..\..\common\Opc.Ua.Cloud.Library.Client\Opc.Ua.Cloud.Library.Client.csproj" />
3231
</ItemGroup>
3332

api/CESMII.ProfileDesigner.OpcUa/CESMII.ProfileDesigner.OpcUa.csproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616
<ProjectReference Include="..\CESMII.ProfileDesigner.Common\CESMII.ProfileDesigner.Common.csproj" />
1717
<ProjectReference Include="..\CESMII.ProfileDesigner.DAL\CESMII.ProfileDesigner.DAL.csproj" />
1818
<ProjectReference Include="..\..\common\CESMII.Common.CloudLibClient\CESMII.Common.CloudLibClient.csproj" />
19-
<PackageReference Include="CESMII.OpcUa.NodeSetModel" Version="2.1.2" />
20-
<PackageReference Include="CESMII.OpcUa.NodeSetModel.Factory.Opc" Version="2.1.2" />
21-
<PackageReference Include="CESMII.OpcUa.NodeSetImporter" Version="2.1.2" />
22-
<PackageReference Include="System.IO.Packaging" Version="6.0.0" />
19+
<PackageReference Include="CESMII.OpcUa.NodeSetModel" Version="2.1.1" />
20+
<PackageReference Include="CESMII.OpcUa.NodeSetModel.Factory.Opc" Version="2.1.1" />
21+
<PackageReference Include="CESMII.OpcUa.NodeSetImporter" Version="2.1.1" />
22+
<!--<PackageReference Include="CESMII.OpcUa.NodeSetModel.EF" Version="1.0.13" />-->
23+
<PackageReference Include="System.IO.Packaging" Version="6.0.0" />
2324
</ItemGroup>
2425

2526
<ItemGroup>

api/SmipJson/CESMII.OpcUa.NodeSetModel.Factory.Smip/CESMII.OpcUa.NodeSetModel.Factory.Smip.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
</ItemGroup>
2626

2727
<ItemGroup>
28-
<PackageReference Include="CESMII.OpcUa.NodeSetModel" Version="2.1.2" />
28+
<PackageReference Include="CESMII.OpcUa.NodeSetModel" Version="2.1.1" />
29+
<!--<ProjectReference Include="..\CESMII.OpcUa.NodeSetModel\CESMII.OpcUa.NodeSetModel.csproj" />-->
2930
</ItemGroup>
3031

3132
</Project>

api/Tests/CESMII.ProfileDesigner.Api.Tests/CESMII.ProfileDesigner.Api.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.12" />
14+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.33" />
1515
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
1616
<PackageReference Include="xunit" Version="2.4.1" />
1717
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
@@ -26,7 +26,7 @@
2626

2727
<ItemGroup>
2828
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Core" Version="1.5.374.78" />
29-
<PackageReference Include="CESMII.OpcUa.NodeSetDiff" Version="2.1.2" />
29+
<PackageReference Include="CESMII.OpcUa.NodeSetDiff" Version="2.1.1" />
3030
</ItemGroup>
3131

3232
<ItemGroup>

api/Tests/CESMII.ProfileDesigner.Api.Tests/PostgresTableTests.cs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,7 @@ public void CheckTableColumnCount(string strTable, int expectedCount)
4646
NpgsqlConnection conn = new NpgsqlConnection(connectionStringProfileDesigner);
4747
try
4848
{
49-
try
50-
{
51-
conn.Open();
52-
}
53-
catch (Exception ex)
54-
{
55-
output.WriteLine($"Error opening connection: {ex.Message}");
56-
Assert.True(false);
57-
}
49+
conn.Open();
5850

5951
// Define a query returning a single row result set
6052
string strSql = $"SELECT COUNT(*) FROM information_schema.columns WHERE table_schema='public' AND table_name='{strTable}'";

0 commit comments

Comments
 (0)