diff --git a/csharp/.idea/.idea.InnovEnergy/.idea/dataSources/2a5ec13b-f9de-43eb-b5a8-49b4fa9ab9d3.xml b/csharp/.idea/.idea.InnovEnergy/.idea/dataSources/2a5ec13b-f9de-43eb-b5a8-49b4fa9ab9d3.xml deleted file mode 100644 index dcee64ebb..000000000 --- a/csharp/.idea/.idea.InnovEnergy/.idea/dataSources/2a5ec13b-f9de-43eb-b5a8-49b4fa9ab9d3.xml +++ /dev/null @@ -1,1376 +0,0 @@ - - - - - 3.39.2 - - - - - - - - - - - - - - - - 1 - - - 1 - - - 1 - - - - - - - - - - - window - - - 1 - - - - - 1 - 1 - - - - - 1 - 1 - - - - - - - window - - - window - - - - - - 1 - 1 - - - 1 - 1 - - - - window - - - - - window - - - - 1 - 1 - - - - - - - 1 - - - window - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - 1 - - - 1 - - - 1 - 1 - - - 1 - window - - - 1 - window - - - 1 - 1 - - - 1 - 1 - - - 1 - - - 1 - - - 1 - 1 - - - 1 - 1 - - - 1 - 1 - - - 1 - - - 1 - - - 1 - 1 - - - window - - - window - - - - window - - - window - - - window - - - - 1 - - - 1 - - - 1 - - - 1 - - - - - - 1 - - - aggregate - - - 1 - - - - - - 1 - 1 - - - window - - - aggregate - - - 1 - 1 - - - window - - - aggregate - - - window - - - window - - - 1 - - - - - - - - window - - - - - 1 - 1 - - - - 1 - - - - - - window - - - 1 - - - 1 - - - - - - 1 - - - window - - - 1 - - - - - 1 - - - 1 - - - - - 1 - - - - - 1 - - - - - - - aggregate - - - - 1 - 1 - - - 1 - - - 1 - - - 1 - - - window - - - - - 1 - 1 - - - window - - - - 1 - - - 1 - - - 1 - - - 1 - 1 - - - 1 - - - 1 - - - aggregate - - - aggregate - - - 1 - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - R - - - R - - - R - - - R - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - R - - - R - - - 1 - - - 2 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - R - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - R - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - -
- 1 -
- - text|0s - 1 - - - text|0s - 1 - 2 - - - text|0s - 3 - - - boolean|0s - 0 - 1 - 4 - - - JSON|0s - '[]' - 1 - 5 - - - text|0s - 1 - 6 - - - text|0s - 1 - 7 - - - TEXT|0s - 1 - - - TEXT|0s - 2 - - - TEXT|0s - 3 - - - INT|0s - 4 - - - TEXT|0s - 5 - - - \ No newline at end of file diff --git a/csharp/.idea/.idea.InnovEnergy/.idea/dataSources/51bd809e-a6f7-454a-b353-e3d11e0a1e28.xml b/csharp/.idea/.idea.InnovEnergy/.idea/dataSources/51bd809e-a6f7-454a-b353-e3d11e0a1e28.xml deleted file mode 100644 index 97ba30dac..000000000 --- a/csharp/.idea/.idea.InnovEnergy/.idea/dataSources/51bd809e-a6f7-454a-b353-e3d11e0a1e28.xml +++ /dev/null @@ -1,1539 +0,0 @@ - - - - - 3.39.2 - - - - - - - - - - - - - - - - 1 - - - 1 - - - 1 - - - - - - - - - - - window - - - 1 - - - - - 1 - 1 - - - - - 1 - 1 - - - - - - - window - - - window - - - - - - 1 - 1 - - - 1 - 1 - - - - window - - - - - window - - - - 1 - 1 - - - - - - - 1 - - - window - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - 1 - - - 1 - - - 1 - 1 - - - 1 - window - - - 1 - window - - - 1 - 1 - - - 1 - 1 - - - 1 - - - 1 - - - 1 - 1 - - - 1 - 1 - - - 1 - 1 - - - 1 - - - 1 - - - 1 - 1 - - - window - - - window - - - - window - - - window - - - window - - - - 1 - - - 1 - - - 1 - - - 1 - - - - - - 1 - - - aggregate - - - 1 - - - - - - 1 - 1 - - - window - - - aggregate - - - 1 - 1 - - - window - - - aggregate - - - window - - - window - - - 1 - - - - - - - - window - - - - - 1 - 1 - - - - 1 - - - - - - window - - - 1 - - - 1 - - - - - - 1 - - - window - - - 1 - - - - - 1 - - - 1 - - - - - 1 - - - - - 1 - - - - - - - aggregate - - - - 1 - 1 - - - 1 - - - 1 - - - 1 - - - window - - - - - 1 - 1 - - - window - - - - 1 - - - 1 - - - 1 - - - 1 - 1 - - - 1 - - - 1 - - - aggregate - - - aggregate - - - 1 - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - R - - - R - - - R - - - R - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - R - - - R - - - 1 - - - 2 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - R - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - R - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - -
-
-
- 1 -
- - 1 -
- -
- - 1 - integer|0s - 1 - 1 - - - varchar|0s - 2 - - - varchar|0s - 3 - - - varchar|0s - 4 - - - integer|0s - 5 - - - parent_id - id - Folder - - - id - 1 - - - 1 - integer|0s - 1 - 1 - - - varchar|0s - 2 - - - varchar|0s - 3 - - - varchar|0s - 4 - - - varchar|0s - 5 - - - varchar|0s - 6 - - - varchar|0s - 7 - - - integer|0s - 8 - - - varchar|0s - 9 - - - varchar|0s - 10 - - - integer|0s - 11 - - - integer|0s - 12 - - - parent_id - id - Folder - - - id - 1 - - - 1 - integer|0s - 1 - 1 - - - varchar|0s - 2 - - - varchar|0s - 3 - - - varchar|0s - 4 - - - varchar|0s - 5 - - - varchar|0s - 6 - - - integer|0s - 7 - - - varchar|0s - 8 - - - id - 1 - - - TEXT|0s - 1 - - - TEXT|0s - 2 - - - TEXT|0s - 3 - - - INT|0s - 4 - - - TEXT|0s - 5 - - - 1 - - - 2 - - - integer|0s - 1 - 1 - - - integer|0s - 1 - 2 - - - integer|0s - 3 - - - user_id - id - User - - - folder_id - id - Folder - - - id - 1 - - - integer|0s - 1 - 1 - - - integer|0s - 1 - 2 - - - integer|0s - 1 - 3 - - - user_id - id - User - - - installation_id - id - Installation - - - id - 1 - - - \ No newline at end of file diff --git a/csharp/.idea/.idea.InnovEnergy/.idea/dataSources/9b01f3fd-76cd-449e-a86d-1d7c4777370b.xml b/csharp/.idea/.idea.InnovEnergy/.idea/dataSources/9b01f3fd-76cd-449e-a86d-1d7c4777370b.xml deleted file mode 100644 index fb2b47c33..000000000 --- a/csharp/.idea/.idea.InnovEnergy/.idea/dataSources/9b01f3fd-76cd-449e-a86d-1d7c4777370b.xml +++ /dev/null @@ -1,1317 +0,0 @@ - - - - - 3.39.2 - - - - - - - - - - - - - - - - 1 - - - 1 - - - 1 - - - - - - - - - - - window - - - 1 - - - - - 1 - 1 - - - - - 1 - 1 - - - - - - - window - - - window - - - - - - 1 - 1 - - - 1 - 1 - - - - window - - - - - window - - - - 1 - 1 - - - - - - - 1 - - - window - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - 1 - - - 1 - - - 1 - 1 - - - 1 - window - - - 1 - window - - - 1 - 1 - - - 1 - 1 - - - 1 - - - 1 - - - 1 - 1 - - - 1 - 1 - - - 1 - 1 - - - 1 - - - 1 - - - 1 - 1 - - - window - - - window - - - - window - - - window - - - window - - - - 1 - - - 1 - - - 1 - - - 1 - - - - - - 1 - - - aggregate - - - 1 - - - - - - 1 - 1 - - - window - - - aggregate - - - 1 - 1 - - - window - - - aggregate - - - window - - - window - - - 1 - - - - - - - - window - - - - - 1 - 1 - - - - 1 - - - - - - window - - - 1 - - - 1 - - - - - - 1 - - - window - - - 1 - - - - - 1 - - - 1 - - - - - 1 - - - - - 1 - - - - - - - aggregate - - - - 1 - 1 - - - 1 - - - 1 - - - 1 - - - window - - - - - 1 - 1 - - - window - - - - 1 - - - 1 - - - 1 - - - 1 - 1 - - - 1 - - - 1 - - - aggregate - - - aggregate - - - 1 - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - R - - - R - - - R - - - R - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - R - - - R - - - 1 - - - 2 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - R - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - R - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - \ No newline at end of file diff --git a/csharp/.idea/.idea.InnovEnergy/.idea/dataSources/abff6dc2-776e-4a65-a8ab-ea34d3484279.xml b/csharp/.idea/.idea.InnovEnergy/.idea/dataSources/abff6dc2-776e-4a65-a8ab-ea34d3484279.xml deleted file mode 100644 index dcee64ebb..000000000 --- a/csharp/.idea/.idea.InnovEnergy/.idea/dataSources/abff6dc2-776e-4a65-a8ab-ea34d3484279.xml +++ /dev/null @@ -1,1376 +0,0 @@ - - - - - 3.39.2 - - - - - - - - - - - - - - - - 1 - - - 1 - - - 1 - - - - - - - - - - - window - - - 1 - - - - - 1 - 1 - - - - - 1 - 1 - - - - - - - window - - - window - - - - - - 1 - 1 - - - 1 - 1 - - - - window - - - - - window - - - - 1 - 1 - - - - - - - 1 - - - window - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - 1 - - - 1 - - - 1 - 1 - - - 1 - window - - - 1 - window - - - 1 - 1 - - - 1 - 1 - - - 1 - - - 1 - - - 1 - 1 - - - 1 - 1 - - - 1 - 1 - - - 1 - - - 1 - - - 1 - 1 - - - window - - - window - - - - window - - - window - - - window - - - - 1 - - - 1 - - - 1 - - - 1 - - - - - - 1 - - - aggregate - - - 1 - - - - - - 1 - 1 - - - window - - - aggregate - - - 1 - 1 - - - window - - - aggregate - - - window - - - window - - - 1 - - - - - - - - window - - - - - 1 - 1 - - - - 1 - - - - - - window - - - 1 - - - 1 - - - - - - 1 - - - window - - - 1 - - - - - 1 - - - 1 - - - - - 1 - - - - - 1 - - - - - - - aggregate - - - - 1 - 1 - - - 1 - - - 1 - - - 1 - - - window - - - - - 1 - 1 - - - window - - - - 1 - - - 1 - - - 1 - - - 1 - 1 - - - 1 - - - 1 - - - aggregate - - - aggregate - - - 1 - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - R - - - R - - - R - - - R - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - R - - - R - - - 1 - - - 2 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - R - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - R - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - -
-
- 1 -
- - text|0s - 1 - - - text|0s - 1 - 2 - - - text|0s - 3 - - - boolean|0s - 0 - 1 - 4 - - - JSON|0s - '[]' - 1 - 5 - - - text|0s - 1 - 6 - - - text|0s - 1 - 7 - - - TEXT|0s - 1 - - - TEXT|0s - 2 - - - TEXT|0s - 3 - - - INT|0s - 4 - - - TEXT|0s - 5 - - - \ No newline at end of file diff --git a/csharp/.idea/.idea.InnovEnergy/.idea/dataSources/daf0851a-1a10-46c6-8c5b-697bd4949acb.xml b/csharp/.idea/.idea.InnovEnergy/.idea/dataSources/daf0851a-1a10-46c6-8c5b-697bd4949acb.xml deleted file mode 100644 index f1c607156..000000000 --- a/csharp/.idea/.idea.InnovEnergy/.idea/dataSources/daf0851a-1a10-46c6-8c5b-697bd4949acb.xml +++ /dev/null @@ -1,1376 +0,0 @@ - - - - - 3.39.2 - - - - - - - - - - - - - - - - 1 - - - 1 - - - 1 - - - - - - - - - - - window - - - 1 - - - - - 1 - 1 - - - - - 1 - 1 - - - - - - - window - - - window - - - - - - 1 - 1 - - - 1 - 1 - - - - window - - - - - window - - - - 1 - 1 - - - - - - - 1 - - - window - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - 1 - - - 1 - - - 1 - 1 - - - 1 - window - - - 1 - window - - - 1 - 1 - - - 1 - 1 - - - 1 - - - 1 - - - 1 - 1 - - - 1 - 1 - - - 1 - 1 - - - 1 - - - 1 - - - 1 - 1 - - - window - - - window - - - - window - - - window - - - window - - - - 1 - - - 1 - - - 1 - - - 1 - - - - - - 1 - - - aggregate - - - 1 - - - - - - 1 - 1 - - - window - - - aggregate - - - 1 - 1 - - - window - - - aggregate - - - window - - - window - - - 1 - - - - - - - - window - - - - - 1 - 1 - - - - 1 - - - - - - window - - - 1 - - - 1 - - - - - - 1 - - - window - - - 1 - - - - - 1 - - - 1 - - - - - 1 - - - - - 1 - - - - - - - aggregate - - - - 1 - 1 - - - 1 - - - 1 - - - 1 - - - window - - - - - 1 - 1 - - - window - - - - 1 - - - 1 - - - 1 - - - 1 - 1 - - - 1 - - - 1 - - - aggregate - - - aggregate - - - 1 - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - R - - - R - - - R - - - R - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - R - - - R - - - 1 - - - 2 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - R - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - R - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - 2 - - - R - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - 2 - - - 3 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - R - - - 1 - - - 2 - - - R - - - 1 - - - R - - - 1 - - - R - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - - R - - - 1 - - -
- 1 -
- - text|0s - 1 - - - text|0s - 1 - 2 - - - text|0s - 3 - - - boolean|0s - 0 - 1 - 4 - - - JSON|0s - '[]' - 1 - 5 - - - text|0s - 1 - 6 - - - text|0s - 1 - 7 - - - TEXT|0s - 1 - - - TEXT|0s - 2 - - - TEXT|0s - 3 - - - INT|0s - 4 - - - TEXT|0s - 5 - - - \ No newline at end of file diff --git a/csharp/.idea/.idea.InnovEnergy/.idea/workspace.xml b/csharp/.idea/.idea.InnovEnergy/.idea/workspace.xml index 59a6bd462..9c19fd101 100644 --- a/csharp/.idea/.idea.InnovEnergy/.idea/workspace.xml +++ b/csharp/.idea/.idea.InnovEnergy/.idea/workspace.xml @@ -17,8 +17,9 @@ - - + + + - { + "keyToString": { + "RunOnceActivity.OpenProjectViewOnStart": "true", + "RunOnceActivity.ShowReadmeOnStart": "true", + "WebServerToolWindowFactoryState": "false", + "XThreadsFramesViewSplitterKey": "0.030162413", + "last_opened_file_path": "/home/kim/code/innovenergy/new/csharp/app/Backend/Backend.csproj", + "nodejs_package_manager_path": "npm", + "settings.editor.selected.configurable": "preferences.pluginManager", + "vue.rearranger.settings.migration": "true" }, - "keyToStringList": { - "DatabaseDriversLRU": [ - "sqlite" + "keyToStringList": { + "DatabaseDriversLRU": [ + "sqlite" ], - "rider.external.source.directories": [ - "/home/kim/.config/JetBrains/Rider2022.3/resharper-host/DecompilerCache", - "/home/kim/.config/JetBrains/Rider2022.3/resharper-host/SourcesCache", - "/home/kim/.local/share/Symbols/src" + "rider.external.source.directories": [ + "/home/kim/.config/JetBrains/Rider2022.3/resharper-host/DecompilerCache", + "/home/kim/.config/JetBrains/Rider2022.3/resharper-host/SourcesCache", + "/home/kim/.local/share/Symbols/src" ] } -}]]> +} diff --git a/csharp/app/API/obj/API.csproj.nuget.dgspec.json b/csharp/app/API/obj/API.csproj.nuget.dgspec.json index ecb4b75e5..ed517c172 100644 --- a/csharp/app/API/obj/API.csproj.nuget.dgspec.json +++ b/csharp/app/API/obj/API.csproj.nuget.dgspec.json @@ -311,6 +311,10 @@ "target": "Package", "version": "[3.3.1, )" }, + "DecimalMath.DecimalEx": { + "target": "Package", + "version": "[1.0.2, )" + }, "System.Reactive.Linq": { "target": "Package", "version": "[5.0.0, )" diff --git a/csharp/app/API/obj/Debug/net6.0/API.assets.cache b/csharp/app/API/obj/Debug/net6.0/API.assets.cache index 4b75ef209..ce9c6266b 100644 Binary files a/csharp/app/API/obj/Debug/net6.0/API.assets.cache and b/csharp/app/API/obj/Debug/net6.0/API.assets.cache differ diff --git a/csharp/app/API/obj/Debug/net6.0/API.csproj.AssemblyReference.cache b/csharp/app/API/obj/Debug/net6.0/API.csproj.AssemblyReference.cache index 204fdef64..bbe0d824e 100644 Binary files a/csharp/app/API/obj/Debug/net6.0/API.csproj.AssemblyReference.cache and b/csharp/app/API/obj/Debug/net6.0/API.csproj.AssemblyReference.cache differ diff --git a/csharp/app/API/obj/project.assets.json b/csharp/app/API/obj/project.assets.json index ee6136c04..8a429a938 100644 --- a/csharp/app/API/obj/project.assets.json +++ b/csharp/app/API/obj/project.assets.json @@ -24,6 +24,19 @@ } } }, + "DecimalMath.DecimalEx/1.0.2": { + "type": "package", + "compile": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + } + }, "Flurl/3.0.4": { "type": "package", "compile": { @@ -419,6 +432,7 @@ "framework": ".NETCoreApp,Version=v6.0", "dependencies": { "CliWrap": "3.3.1", + "DecimalMath.DecimalEx": "1.0.2", "System.Reactive.Linq": "5.0.0" }, "compile": { @@ -497,6 +511,20 @@ "lib/netstandard2.1/CliWrap.xml" ] }, + "DecimalMath.DecimalEx/1.0.2": { + "sha512": "BCii/IxT7Tx7BPZ7MtrpqVlEii/iaHi4OOXpgaPi+zrphnkbe251KKI3S+pgnTzobfn0jS/SF7bgidqOMj1oGw==", + "type": "package", + "path": "decimalmath.decimalex/1.0.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "LICENSE", + "decimalmath.decimalex.1.0.2.nupkg.sha512", + "decimalmath.decimalex.nuspec", + "lib/netstandard2.0/DecimalEx.dll", + "lib/netstandard2.0/DecimalEx.xml" + ] + }, "Flurl/3.0.4": { "sha512": "2bgCzOs3TGwRkfcijCiH+7o9Pz4pyVnt4yyLX2vD3wlMSekpmGhqe2zA4988qSMmPa6AqeekX13CY4FvsjsDJQ==", "type": "package", diff --git a/csharp/app/API/obj/project.nuget.cache b/csharp/app/API/obj/project.nuget.cache index db277adde..1f0393e4d 100644 --- a/csharp/app/API/obj/project.nuget.cache +++ b/csharp/app/API/obj/project.nuget.cache @@ -1,11 +1,12 @@ { "version": 2, - "dgSpecHash": "6lEDaHtCDwj4S/DQQvj1mLNtWThoKABX/6yd9728AgnrA9rIad/UaonAp8TkO53i9i5R0ToUggIRUuFIYaB/yw==", + "dgSpecHash": "txRMsA4BjmCk2iCx9W46PczSZ0GaJCkNKOobx6SK/uzt2sbt/jTboM3Q07JADBWy8hPwfpZqspriY8zteLQAzw==", "success": false, "projectFilePath": "/home/kim/code/innovenergy/new/csharp/app/API/API.csproj", "expectedPackageFiles": [ "/home/kim/.nuget/packages/bouncycastle/1.8.9/bouncycastle.1.8.9.nupkg.sha512", "/home/kim/.nuget/packages/cliwrap/3.3.1/cliwrap.3.3.1.nupkg.sha512", + "/home/kim/.nuget/packages/decimalmath.decimalex/1.0.2/decimalmath.decimalex.1.0.2.nupkg.sha512", "/home/kim/.nuget/packages/flurl/3.0.4/flurl.3.0.4.nupkg.sha512", "/home/kim/.nuget/packages/flurl.http/3.2.2/flurl.http.3.2.2.nupkg.sha512", "/home/kim/.nuget/packages/microsoft.netcore.platforms/2.1.2/microsoft.netcore.platforms.2.1.2.nupkg.sha512", diff --git a/csharp/app/API/obj/rider.project.restore.info b/csharp/app/API/obj/rider.project.restore.info index a13f067b2..1c5428cdb 100644 --- a/csharp/app/API/obj/rider.project.restore.info +++ b/csharp/app/API/obj/rider.project.restore.info @@ -1 +1 @@ -16765322878053266 \ No newline at end of file +16769606177554988 \ No newline at end of file diff --git a/csharp/app/Backend/Program.cs b/csharp/app/Backend/Program.cs deleted file mode 100644 index eab83bb4f..000000000 --- a/csharp/app/Backend/Program.cs +++ /dev/null @@ -1,104 +0,0 @@ -using Backend.Controllers; -using Backend.Database; -using Microsoft.OpenApi.Models; -using Swashbuckle.AspNetCore.SwaggerGen; - - -using (var db = Db.Connect()) -{ - db.CreateFakeRelations(); -} - - - -var builder = WebApplication.CreateBuilder(args); - -builder.Services.AddControllers(); // TODO: remove magic, specify controllers explicitly -// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle - -builder.Services.AddHttpContextAccessor(); -builder.Services.AddEndpointsApiExplorer(); -builder.Services.AddCors(o => o.AddDefaultPolicy(p => p.WithOrigins("*"))); // TODO -builder.Services.AddSwaggerGen(config => -{ - config.SwaggerDoc("v1", new OpenApiInfo{ Title = "My API", Version = "V1" }); - config.OperationFilter(); //Todo testing throw me out -}); - - - -var app = builder.Build(); - -// Configure the HTTP request pipeline. -if (app.Environment.IsDevelopment()) -{ - app.UseSwagger(); - app.UseSwaggerUI(cfg => cfg.EnableFilter()); -} - -app.UseCors(); -app.UseHttpsRedirection(); -app.UseAuthorization(); -app.Use(SetSessionUser); -app.MapControllers(); - -app.Run(); - - - - - - -//================= Functions for above =================== - -//Setting User for current Session -async Task SetSessionUser(HttpContext ctx, RequestDelegate next) -{ - var headers = ctx.Request.Headers; - var hasToken = headers.TryGetValue("auth", out var token); - - if (!ctx.Request.Path.ToString().Contains(nameof(Controller.Login))) - { - if (!hasToken) - { - ctx.Response.StatusCode = 403; - return; - } - - using var db = Db.Connect(); - var user = db.GetUserByToken(token.ToString()); - - if (user is null) - { - ctx.Response.StatusCode = 403; - return; - } - - ctx.Items["User"] = user; - } - - await next(ctx); -} - - - - -/// -/// This is for convenient testing! Todo throw me out? -/// Operation filter to add the requirement of the custom header -/// -public class MyHeaderFilter : IOperationFilter -{ - public void Apply(OpenApiOperation operation, OperationFilterContext context) - { - operation.Parameters ??= new List(); - - operation.Parameters.Add(new OpenApiParameter - { - Name = "auth", - In = ParameterLocation.Header, - Content = new Dictionary(), - Required = false - }); - } -} \ No newline at end of file diff --git a/csharp/app/Backend/db.sqlite b/csharp/app/Backend/db.sqlite deleted file mode 100644 index f0a823cc2..000000000 Binary files a/csharp/app/Backend/db.sqlite and /dev/null differ diff --git a/csharp/app/Backend/obj/Backend.csproj.nuget.dgspec.json b/csharp/app/Backend/obj/Backend.csproj.nuget.dgspec.json index 33f5fb88e..51605bf4b 100644 --- a/csharp/app/Backend/obj/Backend.csproj.nuget.dgspec.json +++ b/csharp/app/Backend/obj/Backend.csproj.nuget.dgspec.json @@ -167,6 +167,10 @@ "target": "Package", "version": "[3.3.1, )" }, + "DecimalMath.DecimalEx": { + "target": "Package", + "version": "[1.0.2, )" + }, "System.Reactive.Linq": { "target": "Package", "version": "[5.0.0, )" diff --git a/csharp/app/Backend/obj/Debug/net6.0/Backend.assets.cache b/csharp/app/Backend/obj/Debug/net6.0/Backend.assets.cache index ea6821645..855faa522 100644 Binary files a/csharp/app/Backend/obj/Debug/net6.0/Backend.assets.cache and b/csharp/app/Backend/obj/Debug/net6.0/Backend.assets.cache differ diff --git a/csharp/app/Backend/obj/Debug/net6.0/Backend.csproj.AssemblyReference.cache b/csharp/app/Backend/obj/Debug/net6.0/Backend.csproj.AssemblyReference.cache index 97eaa3617..12f5d3c7d 100644 Binary files a/csharp/app/Backend/obj/Debug/net6.0/Backend.csproj.AssemblyReference.cache and b/csharp/app/Backend/obj/Debug/net6.0/Backend.csproj.AssemblyReference.cache differ diff --git a/csharp/app/Backend/obj/project.assets.json b/csharp/app/Backend/obj/project.assets.json index a275ff1c4..9814c2d94 100644 --- a/csharp/app/Backend/obj/project.assets.json +++ b/csharp/app/Backend/obj/project.assets.json @@ -97,6 +97,19 @@ } } }, + "DecimalMath.DecimalEx/1.0.2": { + "type": "package", + "compile": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + } + }, "Flurl/3.0.1": { "type": "package", "compile": { @@ -3171,6 +3184,7 @@ "framework": ".NETCoreApp,Version=v6.0", "dependencies": { "CliWrap": "3.3.1", + "DecimalMath.DecimalEx": "1.0.2", "System.Reactive.Linq": "5.0.0" }, "compile": { @@ -3285,6 +3299,20 @@ "lib/netstandard2.1/CliWrap.xml" ] }, + "DecimalMath.DecimalEx/1.0.2": { + "sha512": "BCii/IxT7Tx7BPZ7MtrpqVlEii/iaHi4OOXpgaPi+zrphnkbe251KKI3S+pgnTzobfn0jS/SF7bgidqOMj1oGw==", + "type": "package", + "path": "decimalmath.decimalex/1.0.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "LICENSE", + "decimalmath.decimalex.1.0.2.nupkg.sha512", + "decimalmath.decimalex.nuspec", + "lib/netstandard2.0/DecimalEx.dll", + "lib/netstandard2.0/DecimalEx.xml" + ] + }, "Flurl/3.0.1": { "sha512": "i7CuPSikVroBaWG8sPvO707Ex9C6BP5+r4JufKNU1FGMmiFgLJvNo1ttUg6ZiXIzUNknvIb1VUTIO9iEDucibg==", "type": "package", diff --git a/csharp/app/Backend/obj/project.nuget.cache b/csharp/app/Backend/obj/project.nuget.cache index 5bb442682..d4623cee3 100644 --- a/csharp/app/Backend/obj/project.nuget.cache +++ b/csharp/app/Backend/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "hBEuvzJMBTZr/bRjm1IFxXYVWTs6z0tSCEYPpoau40SnlkyRKUg8tAXvQV7BiCrsk+wHmkjr257pkqzXNT6YIg==", + "dgSpecHash": "MdRskQtEzVoDz9Sm7iAX4BseowH8RQwBYdJ5zAQHKrlwu1lEHilXUBfKGcTAJ2MpQBrppgcAwKnwTyQJuU6q3Q==", "success": true, "projectFilePath": "/home/kim/code/innovenergy/new/csharp/app/Backend/Backend.csproj", "expectedPackageFiles": [ @@ -9,6 +9,7 @@ "/home/kim/.nuget/packages/azure.security.keyvault.certificates/4.1.0/azure.security.keyvault.certificates.4.1.0.nupkg.sha512", "/home/kim/.nuget/packages/azure.security.keyvault.secrets/4.1.0/azure.security.keyvault.secrets.4.1.0.nupkg.sha512", "/home/kim/.nuget/packages/cliwrap/3.3.1/cliwrap.3.3.1.nupkg.sha512", + "/home/kim/.nuget/packages/decimalmath.decimalex/1.0.2/decimalmath.decimalex.1.0.2.nupkg.sha512", "/home/kim/.nuget/packages/flurl/3.0.1/flurl.3.0.1.nupkg.sha512", "/home/kim/.nuget/packages/flurl.http/3.0.1/flurl.http.3.0.1.nupkg.sha512", "/home/kim/.nuget/packages/microsoft.aspnet.cors/5.0.0/microsoft.aspnet.cors.5.0.0.nupkg.sha512", diff --git a/csharp/app/Backend/obj/rider.project.restore.info b/csharp/app/Backend/obj/rider.project.restore.info index 2f9a68d35..fc7f70f92 100644 --- a/csharp/app/Backend/obj/rider.project.restore.info +++ b/csharp/app/Backend/obj/rider.project.restore.info @@ -1 +1 @@ -16758719413962650 \ No newline at end of file +16769606178754984 \ No newline at end of file diff --git a/csharp/app/Backend/obj/staticwebassets.pack.sentinel b/csharp/app/Backend/obj/staticwebassets.pack.sentinel deleted file mode 100644 index ed902547d..000000000 --- a/csharp/app/Backend/obj/staticwebassets.pack.sentinel +++ /dev/null @@ -1,203 +0,0 @@ -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 -2.0 diff --git a/csharp/app/BmsTunnel/obj/BmsTunnel.csproj.nuget.dgspec.json b/csharp/app/BmsTunnel/obj/BmsTunnel.csproj.nuget.dgspec.json index ed4894533..bfa833e29 100644 --- a/csharp/app/BmsTunnel/obj/BmsTunnel.csproj.nuget.dgspec.json +++ b/csharp/app/BmsTunnel/obj/BmsTunnel.csproj.nuget.dgspec.json @@ -108,6 +108,10 @@ "target": "Package", "version": "[3.3.1, )" }, + "DecimalMath.DecimalEx": { + "target": "Package", + "version": "[1.0.2, )" + }, "System.Reactive.Linq": { "target": "Package", "version": "[5.0.0, )" diff --git a/csharp/app/BmsTunnel/obj/Debug/net6.0/BmsTunnel.assets.cache b/csharp/app/BmsTunnel/obj/Debug/net6.0/BmsTunnel.assets.cache index 4e8e49f61..3611c65b9 100644 Binary files a/csharp/app/BmsTunnel/obj/Debug/net6.0/BmsTunnel.assets.cache and b/csharp/app/BmsTunnel/obj/Debug/net6.0/BmsTunnel.assets.cache differ diff --git a/csharp/app/BmsTunnel/obj/Debug/net6.0/BmsTunnel.csproj.AssemblyReference.cache b/csharp/app/BmsTunnel/obj/Debug/net6.0/BmsTunnel.csproj.AssemblyReference.cache index 1e08a4152..98711e2f8 100644 Binary files a/csharp/app/BmsTunnel/obj/Debug/net6.0/BmsTunnel.csproj.AssemblyReference.cache and b/csharp/app/BmsTunnel/obj/Debug/net6.0/BmsTunnel.csproj.AssemblyReference.cache differ diff --git a/csharp/app/BmsTunnel/obj/project.assets.json b/csharp/app/BmsTunnel/obj/project.assets.json index 1ef93a544..bae8f8387 100644 --- a/csharp/app/BmsTunnel/obj/project.assets.json +++ b/csharp/app/BmsTunnel/obj/project.assets.json @@ -15,6 +15,19 @@ } } }, + "DecimalMath.DecimalEx/1.0.2": { + "type": "package", + "compile": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + } + }, "runtime.linux-arm.runtime.native.System.IO.Ports/7.0.0": { "type": "package", "runtimeTargets": { @@ -146,6 +159,7 @@ "framework": ".NETCoreApp,Version=v6.0", "dependencies": { "CliWrap": "3.3.1", + "DecimalMath.DecimalEx": "1.0.2", "System.Reactive.Linq": "5.0.0" }, "compile": { @@ -179,6 +193,20 @@ "lib/netstandard2.1/CliWrap.xml" ] }, + "DecimalMath.DecimalEx/1.0.2": { + "sha512": "BCii/IxT7Tx7BPZ7MtrpqVlEii/iaHi4OOXpgaPi+zrphnkbe251KKI3S+pgnTzobfn0jS/SF7bgidqOMj1oGw==", + "type": "package", + "path": "decimalmath.decimalex/1.0.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "LICENSE", + "decimalmath.decimalex.1.0.2.nupkg.sha512", + "decimalmath.decimalex.nuspec", + "lib/netstandard2.0/DecimalEx.dll", + "lib/netstandard2.0/DecimalEx.xml" + ] + }, "runtime.linux-arm.runtime.native.System.IO.Ports/7.0.0": { "sha512": "CBvgRaF+M0xGLDv2Geb/0v0LEADheH8aK72GRAUJdnqnJVsQO60ki1XO8M3keEhnjm+T5NvLm41pNXAVYAPiSg==", "type": "package", diff --git a/csharp/app/BmsTunnel/obj/project.nuget.cache b/csharp/app/BmsTunnel/obj/project.nuget.cache index 11f0cf3b3..32031d175 100644 --- a/csharp/app/BmsTunnel/obj/project.nuget.cache +++ b/csharp/app/BmsTunnel/obj/project.nuget.cache @@ -1,10 +1,11 @@ { "version": 2, - "dgSpecHash": "Nke11RxKbOWlVoBscpAV7gQaloKYo0efe9EMVqqSyJ5/YDNdEnugot+SMk4WwTtsLCvOYZZD5nsCtFwFIajyjg==", + "dgSpecHash": "Qv6sJgsHepvCERYb47HYJPm/t6a2/9LRsSfrfQuAYMAiZDh/agkv6lO9ULdyFWRlCZf7RQb39DQwxcKtl+rhoQ==", "success": true, "projectFilePath": "/home/kim/code/innovenergy/new/csharp/app/BmsTunnel/BmsTunnel.csproj", "expectedPackageFiles": [ "/home/kim/.nuget/packages/cliwrap/3.4.3/cliwrap.3.4.3.nupkg.sha512", + "/home/kim/.nuget/packages/decimalmath.decimalex/1.0.2/decimalmath.decimalex.1.0.2.nupkg.sha512", "/home/kim/.nuget/packages/runtime.linux-arm.runtime.native.system.io.ports/7.0.0/runtime.linux-arm.runtime.native.system.io.ports.7.0.0.nupkg.sha512", "/home/kim/.nuget/packages/runtime.linux-arm64.runtime.native.system.io.ports/7.0.0/runtime.linux-arm64.runtime.native.system.io.ports.7.0.0.nupkg.sha512", "/home/kim/.nuget/packages/runtime.linux-x64.runtime.native.system.io.ports/7.0.0/runtime.linux-x64.runtime.native.system.io.ports.7.0.0.nupkg.sha512", diff --git a/csharp/app/BmsTunnel/obj/rider.project.restore.info b/csharp/app/BmsTunnel/obj/rider.project.restore.info index 0a5d94e03..c33115bc7 100644 --- a/csharp/app/BmsTunnel/obj/rider.project.restore.info +++ b/csharp/app/BmsTunnel/obj/rider.project.restore.info @@ -1 +1 @@ -16758719413242651 \ No newline at end of file +16769606177514988 \ No newline at end of file diff --git a/csharp/app/Collector/obj/Collector.csproj.nuget.dgspec.json b/csharp/app/Collector/obj/Collector.csproj.nuget.dgspec.json index 55cc61dbb..00c46bbdf 100644 --- a/csharp/app/Collector/obj/Collector.csproj.nuget.dgspec.json +++ b/csharp/app/Collector/obj/Collector.csproj.nuget.dgspec.json @@ -107,6 +107,10 @@ "target": "Package", "version": "[3.3.1, )" }, + "DecimalMath.DecimalEx": { + "target": "Package", + "version": "[1.0.2, )" + }, "System.Reactive.Linq": { "target": "Package", "version": "[5.0.0, )" diff --git a/csharp/app/Collector/obj/Debug/net6.0/Collector.assets.cache b/csharp/app/Collector/obj/Debug/net6.0/Collector.assets.cache index 27ec16f95..1b22ff41b 100644 Binary files a/csharp/app/Collector/obj/Debug/net6.0/Collector.assets.cache and b/csharp/app/Collector/obj/Debug/net6.0/Collector.assets.cache differ diff --git a/csharp/app/Collector/obj/Debug/net6.0/Collector.csproj.AssemblyReference.cache b/csharp/app/Collector/obj/Debug/net6.0/Collector.csproj.AssemblyReference.cache index 3f6fdf612..4c0e54b06 100644 Binary files a/csharp/app/Collector/obj/Debug/net6.0/Collector.csproj.AssemblyReference.cache and b/csharp/app/Collector/obj/Debug/net6.0/Collector.csproj.AssemblyReference.cache differ diff --git a/csharp/app/Collector/obj/project.assets.json b/csharp/app/Collector/obj/project.assets.json index 69d84baca..3e9d85d25 100644 --- a/csharp/app/Collector/obj/project.assets.json +++ b/csharp/app/Collector/obj/project.assets.json @@ -15,6 +15,19 @@ } } }, + "DecimalMath.DecimalEx/1.0.2": { + "type": "package", + "compile": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + } + }, "Flurl/3.0.1": { "type": "package", "compile": { @@ -160,6 +173,7 @@ "framework": ".NETCoreApp,Version=v6.0", "dependencies": { "CliWrap": "3.3.1", + "DecimalMath.DecimalEx": "1.0.2", "System.Reactive.Linq": "5.0.0" }, "compile": { @@ -208,6 +222,20 @@ "lib/netstandard2.1/CliWrap.xml" ] }, + "DecimalMath.DecimalEx/1.0.2": { + "sha512": "BCii/IxT7Tx7BPZ7MtrpqVlEii/iaHi4OOXpgaPi+zrphnkbe251KKI3S+pgnTzobfn0jS/SF7bgidqOMj1oGw==", + "type": "package", + "path": "decimalmath.decimalex/1.0.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "LICENSE", + "decimalmath.decimalex.1.0.2.nupkg.sha512", + "decimalmath.decimalex.nuspec", + "lib/netstandard2.0/DecimalEx.dll", + "lib/netstandard2.0/DecimalEx.xml" + ] + }, "Flurl/3.0.1": { "sha512": "i7CuPSikVroBaWG8sPvO707Ex9C6BP5+r4JufKNU1FGMmiFgLJvNo1ttUg6ZiXIzUNknvIb1VUTIO9iEDucibg==", "type": "package", diff --git a/csharp/app/Collector/obj/project.nuget.cache b/csharp/app/Collector/obj/project.nuget.cache index 6f8a10016..a0ca78e0b 100644 --- a/csharp/app/Collector/obj/project.nuget.cache +++ b/csharp/app/Collector/obj/project.nuget.cache @@ -1,10 +1,11 @@ { "version": 2, - "dgSpecHash": "UAvD9VISYqdox01NdjEo6KkLKz/OvP72h2Q5OBG5/Tc3kKihaY66bw7AtS4v3eL/TkiRinACyW60kqK3zDuCcQ==", + "dgSpecHash": "9i2PFunukqYLM1MlEYMp8ZfqGsWWpgObIdBPomhb6yFXeOcdoI2L8InTM+OxlI58rvCu374fXWyF5IpxnUoHwA==", "success": true, "projectFilePath": "/home/kim/code/innovenergy/new/csharp/app/Collector/Collector.csproj", "expectedPackageFiles": [ "/home/kim/.nuget/packages/cliwrap/3.3.1/cliwrap.3.3.1.nupkg.sha512", + "/home/kim/.nuget/packages/decimalmath.decimalex/1.0.2/decimalmath.decimalex.1.0.2.nupkg.sha512", "/home/kim/.nuget/packages/flurl/3.0.1/flurl.3.0.1.nupkg.sha512", "/home/kim/.nuget/packages/flurl.http/3.0.1/flurl.http.3.0.1.nupkg.sha512", "/home/kim/.nuget/packages/microsoft.netcore.platforms/2.1.2/microsoft.netcore.platforms.2.1.2.nupkg.sha512", diff --git a/csharp/app/Collector/obj/rider.project.restore.info b/csharp/app/Collector/obj/rider.project.restore.info index 01c0c4760..81393c5a6 100644 --- a/csharp/app/Collector/obj/rider.project.restore.info +++ b/csharp/app/Collector/obj/rider.project.restore.info @@ -1 +1 @@ -16758719413362651 \ No newline at end of file +16769606177474988 \ No newline at end of file diff --git a/csharp/app/CsController/obj/CsController.csproj.nuget.dgspec.json b/csharp/app/CsController/obj/CsController.csproj.nuget.dgspec.json index 5b2233d47..a27da6ffd 100644 --- a/csharp/app/CsController/obj/CsController.csproj.nuget.dgspec.json +++ b/csharp/app/CsController/obj/CsController.csproj.nuget.dgspec.json @@ -164,6 +164,10 @@ "target": "Package", "version": "[3.3.1, )" }, + "DecimalMath.DecimalEx": { + "target": "Package", + "version": "[1.0.2, )" + }, "System.Reactive.Linq": { "target": "Package", "version": "[5.0.0, )" diff --git a/csharp/app/CsController/obj/Debug/net6.0/CsController.assets.cache b/csharp/app/CsController/obj/Debug/net6.0/CsController.assets.cache index 0bebb1567..56dd83c32 100644 Binary files a/csharp/app/CsController/obj/Debug/net6.0/CsController.assets.cache and b/csharp/app/CsController/obj/Debug/net6.0/CsController.assets.cache differ diff --git a/csharp/app/CsController/obj/Debug/net6.0/CsController.csproj.AssemblyReference.cache b/csharp/app/CsController/obj/Debug/net6.0/CsController.csproj.AssemblyReference.cache index c8e8090a8..8d05446f8 100644 Binary files a/csharp/app/CsController/obj/Debug/net6.0/CsController.csproj.AssemblyReference.cache and b/csharp/app/CsController/obj/Debug/net6.0/CsController.csproj.AssemblyReference.cache differ diff --git a/csharp/app/CsController/obj/project.assets.json b/csharp/app/CsController/obj/project.assets.json index 044a2cc25..c507304a7 100644 --- a/csharp/app/CsController/obj/project.assets.json +++ b/csharp/app/CsController/obj/project.assets.json @@ -15,6 +15,19 @@ } } }, + "DecimalMath.DecimalEx/1.0.2": { + "type": "package", + "compile": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + } + }, "System.Reactive/5.0.0": { "type": "package", "compile": { @@ -109,6 +122,7 @@ "framework": ".NETCoreApp,Version=v6.0", "dependencies": { "CliWrap": "3.3.1", + "DecimalMath.DecimalEx": "1.0.2", "System.Reactive.Linq": "5.0.0" }, "compile": { @@ -156,6 +170,20 @@ "lib/netstandard2.1/CliWrap.xml" ] }, + "DecimalMath.DecimalEx/1.0.2": { + "sha512": "BCii/IxT7Tx7BPZ7MtrpqVlEii/iaHi4OOXpgaPi+zrphnkbe251KKI3S+pgnTzobfn0jS/SF7bgidqOMj1oGw==", + "type": "package", + "path": "decimalmath.decimalex/1.0.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "LICENSE", + "decimalmath.decimalex.1.0.2.nupkg.sha512", + "decimalmath.decimalex.nuspec", + "lib/netstandard2.0/DecimalEx.dll", + "lib/netstandard2.0/DecimalEx.xml" + ] + }, "System.Reactive/5.0.0": { "sha512": "erBZjkQHWL9jpasCE/0qKAryzVBJFxGHVBAvgRN1bzM0q2s1S4oYREEEL0Vb+1kA/6BKb5FjUZMp5VXmy+gzkQ==", "type": "package", diff --git a/csharp/app/CsController/obj/project.nuget.cache b/csharp/app/CsController/obj/project.nuget.cache index 08a2fa01b..1c66c17dd 100644 --- a/csharp/app/CsController/obj/project.nuget.cache +++ b/csharp/app/CsController/obj/project.nuget.cache @@ -1,10 +1,11 @@ { "version": 2, - "dgSpecHash": "c9nLTvh2gw5hmXYEAUK4OY3AUAnUOWM2cSzskUC72XxP9VR2RIxwun4h+lRbiBjcEDMee01epatSM+z0ybkDcg==", + "dgSpecHash": "J1dr8XRtPJYuBcMKzJg8b7EdgDqthiKaQMwWAK67d8s5CbjLDSve5MWdvx4Nzhx0BRA68Dhqzi04KEotO1aPgQ==", "success": true, "projectFilePath": "/home/kim/code/innovenergy/new/csharp/app/CsController/CsController.csproj", "expectedPackageFiles": [ "/home/kim/.nuget/packages/cliwrap/3.3.1/cliwrap.3.3.1.nupkg.sha512", + "/home/kim/.nuget/packages/decimalmath.decimalex/1.0.2/decimalmath.decimalex.1.0.2.nupkg.sha512", "/home/kim/.nuget/packages/system.reactive/5.0.0/system.reactive.5.0.0.nupkg.sha512", "/home/kim/.nuget/packages/system.reactive.linq/5.0.0/system.reactive.linq.5.0.0.nupkg.sha512", "/home/kim/.nuget/packages/system.reflection.emit/4.7.0/system.reflection.emit.4.7.0.nupkg.sha512", diff --git a/csharp/app/CsController/obj/rider.project.restore.info b/csharp/app/CsController/obj/rider.project.restore.info index bf15616eb..81393c5a6 100644 --- a/csharp/app/CsController/obj/rider.project.restore.info +++ b/csharp/app/CsController/obj/rider.project.restore.info @@ -1 +1 @@ -16758719413402651 \ No newline at end of file +16769606177474988 \ No newline at end of file diff --git a/csharp/app/EmuMeterDriver/obj/Debug/net6.0/EmuMeterDriver.assets.cache b/csharp/app/EmuMeterDriver/obj/Debug/net6.0/EmuMeterDriver.assets.cache index 005add9d0..d92e96143 100644 Binary files a/csharp/app/EmuMeterDriver/obj/Debug/net6.0/EmuMeterDriver.assets.cache and b/csharp/app/EmuMeterDriver/obj/Debug/net6.0/EmuMeterDriver.assets.cache differ diff --git a/csharp/app/EmuMeterDriver/obj/Debug/net6.0/EmuMeterDriver.csproj.AssemblyReference.cache b/csharp/app/EmuMeterDriver/obj/Debug/net6.0/EmuMeterDriver.csproj.AssemblyReference.cache index a16c68d6c..204fdef64 100644 Binary files a/csharp/app/EmuMeterDriver/obj/Debug/net6.0/EmuMeterDriver.csproj.AssemblyReference.cache and b/csharp/app/EmuMeterDriver/obj/Debug/net6.0/EmuMeterDriver.csproj.AssemblyReference.cache differ diff --git a/csharp/app/EmuMeterDriver/obj/EmuMeterDriver.csproj.nuget.dgspec.json b/csharp/app/EmuMeterDriver/obj/EmuMeterDriver.csproj.nuget.dgspec.json index 5818306ea..4ecef31dc 100644 --- a/csharp/app/EmuMeterDriver/obj/EmuMeterDriver.csproj.nuget.dgspec.json +++ b/csharp/app/EmuMeterDriver/obj/EmuMeterDriver.csproj.nuget.dgspec.json @@ -315,6 +315,10 @@ "target": "Package", "version": "[3.3.1, )" }, + "DecimalMath.DecimalEx": { + "target": "Package", + "version": "[1.0.2, )" + }, "System.Reactive.Linq": { "target": "Package", "version": "[5.0.0, )" diff --git a/csharp/app/EmuMeterDriver/obj/project.assets.json b/csharp/app/EmuMeterDriver/obj/project.assets.json index 01af339d3..839112484 100644 --- a/csharp/app/EmuMeterDriver/obj/project.assets.json +++ b/csharp/app/EmuMeterDriver/obj/project.assets.json @@ -15,6 +15,19 @@ } } }, + "DecimalMath.DecimalEx/1.0.2": { + "type": "package", + "compile": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + } + }, "runtime.linux-arm.runtime.native.System.IO.Ports/7.0.0": { "type": "package", "runtimeTargets": { @@ -221,6 +234,7 @@ "framework": ".NETCoreApp,Version=v6.0", "dependencies": { "CliWrap": "3.3.1", + "DecimalMath.DecimalEx": "1.0.2", "System.Reactive.Linq": "5.0.0" }, "compile": { @@ -269,6 +283,20 @@ "lib/netstandard2.1/CliWrap.xml" ] }, + "DecimalMath.DecimalEx/1.0.2": { + "sha512": "BCii/IxT7Tx7BPZ7MtrpqVlEii/iaHi4OOXpgaPi+zrphnkbe251KKI3S+pgnTzobfn0jS/SF7bgidqOMj1oGw==", + "type": "package", + "path": "decimalmath.decimalex/1.0.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "LICENSE", + "decimalmath.decimalex.1.0.2.nupkg.sha512", + "decimalmath.decimalex.nuspec", + "lib/netstandard2.0/DecimalEx.dll", + "lib/netstandard2.0/DecimalEx.xml" + ] + }, "runtime.linux-arm.runtime.native.System.IO.Ports/7.0.0": { "sha512": "CBvgRaF+M0xGLDv2Geb/0v0LEADheH8aK72GRAUJdnqnJVsQO60ki1XO8M3keEhnjm+T5NvLm41pNXAVYAPiSg==", "type": "package", diff --git a/csharp/app/EmuMeterDriver/obj/project.nuget.cache b/csharp/app/EmuMeterDriver/obj/project.nuget.cache index 4d3f04b2c..9fe075e78 100644 --- a/csharp/app/EmuMeterDriver/obj/project.nuget.cache +++ b/csharp/app/EmuMeterDriver/obj/project.nuget.cache @@ -1,10 +1,11 @@ { "version": 2, - "dgSpecHash": "yrf2nH3W4biRAVVAndvH+Kzw+I+85ttiAZFlnT9j9t+ZZIHlzNQfFaAnTGlVa31oTf/i1Q2rSOq4G+/IdqUzlg==", + "dgSpecHash": "2ewazRgRKz4L39xWIoJjSaXaYlWNZzdNQ3JNtlr75qvrWeWsvOlJppatBwbnYKjfISXH2UGgErcEVSB+GMCKnw==", "success": false, "projectFilePath": "/home/kim/code/innovenergy/new/csharp/app/EmuMeterDriver/EmuMeterDriver.csproj", "expectedPackageFiles": [ "/home/kim/.nuget/packages/cliwrap/3.5.0/cliwrap.3.5.0.nupkg.sha512", + "/home/kim/.nuget/packages/decimalmath.decimalex/1.0.2/decimalmath.decimalex.1.0.2.nupkg.sha512", "/home/kim/.nuget/packages/runtime.linux-arm.runtime.native.system.io.ports/7.0.0/runtime.linux-arm.runtime.native.system.io.ports.7.0.0.nupkg.sha512", "/home/kim/.nuget/packages/runtime.linux-arm64.runtime.native.system.io.ports/7.0.0/runtime.linux-arm64.runtime.native.system.io.ports.7.0.0.nupkg.sha512", "/home/kim/.nuget/packages/runtime.linux-x64.runtime.native.system.io.ports/7.0.0/runtime.linux-x64.runtime.native.system.io.ports.7.0.0.nupkg.sha512", diff --git a/csharp/app/EmuMeterDriver/obj/rider.project.restore.info b/csharp/app/EmuMeterDriver/obj/rider.project.restore.info index a13f067b2..b41c8ec78 100644 --- a/csharp/app/EmuMeterDriver/obj/rider.project.restore.info +++ b/csharp/app/EmuMeterDriver/obj/rider.project.restore.info @@ -1 +1 @@ -16765322878053266 \ No newline at end of file +16769606177434988 \ No newline at end of file diff --git a/csharp/app/FossilTui/obj/Debug/net6.0/FossilTui.assets.cache b/csharp/app/FossilTui/obj/Debug/net6.0/FossilTui.assets.cache index 7054fad7f..755f69330 100644 Binary files a/csharp/app/FossilTui/obj/Debug/net6.0/FossilTui.assets.cache and b/csharp/app/FossilTui/obj/Debug/net6.0/FossilTui.assets.cache differ diff --git a/csharp/app/FossilTui/obj/Debug/net6.0/FossilTui.csproj.AssemblyReference.cache b/csharp/app/FossilTui/obj/Debug/net6.0/FossilTui.csproj.AssemblyReference.cache index 204fdef64..f58c211f3 100644 Binary files a/csharp/app/FossilTui/obj/Debug/net6.0/FossilTui.csproj.AssemblyReference.cache and b/csharp/app/FossilTui/obj/Debug/net6.0/FossilTui.csproj.AssemblyReference.cache differ diff --git a/csharp/app/FossilTui/obj/FossilTui.csproj.nuget.dgspec.json b/csharp/app/FossilTui/obj/FossilTui.csproj.nuget.dgspec.json index cf873d09b..9939eca13 100644 --- a/csharp/app/FossilTui/obj/FossilTui.csproj.nuget.dgspec.json +++ b/csharp/app/FossilTui/obj/FossilTui.csproj.nuget.dgspec.json @@ -159,6 +159,10 @@ "target": "Package", "version": "[3.3.1, )" }, + "DecimalMath.DecimalEx": { + "target": "Package", + "version": "[1.0.2, )" + }, "System.Reactive.Linq": { "target": "Package", "version": "[5.0.0, )" diff --git a/csharp/app/FossilTui/obj/project.assets.json b/csharp/app/FossilTui/obj/project.assets.json index 5a346d18b..8c16c816e 100644 --- a/csharp/app/FossilTui/obj/project.assets.json +++ b/csharp/app/FossilTui/obj/project.assets.json @@ -15,6 +15,19 @@ } } }, + "DecimalMath.DecimalEx/1.0.2": { + "type": "package", + "compile": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + } + }, "System.Reactive/5.0.0": { "type": "package", "compile": { @@ -72,6 +85,7 @@ "framework": ".NETCoreApp,Version=v6.0", "dependencies": { "CliWrap": "3.3.1", + "DecimalMath.DecimalEx": "1.0.2", "System.Reactive.Linq": "5.0.0" }, "compile": { @@ -105,6 +119,20 @@ "lib/netstandard2.1/CliWrap.xml" ] }, + "DecimalMath.DecimalEx/1.0.2": { + "sha512": "BCii/IxT7Tx7BPZ7MtrpqVlEii/iaHi4OOXpgaPi+zrphnkbe251KKI3S+pgnTzobfn0jS/SF7bgidqOMj1oGw==", + "type": "package", + "path": "decimalmath.decimalex/1.0.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "LICENSE", + "decimalmath.decimalex.1.0.2.nupkg.sha512", + "decimalmath.decimalex.nuspec", + "lib/netstandard2.0/DecimalEx.dll", + "lib/netstandard2.0/DecimalEx.xml" + ] + }, "System.Reactive/5.0.0": { "sha512": "erBZjkQHWL9jpasCE/0qKAryzVBJFxGHVBAvgRN1bzM0q2s1S4oYREEEL0Vb+1kA/6BKb5FjUZMp5VXmy+gzkQ==", "type": "package", diff --git a/csharp/app/FossilTui/obj/project.nuget.cache b/csharp/app/FossilTui/obj/project.nuget.cache index b8c4fa32c..432ecb3fd 100644 --- a/csharp/app/FossilTui/obj/project.nuget.cache +++ b/csharp/app/FossilTui/obj/project.nuget.cache @@ -1,10 +1,11 @@ { "version": 2, - "dgSpecHash": "jku2j7nKdKz7OSKmKIzLnWIlvYDz5T1ilOYj9aUrVPFn0YKrinlKrEIhfHhDV24pRZv0r4Uq18FfIi+xtsC6bw==", + "dgSpecHash": "U/s4BMvyN0XHGZp5V6nYwrJuMjSDA8kadrq1PqryUUdMuh+ZcyX+yPknYtfEDHV43LGxB54pXSAxqs1pByV0OQ==", "success": true, "projectFilePath": "/home/kim/code/innovenergy/new/csharp/app/FossilTui/FossilTui.csproj", "expectedPackageFiles": [ "/home/kim/.nuget/packages/cliwrap/3.5.0/cliwrap.3.5.0.nupkg.sha512", + "/home/kim/.nuget/packages/decimalmath.decimalex/1.0.2/decimalmath.decimalex.1.0.2.nupkg.sha512", "/home/kim/.nuget/packages/system.reactive/5.0.0/system.reactive.5.0.0.nupkg.sha512", "/home/kim/.nuget/packages/system.reactive.linq/5.0.0/system.reactive.linq.5.0.0.nupkg.sha512", "/home/kim/.nuget/packages/system.threading.tasks.extensions/4.5.4/system.threading.tasks.extensions.4.5.4.nupkg.sha512" diff --git a/csharp/app/FossilTui/obj/rider.project.restore.info b/csharp/app/FossilTui/obj/rider.project.restore.info index a13f067b2..81393c5a6 100644 --- a/csharp/app/FossilTui/obj/rider.project.restore.info +++ b/csharp/app/FossilTui/obj/rider.project.restore.info @@ -1 +1 @@ -16765322878053266 \ No newline at end of file +16769606177474988 \ No newline at end of file diff --git a/csharp/app/GuiFeeder/obj/Debug/net6.0/GuiFeeder.assets.cache b/csharp/app/GuiFeeder/obj/Debug/net6.0/GuiFeeder.assets.cache index 23c8f87d5..a364d9cfa 100644 Binary files a/csharp/app/GuiFeeder/obj/Debug/net6.0/GuiFeeder.assets.cache and b/csharp/app/GuiFeeder/obj/Debug/net6.0/GuiFeeder.assets.cache differ diff --git a/csharp/app/GuiFeeder/obj/GuiFeeder.csproj.nuget.dgspec.json b/csharp/app/GuiFeeder/obj/GuiFeeder.csproj.nuget.dgspec.json index 63c615907..c2eb467b4 100644 --- a/csharp/app/GuiFeeder/obj/GuiFeeder.csproj.nuget.dgspec.json +++ b/csharp/app/GuiFeeder/obj/GuiFeeder.csproj.nuget.dgspec.json @@ -173,6 +173,10 @@ "target": "Package", "version": "[3.3.1, )" }, + "DecimalMath.DecimalEx": { + "target": "Package", + "version": "[1.0.2, )" + }, "System.Reactive.Linq": { "target": "Package", "version": "[5.0.0, )" diff --git a/csharp/app/GuiFeeder/obj/project.assets.json b/csharp/app/GuiFeeder/obj/project.assets.json index ba7549f69..4f3aa6fbe 100644 --- a/csharp/app/GuiFeeder/obj/project.assets.json +++ b/csharp/app/GuiFeeder/obj/project.assets.json @@ -15,6 +15,19 @@ } } }, + "DecimalMath.DecimalEx/1.0.2": { + "type": "package", + "compile": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + } + }, "System.Reactive/5.0.0": { "type": "package", "compile": { @@ -109,6 +122,7 @@ "framework": ".NETCoreApp,Version=v6.0", "dependencies": { "CliWrap": "3.3.1", + "DecimalMath.DecimalEx": "1.0.2", "System.Reactive.Linq": "5.0.0" }, "compile": { @@ -156,6 +170,20 @@ "lib/netstandard2.1/CliWrap.xml" ] }, + "DecimalMath.DecimalEx/1.0.2": { + "sha512": "BCii/IxT7Tx7BPZ7MtrpqVlEii/iaHi4OOXpgaPi+zrphnkbe251KKI3S+pgnTzobfn0jS/SF7bgidqOMj1oGw==", + "type": "package", + "path": "decimalmath.decimalex/1.0.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "LICENSE", + "decimalmath.decimalex.1.0.2.nupkg.sha512", + "decimalmath.decimalex.nuspec", + "lib/netstandard2.0/DecimalEx.dll", + "lib/netstandard2.0/DecimalEx.xml" + ] + }, "System.Reactive/5.0.0": { "sha512": "erBZjkQHWL9jpasCE/0qKAryzVBJFxGHVBAvgRN1bzM0q2s1S4oYREEEL0Vb+1kA/6BKb5FjUZMp5VXmy+gzkQ==", "type": "package", diff --git a/csharp/app/GuiFeeder/obj/project.nuget.cache b/csharp/app/GuiFeeder/obj/project.nuget.cache index fa1a6a811..dcb04e599 100644 --- a/csharp/app/GuiFeeder/obj/project.nuget.cache +++ b/csharp/app/GuiFeeder/obj/project.nuget.cache @@ -1,10 +1,11 @@ { "version": 2, - "dgSpecHash": "cOHONU4GCqA+dI/Rv1t6D73epwZNctGSr2+h5FghVxuDPVxvgMEDFXBxyoRYRgV0hWUgecdkllQClZSN7zPqBA==", + "dgSpecHash": "Sm0ObQgf9KDH/gcYnpfHlXR+ExJ98CSzc9mICxtGxbCBsjLy5FnN0bJ7FfsvoeFMIGGAnXXn66NFzVs5mnIq0A==", "success": false, "projectFilePath": "/home/kim/code/innovenergy/new/csharp/app/GuiFeeder/GuiFeeder.csproj", "expectedPackageFiles": [ "/home/kim/.nuget/packages/cliwrap/3.3.1/cliwrap.3.3.1.nupkg.sha512", + "/home/kim/.nuget/packages/decimalmath.decimalex/1.0.2/decimalmath.decimalex.1.0.2.nupkg.sha512", "/home/kim/.nuget/packages/system.reactive/5.0.0/system.reactive.5.0.0.nupkg.sha512", "/home/kim/.nuget/packages/system.reactive.linq/5.0.0/system.reactive.linq.5.0.0.nupkg.sha512", "/home/kim/.nuget/packages/system.reflection.emit/4.7.0/system.reflection.emit.4.7.0.nupkg.sha512", diff --git a/csharp/app/GuiFeeder/obj/rider.project.restore.info b/csharp/app/GuiFeeder/obj/rider.project.restore.info index 345f18c81..b41c8ec78 100644 --- a/csharp/app/GuiFeeder/obj/rider.project.restore.info +++ b/csharp/app/GuiFeeder/obj/rider.project.restore.info @@ -1 +1 @@ -16765322878013266 \ No newline at end of file +16769606177434988 \ No newline at end of file diff --git a/csharp/app/Logging/obj/Debug/net6.0/Logging.assets.cache b/csharp/app/Logging/obj/Debug/net6.0/Logging.assets.cache index 5a3a65fac..77436a7ce 100644 Binary files a/csharp/app/Logging/obj/Debug/net6.0/Logging.assets.cache and b/csharp/app/Logging/obj/Debug/net6.0/Logging.assets.cache differ diff --git a/csharp/app/Logging/obj/Logging.csproj.nuget.dgspec.json b/csharp/app/Logging/obj/Logging.csproj.nuget.dgspec.json index 1425f7fdd..5ea5e6c13 100644 --- a/csharp/app/Logging/obj/Logging.csproj.nuget.dgspec.json +++ b/csharp/app/Logging/obj/Logging.csproj.nuget.dgspec.json @@ -98,6 +98,10 @@ "target": "Package", "version": "[3.3.1, )" }, + "DecimalMath.DecimalEx": { + "target": "Package", + "version": "[1.0.2, )" + }, "System.Reactive.Linq": { "target": "Package", "version": "[5.0.0, )" diff --git a/csharp/app/Logging/obj/project.assets.json b/csharp/app/Logging/obj/project.assets.json index 5fbb5611e..0352efca9 100644 --- a/csharp/app/Logging/obj/project.assets.json +++ b/csharp/app/Logging/obj/project.assets.json @@ -15,6 +15,19 @@ } } }, + "DecimalMath.DecimalEx/1.0.2": { + "type": "package", + "compile": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + } + }, "System.Reactive/5.0.0": { "type": "package", "compile": { @@ -62,6 +75,7 @@ "framework": ".NETCoreApp,Version=v6.0", "dependencies": { "CliWrap": "3.3.1", + "DecimalMath.DecimalEx": "1.0.2", "System.Reactive.Linq": "5.0.0" }, "compile": { @@ -94,6 +108,20 @@ "lib/netstandard2.1/CliWrap.xml" ] }, + "DecimalMath.DecimalEx/1.0.2": { + "sha512": "BCii/IxT7Tx7BPZ7MtrpqVlEii/iaHi4OOXpgaPi+zrphnkbe251KKI3S+pgnTzobfn0jS/SF7bgidqOMj1oGw==", + "type": "package", + "path": "decimalmath.decimalex/1.0.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "LICENSE", + "decimalmath.decimalex.1.0.2.nupkg.sha512", + "decimalmath.decimalex.nuspec", + "lib/netstandard2.0/DecimalEx.dll", + "lib/netstandard2.0/DecimalEx.xml" + ] + }, "System.Reactive/5.0.0": { "sha512": "erBZjkQHWL9jpasCE/0qKAryzVBJFxGHVBAvgRN1bzM0q2s1S4oYREEEL0Vb+1kA/6BKb5FjUZMp5VXmy+gzkQ==", "type": "package", diff --git a/csharp/app/Logging/obj/project.nuget.cache b/csharp/app/Logging/obj/project.nuget.cache index 462eb1697..ac4aea1a5 100644 --- a/csharp/app/Logging/obj/project.nuget.cache +++ b/csharp/app/Logging/obj/project.nuget.cache @@ -1,10 +1,11 @@ { "version": 2, - "dgSpecHash": "tCxgCnwFnFzHL6MsnctgrTrsOK6WQa2VxHS5FWl65w7tD4THMX81cgx1rDX1NlsndB+AGdrMU8q5VH/p2JbSLA==", + "dgSpecHash": "nKiQuR7HM+9Q0MXXJFrKHfrct9NGC6Bssl2ZK/w5IytlFEAOeJBLDprHJI5Gb4/LXpG4YN7PvT+e9YQkX4YhvA==", "success": true, "projectFilePath": "/home/kim/code/innovenergy/new/csharp/app/Logging/Logging.csproj", "expectedPackageFiles": [ "/home/kim/.nuget/packages/cliwrap/3.3.1/cliwrap.3.3.1.nupkg.sha512", + "/home/kim/.nuget/packages/decimalmath.decimalex/1.0.2/decimalmath.decimalex.1.0.2.nupkg.sha512", "/home/kim/.nuget/packages/system.reactive/5.0.0/system.reactive.5.0.0.nupkg.sha512", "/home/kim/.nuget/packages/system.reactive.linq/5.0.0/system.reactive.linq.5.0.0.nupkg.sha512", "/home/kim/.nuget/packages/system.threading.tasks.extensions/4.5.4/system.threading.tasks.extensions.4.5.4.nupkg.sha512" diff --git a/csharp/app/Logging/obj/rider.project.restore.info b/csharp/app/Logging/obj/rider.project.restore.info index 01c0c4760..c33115bc7 100644 --- a/csharp/app/Logging/obj/rider.project.restore.info +++ b/csharp/app/Logging/obj/rider.project.restore.info @@ -1 +1 @@ -16758719413362651 \ No newline at end of file +16769606177514988 \ No newline at end of file diff --git a/csharp/app/Meiringen/obj/Debug/net6.0/Meiringen.assets.cache b/csharp/app/Meiringen/obj/Debug/net6.0/Meiringen.assets.cache index 1a1db7371..d0314fee4 100644 Binary files a/csharp/app/Meiringen/obj/Debug/net6.0/Meiringen.assets.cache and b/csharp/app/Meiringen/obj/Debug/net6.0/Meiringen.assets.cache differ diff --git a/csharp/app/Meiringen/obj/Debug/net6.0/Meiringen.csproj.AssemblyReference.cache b/csharp/app/Meiringen/obj/Debug/net6.0/Meiringen.csproj.AssemblyReference.cache index 57a4e575b..204fdef64 100644 Binary files a/csharp/app/Meiringen/obj/Debug/net6.0/Meiringen.csproj.AssemblyReference.cache and b/csharp/app/Meiringen/obj/Debug/net6.0/Meiringen.csproj.AssemblyReference.cache differ diff --git a/csharp/app/Meiringen/obj/Meiringen.csproj.nuget.dgspec.json b/csharp/app/Meiringen/obj/Meiringen.csproj.nuget.dgspec.json index 239077462..43312ae58 100644 --- a/csharp/app/Meiringen/obj/Meiringen.csproj.nuget.dgspec.json +++ b/csharp/app/Meiringen/obj/Meiringen.csproj.nuget.dgspec.json @@ -229,6 +229,10 @@ "target": "Package", "version": "[3.3.1, )" }, + "DecimalMath.DecimalEx": { + "target": "Package", + "version": "[1.0.2, )" + }, "System.Reactive.Linq": { "target": "Package", "version": "[5.0.0, )" diff --git a/csharp/app/Meiringen/obj/project.assets.json b/csharp/app/Meiringen/obj/project.assets.json index fd216ce0d..a79c443a9 100644 --- a/csharp/app/Meiringen/obj/project.assets.json +++ b/csharp/app/Meiringen/obj/project.assets.json @@ -15,6 +15,19 @@ } } }, + "DecimalMath.DecimalEx/1.0.2": { + "type": "package", + "compile": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + } + }, "Flurl/3.0.2": { "type": "package", "compile": { @@ -186,6 +199,7 @@ "framework": ".NETCoreApp,Version=v6.0", "dependencies": { "CliWrap": "3.3.1", + "DecimalMath.DecimalEx": "1.0.2", "System.Reactive.Linq": "5.0.0" }, "compile": { @@ -218,6 +232,20 @@ "lib/netstandard2.1/CliWrap.xml" ] }, + "DecimalMath.DecimalEx/1.0.2": { + "sha512": "BCii/IxT7Tx7BPZ7MtrpqVlEii/iaHi4OOXpgaPi+zrphnkbe251KKI3S+pgnTzobfn0jS/SF7bgidqOMj1oGw==", + "type": "package", + "path": "decimalmath.decimalex/1.0.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "LICENSE", + "decimalmath.decimalex.1.0.2.nupkg.sha512", + "decimalmath.decimalex.nuspec", + "lib/netstandard2.0/DecimalEx.dll", + "lib/netstandard2.0/DecimalEx.xml" + ] + }, "Flurl/3.0.2": { "sha512": "1/6mqdzGCTdAekbWkVZBTylCV+8g3JUSTXRBngRVR274S+RsAYNRF79GbDoDsPfMKu8VPc9HkQWdBEAncK1PQQ==", "type": "package", diff --git a/csharp/app/Meiringen/obj/project.nuget.cache b/csharp/app/Meiringen/obj/project.nuget.cache index 0d9313303..767b3a471 100644 --- a/csharp/app/Meiringen/obj/project.nuget.cache +++ b/csharp/app/Meiringen/obj/project.nuget.cache @@ -1,10 +1,11 @@ { "version": 2, - "dgSpecHash": "d/LI/T8eCpgIJKtA6uWehmIp7Ra7KqbDho9Qa9qWOUcsPYwjXm6VGt4mesRy0Mo1N9t2vXtyZTqD2UtDC/N8zA==", + "dgSpecHash": "wJGMLcKu4YOjKxKZWKVDsAFNZ+qFJSTx0anSJi+udROWELHYtcKCrVBvSf9svSz6WxS/qLUkfMqst6vWJAmuBA==", "success": true, "projectFilePath": "/home/kim/code/innovenergy/new/csharp/app/Meiringen/Meiringen.csproj", "expectedPackageFiles": [ "/home/kim/.nuget/packages/cliwrap/3.3.1/cliwrap.3.3.1.nupkg.sha512", + "/home/kim/.nuget/packages/decimalmath.decimalex/1.0.2/decimalmath.decimalex.1.0.2.nupkg.sha512", "/home/kim/.nuget/packages/flurl/3.0.2/flurl.3.0.2.nupkg.sha512", "/home/kim/.nuget/packages/flurl.http/3.2.0/flurl.http.3.2.0.nupkg.sha512", "/home/kim/.nuget/packages/google.protobuf/3.19.4/google.protobuf.3.19.4.nupkg.sha512", diff --git a/csharp/app/Meiringen/obj/rider.project.restore.info b/csharp/app/Meiringen/obj/rider.project.restore.info index 01c0c4760..1c5428cdb 100644 --- a/csharp/app/Meiringen/obj/rider.project.restore.info +++ b/csharp/app/Meiringen/obj/rider.project.restore.info @@ -1 +1 @@ -16758719413362651 \ No newline at end of file +16769606177554988 \ No newline at end of file diff --git a/csharp/app/OpenVpnCertificatesServer/obj/Debug/net6.0/OpenVpnCertificatesServer.assets.cache b/csharp/app/OpenVpnCertificatesServer/obj/Debug/net6.0/OpenVpnCertificatesServer.assets.cache index 4d50d56ab..2618be3e8 100644 Binary files a/csharp/app/OpenVpnCertificatesServer/obj/Debug/net6.0/OpenVpnCertificatesServer.assets.cache and b/csharp/app/OpenVpnCertificatesServer/obj/Debug/net6.0/OpenVpnCertificatesServer.assets.cache differ diff --git a/csharp/app/OpenVpnCertificatesServer/obj/Debug/net6.0/OpenVpnCertificatesServer.csproj.AssemblyReference.cache b/csharp/app/OpenVpnCertificatesServer/obj/Debug/net6.0/OpenVpnCertificatesServer.csproj.AssemblyReference.cache index 1ccc9ca30..5c9ddc1af 100644 Binary files a/csharp/app/OpenVpnCertificatesServer/obj/Debug/net6.0/OpenVpnCertificatesServer.csproj.AssemblyReference.cache and b/csharp/app/OpenVpnCertificatesServer/obj/Debug/net6.0/OpenVpnCertificatesServer.csproj.AssemblyReference.cache differ diff --git a/csharp/app/OpenVpnCertificatesServer/obj/OpenVpnCertificatesServer.csproj.nuget.dgspec.json b/csharp/app/OpenVpnCertificatesServer/obj/OpenVpnCertificatesServer.csproj.nuget.dgspec.json index fcb0f0ed8..67d778aaf 100644 --- a/csharp/app/OpenVpnCertificatesServer/obj/OpenVpnCertificatesServer.csproj.nuget.dgspec.json +++ b/csharp/app/OpenVpnCertificatesServer/obj/OpenVpnCertificatesServer.csproj.nuget.dgspec.json @@ -233,6 +233,10 @@ "target": "Package", "version": "[3.3.1, )" }, + "DecimalMath.DecimalEx": { + "target": "Package", + "version": "[1.0.2, )" + }, "System.Reactive.Linq": { "target": "Package", "version": "[5.0.0, )" diff --git a/csharp/app/OpenVpnCertificatesServer/obj/project.assets.json b/csharp/app/OpenVpnCertificatesServer/obj/project.assets.json index a32796d1b..549c95774 100644 --- a/csharp/app/OpenVpnCertificatesServer/obj/project.assets.json +++ b/csharp/app/OpenVpnCertificatesServer/obj/project.assets.json @@ -24,6 +24,19 @@ } } }, + "DecimalMath.DecimalEx/1.0.2": { + "type": "package", + "compile": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + } + }, "Flurl/3.0.4": { "type": "package", "compile": { @@ -274,6 +287,7 @@ "framework": ".NETCoreApp,Version=v6.0", "dependencies": { "CliWrap": "3.3.1", + "DecimalMath.DecimalEx": "1.0.2", "System.Reactive.Linq": "5.0.0" }, "compile": { @@ -336,6 +350,20 @@ "lib/netstandard2.1/CliWrap.xml" ] }, + "DecimalMath.DecimalEx/1.0.2": { + "sha512": "BCii/IxT7Tx7BPZ7MtrpqVlEii/iaHi4OOXpgaPi+zrphnkbe251KKI3S+pgnTzobfn0jS/SF7bgidqOMj1oGw==", + "type": "package", + "path": "decimalmath.decimalex/1.0.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "LICENSE", + "decimalmath.decimalex.1.0.2.nupkg.sha512", + "decimalmath.decimalex.nuspec", + "lib/netstandard2.0/DecimalEx.dll", + "lib/netstandard2.0/DecimalEx.xml" + ] + }, "Flurl/3.0.4": { "sha512": "2bgCzOs3TGwRkfcijCiH+7o9Pz4pyVnt4yyLX2vD3wlMSekpmGhqe2zA4988qSMmPa6AqeekX13CY4FvsjsDJQ==", "type": "package", diff --git a/csharp/app/OpenVpnCertificatesServer/obj/project.nuget.cache b/csharp/app/OpenVpnCertificatesServer/obj/project.nuget.cache index d12493bdc..8df1dd057 100644 --- a/csharp/app/OpenVpnCertificatesServer/obj/project.nuget.cache +++ b/csharp/app/OpenVpnCertificatesServer/obj/project.nuget.cache @@ -1,11 +1,12 @@ { "version": 2, - "dgSpecHash": "TI3lsVsGRTJmH6CVbTwVd2DTDjreeGGON7YyzY8QAhsqlofp4JHK0yMxhwSNzuCrf8Z1mYOlbCQ+v9n0sgq6Vw==", + "dgSpecHash": "PURWN6Z2AsaTF0jBKvUimx2dUETO70Z5O1PWES1dt8s6Dkt+3PHB83spJwnLOoPHUxZ35fXy20FekyUvGARJrA==", "success": true, "projectFilePath": "/home/kim/code/innovenergy/new/csharp/app/OpenVpnCertificatesServer/OpenVpnCertificatesServer.csproj", "expectedPackageFiles": [ "/home/kim/.nuget/packages/bouncycastle/1.8.9/bouncycastle.1.8.9.nupkg.sha512", "/home/kim/.nuget/packages/cliwrap/3.3.1/cliwrap.3.3.1.nupkg.sha512", + "/home/kim/.nuget/packages/decimalmath.decimalex/1.0.2/decimalmath.decimalex.1.0.2.nupkg.sha512", "/home/kim/.nuget/packages/flurl/3.0.4/flurl.3.0.4.nupkg.sha512", "/home/kim/.nuget/packages/flurl.http/3.2.2/flurl.http.3.2.2.nupkg.sha512", "/home/kim/.nuget/packages/microsoft.netcore.platforms/2.1.2/microsoft.netcore.platforms.2.1.2.nupkg.sha512", diff --git a/csharp/app/OpenVpnCertificatesServer/obj/rider.project.restore.info b/csharp/app/OpenVpnCertificatesServer/obj/rider.project.restore.info index 345f18c81..81393c5a6 100644 --- a/csharp/app/OpenVpnCertificatesServer/obj/rider.project.restore.info +++ b/csharp/app/OpenVpnCertificatesServer/obj/rider.project.restore.info @@ -1 +1 @@ -16765322878013266 \ No newline at end of file +16769606177474988 \ No newline at end of file diff --git a/csharp/app/RemoteSupportConsole/obj/Debug/net6.0/RemoteSupportConsole.assets.cache b/csharp/app/RemoteSupportConsole/obj/Debug/net6.0/RemoteSupportConsole.assets.cache index d36a92196..c33b805f1 100644 Binary files a/csharp/app/RemoteSupportConsole/obj/Debug/net6.0/RemoteSupportConsole.assets.cache and b/csharp/app/RemoteSupportConsole/obj/Debug/net6.0/RemoteSupportConsole.assets.cache differ diff --git a/csharp/app/RemoteSupportConsole/obj/Debug/net6.0/RemoteSupportConsole.csproj.AssemblyReference.cache b/csharp/app/RemoteSupportConsole/obj/Debug/net6.0/RemoteSupportConsole.csproj.AssemblyReference.cache index d911eb07a..48918d3ff 100644 Binary files a/csharp/app/RemoteSupportConsole/obj/Debug/net6.0/RemoteSupportConsole.csproj.AssemblyReference.cache and b/csharp/app/RemoteSupportConsole/obj/Debug/net6.0/RemoteSupportConsole.csproj.AssemblyReference.cache differ diff --git a/csharp/app/RemoteSupportConsole/obj/RemoteSupportConsole.csproj.nuget.dgspec.json b/csharp/app/RemoteSupportConsole/obj/RemoteSupportConsole.csproj.nuget.dgspec.json index d8fe515c2..1e8f3efdb 100644 --- a/csharp/app/RemoteSupportConsole/obj/RemoteSupportConsole.csproj.nuget.dgspec.json +++ b/csharp/app/RemoteSupportConsole/obj/RemoteSupportConsole.csproj.nuget.dgspec.json @@ -163,6 +163,10 @@ "target": "Package", "version": "[3.3.1, )" }, + "DecimalMath.DecimalEx": { + "target": "Package", + "version": "[1.0.2, )" + }, "System.Reactive.Linq": { "target": "Package", "version": "[5.0.0, )" diff --git a/csharp/app/RemoteSupportConsole/obj/project.assets.json b/csharp/app/RemoteSupportConsole/obj/project.assets.json index d98df5aab..06bfc5510 100644 --- a/csharp/app/RemoteSupportConsole/obj/project.assets.json +++ b/csharp/app/RemoteSupportConsole/obj/project.assets.json @@ -15,6 +15,19 @@ } } }, + "DecimalMath.DecimalEx/1.0.2": { + "type": "package", + "compile": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + } + }, "Flurl/3.0.2": { "type": "package", "compile": { @@ -234,6 +247,7 @@ "framework": ".NETCoreApp,Version=v6.0", "dependencies": { "CliWrap": "3.3.1", + "DecimalMath.DecimalEx": "1.0.2", "System.Reactive.Linq": "5.0.0" }, "compile": { @@ -284,6 +298,20 @@ "lib/netstandard2.1/CliWrap.xml" ] }, + "DecimalMath.DecimalEx/1.0.2": { + "sha512": "BCii/IxT7Tx7BPZ7MtrpqVlEii/iaHi4OOXpgaPi+zrphnkbe251KKI3S+pgnTzobfn0jS/SF7bgidqOMj1oGw==", + "type": "package", + "path": "decimalmath.decimalex/1.0.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "LICENSE", + "decimalmath.decimalex.1.0.2.nupkg.sha512", + "decimalmath.decimalex.nuspec", + "lib/netstandard2.0/DecimalEx.dll", + "lib/netstandard2.0/DecimalEx.xml" + ] + }, "Flurl/3.0.2": { "sha512": "1/6mqdzGCTdAekbWkVZBTylCV+8g3JUSTXRBngRVR274S+RsAYNRF79GbDoDsPfMKu8VPc9HkQWdBEAncK1PQQ==", "type": "package", diff --git a/csharp/app/RemoteSupportConsole/obj/project.nuget.cache b/csharp/app/RemoteSupportConsole/obj/project.nuget.cache index a6da555c6..8fc8c9ae7 100644 --- a/csharp/app/RemoteSupportConsole/obj/project.nuget.cache +++ b/csharp/app/RemoteSupportConsole/obj/project.nuget.cache @@ -1,10 +1,11 @@ { "version": 2, - "dgSpecHash": "AdnIfm2lNYa0hZdkAnUPEg0raUxomGw3BfN55kJR0l/A9D2btlf5Klc7INJwX3b5EfYHX6zPLRkpMmwP9bSczA==", + "dgSpecHash": "5BTw46APqOr5EwrDgKZrsoSeSWwW4szbE+t91il2kXeIp9S3W9fmBCSQYFzwexpBevH2F6+7W7pbqkOkWz9SAg==", "success": true, "projectFilePath": "/home/kim/code/innovenergy/new/csharp/app/RemoteSupportConsole/RemoteSupportConsole.csproj", "expectedPackageFiles": [ "/home/kim/.nuget/packages/cliwrap/3.6.0/cliwrap.3.6.0.nupkg.sha512", + "/home/kim/.nuget/packages/decimalmath.decimalex/1.0.2/decimalmath.decimalex.1.0.2.nupkg.sha512", "/home/kim/.nuget/packages/flurl/3.0.2/flurl.3.0.2.nupkg.sha512", "/home/kim/.nuget/packages/flurl.http/3.2.0/flurl.http.3.2.0.nupkg.sha512", "/home/kim/.nuget/packages/microsoft.bcl.asyncinterfaces/6.0.0/microsoft.bcl.asyncinterfaces.6.0.0.nupkg.sha512", diff --git a/csharp/app/RemoteSupportConsole/obj/rider.project.restore.info b/csharp/app/RemoteSupportConsole/obj/rider.project.restore.info index 345f18c81..46a715514 100644 --- a/csharp/app/RemoteSupportConsole/obj/rider.project.restore.info +++ b/csharp/app/RemoteSupportConsole/obj/rider.project.restore.info @@ -1 +1 @@ -16765322878013266 \ No newline at end of file +16769606177594988 \ No newline at end of file diff --git a/csharp/app/SaliMax/obj/Debug/net6.0/SaliMax.csproj.AssemblyReference.cache b/csharp/app/SaliMax/obj/Debug/net6.0/SaliMax.csproj.AssemblyReference.cache index 1814037d4..204fdef64 100644 Binary files a/csharp/app/SaliMax/obj/Debug/net6.0/SaliMax.csproj.AssemblyReference.cache and b/csharp/app/SaliMax/obj/Debug/net6.0/SaliMax.csproj.AssemblyReference.cache differ diff --git a/csharp/app/SaliMax/obj/SaliMax.csproj.nuget.dgspec.json b/csharp/app/SaliMax/obj/SaliMax.csproj.nuget.dgspec.json index 6987e9c4f..e8e20d9bc 100644 --- a/csharp/app/SaliMax/obj/SaliMax.csproj.nuget.dgspec.json +++ b/csharp/app/SaliMax/obj/SaliMax.csproj.nuget.dgspec.json @@ -726,6 +726,10 @@ "target": "Package", "version": "[3.3.1, )" }, + "DecimalMath.DecimalEx": { + "target": "Package", + "version": "[1.0.2, )" + }, "System.Reactive.Linq": { "target": "Package", "version": "[5.0.0, )" diff --git a/csharp/app/SaliMax/obj/project.assets.json b/csharp/app/SaliMax/obj/project.assets.json index 670c2731a..22d538a6e 100644 --- a/csharp/app/SaliMax/obj/project.assets.json +++ b/csharp/app/SaliMax/obj/project.assets.json @@ -378,6 +378,7 @@ "framework": ".NETCoreApp,Version=v6.0", "dependencies": { "CliWrap": "3.3.1", + "DecimalMath.DecimalEx": "1.0.2", "System.Reactive.Linq": "5.0.0" }, "compile": { diff --git a/csharp/app/SaliMax/obj/project.nuget.cache b/csharp/app/SaliMax/obj/project.nuget.cache index c05c9fc7f..bbe7b1ff5 100644 --- a/csharp/app/SaliMax/obj/project.nuget.cache +++ b/csharp/app/SaliMax/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "8ZrGpi/CCtEGUWcbUHi3w8aGb6XllKy4nkfVZNHV8M6DhjiXCLpu36OFEUH0dPqzdEZtvMEpoO4bW6c6Xzrmag==", + "dgSpecHash": "Dp+CqO5frfeh+Sk8YUkxWZex9Ta2zDQcbbXGy6aNkhlOfuGgWTn6xAJIAU6B48BH6ZTO6FFtQASv/UDKEpp3aw==", "success": true, "projectFilePath": "/home/kim/code/innovenergy/new/csharp/app/SaliMax/SaliMax.csproj", "expectedPackageFiles": [ diff --git a/csharp/app/SaliMax/obj/rider.project.restore.info b/csharp/app/SaliMax/obj/rider.project.restore.info index be4b54233..f43d46a0f 100644 --- a/csharp/app/SaliMax/obj/rider.project.restore.info +++ b/csharp/app/SaliMax/obj/rider.project.restore.info @@ -1 +1 @@ -16759449276686422 \ No newline at end of file +16769606177674987 \ No newline at end of file diff --git a/csharp/app/SaliMax/src/Log/EmuMeter.cs b/csharp/app/SaliMax/src/Log/EmuMeter.cs index 08245fbb9..a6b7062cf 100644 --- a/csharp/app/SaliMax/src/Log/EmuMeter.cs +++ b/csharp/app/SaliMax/src/Log/EmuMeter.cs @@ -1,27 +1,46 @@ using System.Text.Json.Nodes; -using DecimalMath; using InnovEnergy.Lib.Devices.EmuMeter; using InnovEnergy.Lib.StatusApi; using InnovEnergy.Lib.Utils; +using static DecimalMath.DecimalEx; +using static InnovEnergy.SaliMax.Log.JsonUtil; namespace InnovEnergy.SaliMax.Log; public static class EmuMeter { - public static JsonObject? Log(this EmuMeterStatus? s, DeviceType type) + public static JsonObject? Log(this EmuMeterStatus? s, DeviceType type, String serialNb) { if (s is null) return null; - return type - .CreateDevice("EmuMeter") - .AddAcConnection(s.Frequency.Round3(), s.GetAcPhases()); + + // + + var l1 = CreateAcPhase(s.CurrentL1, s.VoltageL1N, ACos(s.PowerFactorL1)); + var l2 = CreateAcPhase(s.CurrentL2, s.VoltageL2N, ACos(s.PowerFactorL2)); + var l3 = CreateAcPhase(s.CurrentL3, s.VoltageL3N, ACos(s.PowerFactorL3)); + + var ac = new JsonObject + { + ["L1"] = l1, + ["L2"] = l2, + ["L3"] = l3, + ["Frequency"] = s.Frequency + }; + + var status = new JsonObject + { + ["Ac"] = ac, + }; + + return new JsonObject { [$"EmuMeter {serialNb}"] = status }; } private static IEnumerable GetAcPhases(this EmuMeterStatus s) { - yield return Util.CreateAcPhase(s.CurrentL1.Round3(),s.VoltageL1N.Round3(),s.PowerFactorL1.Apply(DecimalEx.ACos).Round3()); - yield return Util.CreateAcPhase(s.CurrentL2.Round3(),s.VoltageL2N.Round3(),s.PowerFactorL2.Apply(DecimalEx.ACos).Round3()); - yield return Util.CreateAcPhase(s.CurrentL3.Round3(),s.VoltageL3N.Round3(),s.PowerFactorL3.Apply(DecimalEx.ACos).Round3()); + yield return CreateAcPhase(s.CurrentL1.Round3(),s.VoltageL1N.Round3(),s.PowerFactorL1.Apply(ACos).Round3()); + yield return CreateAcPhase(s.CurrentL2.Round3(),s.VoltageL2N.Round3(),s.PowerFactorL2.Apply(ACos).Round3()); + yield return CreateAcPhase(s.CurrentL3.Round3(),s.VoltageL3N.Round3(),s.PowerFactorL3.Apply(ACos).Round3()); } } \ No newline at end of file diff --git a/csharp/app/SaliMax/src/Log/Salimax.cs b/csharp/app/SaliMax/src/Log/Salimax.cs index a888d7a8b..00ff996d8 100644 --- a/csharp/app/SaliMax/src/Log/Salimax.cs +++ b/csharp/app/SaliMax/src/Log/Salimax.cs @@ -24,8 +24,8 @@ public static class Salimax private static IEnumerable GetDevices(StatusRecord s) { - yield return s.InverterStatus.Log(); - yield return s.DcDcStatus.Log(); + yield return s.InverterStatus.Log("1234"); + yield return s.DcDcStatus.Log("3214"); yield return s.GridMeterStatus.Log(DeviceType.Grid); yield return s.AcInToAcOutMeterStatus.Log(DeviceType.AcInToAcOut); yield return s.AmptStatus.Log(); @@ -34,49 +34,49 @@ public static class Salimax public static JsonArray CreateTopology() { - var acInBusJson = Util.CreateBus + var acInBusJson = JsonUtil.CreateBus ( name: "AcIn", - left: Util.Port(DeviceType.Grid, BusPort.Ac), - top: Util.Port(DeviceType.PvOnAcIn, BusPort.Ac), - bottom: Util.Port(DeviceType.Load, BusPort.Infer), - right: Util.Port(DeviceType.AcInToAcOut, BusPort.Ac, false) + left: JsonUtil.Port(DeviceType.Grid, BusPort.Ac), + top: JsonUtil.Port(DeviceType.PvOnAcIn, BusPort.Ac), + bottom: JsonUtil.Port(DeviceType.Load, BusPort.Infer), + right: JsonUtil.Port(DeviceType.AcInToAcOut, BusPort.Ac, false) ); - var acOutBusJson = Util.CreateBus + var acOutBusJson = JsonUtil.CreateBus ( name: "AcOut", - left: Util.Port(DeviceType.AcInToAcOut, BusPort.Ac, false), - top: Util.Port(DeviceType.PvOnAcOut, BusPort.Ac), - bottom: Util.Port(DeviceType.CriticalLoad, BusPort.Infer), - right: Util.Port(DeviceType.Inverter, BusPort.Ac) + left: JsonUtil.Port(DeviceType.AcInToAcOut, BusPort.Ac, false), + top: JsonUtil.Port(DeviceType.PvOnAcOut, BusPort.Ac), + bottom: JsonUtil.Port(DeviceType.CriticalLoad, BusPort.Infer), + right: JsonUtil.Port(DeviceType.Inverter, BusPort.Ac) ); - var inverterJson = Util.CreateBus + var inverterJson = JsonUtil.CreateBus ( name: "Inverter", - left: Util.Port(DeviceType.Inverter, BusPort.Ac), - top: Util.Port(DeviceType.None, BusPort.None), - bottom: Util.Port(DeviceType.Losses, BusPort.Infer), - right: Util.Port(DeviceType.Inverter, BusPort.Dc) + left: JsonUtil.Port(DeviceType.Inverter, BusPort.Ac), + top: JsonUtil.Port(DeviceType.None, BusPort.None), + bottom: JsonUtil.Port(DeviceType.Losses, BusPort.Infer), + right: JsonUtil.Port(DeviceType.Inverter, BusPort.Dc) ); - var dcBusJson = Util.CreateBus + var dcBusJson = JsonUtil.CreateBus ( name: "Dc", - left: Util.Port(DeviceType.Inverter, BusPort.Dc), - top: Util.Port(DeviceType.PvOnDc, BusPort.Dc), - bottom: Util.Port(DeviceType.DcLoad, BusPort.Infer), - right: Util.Port(DeviceType.DcDc, BusPort.Dc) + left: JsonUtil.Port(DeviceType.Inverter, BusPort.Dc), + top: JsonUtil.Port(DeviceType.PvOnDc, BusPort.Dc), + bottom: JsonUtil.Port(DeviceType.DcLoad, BusPort.Infer), + right: JsonUtil.Port(DeviceType.DcDc, BusPort.Dc) ); - var dcDcJson = Util.CreateBus + var dcDcJson = JsonUtil.CreateBus ( name: "DcDc", - left: Util.Port(DeviceType.DcDc, BusPort.Dc), - top: Util.Port(DeviceType.None, BusPort.None), - bottom: Util.Port(DeviceType.Losses, BusPort.Infer), - right: Util.Port(DeviceType.Battery, BusPort.Dc) + left: JsonUtil.Port(DeviceType.DcDc, BusPort.Dc), + top: JsonUtil.Port(DeviceType.None, BusPort.None), + bottom: JsonUtil.Port(DeviceType.Losses, BusPort.Infer), + right: JsonUtil.Port(DeviceType.Battery, BusPort.Dc) ); return new JsonArray(acInBusJson, acOutBusJson, inverterJson, dcBusJson, dcDcJson); diff --git a/csharp/app/SaliMax/src/Log/TruConvertAc.cs b/csharp/app/SaliMax/src/Log/TruConvertAc.cs index 7aac9367d..9a0446a66 100644 --- a/csharp/app/SaliMax/src/Log/TruConvertAc.cs +++ b/csharp/app/SaliMax/src/Log/TruConvertAc.cs @@ -1,46 +1,66 @@ using System.Text.Json.Nodes; -using DecimalMath; using InnovEnergy.Lib.Devices.Trumpf.TruConvertAc; -using InnovEnergy.Lib.StatusApi; using InnovEnergy.Lib.Utils; +using static DecimalMath.DecimalEx; +using static InnovEnergy.SaliMax.Log.JsonUtil; namespace InnovEnergy.SaliMax.Log; public static class TruConvertAc { - public static JsonObject? Log(this TruConvertAcStatus? s) + + // TODO: remove serialNb arg, embed TruConvertDcStatus + public static JsonObject? Log(this TruConvertAcStatus? s, String serialNb) { if (s is null) return null; - var pwr = s.PowerAcL1 + s.PowerAcL2 + s.PowerAcL3; - var voltage = s.ActualDcLinkVoltageLowerHalfExt + s.ActualDcLinkVoltageUpperHalfExt; - var current = 0.0m; - if (voltage != 0) + var dcPower = s.PowerAcL1 + s.PowerAcL2 + s.PowerAcL3; + var dcVoltage = s.ActualDcLinkVoltageLowerHalfExt + s.ActualDcLinkVoltageUpperHalfExt; + var dcCurrent = dcVoltage != 0m + ? dcPower / dcVoltage + : 0m; + + + // TODO: acos quadrant + // TODO: total AC power + + var l1 = CreateAcPhase(s.PhaseCurrentL1, s.GridVoltageL1, ACos(s.CosPhiL1)); + var l2 = CreateAcPhase(s.PhaseCurrentL2, s.GridVoltageL2, ACos(s.CosPhiL2)); + var l3 = CreateAcPhase(s.PhaseCurrentL3, s.GridVoltageL3, ACos(s.CosPhiL3)); + + var ac = new JsonObject { - current = pwr / voltage; - } - return DeviceType - .Inverter - .CreateDevice("TruConvertAc") - .AddAcConnection(Decimal.Round(s.GridFrequency, 3), s.GetAcPhases()) - .AddProp("Total Calculated Power", pwr) - .AddDcConnection(Decimal.Round(current, 3), voltage) - .AddAlarms(s.Alarms) - .AddProp("MainState", s.MainState.ToString()); + ["L1"] = l1, + ["L2"] = l2, + ["L3"] = l3, + ["Frequency"] = s.GridFrequency + }; + + var dc = CreateDcPhase(dcCurrent, dcVoltage); + + var status = new JsonObject + { + ["Ac"] = ac , + ["Dc"] = dc , + ["Warnings"] = s.Warnings.ToJsonArray() , + ["Alarms"] = s.Alarms.ToJsonArray() , + }; + + return new JsonObject { [$"TruConvertAc {serialNb}"] = status }; } private static IEnumerable GetAcPhases(this TruConvertAcStatus s) { // Math.Acos return "NaN" if the cos phi < -1 or > 1 // Decimal.Acos throw an exception - yield return Util.CreateAcPhase(s.PhaseCurrentL1.Round3(), s.GridVoltageL1.Round3(), - s.CosPhiL1.Clamp(-1m, 1m).Apply(DecimalEx.ACos).Round3()); + yield return JsonUtil.CreateAcPhase(s.PhaseCurrentL1.Round3(), s.GridVoltageL1.Round3(), + s.CosPhiL1.Clamp(-1m, 1m).Apply(ACos).Round3()); - yield return Util.CreateAcPhase(s.PhaseCurrentL2.Round3(), s.GridVoltageL2.Round3(), - s.CosPhiL2.Clamp(-1m, 1m).Apply(DecimalEx.ACos).Round3()); + yield return JsonUtil.CreateAcPhase(s.PhaseCurrentL2.Round3(), s.GridVoltageL2.Round3(), + s.CosPhiL2.Clamp(-1m, 1m).Apply(ACos).Round3()); - yield return Util.CreateAcPhase(s.PhaseCurrentL3.Round3(), s.GridVoltageL3.Round3(), - s.CosPhiL3.Clamp(-1m, 1m).Apply(DecimalEx.ACos).Round3()); + yield return JsonUtil.CreateAcPhase(s.PhaseCurrentL3.Round3(), s.GridVoltageL3.Round3(), + s.CosPhiL3.Clamp(-1m, 1m).Apply(ACos).Round3()); } } \ No newline at end of file diff --git a/csharp/app/SaliMax/src/Log/TruConvertDc.cs b/csharp/app/SaliMax/src/Log/TruConvertDc.cs index d5ac75e77..68536c609 100644 --- a/csharp/app/SaliMax/src/Log/TruConvertDc.cs +++ b/csharp/app/SaliMax/src/Log/TruConvertDc.cs @@ -1,31 +1,43 @@ using System.Text.Json.Nodes; using InnovEnergy.Lib.Devices.Trumpf.TruConvertDc; -using InnovEnergy.Lib.StatusApi; +using static InnovEnergy.SaliMax.Log.JsonUtil; namespace InnovEnergy.SaliMax.Log; +using JO = JsonObject; + public static class TruConvertDc { - public static JsonObject? Log(this TruConvertDcStatus? s) + // TODO: remove serialNb arg, embed TruConvertDcStatus + public static JsonObject? Log(this TruConvertDcStatus? s, String serialNb) { if (s is null) return null; - var pwr = s.DcPower; - var voltage = s.DcLinkVoltage; - var current = 0.0m; - if (voltage != 0) + var dcCurrent = s.DcLinkVoltage != 0m + ? s.DcPower / s.DcLinkVoltage + : 0m; + + return new JO { - current = pwr / voltage; - } + { + $"TruConvertDc {serialNb}", new JO + { + { "Dc" , CreateDcPhase(dcCurrent, s.DcLinkVoltage) }, + { "Dc48" , CreateDcPhase(s.BatteryCurrent, s.BatteryVoltage) }, + { "Warnings", s.Warnings.ToJsonArray() }, + { "Alarms" , s.Alarms.ToJsonArray() }, + } + } + }; - return DeviceType - .DcDc - .CreateDevice("TruConvertDc") - .AddDcConnection(Decimal.Round(current, 3), s.DcLinkVoltage) - .AddDc48Connection(Decimal.Round(s.BatteryCurrent, 3), Decimal.Round(s.BatteryVoltage, 3)) - .AddWarnings(s.Warnings) - .AddAlarms(s.Alarms) - .AddProp("DC Power", s.DcPower); + // return DeviceType + // .DcDc + // .CreateDevice("TruConvertDc") + // //.AddDcConnection(Decimal.Round(current, 3), s.DcLinkVoltage) + // .AddDc48Connection(Decimal.Round(s.BatteryCurrent, 3), Decimal.Round(s.BatteryVoltage, 3)) + // .AddWarnings(s.Warnings) + // .AddAlarms(s.Alarms) + // .AddProp("DC Power", s.DcPower); } } \ No newline at end of file diff --git a/csharp/app/SaliMax/src/Log/Util.cs b/csharp/app/SaliMax/src/Log/Util.cs deleted file mode 100644 index bef654ea4..000000000 --- a/csharp/app/SaliMax/src/Log/Util.cs +++ /dev/null @@ -1,111 +0,0 @@ -using System.Text.Json.Nodes; -using InnovEnergy.Lib.StatusApi; - -namespace InnovEnergy.SaliMax.Log; - -public static class Util -{ - public static JsonObject CreateDevice(this DeviceType deviceType, String name) - { - return new JsonObject - { - { "Name", name }, - { "Type", deviceType.ToString() } - }; - } - - - public static JsonObject AddAcConnection(this JsonObject json, Decimal frequency, IEnumerable acPhases) - { - return json.AddAcConnection(frequency, acPhases.ToArray()); - } - - public static JsonObject AddAcConnection(this JsonObject json, Decimal frequency, params JsonNode[] acPhases) - { - return json - .AddProp("Ac", new JsonArray(acPhases)) - .AddProp("Frequency", frequency); - } - - public static JsonObject AddAlarms(this JsonObject json, IEnumerable alarms) - { - return json.AddProp("Alarms", alarms.ToJsonArray()); - } - - public static JsonObject AddWarnings(this JsonObject json, IEnumerable warnings) - { - return json.AddProp("Warnings", warnings.ToJsonArray()); - } - - - public static JsonObject AddProp(this JsonObject json, String key, JsonNode? value) - { - json.Add(key, value); - return json; - } - - - public static JsonObject AddDcConnection(this JsonObject json, Decimal current, Decimal voltage) - { - return json.AddProp("Dc", CreateDcPhase(current, voltage)); - } - - public static JsonObject AddDc48Connection(this JsonObject json, Decimal current, Decimal voltage) - { - return json.AddProp("Dc48", CreateDcPhase(current, voltage)); - } - - public static JsonObject CreateAcPhase(Decimal current, Decimal voltage, Decimal phi) - { - return CreateDcPhase(current, voltage).AddProp("Phi", phi); - } - - public static JsonObject CreateDcPhase(Decimal current, Decimal voltage) - { - return new JsonObject - { - { "Current", current }, - { "Voltage", voltage } - }; - } - - public static Decimal Round3(this Decimal val) - { - return Decimal.Round(val, 3); - } - - public static Decimal Round0(this Decimal val) - { - return Decimal.Round(val, 0); - } - - public static JsonObject CreateBus(String left, String top, String bottom, String right, String name) - { - return new JsonObject - { - { "Name", name }, - { "Left", left }, - { "Top", top }, - { "Bottom", bottom }, - { "Right", right } - }; - } - - public static String Port(DeviceType dt, BusPort bp, Boolean display = true) - { - return $"{Enum.GetName(dt)}:{Enum.GetName(bp)}:{(display ? "show" : "hide")}"; - } - - - public static JsonArray ToJsonArray(this IEnumerable things) - { - var jsonValues = things - .Select(t => t!.ToString()) - .Select(t => JsonValue.Create(t)) - .OfType() - .ToArray(); - - return new JsonArray(jsonValues); - } - -} \ No newline at end of file diff --git a/csharp/app/TestBatteryDbus/obj/Debug/net6.0/TestBatteryDbus.assets.cache b/csharp/app/TestBatteryDbus/obj/Debug/net6.0/TestBatteryDbus.assets.cache index fbc18fda9..9ca5a9556 100644 Binary files a/csharp/app/TestBatteryDbus/obj/Debug/net6.0/TestBatteryDbus.assets.cache and b/csharp/app/TestBatteryDbus/obj/Debug/net6.0/TestBatteryDbus.assets.cache differ diff --git a/csharp/app/TestBatteryDbus/obj/Debug/net6.0/TestBatteryDbus.csproj.AssemblyReference.cache b/csharp/app/TestBatteryDbus/obj/Debug/net6.0/TestBatteryDbus.csproj.AssemblyReference.cache index 22ed6f940..ea054af55 100644 Binary files a/csharp/app/TestBatteryDbus/obj/Debug/net6.0/TestBatteryDbus.csproj.AssemblyReference.cache and b/csharp/app/TestBatteryDbus/obj/Debug/net6.0/TestBatteryDbus.csproj.AssemblyReference.cache differ diff --git a/csharp/app/TestBatteryDbus/obj/TestBatteryDbus.csproj.nuget.dgspec.json b/csharp/app/TestBatteryDbus/obj/TestBatteryDbus.csproj.nuget.dgspec.json index 4918e6c6c..38e3975ad 100644 --- a/csharp/app/TestBatteryDbus/obj/TestBatteryDbus.csproj.nuget.dgspec.json +++ b/csharp/app/TestBatteryDbus/obj/TestBatteryDbus.csproj.nuget.dgspec.json @@ -180,6 +180,10 @@ "target": "Package", "version": "[3.3.1, )" }, + "DecimalMath.DecimalEx": { + "target": "Package", + "version": "[1.0.2, )" + }, "System.Reactive.Linq": { "target": "Package", "version": "[5.0.0, )" diff --git a/csharp/app/TestBatteryDbus/obj/project.assets.json b/csharp/app/TestBatteryDbus/obj/project.assets.json index 0c68b866e..728661746 100644 --- a/csharp/app/TestBatteryDbus/obj/project.assets.json +++ b/csharp/app/TestBatteryDbus/obj/project.assets.json @@ -15,6 +15,19 @@ } } }, + "DecimalMath.DecimalEx/1.0.2": { + "type": "package", + "compile": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + } + }, "runtime.linux-arm.runtime.native.System.IO.Ports/6.0.0": { "type": "package", "runtimeTargets": { @@ -193,6 +206,7 @@ "framework": ".NETCoreApp,Version=v6.0", "dependencies": { "CliWrap": "3.3.1", + "DecimalMath.DecimalEx": "1.0.2", "System.Reactive.Linq": "5.0.0" }, "compile": { @@ -241,6 +255,20 @@ "lib/netstandard2.1/CliWrap.xml" ] }, + "DecimalMath.DecimalEx/1.0.2": { + "sha512": "BCii/IxT7Tx7BPZ7MtrpqVlEii/iaHi4OOXpgaPi+zrphnkbe251KKI3S+pgnTzobfn0jS/SF7bgidqOMj1oGw==", + "type": "package", + "path": "decimalmath.decimalex/1.0.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "LICENSE", + "decimalmath.decimalex.1.0.2.nupkg.sha512", + "decimalmath.decimalex.nuspec", + "lib/netstandard2.0/DecimalEx.dll", + "lib/netstandard2.0/DecimalEx.xml" + ] + }, "runtime.linux-arm.runtime.native.System.IO.Ports/6.0.0": { "sha512": "75q52H7CSpgIoIDwXb9o833EvBZIXJ0mdPhz1E6jSisEXUBlSCPalC29cj3EXsjpuDwr0dj1LRXZepIQH/oL4Q==", "type": "package", diff --git a/csharp/app/TestBatteryDbus/obj/project.nuget.cache b/csharp/app/TestBatteryDbus/obj/project.nuget.cache index 62c750620..5b1ccea54 100644 --- a/csharp/app/TestBatteryDbus/obj/project.nuget.cache +++ b/csharp/app/TestBatteryDbus/obj/project.nuget.cache @@ -1,10 +1,11 @@ { "version": 2, - "dgSpecHash": "gEMk+mT1D8PWFdFmPG3TRCO0Wz423MJMmNQm5V7OjLW0dLHHs3o0lgWwpKYFTCwiV8ERVVOGTnTudPDYkTg6oQ==", + "dgSpecHash": "TD9te3TyXj2RsRsD9acNtF6zR4mfpk/Q+ee530RI+gEveMrsZaBKHRdgmtFzmBLTCXR9dkJizfl4f5oKgJnQjg==", "success": false, "projectFilePath": "/home/kim/code/innovenergy/new/csharp/app/TestBatteryDbus/TestBatteryDbus.csproj", "expectedPackageFiles": [ "/home/kim/.nuget/packages/cliwrap/3.4.3/cliwrap.3.4.3.nupkg.sha512", + "/home/kim/.nuget/packages/decimalmath.decimalex/1.0.2/decimalmath.decimalex.1.0.2.nupkg.sha512", "/home/kim/.nuget/packages/runtime.linux-arm.runtime.native.system.io.ports/6.0.0/runtime.linux-arm.runtime.native.system.io.ports.6.0.0.nupkg.sha512", "/home/kim/.nuget/packages/runtime.linux-arm64.runtime.native.system.io.ports/6.0.0/runtime.linux-arm64.runtime.native.system.io.ports.6.0.0.nupkg.sha512", "/home/kim/.nuget/packages/runtime.linux-x64.runtime.native.system.io.ports/6.0.0/runtime.linux-x64.runtime.native.system.io.ports.6.0.0.nupkg.sha512", diff --git a/csharp/app/TestBatteryDbus/obj/rider.project.restore.info b/csharp/app/TestBatteryDbus/obj/rider.project.restore.info index a13f067b2..1c5428cdb 100644 --- a/csharp/app/TestBatteryDbus/obj/rider.project.restore.info +++ b/csharp/app/TestBatteryDbus/obj/rider.project.restore.info @@ -1 +1 @@ -16765322878053266 \ No newline at end of file +16769606177554988 \ No newline at end of file diff --git a/csharp/app/VenusFirmwareCiDaemon/obj/Debug/net6.0/FirmwareCiDaemon.assets.cache b/csharp/app/VenusFirmwareCiDaemon/obj/Debug/net6.0/FirmwareCiDaemon.assets.cache index 9daf3e236..6bbb72a2f 100644 Binary files a/csharp/app/VenusFirmwareCiDaemon/obj/Debug/net6.0/FirmwareCiDaemon.assets.cache and b/csharp/app/VenusFirmwareCiDaemon/obj/Debug/net6.0/FirmwareCiDaemon.assets.cache differ diff --git a/csharp/app/VenusFirmwareCiDaemon/obj/Debug/net6.0/FirmwareCiDaemon.csproj.AssemblyReference.cache b/csharp/app/VenusFirmwareCiDaemon/obj/Debug/net6.0/FirmwareCiDaemon.csproj.AssemblyReference.cache index 8fcaf67f4..204fdef64 100644 Binary files a/csharp/app/VenusFirmwareCiDaemon/obj/Debug/net6.0/FirmwareCiDaemon.csproj.AssemblyReference.cache and b/csharp/app/VenusFirmwareCiDaemon/obj/Debug/net6.0/FirmwareCiDaemon.csproj.AssemblyReference.cache differ diff --git a/csharp/app/VenusFirmwareCiDaemon/obj/FirmwareCiDaemon.csproj.nuget.dgspec.json b/csharp/app/VenusFirmwareCiDaemon/obj/FirmwareCiDaemon.csproj.nuget.dgspec.json index c7460b626..4055b0fd6 100644 --- a/csharp/app/VenusFirmwareCiDaemon/obj/FirmwareCiDaemon.csproj.nuget.dgspec.json +++ b/csharp/app/VenusFirmwareCiDaemon/obj/FirmwareCiDaemon.csproj.nuget.dgspec.json @@ -104,6 +104,10 @@ "target": "Package", "version": "[3.3.1, )" }, + "DecimalMath.DecimalEx": { + "target": "Package", + "version": "[1.0.2, )" + }, "System.Reactive.Linq": { "target": "Package", "version": "[5.0.0, )" diff --git a/csharp/app/VenusFirmwareCiDaemon/obj/project.assets.json b/csharp/app/VenusFirmwareCiDaemon/obj/project.assets.json index d3d660c9d..37c33a72e 100644 --- a/csharp/app/VenusFirmwareCiDaemon/obj/project.assets.json +++ b/csharp/app/VenusFirmwareCiDaemon/obj/project.assets.json @@ -15,6 +15,19 @@ } } }, + "DecimalMath.DecimalEx/1.0.2": { + "type": "package", + "compile": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + } + }, "System.Reactive/5.0.0": { "type": "package", "compile": { @@ -62,6 +75,7 @@ "framework": ".NETCoreApp,Version=v6.0", "dependencies": { "CliWrap": "3.3.1", + "DecimalMath.DecimalEx": "1.0.2", "System.Reactive.Linq": "5.0.0" }, "compile": { @@ -94,6 +108,20 @@ "lib/netstandard2.1/CliWrap.xml" ] }, + "DecimalMath.DecimalEx/1.0.2": { + "sha512": "BCii/IxT7Tx7BPZ7MtrpqVlEii/iaHi4OOXpgaPi+zrphnkbe251KKI3S+pgnTzobfn0jS/SF7bgidqOMj1oGw==", + "type": "package", + "path": "decimalmath.decimalex/1.0.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "LICENSE", + "decimalmath.decimalex.1.0.2.nupkg.sha512", + "decimalmath.decimalex.nuspec", + "lib/netstandard2.0/DecimalEx.dll", + "lib/netstandard2.0/DecimalEx.xml" + ] + }, "System.Reactive/5.0.0": { "sha512": "erBZjkQHWL9jpasCE/0qKAryzVBJFxGHVBAvgRN1bzM0q2s1S4oYREEEL0Vb+1kA/6BKb5FjUZMp5VXmy+gzkQ==", "type": "package", diff --git a/csharp/app/VenusFirmwareCiDaemon/obj/project.nuget.cache b/csharp/app/VenusFirmwareCiDaemon/obj/project.nuget.cache index f553a07d9..a6aa06160 100644 --- a/csharp/app/VenusFirmwareCiDaemon/obj/project.nuget.cache +++ b/csharp/app/VenusFirmwareCiDaemon/obj/project.nuget.cache @@ -1,10 +1,11 @@ { "version": 2, - "dgSpecHash": "krCL4UZYz1RpwmjseSAtEAX3x8idNoLWWKrSWsPX71G0xJ5LUQ94yrUK2fHvrPhdNf1+suuL+8DGaXSPa/UfvQ==", + "dgSpecHash": "v6UDRH11HL8zKRPmuAw8RDu1SeuVksziYJMA66hRywqhhoLFAUj4FQ+2/ncDuQ71+mEKVzakLsvo7K3i+CLqlQ==", "success": true, "projectFilePath": "/home/kim/code/innovenergy/new/csharp/app/VenusFirmwareCiDaemon/FirmwareCiDaemon.csproj", "expectedPackageFiles": [ "/home/kim/.nuget/packages/cliwrap/3.3.1/cliwrap.3.3.1.nupkg.sha512", + "/home/kim/.nuget/packages/decimalmath.decimalex/1.0.2/decimalmath.decimalex.1.0.2.nupkg.sha512", "/home/kim/.nuget/packages/system.reactive/5.0.0/system.reactive.5.0.0.nupkg.sha512", "/home/kim/.nuget/packages/system.reactive.linq/5.0.0/system.reactive.linq.5.0.0.nupkg.sha512", "/home/kim/.nuget/packages/system.threading.tasks.extensions/4.5.4/system.threading.tasks.extensions.4.5.4.nupkg.sha512" diff --git a/csharp/app/VenusFirmwareCiDaemon/obj/rider.project.restore.info b/csharp/app/VenusFirmwareCiDaemon/obj/rider.project.restore.info index bf15616eb..c33115bc7 100644 --- a/csharp/app/VenusFirmwareCiDaemon/obj/rider.project.restore.info +++ b/csharp/app/VenusFirmwareCiDaemon/obj/rider.project.restore.info @@ -1 +1 @@ -16758719413402651 \ No newline at end of file +16769606177514988 \ No newline at end of file diff --git a/csharp/app/VenusLogger/obj/Debug/net6.0/VenusLogger.assets.cache b/csharp/app/VenusLogger/obj/Debug/net6.0/VenusLogger.assets.cache index e22addbea..b6f9995e6 100644 Binary files a/csharp/app/VenusLogger/obj/Debug/net6.0/VenusLogger.assets.cache and b/csharp/app/VenusLogger/obj/Debug/net6.0/VenusLogger.assets.cache differ diff --git a/csharp/app/VenusLogger/obj/Debug/net6.0/VenusLogger.csproj.AssemblyReference.cache b/csharp/app/VenusLogger/obj/Debug/net6.0/VenusLogger.csproj.AssemblyReference.cache index 8d56ac0e8..204fdef64 100644 Binary files a/csharp/app/VenusLogger/obj/Debug/net6.0/VenusLogger.csproj.AssemblyReference.cache and b/csharp/app/VenusLogger/obj/Debug/net6.0/VenusLogger.csproj.AssemblyReference.cache differ diff --git a/csharp/app/VenusLogger/obj/VenusLogger.csproj.nuget.dgspec.json b/csharp/app/VenusLogger/obj/VenusLogger.csproj.nuget.dgspec.json index d236497ba..b5d8ca711 100644 --- a/csharp/app/VenusLogger/obj/VenusLogger.csproj.nuget.dgspec.json +++ b/csharp/app/VenusLogger/obj/VenusLogger.csproj.nuget.dgspec.json @@ -304,6 +304,10 @@ "target": "Package", "version": "[3.3.1, )" }, + "DecimalMath.DecimalEx": { + "target": "Package", + "version": "[1.0.2, )" + }, "System.Reactive.Linq": { "target": "Package", "version": "[5.0.0, )" diff --git a/csharp/app/VenusLogger/obj/project.assets.json b/csharp/app/VenusLogger/obj/project.assets.json index 7593ba147..788b2bd59 100644 --- a/csharp/app/VenusLogger/obj/project.assets.json +++ b/csharp/app/VenusLogger/obj/project.assets.json @@ -44,6 +44,19 @@ } } }, + "DecimalMath.DecimalEx/1.0.2": { + "type": "package", + "compile": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + } + }, "Flurl/3.0.2": { "type": "package", "compile": { @@ -275,6 +288,7 @@ "framework": ".NETCoreApp,Version=v6.0", "dependencies": { "CliWrap": "3.3.1", + "DecimalMath.DecimalEx": "1.0.2", "System.Reactive.Linq": "5.0.0" }, "compile": { @@ -374,6 +388,20 @@ "lib/netstandard2.1/CliWrap.xml" ] }, + "DecimalMath.DecimalEx/1.0.2": { + "sha512": "BCii/IxT7Tx7BPZ7MtrpqVlEii/iaHi4OOXpgaPi+zrphnkbe251KKI3S+pgnTzobfn0jS/SF7bgidqOMj1oGw==", + "type": "package", + "path": "decimalmath.decimalex/1.0.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "LICENSE", + "decimalmath.decimalex.1.0.2.nupkg.sha512", + "decimalmath.decimalex.nuspec", + "lib/netstandard2.0/DecimalEx.dll", + "lib/netstandard2.0/DecimalEx.xml" + ] + }, "Flurl/3.0.2": { "sha512": "1/6mqdzGCTdAekbWkVZBTylCV+8g3JUSTXRBngRVR274S+RsAYNRF79GbDoDsPfMKu8VPc9HkQWdBEAncK1PQQ==", "type": "package", diff --git a/csharp/app/VenusLogger/obj/project.nuget.cache b/csharp/app/VenusLogger/obj/project.nuget.cache index 4cdb8a994..b5cf9ebfe 100644 --- a/csharp/app/VenusLogger/obj/project.nuget.cache +++ b/csharp/app/VenusLogger/obj/project.nuget.cache @@ -1,12 +1,13 @@ { "version": 2, - "dgSpecHash": "LEkD20OkvEt0gTTdIpqPW03RLAKins/2ucBqaOiK9/BgWhA0FbWdIdWSYbXUXTx0B7I/dk4p7ClAiH4ymFlKKQ==", + "dgSpecHash": "zHOxxYmrpL2cxDqZ9+dyKPTELruQialCHctqDwEzFIa2I68ZZ9xq2DBbJYxPx9g3L0YyCGWQzvFz0SLtDhWH7A==", "success": false, "projectFilePath": "/home/kim/code/innovenergy/new/csharp/app/VenusLogger/VenusLogger.csproj", "expectedPackageFiles": [ "/home/kim/.nuget/packages/awssdk.core/3.7.8.10/awssdk.core.3.7.8.10.nupkg.sha512", "/home/kim/.nuget/packages/awssdk.s3/3.7.8.8/awssdk.s3.3.7.8.8.nupkg.sha512", "/home/kim/.nuget/packages/cliwrap/3.3.1/cliwrap.3.3.1.nupkg.sha512", + "/home/kim/.nuget/packages/decimalmath.decimalex/1.0.2/decimalmath.decimalex.1.0.2.nupkg.sha512", "/home/kim/.nuget/packages/flurl/3.0.2/flurl.3.0.2.nupkg.sha512", "/home/kim/.nuget/packages/flurl.http/3.2.0/flurl.http.3.2.0.nupkg.sha512", "/home/kim/.nuget/packages/google.protobuf/3.19.4/google.protobuf.3.19.4.nupkg.sha512", diff --git a/csharp/app/VenusLogger/obj/rider.project.restore.info b/csharp/app/VenusLogger/obj/rider.project.restore.info index 345f18c81..46a715514 100644 --- a/csharp/app/VenusLogger/obj/rider.project.restore.info +++ b/csharp/app/VenusLogger/obj/rider.project.restore.info @@ -1 +1 @@ -16765322878013266 \ No newline at end of file +16769606177594988 \ No newline at end of file diff --git a/csharp/lib/Channels/obj/Channels.csproj.nuget.dgspec.json b/csharp/lib/Channels/obj/Channels.csproj.nuget.dgspec.json index b09659274..4d8f6b2b5 100644 --- a/csharp/lib/Channels/obj/Channels.csproj.nuget.dgspec.json +++ b/csharp/lib/Channels/obj/Channels.csproj.nuget.dgspec.json @@ -98,6 +98,10 @@ "target": "Package", "version": "[3.3.1, )" }, + "DecimalMath.DecimalEx": { + "target": "Package", + "version": "[1.0.2, )" + }, "System.Reactive.Linq": { "target": "Package", "version": "[5.0.0, )" diff --git a/csharp/lib/Channels/obj/Debug/net6.0/Channels.assets.cache b/csharp/lib/Channels/obj/Debug/net6.0/Channels.assets.cache index cf6fcd5fd..bf47bc659 100644 Binary files a/csharp/lib/Channels/obj/Debug/net6.0/Channels.assets.cache and b/csharp/lib/Channels/obj/Debug/net6.0/Channels.assets.cache differ diff --git a/csharp/lib/Channels/obj/project.assets.json b/csharp/lib/Channels/obj/project.assets.json index 958b178b7..c9a01a1b2 100644 --- a/csharp/lib/Channels/obj/project.assets.json +++ b/csharp/lib/Channels/obj/project.assets.json @@ -15,6 +15,19 @@ } } }, + "DecimalMath.DecimalEx/1.0.2": { + "type": "package", + "compile": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + } + }, "System.Reactive/5.0.0": { "type": "package", "compile": { @@ -62,6 +75,7 @@ "framework": ".NETCoreApp,Version=v6.0", "dependencies": { "CliWrap": "3.3.1", + "DecimalMath.DecimalEx": "1.0.2", "System.Reactive.Linq": "5.0.0" }, "compile": { @@ -94,6 +108,20 @@ "lib/netstandard2.1/CliWrap.xml" ] }, + "DecimalMath.DecimalEx/1.0.2": { + "sha512": "BCii/IxT7Tx7BPZ7MtrpqVlEii/iaHi4OOXpgaPi+zrphnkbe251KKI3S+pgnTzobfn0jS/SF7bgidqOMj1oGw==", + "type": "package", + "path": "decimalmath.decimalex/1.0.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "LICENSE", + "decimalmath.decimalex.1.0.2.nupkg.sha512", + "decimalmath.decimalex.nuspec", + "lib/netstandard2.0/DecimalEx.dll", + "lib/netstandard2.0/DecimalEx.xml" + ] + }, "System.Reactive/5.0.0": { "sha512": "erBZjkQHWL9jpasCE/0qKAryzVBJFxGHVBAvgRN1bzM0q2s1S4oYREEEL0Vb+1kA/6BKb5FjUZMp5VXmy+gzkQ==", "type": "package", diff --git a/csharp/lib/Channels/obj/project.nuget.cache b/csharp/lib/Channels/obj/project.nuget.cache index 73d769efb..84db0f4fc 100644 --- a/csharp/lib/Channels/obj/project.nuget.cache +++ b/csharp/lib/Channels/obj/project.nuget.cache @@ -1,10 +1,11 @@ { "version": 2, - "dgSpecHash": "5+DQWUR2RsxX1IfP9fTTTKLUCzhhqoOSEDaYsQcsx2XkA+I1q5TbdzYDhCbL3Q8jFwTNCxLnU5sR952Gdr8kyQ==", + "dgSpecHash": "zppjJ7UrieHMGTzdYfbKqyg51OgIDXZZFLYBcYh8I3ciJTA4wcd4Cv4+V5EV6ttswJHuxc3psTUZQwe3xnt7NQ==", "success": true, "projectFilePath": "/home/kim/code/innovenergy/new/csharp/lib/Channels/Channels.csproj", "expectedPackageFiles": [ "/home/kim/.nuget/packages/cliwrap/3.3.1/cliwrap.3.3.1.nupkg.sha512", + "/home/kim/.nuget/packages/decimalmath.decimalex/1.0.2/decimalmath.decimalex.1.0.2.nupkg.sha512", "/home/kim/.nuget/packages/system.reactive/5.0.0/system.reactive.5.0.0.nupkg.sha512", "/home/kim/.nuget/packages/system.reactive.linq/5.0.0/system.reactive.linq.5.0.0.nupkg.sha512", "/home/kim/.nuget/packages/system.threading.tasks.extensions/4.5.4/system.threading.tasks.extensions.4.5.4.nupkg.sha512" diff --git a/csharp/lib/Channels/obj/rider.project.restore.info b/csharp/lib/Channels/obj/rider.project.restore.info index e5c1f2162..c33115bc7 100644 --- a/csharp/lib/Channels/obj/rider.project.restore.info +++ b/csharp/lib/Channels/obj/rider.project.restore.info @@ -1 +1 @@ -16758719413202651 \ No newline at end of file +16769606177514988 \ No newline at end of file diff --git a/csharp/lib/Devices/AMPT/obj/Ampt.csproj.nuget.dgspec.json b/csharp/lib/Devices/AMPT/obj/Ampt.csproj.nuget.dgspec.json index 67d268643..119ab3d4e 100644 --- a/csharp/lib/Devices/AMPT/obj/Ampt.csproj.nuget.dgspec.json +++ b/csharp/lib/Devices/AMPT/obj/Ampt.csproj.nuget.dgspec.json @@ -169,6 +169,10 @@ "target": "Package", "version": "[3.3.1, )" }, + "DecimalMath.DecimalEx": { + "target": "Package", + "version": "[1.0.2, )" + }, "System.Reactive.Linq": { "target": "Package", "version": "[5.0.0, )" diff --git a/csharp/lib/Devices/AMPT/obj/Debug/net6.0/Ampt.csproj.AssemblyReference.cache b/csharp/lib/Devices/AMPT/obj/Debug/net6.0/Ampt.csproj.AssemblyReference.cache index 92cd8a837..204fdef64 100644 Binary files a/csharp/lib/Devices/AMPT/obj/Debug/net6.0/Ampt.csproj.AssemblyReference.cache and b/csharp/lib/Devices/AMPT/obj/Debug/net6.0/Ampt.csproj.AssemblyReference.cache differ diff --git a/csharp/lib/Devices/AMPT/obj/project.assets.json b/csharp/lib/Devices/AMPT/obj/project.assets.json index b91148fe1..aa116429a 100644 --- a/csharp/lib/Devices/AMPT/obj/project.assets.json +++ b/csharp/lib/Devices/AMPT/obj/project.assets.json @@ -173,6 +173,7 @@ "framework": ".NETCoreApp,Version=v6.0", "dependencies": { "CliWrap": "3.3.1", + "DecimalMath.DecimalEx": "1.0.2", "System.Reactive.Linq": "5.0.0" }, "compile": { diff --git a/csharp/lib/Devices/AMPT/obj/project.nuget.cache b/csharp/lib/Devices/AMPT/obj/project.nuget.cache index 1fd769cb6..6f2262c55 100644 --- a/csharp/lib/Devices/AMPT/obj/project.nuget.cache +++ b/csharp/lib/Devices/AMPT/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "jyRZbmXidkF5Wqsbhqxb0kDf32qxN0qVmbjvQS3i46ZgrGQ6QLREOwTrmw+bohovBIcy/ntmCY+QWskE9uQVyg==", + "dgSpecHash": "yMy/ZXPDbBJ7kbmDIDxN3HyXp3EMB3UCUcHdLqBPYD9/MfoXCF3XIRY8OWkWl7/9BcQtz7T1VPK1VJdsYEKAcQ==", "success": true, "projectFilePath": "/home/kim/code/innovenergy/new/csharp/lib/Devices/AMPT/Ampt.csproj", "expectedPackageFiles": [ diff --git a/csharp/lib/Devices/AMPT/obj/rider.project.restore.info b/csharp/lib/Devices/AMPT/obj/rider.project.restore.info index bf15616eb..81393c5a6 100644 --- a/csharp/lib/Devices/AMPT/obj/rider.project.restore.info +++ b/csharp/lib/Devices/AMPT/obj/rider.project.restore.info @@ -1 +1 @@ -16758719413402651 \ No newline at end of file +16769606177474988 \ No newline at end of file diff --git a/csharp/lib/Devices/Adam6060/obj/Adam6060.csproj.nuget.dgspec.json b/csharp/lib/Devices/Adam6060/obj/Adam6060.csproj.nuget.dgspec.json index 23ece5599..1c047d861 100644 --- a/csharp/lib/Devices/Adam6060/obj/Adam6060.csproj.nuget.dgspec.json +++ b/csharp/lib/Devices/Adam6060/obj/Adam6060.csproj.nuget.dgspec.json @@ -160,6 +160,10 @@ "target": "Package", "version": "[3.3.1, )" }, + "DecimalMath.DecimalEx": { + "target": "Package", + "version": "[1.0.2, )" + }, "System.Reactive.Linq": { "target": "Package", "version": "[5.0.0, )" diff --git a/csharp/lib/Devices/Adam6060/obj/Debug/net6.0/Adam6060.assets.cache b/csharp/lib/Devices/Adam6060/obj/Debug/net6.0/Adam6060.assets.cache index ba5047618..33b6c9c56 100644 Binary files a/csharp/lib/Devices/Adam6060/obj/Debug/net6.0/Adam6060.assets.cache and b/csharp/lib/Devices/Adam6060/obj/Debug/net6.0/Adam6060.assets.cache differ diff --git a/csharp/lib/Devices/Adam6060/obj/Debug/net6.0/Adam6060.csproj.AssemblyReference.cache b/csharp/lib/Devices/Adam6060/obj/Debug/net6.0/Adam6060.csproj.AssemblyReference.cache index 9c71c22ab..204fdef64 100644 Binary files a/csharp/lib/Devices/Adam6060/obj/Debug/net6.0/Adam6060.csproj.AssemblyReference.cache and b/csharp/lib/Devices/Adam6060/obj/Debug/net6.0/Adam6060.csproj.AssemblyReference.cache differ diff --git a/csharp/lib/Devices/Adam6060/obj/project.assets.json b/csharp/lib/Devices/Adam6060/obj/project.assets.json index 6d7b2175b..f04aa8379 100644 --- a/csharp/lib/Devices/Adam6060/obj/project.assets.json +++ b/csharp/lib/Devices/Adam6060/obj/project.assets.json @@ -15,6 +15,19 @@ } } }, + "DecimalMath.DecimalEx/1.0.2": { + "type": "package", + "compile": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + } + }, "runtime.linux-arm.runtime.native.System.IO.Ports/7.0.0": { "type": "package", "runtimeTargets": { @@ -160,6 +173,7 @@ "framework": ".NETCoreApp,Version=v6.0", "dependencies": { "CliWrap": "3.3.1", + "DecimalMath.DecimalEx": "1.0.2", "System.Reactive.Linq": "5.0.0" }, "compile": { @@ -192,6 +206,20 @@ "lib/netstandard2.1/CliWrap.xml" ] }, + "DecimalMath.DecimalEx/1.0.2": { + "sha512": "BCii/IxT7Tx7BPZ7MtrpqVlEii/iaHi4OOXpgaPi+zrphnkbe251KKI3S+pgnTzobfn0jS/SF7bgidqOMj1oGw==", + "type": "package", + "path": "decimalmath.decimalex/1.0.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "LICENSE", + "decimalmath.decimalex.1.0.2.nupkg.sha512", + "decimalmath.decimalex.nuspec", + "lib/netstandard2.0/DecimalEx.dll", + "lib/netstandard2.0/DecimalEx.xml" + ] + }, "runtime.linux-arm.runtime.native.System.IO.Ports/7.0.0": { "sha512": "CBvgRaF+M0xGLDv2Geb/0v0LEADheH8aK72GRAUJdnqnJVsQO60ki1XO8M3keEhnjm+T5NvLm41pNXAVYAPiSg==", "type": "package", diff --git a/csharp/lib/Devices/Adam6060/obj/project.nuget.cache b/csharp/lib/Devices/Adam6060/obj/project.nuget.cache index 2d2f9c259..9f2b32fc3 100644 --- a/csharp/lib/Devices/Adam6060/obj/project.nuget.cache +++ b/csharp/lib/Devices/Adam6060/obj/project.nuget.cache @@ -1,10 +1,11 @@ { "version": 2, - "dgSpecHash": "4x5ieBi+i4zAwO9vG0WBffei3Mm/QaZBH7zVmCrCOp5mzIznUCgg8ym8WKnVCx3lb9qQR0LEkYmZG/AzE84amw==", + "dgSpecHash": "vk0IQuQMb7phWAfvABZ/yd8gtP1dEZGNfmcJBmR3zv++ERnZTePgVbHdvwb2zmqljimS1+DkXNedJ6BdbtXC7g==", "success": true, "projectFilePath": "/home/kim/code/innovenergy/new/csharp/lib/Devices/Adam6060/Adam6060.csproj", "expectedPackageFiles": [ "/home/kim/.nuget/packages/cliwrap/3.3.1/cliwrap.3.3.1.nupkg.sha512", + "/home/kim/.nuget/packages/decimalmath.decimalex/1.0.2/decimalmath.decimalex.1.0.2.nupkg.sha512", "/home/kim/.nuget/packages/runtime.linux-arm.runtime.native.system.io.ports/7.0.0/runtime.linux-arm.runtime.native.system.io.ports.7.0.0.nupkg.sha512", "/home/kim/.nuget/packages/runtime.linux-arm64.runtime.native.system.io.ports/7.0.0/runtime.linux-arm64.runtime.native.system.io.ports.7.0.0.nupkg.sha512", "/home/kim/.nuget/packages/runtime.linux-x64.runtime.native.system.io.ports/7.0.0/runtime.linux-x64.runtime.native.system.io.ports.7.0.0.nupkg.sha512", diff --git a/csharp/lib/Devices/Adam6060/obj/rider.project.restore.info b/csharp/lib/Devices/Adam6060/obj/rider.project.restore.info index bf15616eb..46a715514 100644 --- a/csharp/lib/Devices/Adam6060/obj/rider.project.restore.info +++ b/csharp/lib/Devices/Adam6060/obj/rider.project.restore.info @@ -1 +1 @@ -16758719413402651 \ No newline at end of file +16769606177594988 \ No newline at end of file diff --git a/csharp/lib/Devices/Battery48TL/obj/Battery48TL.csproj.nuget.dgspec.json b/csharp/lib/Devices/Battery48TL/obj/Battery48TL.csproj.nuget.dgspec.json index 86c4542cd..6f54b2ca4 100644 --- a/csharp/lib/Devices/Battery48TL/obj/Battery48TL.csproj.nuget.dgspec.json +++ b/csharp/lib/Devices/Battery48TL/obj/Battery48TL.csproj.nuget.dgspec.json @@ -163,6 +163,10 @@ "target": "Package", "version": "[3.3.1, )" }, + "DecimalMath.DecimalEx": { + "target": "Package", + "version": "[1.0.2, )" + }, "System.Reactive.Linq": { "target": "Package", "version": "[5.0.0, )" diff --git a/csharp/lib/Devices/Battery48TL/obj/Debug/net6.0/Battery48TL.assets.cache b/csharp/lib/Devices/Battery48TL/obj/Debug/net6.0/Battery48TL.assets.cache index 33b952bd4..372a1c36c 100644 Binary files a/csharp/lib/Devices/Battery48TL/obj/Debug/net6.0/Battery48TL.assets.cache and b/csharp/lib/Devices/Battery48TL/obj/Debug/net6.0/Battery48TL.assets.cache differ diff --git a/csharp/lib/Devices/Battery48TL/obj/Debug/net6.0/Battery48TL.csproj.AssemblyReference.cache b/csharp/lib/Devices/Battery48TL/obj/Debug/net6.0/Battery48TL.csproj.AssemblyReference.cache index 0f9f3216a..314c911b6 100644 Binary files a/csharp/lib/Devices/Battery48TL/obj/Debug/net6.0/Battery48TL.csproj.AssemblyReference.cache and b/csharp/lib/Devices/Battery48TL/obj/Debug/net6.0/Battery48TL.csproj.AssemblyReference.cache differ diff --git a/csharp/lib/Devices/Battery48TL/obj/project.assets.json b/csharp/lib/Devices/Battery48TL/obj/project.assets.json index d632146b1..47795ead0 100644 --- a/csharp/lib/Devices/Battery48TL/obj/project.assets.json +++ b/csharp/lib/Devices/Battery48TL/obj/project.assets.json @@ -15,6 +15,19 @@ } } }, + "DecimalMath.DecimalEx/1.0.2": { + "type": "package", + "compile": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + } + }, "runtime.linux-arm.runtime.native.System.IO.Ports/7.0.0": { "type": "package", "runtimeTargets": { @@ -160,6 +173,7 @@ "framework": ".NETCoreApp,Version=v6.0", "dependencies": { "CliWrap": "3.3.1", + "DecimalMath.DecimalEx": "1.0.2", "System.Reactive.Linq": "5.0.0" }, "compile": { @@ -192,6 +206,20 @@ "lib/netstandard2.1/CliWrap.xml" ] }, + "DecimalMath.DecimalEx/1.0.2": { + "sha512": "BCii/IxT7Tx7BPZ7MtrpqVlEii/iaHi4OOXpgaPi+zrphnkbe251KKI3S+pgnTzobfn0jS/SF7bgidqOMj1oGw==", + "type": "package", + "path": "decimalmath.decimalex/1.0.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "LICENSE", + "decimalmath.decimalex.1.0.2.nupkg.sha512", + "decimalmath.decimalex.nuspec", + "lib/netstandard2.0/DecimalEx.dll", + "lib/netstandard2.0/DecimalEx.xml" + ] + }, "runtime.linux-arm.runtime.native.System.IO.Ports/7.0.0": { "sha512": "CBvgRaF+M0xGLDv2Geb/0v0LEADheH8aK72GRAUJdnqnJVsQO60ki1XO8M3keEhnjm+T5NvLm41pNXAVYAPiSg==", "type": "package", diff --git a/csharp/lib/Devices/Battery48TL/obj/project.nuget.cache b/csharp/lib/Devices/Battery48TL/obj/project.nuget.cache index e79750a1f..d139d4805 100644 --- a/csharp/lib/Devices/Battery48TL/obj/project.nuget.cache +++ b/csharp/lib/Devices/Battery48TL/obj/project.nuget.cache @@ -1,10 +1,11 @@ { "version": 2, - "dgSpecHash": "bZUU5uOJKDc2td9CPQSjhkYUzjth/AUj8q0pfSDvbU9VOrjEFYCdBRkxFDgBSi3DH5cxyn9FD+YBrh1qYalosg==", + "dgSpecHash": "XPSIoIEy0b4py5GuuMd62ER7pPkbg0przBXCDwRRbBTUwitjNei080c2LXOx3zuhpxeZlomaJQFWII8/uY0Kqg==", "success": true, "projectFilePath": "/home/kim/code/innovenergy/new/csharp/lib/Devices/Battery48TL/Battery48TL.csproj", "expectedPackageFiles": [ "/home/kim/.nuget/packages/cliwrap/3.3.1/cliwrap.3.3.1.nupkg.sha512", + "/home/kim/.nuget/packages/decimalmath.decimalex/1.0.2/decimalmath.decimalex.1.0.2.nupkg.sha512", "/home/kim/.nuget/packages/runtime.linux-arm.runtime.native.system.io.ports/7.0.0/runtime.linux-arm.runtime.native.system.io.ports.7.0.0.nupkg.sha512", "/home/kim/.nuget/packages/runtime.linux-arm64.runtime.native.system.io.ports/7.0.0/runtime.linux-arm64.runtime.native.system.io.ports.7.0.0.nupkg.sha512", "/home/kim/.nuget/packages/runtime.linux-x64.runtime.native.system.io.ports/7.0.0/runtime.linux-x64.runtime.native.system.io.ports.7.0.0.nupkg.sha512", diff --git a/csharp/lib/Devices/Battery48TL/obj/rider.project.restore.info b/csharp/lib/Devices/Battery48TL/obj/rider.project.restore.info index 0a5d94e03..1c5428cdb 100644 --- a/csharp/lib/Devices/Battery48TL/obj/rider.project.restore.info +++ b/csharp/lib/Devices/Battery48TL/obj/rider.project.restore.info @@ -1 +1 @@ -16758719413242651 \ No newline at end of file +16769606177554988 \ No newline at end of file diff --git a/csharp/lib/Devices/EmuMeter/obj/Debug/net6.0/EmuMeter.assets.cache b/csharp/lib/Devices/EmuMeter/obj/Debug/net6.0/EmuMeter.assets.cache index 2959de22f..e89ea2edf 100644 Binary files a/csharp/lib/Devices/EmuMeter/obj/Debug/net6.0/EmuMeter.assets.cache and b/csharp/lib/Devices/EmuMeter/obj/Debug/net6.0/EmuMeter.assets.cache differ diff --git a/csharp/lib/Devices/EmuMeter/obj/EmuMeter.csproj.nuget.dgspec.json b/csharp/lib/Devices/EmuMeter/obj/EmuMeter.csproj.nuget.dgspec.json index 5276a4b70..377c07151 100644 --- a/csharp/lib/Devices/EmuMeter/obj/EmuMeter.csproj.nuget.dgspec.json +++ b/csharp/lib/Devices/EmuMeter/obj/EmuMeter.csproj.nuget.dgspec.json @@ -163,6 +163,10 @@ "target": "Package", "version": "[3.3.1, )" }, + "DecimalMath.DecimalEx": { + "target": "Package", + "version": "[1.0.2, )" + }, "System.Reactive.Linq": { "target": "Package", "version": "[5.0.0, )" diff --git a/csharp/lib/Devices/EmuMeter/obj/project.assets.json b/csharp/lib/Devices/EmuMeter/obj/project.assets.json index c24612c50..1fdaef73b 100644 --- a/csharp/lib/Devices/EmuMeter/obj/project.assets.json +++ b/csharp/lib/Devices/EmuMeter/obj/project.assets.json @@ -15,6 +15,19 @@ } } }, + "DecimalMath.DecimalEx/1.0.2": { + "type": "package", + "compile": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + } + }, "runtime.linux-arm.runtime.native.System.IO.Ports/7.0.0": { "type": "package", "runtimeTargets": { @@ -160,6 +173,7 @@ "framework": ".NETCoreApp,Version=v6.0", "dependencies": { "CliWrap": "3.3.1", + "DecimalMath.DecimalEx": "1.0.2", "System.Reactive.Linq": "5.0.0" }, "compile": { @@ -192,6 +206,20 @@ "lib/netstandard2.1/CliWrap.xml" ] }, + "DecimalMath.DecimalEx/1.0.2": { + "sha512": "BCii/IxT7Tx7BPZ7MtrpqVlEii/iaHi4OOXpgaPi+zrphnkbe251KKI3S+pgnTzobfn0jS/SF7bgidqOMj1oGw==", + "type": "package", + "path": "decimalmath.decimalex/1.0.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "LICENSE", + "decimalmath.decimalex.1.0.2.nupkg.sha512", + "decimalmath.decimalex.nuspec", + "lib/netstandard2.0/DecimalEx.dll", + "lib/netstandard2.0/DecimalEx.xml" + ] + }, "runtime.linux-arm.runtime.native.System.IO.Ports/7.0.0": { "sha512": "CBvgRaF+M0xGLDv2Geb/0v0LEADheH8aK72GRAUJdnqnJVsQO60ki1XO8M3keEhnjm+T5NvLm41pNXAVYAPiSg==", "type": "package", diff --git a/csharp/lib/Devices/EmuMeter/obj/project.nuget.cache b/csharp/lib/Devices/EmuMeter/obj/project.nuget.cache index 856eeda5f..f6956271c 100644 --- a/csharp/lib/Devices/EmuMeter/obj/project.nuget.cache +++ b/csharp/lib/Devices/EmuMeter/obj/project.nuget.cache @@ -1,10 +1,11 @@ { "version": 2, - "dgSpecHash": "ThJ4Nj2wJQG+mZvA14d+z9R8laGua1KvwEFBuAlbWN7CCdPBcXw8b5CuFRdtyo5JyQdeJr9zbOkUqFdoZVQ/yA==", + "dgSpecHash": "YmU8pX7WipMLXVEdoDXTge/qRdCJA0o0uFNvvxSMU0+N/+ayZ/kgenqLDjZsvXzTWqPAaDspvsctd735Q8lByw==", "success": true, "projectFilePath": "/home/kim/code/innovenergy/new/csharp/lib/Devices/EmuMeter/EmuMeter.csproj", "expectedPackageFiles": [ "/home/kim/.nuget/packages/cliwrap/3.3.1/cliwrap.3.3.1.nupkg.sha512", + "/home/kim/.nuget/packages/decimalmath.decimalex/1.0.2/decimalmath.decimalex.1.0.2.nupkg.sha512", "/home/kim/.nuget/packages/runtime.linux-arm.runtime.native.system.io.ports/7.0.0/runtime.linux-arm.runtime.native.system.io.ports.7.0.0.nupkg.sha512", "/home/kim/.nuget/packages/runtime.linux-arm64.runtime.native.system.io.ports/7.0.0/runtime.linux-arm64.runtime.native.system.io.ports.7.0.0.nupkg.sha512", "/home/kim/.nuget/packages/runtime.linux-x64.runtime.native.system.io.ports/7.0.0/runtime.linux-x64.runtime.native.system.io.ports.7.0.0.nupkg.sha512", diff --git a/csharp/lib/Devices/EmuMeter/obj/rider.project.restore.info b/csharp/lib/Devices/EmuMeter/obj/rider.project.restore.info index 01c0c4760..1c5428cdb 100644 --- a/csharp/lib/Devices/EmuMeter/obj/rider.project.restore.info +++ b/csharp/lib/Devices/EmuMeter/obj/rider.project.restore.info @@ -1 +1 @@ -16758719413362651 \ No newline at end of file +16769606177554988 \ No newline at end of file diff --git a/csharp/lib/Devices/Trumpf/TruConvert/obj/Debug/net6.0/TruConvert.assets.cache b/csharp/lib/Devices/Trumpf/TruConvert/obj/Debug/net6.0/TruConvert.assets.cache index 66339234d..432d23c4e 100644 Binary files a/csharp/lib/Devices/Trumpf/TruConvert/obj/Debug/net6.0/TruConvert.assets.cache and b/csharp/lib/Devices/Trumpf/TruConvert/obj/Debug/net6.0/TruConvert.assets.cache differ diff --git a/csharp/lib/Devices/Trumpf/TruConvert/obj/TruConvert.csproj.nuget.dgspec.json b/csharp/lib/Devices/Trumpf/TruConvert/obj/TruConvert.csproj.nuget.dgspec.json index e19cc05c8..1b3df6e9a 100644 --- a/csharp/lib/Devices/Trumpf/TruConvert/obj/TruConvert.csproj.nuget.dgspec.json +++ b/csharp/lib/Devices/Trumpf/TruConvert/obj/TruConvert.csproj.nuget.dgspec.json @@ -98,6 +98,10 @@ "target": "Package", "version": "[3.3.1, )" }, + "DecimalMath.DecimalEx": { + "target": "Package", + "version": "[1.0.2, )" + }, "System.Reactive.Linq": { "target": "Package", "version": "[5.0.0, )" diff --git a/csharp/lib/Devices/Trumpf/TruConvert/obj/project.assets.json b/csharp/lib/Devices/Trumpf/TruConvert/obj/project.assets.json index f46af46fc..7adb4db47 100644 --- a/csharp/lib/Devices/Trumpf/TruConvert/obj/project.assets.json +++ b/csharp/lib/Devices/Trumpf/TruConvert/obj/project.assets.json @@ -15,6 +15,19 @@ } } }, + "DecimalMath.DecimalEx/1.0.2": { + "type": "package", + "compile": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + } + }, "System.Reactive/5.0.0": { "type": "package", "compile": { @@ -62,6 +75,7 @@ "framework": ".NETCoreApp,Version=v6.0", "dependencies": { "CliWrap": "3.3.1", + "DecimalMath.DecimalEx": "1.0.2", "System.Reactive.Linq": "5.0.0" }, "compile": { @@ -94,6 +108,20 @@ "lib/netstandard2.1/CliWrap.xml" ] }, + "DecimalMath.DecimalEx/1.0.2": { + "sha512": "BCii/IxT7Tx7BPZ7MtrpqVlEii/iaHi4OOXpgaPi+zrphnkbe251KKI3S+pgnTzobfn0jS/SF7bgidqOMj1oGw==", + "type": "package", + "path": "decimalmath.decimalex/1.0.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "LICENSE", + "decimalmath.decimalex.1.0.2.nupkg.sha512", + "decimalmath.decimalex.nuspec", + "lib/netstandard2.0/DecimalEx.dll", + "lib/netstandard2.0/DecimalEx.xml" + ] + }, "System.Reactive/5.0.0": { "sha512": "erBZjkQHWL9jpasCE/0qKAryzVBJFxGHVBAvgRN1bzM0q2s1S4oYREEEL0Vb+1kA/6BKb5FjUZMp5VXmy+gzkQ==", "type": "package", diff --git a/csharp/lib/Devices/Trumpf/TruConvert/obj/project.nuget.cache b/csharp/lib/Devices/Trumpf/TruConvert/obj/project.nuget.cache index 43c16c7d4..5cadd71ab 100644 --- a/csharp/lib/Devices/Trumpf/TruConvert/obj/project.nuget.cache +++ b/csharp/lib/Devices/Trumpf/TruConvert/obj/project.nuget.cache @@ -1,10 +1,11 @@ { "version": 2, - "dgSpecHash": "wmtHaSO1Zv02wVLxTyFIo/dL2Gu8tkw/RugdTf9aKuuW70y4bdFecGFfg6p+il7f2+BJ+S1tOP/yZoeGtevHcg==", + "dgSpecHash": "k0/eLjU04GHLVNcRLGjdP1OH0ZGANCjk0T8EJXSZLdf94y/hAbUBnUxkDP/4C8bBJqpMejlaM1JnQKn18NGuUg==", "success": true, "projectFilePath": "/home/kim/code/innovenergy/new/csharp/lib/Devices/Trumpf/TruConvert/TruConvert.csproj", "expectedPackageFiles": [ "/home/kim/.nuget/packages/cliwrap/3.3.1/cliwrap.3.3.1.nupkg.sha512", + "/home/kim/.nuget/packages/decimalmath.decimalex/1.0.2/decimalmath.decimalex.1.0.2.nupkg.sha512", "/home/kim/.nuget/packages/system.reactive/5.0.0/system.reactive.5.0.0.nupkg.sha512", "/home/kim/.nuget/packages/system.reactive.linq/5.0.0/system.reactive.linq.5.0.0.nupkg.sha512", "/home/kim/.nuget/packages/system.threading.tasks.extensions/4.5.4/system.threading.tasks.extensions.4.5.4.nupkg.sha512" diff --git a/csharp/lib/Devices/Trumpf/TruConvert/obj/rider.project.restore.info b/csharp/lib/Devices/Trumpf/TruConvert/obj/rider.project.restore.info index 47d107710..46a715514 100644 --- a/csharp/lib/Devices/Trumpf/TruConvert/obj/rider.project.restore.info +++ b/csharp/lib/Devices/Trumpf/TruConvert/obj/rider.project.restore.info @@ -1 +1 @@ -16758719413322651 \ No newline at end of file +16769606177594988 \ No newline at end of file diff --git a/csharp/lib/Devices/Trumpf/TruConvertAc/obj/Debug/net6.0/TruConvertAc.assets.cache b/csharp/lib/Devices/Trumpf/TruConvertAc/obj/Debug/net6.0/TruConvertAc.assets.cache index 22cb1eec1..ee9d47129 100644 Binary files a/csharp/lib/Devices/Trumpf/TruConvertAc/obj/Debug/net6.0/TruConvertAc.assets.cache and b/csharp/lib/Devices/Trumpf/TruConvertAc/obj/Debug/net6.0/TruConvertAc.assets.cache differ diff --git a/csharp/lib/Devices/Trumpf/TruConvertAc/obj/Debug/net6.0/TruConvertAc.csproj.AssemblyReference.cache b/csharp/lib/Devices/Trumpf/TruConvertAc/obj/Debug/net6.0/TruConvertAc.csproj.AssemblyReference.cache index 5124badbf..204fdef64 100644 Binary files a/csharp/lib/Devices/Trumpf/TruConvertAc/obj/Debug/net6.0/TruConvertAc.csproj.AssemblyReference.cache and b/csharp/lib/Devices/Trumpf/TruConvertAc/obj/Debug/net6.0/TruConvertAc.csproj.AssemblyReference.cache differ diff --git a/csharp/lib/Devices/Trumpf/TruConvertAc/obj/TruConvertAc.csproj.nuget.dgspec.json b/csharp/lib/Devices/Trumpf/TruConvertAc/obj/TruConvertAc.csproj.nuget.dgspec.json index 8683101c2..89b748fc6 100644 --- a/csharp/lib/Devices/Trumpf/TruConvertAc/obj/TruConvertAc.csproj.nuget.dgspec.json +++ b/csharp/lib/Devices/Trumpf/TruConvertAc/obj/TruConvertAc.csproj.nuget.dgspec.json @@ -219,6 +219,10 @@ "target": "Package", "version": "[3.3.1, )" }, + "DecimalMath.DecimalEx": { + "target": "Package", + "version": "[1.0.2, )" + }, "System.Reactive.Linq": { "target": "Package", "version": "[5.0.0, )" diff --git a/csharp/lib/Devices/Trumpf/TruConvertAc/obj/project.assets.json b/csharp/lib/Devices/Trumpf/TruConvertAc/obj/project.assets.json index 1eead2405..ccbd97363 100644 --- a/csharp/lib/Devices/Trumpf/TruConvertAc/obj/project.assets.json +++ b/csharp/lib/Devices/Trumpf/TruConvertAc/obj/project.assets.json @@ -15,6 +15,19 @@ } } }, + "DecimalMath.DecimalEx/1.0.2": { + "type": "package", + "compile": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + } + }, "runtime.linux-arm.runtime.native.System.IO.Ports/7.0.0": { "type": "package", "runtimeTargets": { @@ -173,6 +186,7 @@ "framework": ".NETCoreApp,Version=v6.0", "dependencies": { "CliWrap": "3.3.1", + "DecimalMath.DecimalEx": "1.0.2", "System.Reactive.Linq": "5.0.0" }, "compile": { @@ -205,6 +219,20 @@ "lib/netstandard2.1/CliWrap.xml" ] }, + "DecimalMath.DecimalEx/1.0.2": { + "sha512": "BCii/IxT7Tx7BPZ7MtrpqVlEii/iaHi4OOXpgaPi+zrphnkbe251KKI3S+pgnTzobfn0jS/SF7bgidqOMj1oGw==", + "type": "package", + "path": "decimalmath.decimalex/1.0.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "LICENSE", + "decimalmath.decimalex.1.0.2.nupkg.sha512", + "decimalmath.decimalex.nuspec", + "lib/netstandard2.0/DecimalEx.dll", + "lib/netstandard2.0/DecimalEx.xml" + ] + }, "runtime.linux-arm.runtime.native.System.IO.Ports/7.0.0": { "sha512": "CBvgRaF+M0xGLDv2Geb/0v0LEADheH8aK72GRAUJdnqnJVsQO60ki1XO8M3keEhnjm+T5NvLm41pNXAVYAPiSg==", "type": "package", diff --git a/csharp/lib/Devices/Trumpf/TruConvertAc/obj/project.nuget.cache b/csharp/lib/Devices/Trumpf/TruConvertAc/obj/project.nuget.cache index 8b4d5b589..775641063 100644 --- a/csharp/lib/Devices/Trumpf/TruConvertAc/obj/project.nuget.cache +++ b/csharp/lib/Devices/Trumpf/TruConvertAc/obj/project.nuget.cache @@ -1,10 +1,11 @@ { "version": 2, - "dgSpecHash": "Djh2RhiLk3Hfah1FN2wBDIPhA74yv145Qo6pYsUOIed4MjnOHT2IOs+xOm6h2XrCC+0kbDhtL0NDEOuVipL4Gg==", + "dgSpecHash": "uGK6pHmxVB8ZfN7wSppsp3Bql0XpGky2lh7wKjCQd48vSKXcEIDtTv224K2MoJD2S+qbf1B6VTVrDZ/N8GLJMw==", "success": true, "projectFilePath": "/home/kim/code/innovenergy/new/csharp/lib/Devices/Trumpf/TruConvertAc/TruConvertAc.csproj", "expectedPackageFiles": [ "/home/kim/.nuget/packages/cliwrap/3.3.1/cliwrap.3.3.1.nupkg.sha512", + "/home/kim/.nuget/packages/decimalmath.decimalex/1.0.2/decimalmath.decimalex.1.0.2.nupkg.sha512", "/home/kim/.nuget/packages/runtime.linux-arm.runtime.native.system.io.ports/7.0.0/runtime.linux-arm.runtime.native.system.io.ports.7.0.0.nupkg.sha512", "/home/kim/.nuget/packages/runtime.linux-arm64.runtime.native.system.io.ports/7.0.0/runtime.linux-arm64.runtime.native.system.io.ports.7.0.0.nupkg.sha512", "/home/kim/.nuget/packages/runtime.linux-x64.runtime.native.system.io.ports/7.0.0/runtime.linux-x64.runtime.native.system.io.ports.7.0.0.nupkg.sha512", diff --git a/csharp/lib/Devices/Trumpf/TruConvertAc/obj/rider.project.restore.info b/csharp/lib/Devices/Trumpf/TruConvertAc/obj/rider.project.restore.info index 47d107710..46a715514 100644 --- a/csharp/lib/Devices/Trumpf/TruConvertAc/obj/rider.project.restore.info +++ b/csharp/lib/Devices/Trumpf/TruConvertAc/obj/rider.project.restore.info @@ -1 +1 @@ -16758719413322651 \ No newline at end of file +16769606177594988 \ No newline at end of file diff --git a/csharp/lib/Devices/Trumpf/TruConvertDc/obj/Debug/net6.0/TruConvertDc.assets.cache b/csharp/lib/Devices/Trumpf/TruConvertDc/obj/Debug/net6.0/TruConvertDc.assets.cache index 2c08d68d4..09198006b 100644 Binary files a/csharp/lib/Devices/Trumpf/TruConvertDc/obj/Debug/net6.0/TruConvertDc.assets.cache and b/csharp/lib/Devices/Trumpf/TruConvertDc/obj/Debug/net6.0/TruConvertDc.assets.cache differ diff --git a/csharp/lib/Devices/Trumpf/TruConvertDc/obj/Debug/net6.0/TruConvertDc.csproj.AssemblyReference.cache b/csharp/lib/Devices/Trumpf/TruConvertDc/obj/Debug/net6.0/TruConvertDc.csproj.AssemblyReference.cache index 5124badbf..204fdef64 100644 Binary files a/csharp/lib/Devices/Trumpf/TruConvertDc/obj/Debug/net6.0/TruConvertDc.csproj.AssemblyReference.cache and b/csharp/lib/Devices/Trumpf/TruConvertDc/obj/Debug/net6.0/TruConvertDc.csproj.AssemblyReference.cache differ diff --git a/csharp/lib/Devices/Trumpf/TruConvertDc/obj/TruConvertDc.csproj.nuget.dgspec.json b/csharp/lib/Devices/Trumpf/TruConvertDc/obj/TruConvertDc.csproj.nuget.dgspec.json index 2ba0daa25..79e2e81b6 100644 --- a/csharp/lib/Devices/Trumpf/TruConvertDc/obj/TruConvertDc.csproj.nuget.dgspec.json +++ b/csharp/lib/Devices/Trumpf/TruConvertDc/obj/TruConvertDc.csproj.nuget.dgspec.json @@ -219,6 +219,10 @@ "target": "Package", "version": "[3.3.1, )" }, + "DecimalMath.DecimalEx": { + "target": "Package", + "version": "[1.0.2, )" + }, "System.Reactive.Linq": { "target": "Package", "version": "[5.0.0, )" diff --git a/csharp/lib/Devices/Trumpf/TruConvertDc/obj/project.assets.json b/csharp/lib/Devices/Trumpf/TruConvertDc/obj/project.assets.json index a21cb28df..8a12c0786 100644 --- a/csharp/lib/Devices/Trumpf/TruConvertDc/obj/project.assets.json +++ b/csharp/lib/Devices/Trumpf/TruConvertDc/obj/project.assets.json @@ -15,6 +15,19 @@ } } }, + "DecimalMath.DecimalEx/1.0.2": { + "type": "package", + "compile": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + } + }, "runtime.linux-arm.runtime.native.System.IO.Ports/7.0.0": { "type": "package", "runtimeTargets": { @@ -173,6 +186,7 @@ "framework": ".NETCoreApp,Version=v6.0", "dependencies": { "CliWrap": "3.3.1", + "DecimalMath.DecimalEx": "1.0.2", "System.Reactive.Linq": "5.0.0" }, "compile": { @@ -205,6 +219,20 @@ "lib/netstandard2.1/CliWrap.xml" ] }, + "DecimalMath.DecimalEx/1.0.2": { + "sha512": "BCii/IxT7Tx7BPZ7MtrpqVlEii/iaHi4OOXpgaPi+zrphnkbe251KKI3S+pgnTzobfn0jS/SF7bgidqOMj1oGw==", + "type": "package", + "path": "decimalmath.decimalex/1.0.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "LICENSE", + "decimalmath.decimalex.1.0.2.nupkg.sha512", + "decimalmath.decimalex.nuspec", + "lib/netstandard2.0/DecimalEx.dll", + "lib/netstandard2.0/DecimalEx.xml" + ] + }, "runtime.linux-arm.runtime.native.System.IO.Ports/7.0.0": { "sha512": "CBvgRaF+M0xGLDv2Geb/0v0LEADheH8aK72GRAUJdnqnJVsQO60ki1XO8M3keEhnjm+T5NvLm41pNXAVYAPiSg==", "type": "package", diff --git a/csharp/lib/Devices/Trumpf/TruConvertDc/obj/project.nuget.cache b/csharp/lib/Devices/Trumpf/TruConvertDc/obj/project.nuget.cache index d359ee3b0..167111fbe 100644 --- a/csharp/lib/Devices/Trumpf/TruConvertDc/obj/project.nuget.cache +++ b/csharp/lib/Devices/Trumpf/TruConvertDc/obj/project.nuget.cache @@ -1,10 +1,11 @@ { "version": 2, - "dgSpecHash": "UwV1i8qi5KCBvJWwkthfJhmDE/BpvJVe9Oz94t9u0ew/HvbWMiH3a9V9o5dFzSONK7LxWPhUkvZFE9hoe21aBg==", + "dgSpecHash": "iJaZ3VJXmLTVtdUTreHIXYlqmeckjzafVloYcb9cumV31T7cL4NcO+UYcYHPwDWm38Io4ERK3ChJPaUwQ/Wkkg==", "success": true, "projectFilePath": "/home/kim/code/innovenergy/new/csharp/lib/Devices/Trumpf/TruConvertDc/TruConvertDc.csproj", "expectedPackageFiles": [ "/home/kim/.nuget/packages/cliwrap/3.3.1/cliwrap.3.3.1.nupkg.sha512", + "/home/kim/.nuget/packages/decimalmath.decimalex/1.0.2/decimalmath.decimalex.1.0.2.nupkg.sha512", "/home/kim/.nuget/packages/runtime.linux-arm.runtime.native.system.io.ports/7.0.0/runtime.linux-arm.runtime.native.system.io.ports.7.0.0.nupkg.sha512", "/home/kim/.nuget/packages/runtime.linux-arm64.runtime.native.system.io.ports/7.0.0/runtime.linux-arm64.runtime.native.system.io.ports.7.0.0.nupkg.sha512", "/home/kim/.nuget/packages/runtime.linux-x64.runtime.native.system.io.ports/7.0.0/runtime.linux-x64.runtime.native.system.io.ports.7.0.0.nupkg.sha512", diff --git a/csharp/lib/Devices/Trumpf/TruConvertDc/obj/rider.project.restore.info b/csharp/lib/Devices/Trumpf/TruConvertDc/obj/rider.project.restore.info index d7faba9e4..88002e704 100644 --- a/csharp/lib/Devices/Trumpf/TruConvertDc/obj/rider.project.restore.info +++ b/csharp/lib/Devices/Trumpf/TruConvertDc/obj/rider.project.restore.info @@ -1 +1 @@ -16758719413282651 \ No newline at end of file +16769606177634987 \ No newline at end of file diff --git a/csharp/lib/Protocols/DBus/obj/Debug/net6.0/DBus.csproj.AssemblyReference.cache b/csharp/lib/Protocols/DBus/obj/Debug/net6.0/DBus.csproj.AssemblyReference.cache index 33d55cf0e..204fdef64 100644 Binary files a/csharp/lib/Protocols/DBus/obj/Debug/net6.0/DBus.csproj.AssemblyReference.cache and b/csharp/lib/Protocols/DBus/obj/Debug/net6.0/DBus.csproj.AssemblyReference.cache differ diff --git a/csharp/lib/Protocols/Modbus/obj/Debug/net6.0/Modbus.assets.cache b/csharp/lib/Protocols/Modbus/obj/Debug/net6.0/Modbus.assets.cache index faa0c5c9e..63d135f28 100644 Binary files a/csharp/lib/Protocols/Modbus/obj/Debug/net6.0/Modbus.assets.cache and b/csharp/lib/Protocols/Modbus/obj/Debug/net6.0/Modbus.assets.cache differ diff --git a/csharp/lib/Protocols/Modbus/obj/Debug/net6.0/Modbus.csproj.AssemblyReference.cache b/csharp/lib/Protocols/Modbus/obj/Debug/net6.0/Modbus.csproj.AssemblyReference.cache index 467f88fda..204fdef64 100644 Binary files a/csharp/lib/Protocols/Modbus/obj/Debug/net6.0/Modbus.csproj.AssemblyReference.cache and b/csharp/lib/Protocols/Modbus/obj/Debug/net6.0/Modbus.csproj.AssemblyReference.cache differ diff --git a/csharp/lib/Protocols/Modbus/obj/Modbus.csproj.nuget.dgspec.json b/csharp/lib/Protocols/Modbus/obj/Modbus.csproj.nuget.dgspec.json index e179b07ba..76692f250 100644 --- a/csharp/lib/Protocols/Modbus/obj/Modbus.csproj.nuget.dgspec.json +++ b/csharp/lib/Protocols/Modbus/obj/Modbus.csproj.nuget.dgspec.json @@ -104,6 +104,10 @@ "target": "Package", "version": "[3.3.1, )" }, + "DecimalMath.DecimalEx": { + "target": "Package", + "version": "[1.0.2, )" + }, "System.Reactive.Linq": { "target": "Package", "version": "[5.0.0, )" diff --git a/csharp/lib/Protocols/Modbus/obj/project.assets.json b/csharp/lib/Protocols/Modbus/obj/project.assets.json index 2c6d8e691..efbcc5587 100644 --- a/csharp/lib/Protocols/Modbus/obj/project.assets.json +++ b/csharp/lib/Protocols/Modbus/obj/project.assets.json @@ -15,6 +15,19 @@ } } }, + "DecimalMath.DecimalEx/1.0.2": { + "type": "package", + "compile": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + } + }, "runtime.linux-arm.runtime.native.System.IO.Ports/7.0.0": { "type": "package", "runtimeTargets": { @@ -146,6 +159,7 @@ "framework": ".NETCoreApp,Version=v6.0", "dependencies": { "CliWrap": "3.3.1", + "DecimalMath.DecimalEx": "1.0.2", "System.Reactive.Linq": "5.0.0" }, "compile": { @@ -178,6 +192,20 @@ "lib/netstandard2.1/CliWrap.xml" ] }, + "DecimalMath.DecimalEx/1.0.2": { + "sha512": "BCii/IxT7Tx7BPZ7MtrpqVlEii/iaHi4OOXpgaPi+zrphnkbe251KKI3S+pgnTzobfn0jS/SF7bgidqOMj1oGw==", + "type": "package", + "path": "decimalmath.decimalex/1.0.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "LICENSE", + "decimalmath.decimalex.1.0.2.nupkg.sha512", + "decimalmath.decimalex.nuspec", + "lib/netstandard2.0/DecimalEx.dll", + "lib/netstandard2.0/DecimalEx.xml" + ] + }, "runtime.linux-arm.runtime.native.System.IO.Ports/7.0.0": { "sha512": "CBvgRaF+M0xGLDv2Geb/0v0LEADheH8aK72GRAUJdnqnJVsQO60ki1XO8M3keEhnjm+T5NvLm41pNXAVYAPiSg==", "type": "package", diff --git a/csharp/lib/Protocols/Modbus/obj/project.nuget.cache b/csharp/lib/Protocols/Modbus/obj/project.nuget.cache index 89d5744f2..85f57d102 100644 --- a/csharp/lib/Protocols/Modbus/obj/project.nuget.cache +++ b/csharp/lib/Protocols/Modbus/obj/project.nuget.cache @@ -1,10 +1,11 @@ { "version": 2, - "dgSpecHash": "rufMgreffa84Pwda8kMGHo8odX+IooxtxNicjqYLTlYtbA86nz6rT7kf+d8fLOa1CUF32GaSZQe0YOpSPNeAKQ==", + "dgSpecHash": "AQo9X9tCJOq5B8bmP+LY1IxloABe91GQlTnUndyOt1I7DiJkmUzObbfr8HGuYkR/auFMzgsG26i+nj/XqK5Icg==", "success": true, "projectFilePath": "/home/kim/code/innovenergy/new/csharp/lib/Protocols/Modbus/Modbus.csproj", "expectedPackageFiles": [ "/home/kim/.nuget/packages/cliwrap/3.3.1/cliwrap.3.3.1.nupkg.sha512", + "/home/kim/.nuget/packages/decimalmath.decimalex/1.0.2/decimalmath.decimalex.1.0.2.nupkg.sha512", "/home/kim/.nuget/packages/runtime.linux-arm.runtime.native.system.io.ports/7.0.0/runtime.linux-arm.runtime.native.system.io.ports.7.0.0.nupkg.sha512", "/home/kim/.nuget/packages/runtime.linux-arm64.runtime.native.system.io.ports/7.0.0/runtime.linux-arm64.runtime.native.system.io.ports.7.0.0.nupkg.sha512", "/home/kim/.nuget/packages/runtime.linux-x64.runtime.native.system.io.ports/7.0.0/runtime.linux-x64.runtime.native.system.io.ports.7.0.0.nupkg.sha512", diff --git a/csharp/lib/Protocols/Modbus/obj/rider.project.restore.info b/csharp/lib/Protocols/Modbus/obj/rider.project.restore.info index 0a5d94e03..1c5428cdb 100644 --- a/csharp/lib/Protocols/Modbus/obj/rider.project.restore.info +++ b/csharp/lib/Protocols/Modbus/obj/rider.project.restore.info @@ -1 +1 @@ -16758719413242651 \ No newline at end of file +16769606177554988 \ No newline at end of file diff --git a/csharp/lib/S3.Tests/obj/Debug/net6.0/S3.Tests.assets.cache b/csharp/lib/S3.Tests/obj/Debug/net6.0/S3.Tests.assets.cache index a2fce23df..10ae4c48f 100644 Binary files a/csharp/lib/S3.Tests/obj/Debug/net6.0/S3.Tests.assets.cache and b/csharp/lib/S3.Tests/obj/Debug/net6.0/S3.Tests.assets.cache differ diff --git a/csharp/lib/S3.Tests/obj/Debug/net6.0/S3.Tests.csproj.AssemblyReference.cache b/csharp/lib/S3.Tests/obj/Debug/net6.0/S3.Tests.csproj.AssemblyReference.cache index d7d4522c2..649b34b39 100644 Binary files a/csharp/lib/S3.Tests/obj/Debug/net6.0/S3.Tests.csproj.AssemblyReference.cache and b/csharp/lib/S3.Tests/obj/Debug/net6.0/S3.Tests.csproj.AssemblyReference.cache differ diff --git a/csharp/lib/S3.Tests/obj/S3.Tests.csproj.nuget.dgspec.json b/csharp/lib/S3.Tests/obj/S3.Tests.csproj.nuget.dgspec.json index c1a689820..e3c14fe8e 100644 --- a/csharp/lib/S3.Tests/obj/S3.Tests.csproj.nuget.dgspec.json +++ b/csharp/lib/S3.Tests/obj/S3.Tests.csproj.nuget.dgspec.json @@ -237,6 +237,10 @@ "target": "Package", "version": "[3.3.1, )" }, + "DecimalMath.DecimalEx": { + "target": "Package", + "version": "[1.0.2, )" + }, "System.Reactive.Linq": { "target": "Package", "version": "[5.0.0, )" diff --git a/csharp/lib/S3.Tests/obj/project.assets.json b/csharp/lib/S3.Tests/obj/project.assets.json index 2112b2f75..e0ddc891b 100644 --- a/csharp/lib/S3.Tests/obj/project.assets.json +++ b/csharp/lib/S3.Tests/obj/project.assets.json @@ -21,6 +21,19 @@ "build/netstandard1.0/coverlet.collector.targets": {} } }, + "DecimalMath.DecimalEx/1.0.2": { + "type": "package", + "compile": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + } + }, "Flurl/3.0.2": { "type": "package", "compile": { @@ -1794,6 +1807,7 @@ "framework": ".NETCoreApp,Version=v6.0", "dependencies": { "CliWrap": "3.3.1", + "DecimalMath.DecimalEx": "1.0.2", "System.Reactive.Linq": "5.0.0" }, "compile": { @@ -1858,6 +1872,20 @@ "coverlet.collector.nuspec" ] }, + "DecimalMath.DecimalEx/1.0.2": { + "sha512": "BCii/IxT7Tx7BPZ7MtrpqVlEii/iaHi4OOXpgaPi+zrphnkbe251KKI3S+pgnTzobfn0jS/SF7bgidqOMj1oGw==", + "type": "package", + "path": "decimalmath.decimalex/1.0.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "LICENSE", + "decimalmath.decimalex.1.0.2.nupkg.sha512", + "decimalmath.decimalex.nuspec", + "lib/netstandard2.0/DecimalEx.dll", + "lib/netstandard2.0/DecimalEx.xml" + ] + }, "Flurl/3.0.2": { "sha512": "1/6mqdzGCTdAekbWkVZBTylCV+8g3JUSTXRBngRVR274S+RsAYNRF79GbDoDsPfMKu8VPc9HkQWdBEAncK1PQQ==", "type": "package", diff --git a/csharp/lib/S3.Tests/obj/project.nuget.cache b/csharp/lib/S3.Tests/obj/project.nuget.cache index e3ca5970b..a6ad363aa 100644 --- a/csharp/lib/S3.Tests/obj/project.nuget.cache +++ b/csharp/lib/S3.Tests/obj/project.nuget.cache @@ -1,11 +1,12 @@ { "version": 2, - "dgSpecHash": "ow9xTJqaI3cxSCYyC/Jn45QuFHUOWAmTINZp2VToOYu02xftD2WXyfsKQVZCZavAoces/sXV+YYt11nNj539oQ==", + "dgSpecHash": "Pw1GQMSnIw52d8usHjqAfTJ/rEaCeaP8fLlBYupODKOgm+tBiAX7JdWrottv61CHqLbUULLwCyGphKJfDsK/Zg==", "success": true, "projectFilePath": "/home/kim/code/innovenergy/new/csharp/lib/S3.Tests/S3.Tests.csproj", "expectedPackageFiles": [ "/home/kim/.nuget/packages/cliwrap/3.3.1/cliwrap.3.3.1.nupkg.sha512", "/home/kim/.nuget/packages/coverlet.collector/1.3.0/coverlet.collector.1.3.0.nupkg.sha512", + "/home/kim/.nuget/packages/decimalmath.decimalex/1.0.2/decimalmath.decimalex.1.0.2.nupkg.sha512", "/home/kim/.nuget/packages/flurl/3.0.2/flurl.3.0.2.nupkg.sha512", "/home/kim/.nuget/packages/flurl.http/3.2.0/flurl.http.3.2.0.nupkg.sha512", "/home/kim/.nuget/packages/microsoft.codecoverage/16.7.1/microsoft.codecoverage.16.7.1.nupkg.sha512", diff --git a/csharp/lib/S3.Tests/obj/rider.project.restore.info b/csharp/lib/S3.Tests/obj/rider.project.restore.info index 87afb8e54..0a0bf85d9 100644 --- a/csharp/lib/S3.Tests/obj/rider.project.restore.info +++ b/csharp/lib/S3.Tests/obj/rider.project.restore.info @@ -1 +1 @@ -16758719413842650 \ No newline at end of file +16769606178234985 \ No newline at end of file diff --git a/csharp/lib/S3/obj/Debug/net6.0/S3.assets.cache b/csharp/lib/S3/obj/Debug/net6.0/S3.assets.cache index a2713e95c..ee14f1ebd 100644 Binary files a/csharp/lib/S3/obj/Debug/net6.0/S3.assets.cache and b/csharp/lib/S3/obj/Debug/net6.0/S3.assets.cache differ diff --git a/csharp/lib/S3/obj/Debug/net6.0/S3.csproj.AssemblyReference.cache b/csharp/lib/S3/obj/Debug/net6.0/S3.csproj.AssemblyReference.cache index 717bd9462..204fdef64 100644 Binary files a/csharp/lib/S3/obj/Debug/net6.0/S3.csproj.AssemblyReference.cache and b/csharp/lib/S3/obj/Debug/net6.0/S3.csproj.AssemblyReference.cache differ diff --git a/csharp/lib/S3/obj/S3.csproj.nuget.dgspec.json b/csharp/lib/S3/obj/S3.csproj.nuget.dgspec.json index a151ff50c..f5b746e61 100644 --- a/csharp/lib/S3/obj/S3.csproj.nuget.dgspec.json +++ b/csharp/lib/S3/obj/S3.csproj.nuget.dgspec.json @@ -163,6 +163,10 @@ "target": "Package", "version": "[3.3.1, )" }, + "DecimalMath.DecimalEx": { + "target": "Package", + "version": "[1.0.2, )" + }, "System.Reactive.Linq": { "target": "Package", "version": "[5.0.0, )" diff --git a/csharp/lib/S3/obj/project.assets.json b/csharp/lib/S3/obj/project.assets.json index fff8ca042..6adfb471c 100644 --- a/csharp/lib/S3/obj/project.assets.json +++ b/csharp/lib/S3/obj/project.assets.json @@ -15,6 +15,19 @@ } } }, + "DecimalMath.DecimalEx/1.0.2": { + "type": "package", + "compile": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + } + }, "Flurl/3.0.2": { "type": "package", "compile": { @@ -157,6 +170,7 @@ "framework": ".NETCoreApp,Version=v6.0", "dependencies": { "CliWrap": "3.3.1", + "DecimalMath.DecimalEx": "1.0.2", "System.Reactive.Linq": "5.0.0" }, "compile": { @@ -189,6 +203,20 @@ "lib/netstandard2.1/CliWrap.xml" ] }, + "DecimalMath.DecimalEx/1.0.2": { + "sha512": "BCii/IxT7Tx7BPZ7MtrpqVlEii/iaHi4OOXpgaPi+zrphnkbe251KKI3S+pgnTzobfn0jS/SF7bgidqOMj1oGw==", + "type": "package", + "path": "decimalmath.decimalex/1.0.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "LICENSE", + "decimalmath.decimalex.1.0.2.nupkg.sha512", + "decimalmath.decimalex.nuspec", + "lib/netstandard2.0/DecimalEx.dll", + "lib/netstandard2.0/DecimalEx.xml" + ] + }, "Flurl/3.0.2": { "sha512": "1/6mqdzGCTdAekbWkVZBTylCV+8g3JUSTXRBngRVR274S+RsAYNRF79GbDoDsPfMKu8VPc9HkQWdBEAncK1PQQ==", "type": "package", diff --git a/csharp/lib/S3/obj/project.nuget.cache b/csharp/lib/S3/obj/project.nuget.cache index 0421d4d80..20b6e7b54 100644 --- a/csharp/lib/S3/obj/project.nuget.cache +++ b/csharp/lib/S3/obj/project.nuget.cache @@ -1,10 +1,11 @@ { "version": 2, - "dgSpecHash": "DfAEwq11rn8KQzBJ0zhH2m/cXfm+4saQFb3FEuQBqFrwjMULhFkOofM/bUgfJE6WzcC0PLVqECnzO63CC1hkBw==", + "dgSpecHash": "EQaA6149YgVSPht6HQHx2E0vd2OzyQr+dsmQnJLMLMYyucd8xjbfhFXFerFIMlvbJiDPZkMr/4N6F9WNWgx0og==", "success": true, "projectFilePath": "/home/kim/code/innovenergy/new/csharp/lib/S3/S3.csproj", "expectedPackageFiles": [ "/home/kim/.nuget/packages/cliwrap/3.3.1/cliwrap.3.3.1.nupkg.sha512", + "/home/kim/.nuget/packages/decimalmath.decimalex/1.0.2/decimalmath.decimalex.1.0.2.nupkg.sha512", "/home/kim/.nuget/packages/flurl/3.0.2/flurl.3.0.2.nupkg.sha512", "/home/kim/.nuget/packages/flurl.http/3.2.0/flurl.http.3.2.0.nupkg.sha512", "/home/kim/.nuget/packages/microsoft.netcore.platforms/2.1.2/microsoft.netcore.platforms.2.1.2.nupkg.sha512", diff --git a/csharp/lib/S3/obj/rider.project.restore.info b/csharp/lib/S3/obj/rider.project.restore.info index 47d107710..81393c5a6 100644 --- a/csharp/lib/S3/obj/rider.project.restore.info +++ b/csharp/lib/S3/obj/rider.project.restore.info @@ -1 +1 @@ -16758719413322651 \ No newline at end of file +16769606177474988 \ No newline at end of file diff --git a/csharp/lib/StatusApi/AcDevice.cs b/csharp/lib/StatusApi/AcDevice.cs deleted file mode 100644 index 5a7562d94..000000000 --- a/csharp/lib/StatusApi/AcDevice.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Text.Json.Nodes; - -namespace InnovEnergy.Lib.StatusApi; - - -public record AcDevice : IAcDevice -{ - public IAcPhase[] Ac { get; init; } = Array.Empty(); - public Double Frequency { get; init; } - public DeviceType Type { get; init; } - public String? Name { get; init; } - - - public JsonNode ToJson() - { - var json = new Dictionary(); - - json[nameof(Type)] = Type.ToString()!; - json[nameof(Frequency)] = Frequency; - - if (Name is not null) - json[nameof(Name)] = Name!; - - - if (Ac.Any()) - { - json[nameof(Ac)] = new JsonArray(Ac.Select(p => p.ToJson()).ToArray()); - } - - json[nameof(Type)] = Type.ToString()!; - - - return new JsonObject(json!); - } - -} \ No newline at end of file diff --git a/csharp/lib/StatusApi/AcPhase.cs b/csharp/lib/StatusApi/AcPhase.cs deleted file mode 100644 index 6e678bb28..000000000 --- a/csharp/lib/StatusApi/AcPhase.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Text.Json.Nodes; - -namespace InnovEnergy.Lib.StatusApi; - -public record AcPhase : IAcPhase -{ - - // Note: only inherit from interfaces in order to make JSON serialization work - - public Double Phi { get; init;} - public Double Voltage { get; init;} - public Double Current { get; init;} - - public JsonNode ToJson() - { - var jsonDict = new Dictionary(); - - jsonDict[nameof(Phi)] = Phi; - jsonDict[nameof(Voltage)] = Voltage; - jsonDict[nameof(Current)] = Current; - - return new JsonObject(jsonDict!); - } -} \ No newline at end of file diff --git a/csharp/lib/StatusApi/Api.cs b/csharp/lib/StatusApi/Api.cs deleted file mode 100644 index f8ef252c8..000000000 --- a/csharp/lib/StatusApi/Api.cs +++ /dev/null @@ -1,134 +0,0 @@ - -using System.Text.Json.Nodes; - -namespace InnovEnergy.Lib.StatusApi; - - - - -/// SIGN CONVENTION -/// -/// Voltages have to be measured/indicated so that they are guaranteed to be never negative. -/// In the case of AC this is accomplished by using the RMS measurement. -/// The sign convention of the current (and hence power, since voltage defined to be never negative) -/// depends on the type of the device. -/// If the device can only produce (e.g. PV) or only consume (e.g. Loads), -/// then the current has to be 0 or positive. -/// If the device is a prosumer (e.g. inverter, battery, grid...) -/// then a positive sign denotes current (power) flow away from the grid (to the "right") -/// and a negative sign denotes current (power) flow towards the grid (to the "left") - - - - -/// the currently known DeviceTypes, to be serialized as string in JSON -public enum DeviceType -{ - None, - PvOnAcIn , - PvOnAcOut , - PvOnDc , - Load , - CriticalLoad, - Battery , - Grid , - Inverter , - AcInToAcOut , - DcDc , - DcLoad , - Losses -} - - -public interface IJson -{ - JsonNode ToJson(); -} - - -/// A phase must have at least a known Voltage and Current. -/// For DC this is already enough. -/// For AC the values have to be in RMS (not amplitude or P2P) -/// Power can be inferred, P = UI -public interface IPhase : IJson -{ - public Double Voltage { get; } // U, non-negative - public Double Current { get; } // I, sign depends on device type, see sign convention above -} - -/// An AC phase additionally needs a field Phi denoting -/// the phase difference between voltage and current -/// Phi has to be in the interval [0,2pi) -/// Apparent Power = U*I -/// Active Power = cos(phi)*U*I -/// Reactive Power = sin(phi)*U*I -/// Power Factor = cos(phi) -/// Active Power is signed (via cos(phi)) -/// Current and Voltage are RMS and unsigned -public interface IAcPhase : IPhase -{ - public Double Phi { get; } -} - -/// a device must have a Name and DeviceType -public interface IDevice : IJson -{ - DeviceType Type { get; } - String? Name { get; } -} - -/// A DC device must have a field denoting its DC connection -public interface IDcDevice : IDevice -{ - public IPhase Dc { get; } -} - -/// An AC device can have 1 to 3 AC phases -/// An AC device also needs a Frequency measurement -/// Total power can be obtained by summing the power of the phases -public interface IAcDevice : IDevice -{ - public IAcPhase[] Ac { get; } // 1 to 3 phases - public Double Frequency { get; } // non-negative -} - -/// A low voltage 48V DC device -/// Needed to distinguish the two sides of the DCDC -/// Will be dropped once we get HV batteries -public interface IDc48Device : IDevice -{ - public IPhase? Dc48 { get; } -} - -public interface IBattery : IJson -{ - public Double Soc { get; } - public Double Temperature { get; } -} - -public interface IDc48Battery : IDc48Device, IBattery -{ -} - -public interface IDcBattery : IDcDevice, IBattery -{ -} - - -/// An inverter has both an AC and a DC connection -public interface IInverter : IAcDevice, IDcDevice -{ -} - -public interface IDeviceStack : IJson -{ - public IDevice[] Top { get; } - public IDevice[] Right { get; } - public IDevice[] Bottom { get; } - public Boolean Disconnected { get; } -} - -public interface IInstallationStatus: IJson -{ - public IDeviceStack[] Stacks { get; } -} \ No newline at end of file diff --git a/csharp/lib/StatusApi/Dc48Device.cs b/csharp/lib/StatusApi/Dc48Device.cs deleted file mode 100644 index a1196e19f..000000000 --- a/csharp/lib/StatusApi/Dc48Device.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Text.Json.Nodes; - -namespace InnovEnergy.Lib.StatusApi; - -public record Dc48Device : IDc48Device -{ - public IPhase? Dc48 { get; init; } - public DeviceType Type { get; init; } - public String? Name { get; init; } - - public JsonNode ToJson() - { - var jsonDict = new Dictionary(); - - jsonDict[nameof(Type)] = Type.ToString()!; - jsonDict[nameof(Name)] = Name; - - return new JsonObject(jsonDict!); - } -} \ No newline at end of file diff --git a/csharp/lib/StatusApi/DcDevice.cs b/csharp/lib/StatusApi/DcDevice.cs deleted file mode 100644 index 894a500dc..000000000 --- a/csharp/lib/StatusApi/DcDevice.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System.Text.Json.Nodes; - -namespace InnovEnergy.Lib.StatusApi; - -public record DcDevice : IDcDevice -{ - public IPhase Dc { get; init; } - public DeviceType Type { get; init; } - public String? Name { get; init; } - - - public JsonNode ToJson() - { - var jsonDict = new Dictionary(); - - jsonDict[nameof(Type)] = Type.ToString()!; - - if (Name is not null) - jsonDict[nameof(Name)] = Name!; - - - return new JsonObject(jsonDict!); - } - -} \ No newline at end of file diff --git a/csharp/lib/StatusApi/Device.cs b/csharp/lib/StatusApi/Device.cs deleted file mode 100644 index fc1bc57a4..000000000 --- a/csharp/lib/StatusApi/Device.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Text.Json.Nodes; - -namespace InnovEnergy.Lib.StatusApi; - -public class Device : IDevice -{ - public DeviceType Type { get; init; } - public String? Name { get; init;} - - public JsonNode ToJson() - { - var jsonDict = new Dictionary(); - - jsonDict[nameof(Type)] = Type.ToString()!; - jsonDict[nameof(Name)] = Name!; - - return new JsonObject(jsonDict!); - } -} \ No newline at end of file diff --git a/csharp/lib/StatusApi/DeviceStack.cs b/csharp/lib/StatusApi/DeviceStack.cs deleted file mode 100644 index a60f65047..000000000 --- a/csharp/lib/StatusApi/DeviceStack.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Text.Json.Nodes; - -namespace InnovEnergy.Lib.StatusApi; - - - -public record Bus -{ - public String Top { get; init; } - public String Right { get; init; } - public String Left { get; init; } - public String Bottom { get; init; } - public Boolean Connected { get; init; } - - public JsonNode ToJson() - { - throw new NotImplementedException(); - } -} - diff --git a/csharp/lib/StatusApi/InstallationStatus.cs b/csharp/lib/StatusApi/InstallationStatus.cs deleted file mode 100644 index fa138a560..000000000 --- a/csharp/lib/StatusApi/InstallationStatus.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Text.Json.Nodes; - -namespace InnovEnergy.Lib.StatusApi; - -public record InstallationStatus : IInstallationStatus -{ - public IDeviceStack[] Stacks { get; init; } - - public JsonNode ToJson() - { - /* var json = new Dictionary(); - - if (Stacks.Any()) - { - json[nameof(Stacks)] = new JsonArray(Stacks.Select(d => d.ToJson()).ToArray()); - } - return new JsonObject(json!);*/ - return null; - } -} \ No newline at end of file diff --git a/csharp/lib/StatusApi/Inverter.cs b/csharp/lib/StatusApi/Inverter.cs deleted file mode 100644 index fc6c6ebbc..000000000 --- a/csharp/lib/StatusApi/Inverter.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Text.Json.Nodes; - -namespace InnovEnergy.Lib.StatusApi; - -public record Inverter : IInverter -{ - public IAcPhase[] Ac { get; init; } - public Double Frequency { get; init; } - public IPhase Dc { get; init; } - public DeviceType Type { get; init; } - public String? Name { get; init; } - - public JsonNode ToJson() - { - var json = new Dictionary(); - - json[nameof(Type)] = Type.ToString()!; - json[nameof(Frequency)] = Frequency; - - if (Name is not null) - json[nameof(Name)] = Name!; - - if (Ac.Any()) - { - json[nameof(Ac)] = new JsonArray(Ac.Select(p => p.ToJson()).ToArray()); - } - - json[nameof(Dc.Current)] = Dc.Current; - json[nameof(Dc.Voltage)] = Dc.Voltage; - - return new JsonObject(json!); - } -} \ No newline at end of file diff --git a/csharp/lib/StatusApi/Phase.cs b/csharp/lib/StatusApi/Phase.cs deleted file mode 100644 index 7090c6943..000000000 --- a/csharp/lib/StatusApi/Phase.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Text.Json.Nodes; - -namespace InnovEnergy.Lib.StatusApi; - -public record Phase : IPhase -{ - public Double Voltage { get; init; } - public Double Current { get; init; } - - public JsonNode ToJson() - { - var jsonDict = new Dictionary - { - [nameof(Voltage)] = Voltage, - [nameof(Current)] = Current - }; - - return new JsonObject(jsonDict!); - } -} \ No newline at end of file diff --git a/csharp/lib/StatusApi/obj/Debug/net6.0/StatusApi.assets.cache b/csharp/lib/StatusApi/obj/Debug/net6.0/StatusApi.assets.cache index b6a030f2d..3fb576205 100644 Binary files a/csharp/lib/StatusApi/obj/Debug/net6.0/StatusApi.assets.cache and b/csharp/lib/StatusApi/obj/Debug/net6.0/StatusApi.assets.cache differ diff --git a/csharp/lib/StatusApi/obj/StatusApi.csproj.nuget.dgspec.json b/csharp/lib/StatusApi/obj/StatusApi.csproj.nuget.dgspec.json index d10100225..a1b532b0b 100644 --- a/csharp/lib/StatusApi/obj/StatusApi.csproj.nuget.dgspec.json +++ b/csharp/lib/StatusApi/obj/StatusApi.csproj.nuget.dgspec.json @@ -160,6 +160,10 @@ "target": "Package", "version": "[3.3.1, )" }, + "DecimalMath.DecimalEx": { + "target": "Package", + "version": "[1.0.2, )" + }, "System.Reactive.Linq": { "target": "Package", "version": "[5.0.0, )" diff --git a/csharp/lib/StatusApi/obj/project.assets.json b/csharp/lib/StatusApi/obj/project.assets.json index 1b8fba40c..6701eda54 100644 --- a/csharp/lib/StatusApi/obj/project.assets.json +++ b/csharp/lib/StatusApi/obj/project.assets.json @@ -15,6 +15,19 @@ } } }, + "DecimalMath.DecimalEx/1.0.2": { + "type": "package", + "compile": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + } + }, "runtime.linux-arm.runtime.native.System.IO.Ports/7.0.0": { "type": "package", "runtimeTargets": { @@ -160,6 +173,7 @@ "framework": ".NETCoreApp,Version=v6.0", "dependencies": { "CliWrap": "3.3.1", + "DecimalMath.DecimalEx": "1.0.2", "System.Reactive.Linq": "5.0.0" }, "compile": { @@ -192,6 +206,20 @@ "lib/netstandard2.1/CliWrap.xml" ] }, + "DecimalMath.DecimalEx/1.0.2": { + "sha512": "BCii/IxT7Tx7BPZ7MtrpqVlEii/iaHi4OOXpgaPi+zrphnkbe251KKI3S+pgnTzobfn0jS/SF7bgidqOMj1oGw==", + "type": "package", + "path": "decimalmath.decimalex/1.0.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "LICENSE", + "decimalmath.decimalex.1.0.2.nupkg.sha512", + "decimalmath.decimalex.nuspec", + "lib/netstandard2.0/DecimalEx.dll", + "lib/netstandard2.0/DecimalEx.xml" + ] + }, "runtime.linux-arm.runtime.native.System.IO.Ports/7.0.0": { "sha512": "CBvgRaF+M0xGLDv2Geb/0v0LEADheH8aK72GRAUJdnqnJVsQO60ki1XO8M3keEhnjm+T5NvLm41pNXAVYAPiSg==", "type": "package", diff --git a/csharp/lib/StatusApi/obj/project.nuget.cache b/csharp/lib/StatusApi/obj/project.nuget.cache index 36eab16aa..8ace4a3c1 100644 --- a/csharp/lib/StatusApi/obj/project.nuget.cache +++ b/csharp/lib/StatusApi/obj/project.nuget.cache @@ -1,10 +1,11 @@ { "version": 2, - "dgSpecHash": "rbxUTi+tZSTWJLgQF9zknvH/3sk6dsjljAi9389I1NpZhKTdnUrwlyEz3Q/mDwF/pxLF01iExKN3GaBHDDcqgg==", + "dgSpecHash": "kV5qZqs4QllHGvXCrUudlthVN12cHpAPsyQ9AazDWDz3yf5Akh1JHZHJ6spaGrsx/H3f59h1y3QP9aFh8HUYJg==", "success": true, "projectFilePath": "/home/kim/code/innovenergy/new/csharp/lib/StatusApi/StatusApi.csproj", "expectedPackageFiles": [ "/home/kim/.nuget/packages/cliwrap/3.3.1/cliwrap.3.3.1.nupkg.sha512", + "/home/kim/.nuget/packages/decimalmath.decimalex/1.0.2/decimalmath.decimalex.1.0.2.nupkg.sha512", "/home/kim/.nuget/packages/runtime.linux-arm.runtime.native.system.io.ports/7.0.0/runtime.linux-arm.runtime.native.system.io.ports.7.0.0.nupkg.sha512", "/home/kim/.nuget/packages/runtime.linux-arm64.runtime.native.system.io.ports/7.0.0/runtime.linux-arm64.runtime.native.system.io.ports.7.0.0.nupkg.sha512", "/home/kim/.nuget/packages/runtime.linux-x64.runtime.native.system.io.ports/7.0.0/runtime.linux-x64.runtime.native.system.io.ports.7.0.0.nupkg.sha512", diff --git a/csharp/lib/StatusApi/obj/rider.project.restore.info b/csharp/lib/StatusApi/obj/rider.project.restore.info index 47d107710..1c5428cdb 100644 --- a/csharp/lib/StatusApi/obj/rider.project.restore.info +++ b/csharp/lib/StatusApi/obj/rider.project.restore.info @@ -1 +1 @@ -16758719413322651 \ No newline at end of file +16769606177554988 \ No newline at end of file diff --git a/csharp/lib/Time/obj/Debug/net6.0/Time.csproj.AssemblyReference.cache b/csharp/lib/Time/obj/Debug/net6.0/Time.csproj.AssemblyReference.cache index bef23bfd7..204fdef64 100644 Binary files a/csharp/lib/Time/obj/Debug/net6.0/Time.csproj.AssemblyReference.cache and b/csharp/lib/Time/obj/Debug/net6.0/Time.csproj.AssemblyReference.cache differ diff --git a/csharp/lib/Utils/Utils.csproj b/csharp/lib/Utils/Utils.csproj index c88be789c..a645f2431 100644 --- a/csharp/lib/Utils/Utils.csproj +++ b/csharp/lib/Utils/Utils.csproj @@ -7,6 +7,7 @@ + diff --git a/csharp/lib/Utils/obj/Debug/net6.0/Utils.assets.cache b/csharp/lib/Utils/obj/Debug/net6.0/Utils.assets.cache index f18638171..5902e7462 100644 Binary files a/csharp/lib/Utils/obj/Debug/net6.0/Utils.assets.cache and b/csharp/lib/Utils/obj/Debug/net6.0/Utils.assets.cache differ diff --git a/csharp/lib/Utils/obj/Debug/net6.0/Utils.csproj.AssemblyReference.cache b/csharp/lib/Utils/obj/Debug/net6.0/Utils.csproj.AssemblyReference.cache index 8aa09d034..9aef7914b 100644 Binary files a/csharp/lib/Utils/obj/Debug/net6.0/Utils.csproj.AssemblyReference.cache and b/csharp/lib/Utils/obj/Debug/net6.0/Utils.csproj.AssemblyReference.cache differ diff --git a/csharp/lib/Utils/obj/Utils.csproj.nuget.dgspec.json b/csharp/lib/Utils/obj/Utils.csproj.nuget.dgspec.json index e9f8ff828..389aec3c9 100644 --- a/csharp/lib/Utils/obj/Utils.csproj.nuget.dgspec.json +++ b/csharp/lib/Utils/obj/Utils.csproj.nuget.dgspec.json @@ -42,6 +42,10 @@ "target": "Package", "version": "[3.3.1, )" }, + "DecimalMath.DecimalEx": { + "target": "Package", + "version": "[1.0.2, )" + }, "System.Reactive.Linq": { "target": "Package", "version": "[5.0.0, )" diff --git a/csharp/lib/Utils/obj/project.assets.json b/csharp/lib/Utils/obj/project.assets.json index c4e5873e7..8b9bde59b 100644 --- a/csharp/lib/Utils/obj/project.assets.json +++ b/csharp/lib/Utils/obj/project.assets.json @@ -15,6 +15,19 @@ } } }, + "DecimalMath.DecimalEx/1.0.2": { + "type": "package", + "compile": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + } + }, "System.Reactive/5.0.0": { "type": "package", "compile": { @@ -80,6 +93,20 @@ "lib/netstandard2.1/CliWrap.xml" ] }, + "DecimalMath.DecimalEx/1.0.2": { + "sha512": "BCii/IxT7Tx7BPZ7MtrpqVlEii/iaHi4OOXpgaPi+zrphnkbe251KKI3S+pgnTzobfn0jS/SF7bgidqOMj1oGw==", + "type": "package", + "path": "decimalmath.decimalex/1.0.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "LICENSE", + "decimalmath.decimalex.1.0.2.nupkg.sha512", + "decimalmath.decimalex.nuspec", + "lib/netstandard2.0/DecimalEx.dll", + "lib/netstandard2.0/DecimalEx.xml" + ] + }, "System.Reactive/5.0.0": { "sha512": "erBZjkQHWL9jpasCE/0qKAryzVBJFxGHVBAvgRN1bzM0q2s1S4oYREEEL0Vb+1kA/6BKb5FjUZMp5VXmy+gzkQ==", "type": "package", @@ -168,6 +195,7 @@ "projectFileDependencyGroups": { "net6.0": [ "CliWrap >= 3.3.1", + "DecimalMath.DecimalEx >= 1.0.2", "System.Reactive.Linq >= 5.0.0" ] }, @@ -212,6 +240,10 @@ "target": "Package", "version": "[3.3.1, )" }, + "DecimalMath.DecimalEx": { + "target": "Package", + "version": "[1.0.2, )" + }, "System.Reactive.Linq": { "target": "Package", "version": "[5.0.0, )" diff --git a/csharp/lib/Utils/obj/project.nuget.cache b/csharp/lib/Utils/obj/project.nuget.cache index f775079d7..b2e6a047a 100644 --- a/csharp/lib/Utils/obj/project.nuget.cache +++ b/csharp/lib/Utils/obj/project.nuget.cache @@ -1,10 +1,11 @@ { "version": 2, - "dgSpecHash": "u/iVGeNiXk4zDYP0KmCw+91K3Tp5Y91jNV7Z3g54Q8JWBuRaYIGU0oUdZlH50Twt6y6W+jVCDwX66PG6tHj6DQ==", + "dgSpecHash": "7q5l7UhgQCd4JdWirslacD1l1eSFgXxQcXn0Sxzbd4gzNoNiLdUPLBMWKD+8JUdCEwMaWbkVdYsfwvwoV+jUlQ==", "success": true, "projectFilePath": "/home/kim/code/innovenergy/new/csharp/lib/Utils/Utils.csproj", "expectedPackageFiles": [ "/home/kim/.nuget/packages/cliwrap/3.3.1/cliwrap.3.3.1.nupkg.sha512", + "/home/kim/.nuget/packages/decimalmath.decimalex/1.0.2/decimalmath.decimalex.1.0.2.nupkg.sha512", "/home/kim/.nuget/packages/system.reactive/5.0.0/system.reactive.5.0.0.nupkg.sha512", "/home/kim/.nuget/packages/system.reactive.linq/5.0.0/system.reactive.linq.5.0.0.nupkg.sha512", "/home/kim/.nuget/packages/system.threading.tasks.extensions/4.5.4/system.threading.tasks.extensions.4.5.4.nupkg.sha512" diff --git a/csharp/lib/Utils/obj/project.packagespec.json b/csharp/lib/Utils/obj/project.packagespec.json index 9e5f7acc1..eb398bfbc 100644 --- a/csharp/lib/Utils/obj/project.packagespec.json +++ b/csharp/lib/Utils/obj/project.packagespec.json @@ -1 +1 @@ -"restore":{"projectUniqueName":"/home/kim/code/innovenergy/new/csharp/lib/Utils/Utils.csproj","projectName":"Utils","projectPath":"/home/kim/code/innovenergy/new/csharp/lib/Utils/Utils.csproj","outputPath":"/home/kim/code/innovenergy/new/csharp/lib/Utils/obj/","projectStyle":"PackageReference","originalTargetFrameworks":["net6.0"],"sources":{"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net6.0":{"targetAlias":"net6.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net6.0":{"targetAlias":"net6.0","dependencies":{"CliWrap":{"target":"Package","version":"[3.3.1, )"},"System.Reactive.Linq":{"target":"Package","version":"[5.0.0, )"}},"imports":["net461","net462","net47","net471","net472","net48"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"/usr/lib/dotnet/sdk/6.0.113/RuntimeIdentifierGraph.json"}} \ No newline at end of file +"restore":{"projectUniqueName":"/home/kim/code/innovenergy/new/csharp/lib/Utils/Utils.csproj","projectName":"Utils","projectPath":"/home/kim/code/innovenergy/new/csharp/lib/Utils/Utils.csproj","outputPath":"/home/kim/code/innovenergy/new/csharp/lib/Utils/obj/","projectStyle":"PackageReference","originalTargetFrameworks":["net6.0"],"sources":{"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net6.0":{"targetAlias":"net6.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net6.0":{"targetAlias":"net6.0","dependencies":{"CliWrap":{"target":"Package","version":"[3.3.1, )"},"DecimalMath.DecimalEx":{"target":"Package","version":"[1.0.2, )"},"System.Reactive.Linq":{"target":"Package","version":"[5.0.0, )"}},"imports":["net461","net462","net47","net471","net472","net48"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"/usr/lib/dotnet/sdk/6.0.113/RuntimeIdentifierGraph.json"}} \ No newline at end of file diff --git a/csharp/lib/Utils/obj/rider.project.restore.info b/csharp/lib/Utils/obj/rider.project.restore.info index 9c60e7206..46a715514 100644 --- a/csharp/lib/Utils/obj/rider.project.restore.info +++ b/csharp/lib/Utils/obj/rider.project.restore.info @@ -1 +1 @@ -16758719413162652 \ No newline at end of file +16769606177594988 \ No newline at end of file diff --git a/csharp/lib/Victron/VeDBus/obj/Debug/net6.0/VeDBus.assets.cache b/csharp/lib/Victron/VeDBus/obj/Debug/net6.0/VeDBus.assets.cache index 9a81e8f68..100b9aef6 100644 Binary files a/csharp/lib/Victron/VeDBus/obj/Debug/net6.0/VeDBus.assets.cache and b/csharp/lib/Victron/VeDBus/obj/Debug/net6.0/VeDBus.assets.cache differ diff --git a/csharp/lib/Victron/VeDBus/obj/Debug/net6.0/VeDBus.csproj.AssemblyReference.cache b/csharp/lib/Victron/VeDBus/obj/Debug/net6.0/VeDBus.csproj.AssemblyReference.cache index 7fdea14c1..204fdef64 100644 Binary files a/csharp/lib/Victron/VeDBus/obj/Debug/net6.0/VeDBus.csproj.AssemblyReference.cache and b/csharp/lib/Victron/VeDBus/obj/Debug/net6.0/VeDBus.csproj.AssemblyReference.cache differ diff --git a/csharp/lib/Victron/VeDBus/obj/VeDBus.csproj.nuget.dgspec.json b/csharp/lib/Victron/VeDBus/obj/VeDBus.csproj.nuget.dgspec.json index 54554ef58..e67206c99 100644 --- a/csharp/lib/Victron/VeDBus/obj/VeDBus.csproj.nuget.dgspec.json +++ b/csharp/lib/Victron/VeDBus/obj/VeDBus.csproj.nuget.dgspec.json @@ -108,6 +108,10 @@ "target": "Package", "version": "[3.3.1, )" }, + "DecimalMath.DecimalEx": { + "target": "Package", + "version": "[1.0.2, )" + }, "System.Reactive.Linq": { "target": "Package", "version": "[5.0.0, )" diff --git a/csharp/lib/Victron/VeDBus/obj/project.assets.json b/csharp/lib/Victron/VeDBus/obj/project.assets.json index 585812411..22239020c 100644 --- a/csharp/lib/Victron/VeDBus/obj/project.assets.json +++ b/csharp/lib/Victron/VeDBus/obj/project.assets.json @@ -15,6 +15,19 @@ } } }, + "DecimalMath.DecimalEx/1.0.2": { + "type": "package", + "compile": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + } + }, "System.Reactive/5.0.0": { "type": "package", "compile": { @@ -109,6 +122,7 @@ "framework": ".NETCoreApp,Version=v6.0", "dependencies": { "CliWrap": "3.3.1", + "DecimalMath.DecimalEx": "1.0.2", "System.Reactive.Linq": "5.0.0" }, "compile": { @@ -141,6 +155,20 @@ "lib/netstandard2.1/CliWrap.xml" ] }, + "DecimalMath.DecimalEx/1.0.2": { + "sha512": "BCii/IxT7Tx7BPZ7MtrpqVlEii/iaHi4OOXpgaPi+zrphnkbe251KKI3S+pgnTzobfn0jS/SF7bgidqOMj1oGw==", + "type": "package", + "path": "decimalmath.decimalex/1.0.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "LICENSE", + "decimalmath.decimalex.1.0.2.nupkg.sha512", + "decimalmath.decimalex.nuspec", + "lib/netstandard2.0/DecimalEx.dll", + "lib/netstandard2.0/DecimalEx.xml" + ] + }, "System.Reactive/5.0.0": { "sha512": "erBZjkQHWL9jpasCE/0qKAryzVBJFxGHVBAvgRN1bzM0q2s1S4oYREEEL0Vb+1kA/6BKb5FjUZMp5VXmy+gzkQ==", "type": "package", diff --git a/csharp/lib/Victron/VeDBus/obj/project.nuget.cache b/csharp/lib/Victron/VeDBus/obj/project.nuget.cache index 1c51e3781..8f98dc2d0 100644 --- a/csharp/lib/Victron/VeDBus/obj/project.nuget.cache +++ b/csharp/lib/Victron/VeDBus/obj/project.nuget.cache @@ -1,10 +1,11 @@ { "version": 2, - "dgSpecHash": "2pr1IYFRyGHKtjfqgPTohS+oUVllHMxny8UkNSbRoZlHV/f2qryv4/VMKp8QJByol7jkWYAlr/+6XB5gphBb3w==", + "dgSpecHash": "5FpY92X9BjJWv0Jkwv2gR/CHhGJxSzgA0dG0lt+5lCeoBnbS4Nvsd0YXbpqsNa3gaFkroSvFE6gE2ZUyux+gwA==", "success": true, "projectFilePath": "/home/kim/code/innovenergy/new/csharp/lib/Victron/VeDBus/VeDBus.csproj", "expectedPackageFiles": [ "/home/kim/.nuget/packages/cliwrap/3.3.1/cliwrap.3.3.1.nupkg.sha512", + "/home/kim/.nuget/packages/decimalmath.decimalex/1.0.2/decimalmath.decimalex.1.0.2.nupkg.sha512", "/home/kim/.nuget/packages/system.reactive/5.0.0/system.reactive.5.0.0.nupkg.sha512", "/home/kim/.nuget/packages/system.reactive.linq/5.0.0/system.reactive.linq.5.0.0.nupkg.sha512", "/home/kim/.nuget/packages/system.reflection.emit/4.7.0/system.reflection.emit.4.7.0.nupkg.sha512", diff --git a/csharp/lib/Victron/VeDBus/obj/rider.project.restore.info b/csharp/lib/Victron/VeDBus/obj/rider.project.restore.info index 9c60e7206..46a715514 100644 --- a/csharp/lib/Victron/VeDBus/obj/rider.project.restore.info +++ b/csharp/lib/Victron/VeDBus/obj/rider.project.restore.info @@ -1 +1 @@ -16758719413162652 \ No newline at end of file +16769606177594988 \ No newline at end of file diff --git a/csharp/lib/Victron/VictronVRM/obj/Debug/net6.0/VictronVRM.assets.cache b/csharp/lib/Victron/VictronVRM/obj/Debug/net6.0/VictronVRM.assets.cache index 21398d703..b5e6bec4d 100644 Binary files a/csharp/lib/Victron/VictronVRM/obj/Debug/net6.0/VictronVRM.assets.cache and b/csharp/lib/Victron/VictronVRM/obj/Debug/net6.0/VictronVRM.assets.cache differ diff --git a/csharp/lib/Victron/VictronVRM/obj/Debug/net6.0/VictronVRM.csproj.AssemblyReference.cache b/csharp/lib/Victron/VictronVRM/obj/Debug/net6.0/VictronVRM.csproj.AssemblyReference.cache index 8eaf83b7c..fed0d1be8 100644 Binary files a/csharp/lib/Victron/VictronVRM/obj/Debug/net6.0/VictronVRM.csproj.AssemblyReference.cache and b/csharp/lib/Victron/VictronVRM/obj/Debug/net6.0/VictronVRM.csproj.AssemblyReference.cache differ diff --git a/csharp/lib/Victron/VictronVRM/obj/VictronVRM.csproj.nuget.dgspec.json b/csharp/lib/Victron/VictronVRM/obj/VictronVRM.csproj.nuget.dgspec.json index 9449fdd45..e34bb569d 100644 --- a/csharp/lib/Victron/VictronVRM/obj/VictronVRM.csproj.nuget.dgspec.json +++ b/csharp/lib/Victron/VictronVRM/obj/VictronVRM.csproj.nuget.dgspec.json @@ -94,6 +94,10 @@ "target": "Package", "version": "[3.3.1, )" }, + "DecimalMath.DecimalEx": { + "target": "Package", + "version": "[1.0.2, )" + }, "System.Reactive.Linq": { "target": "Package", "version": "[5.0.0, )" diff --git a/csharp/lib/Victron/VictronVRM/obj/project.assets.json b/csharp/lib/Victron/VictronVRM/obj/project.assets.json index c0675acf6..5950071c5 100644 --- a/csharp/lib/Victron/VictronVRM/obj/project.assets.json +++ b/csharp/lib/Victron/VictronVRM/obj/project.assets.json @@ -15,6 +15,19 @@ } } }, + "DecimalMath.DecimalEx/1.0.2": { + "type": "package", + "compile": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + } + }, "Flurl/3.0.2": { "type": "package", "compile": { @@ -206,6 +219,7 @@ "framework": ".NETCoreApp,Version=v6.0", "dependencies": { "CliWrap": "3.3.1", + "DecimalMath.DecimalEx": "1.0.2", "System.Reactive.Linq": "5.0.0" }, "compile": { @@ -238,6 +252,20 @@ "lib/netstandard2.1/CliWrap.xml" ] }, + "DecimalMath.DecimalEx/1.0.2": { + "sha512": "BCii/IxT7Tx7BPZ7MtrpqVlEii/iaHi4OOXpgaPi+zrphnkbe251KKI3S+pgnTzobfn0jS/SF7bgidqOMj1oGw==", + "type": "package", + "path": "decimalmath.decimalex/1.0.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "LICENSE", + "decimalmath.decimalex.1.0.2.nupkg.sha512", + "decimalmath.decimalex.nuspec", + "lib/netstandard2.0/DecimalEx.dll", + "lib/netstandard2.0/DecimalEx.xml" + ] + }, "Flurl/3.0.2": { "sha512": "1/6mqdzGCTdAekbWkVZBTylCV+8g3JUSTXRBngRVR274S+RsAYNRF79GbDoDsPfMKu8VPc9HkQWdBEAncK1PQQ==", "type": "package", diff --git a/csharp/lib/Victron/VictronVRM/obj/project.nuget.cache b/csharp/lib/Victron/VictronVRM/obj/project.nuget.cache index 06de42d50..46e17364d 100644 --- a/csharp/lib/Victron/VictronVRM/obj/project.nuget.cache +++ b/csharp/lib/Victron/VictronVRM/obj/project.nuget.cache @@ -1,10 +1,11 @@ { "version": 2, - "dgSpecHash": "jz6BWxI1eGYuQlR8MsJB26AUVqmzwCk2v1ylS2i5N1HprYd4dtaNEG3FnASTKJY/Ns9wLuBVT/SqufcXtPI/4A==", + "dgSpecHash": "01SOIO8BxikqdYtK9n1FBbXSiR8M9IHQbQFdw22W9ngb1p86ONYJcZIIohOuDTTITMukGVHFDqvkGyhFV81h0Q==", "success": true, "projectFilePath": "/home/kim/code/innovenergy/new/csharp/lib/Victron/VictronVRM/VictronVRM.csproj", "expectedPackageFiles": [ "/home/kim/.nuget/packages/cliwrap/3.3.1/cliwrap.3.3.1.nupkg.sha512", + "/home/kim/.nuget/packages/decimalmath.decimalex/1.0.2/decimalmath.decimalex.1.0.2.nupkg.sha512", "/home/kim/.nuget/packages/flurl/3.0.2/flurl.3.0.2.nupkg.sha512", "/home/kim/.nuget/packages/flurl.http/3.2.0/flurl.http.3.2.0.nupkg.sha512", "/home/kim/.nuget/packages/microsoft.netcore.platforms/2.1.2/microsoft.netcore.platforms.2.1.2.nupkg.sha512", diff --git a/csharp/lib/Victron/VictronVRM/obj/rider.project.restore.info b/csharp/lib/Victron/VictronVRM/obj/rider.project.restore.info index 345f18c81..46a715514 100644 --- a/csharp/lib/Victron/VictronVRM/obj/rider.project.restore.info +++ b/csharp/lib/Victron/VictronVRM/obj/rider.project.restore.info @@ -1 +1 @@ -16765322878013266 \ No newline at end of file +16769606177594988 \ No newline at end of file diff --git a/csharp/lib/WebServer/obj/Debug/net6.0/WebServer.assets.cache b/csharp/lib/WebServer/obj/Debug/net6.0/WebServer.assets.cache index 3666a4157..066dfe399 100644 Binary files a/csharp/lib/WebServer/obj/Debug/net6.0/WebServer.assets.cache and b/csharp/lib/WebServer/obj/Debug/net6.0/WebServer.assets.cache differ diff --git a/csharp/lib/WebServer/obj/Debug/net6.0/WebServer.csproj.AssemblyReference.cache b/csharp/lib/WebServer/obj/Debug/net6.0/WebServer.csproj.AssemblyReference.cache index c7f79f524..d2c9fb728 100644 Binary files a/csharp/lib/WebServer/obj/Debug/net6.0/WebServer.csproj.AssemblyReference.cache and b/csharp/lib/WebServer/obj/Debug/net6.0/WebServer.csproj.AssemblyReference.cache differ diff --git a/csharp/lib/WebServer/obj/WebServer.csproj.nuget.dgspec.json b/csharp/lib/WebServer/obj/WebServer.csproj.nuget.dgspec.json index 4c8d16fd6..44930711e 100644 --- a/csharp/lib/WebServer/obj/WebServer.csproj.nuget.dgspec.json +++ b/csharp/lib/WebServer/obj/WebServer.csproj.nuget.dgspec.json @@ -42,6 +42,10 @@ "target": "Package", "version": "[3.3.1, )" }, + "DecimalMath.DecimalEx": { + "target": "Package", + "version": "[1.0.2, )" + }, "System.Reactive.Linq": { "target": "Package", "version": "[5.0.0, )" diff --git a/csharp/lib/WebServer/obj/project.assets.json b/csharp/lib/WebServer/obj/project.assets.json index 2d07d4342..42ab099c8 100644 --- a/csharp/lib/WebServer/obj/project.assets.json +++ b/csharp/lib/WebServer/obj/project.assets.json @@ -15,6 +15,19 @@ } } }, + "DecimalMath.DecimalEx/1.0.2": { + "type": "package", + "compile": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/DecimalEx.dll": { + "related": ".xml" + } + } + }, "Flurl/3.0.1": { "type": "package", "compile": { @@ -147,6 +160,7 @@ "framework": ".NETCoreApp,Version=v6.0", "dependencies": { "CliWrap": "3.3.1", + "DecimalMath.DecimalEx": "1.0.2", "System.Reactive.Linq": "5.0.0" }, "compile": { @@ -179,6 +193,20 @@ "lib/netstandard2.1/CliWrap.xml" ] }, + "DecimalMath.DecimalEx/1.0.2": { + "sha512": "BCii/IxT7Tx7BPZ7MtrpqVlEii/iaHi4OOXpgaPi+zrphnkbe251KKI3S+pgnTzobfn0jS/SF7bgidqOMj1oGw==", + "type": "package", + "path": "decimalmath.decimalex/1.0.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "LICENSE", + "decimalmath.decimalex.1.0.2.nupkg.sha512", + "decimalmath.decimalex.nuspec", + "lib/netstandard2.0/DecimalEx.dll", + "lib/netstandard2.0/DecimalEx.xml" + ] + }, "Flurl/3.0.1": { "sha512": "i7CuPSikVroBaWG8sPvO707Ex9C6BP5+r4JufKNU1FGMmiFgLJvNo1ttUg6ZiXIzUNknvIb1VUTIO9iEDucibg==", "type": "package", diff --git a/csharp/lib/WebServer/obj/project.nuget.cache b/csharp/lib/WebServer/obj/project.nuget.cache index d93ea397d..d3b2054dc 100644 --- a/csharp/lib/WebServer/obj/project.nuget.cache +++ b/csharp/lib/WebServer/obj/project.nuget.cache @@ -1,10 +1,11 @@ { "version": 2, - "dgSpecHash": "W2ywCccb8qBufGDBZDcZEo5ZoWBop1aYja2MPcqj21JDZUw3hQ3Gw7x3M4qH2OKCV1iFx0h+EIuu3+jIo0+Ntw==", + "dgSpecHash": "bvNBhR76+k49+CHSAVn+eh0W7TlzRuYoF4lwi18d4hBziVPbaMjOt1r31k+f2FnkZ2upVdytEU9Um/cGaIO9aA==", "success": true, "projectFilePath": "/home/kim/code/innovenergy/new/csharp/lib/WebServer/WebServer.csproj", "expectedPackageFiles": [ "/home/kim/.nuget/packages/cliwrap/3.3.1/cliwrap.3.3.1.nupkg.sha512", + "/home/kim/.nuget/packages/decimalmath.decimalex/1.0.2/decimalmath.decimalex.1.0.2.nupkg.sha512", "/home/kim/.nuget/packages/flurl/3.0.1/flurl.3.0.1.nupkg.sha512", "/home/kim/.nuget/packages/flurl.http/3.0.1/flurl.http.3.0.1.nupkg.sha512", "/home/kim/.nuget/packages/microsoft.netcore.platforms/2.1.2/microsoft.netcore.platforms.2.1.2.nupkg.sha512", diff --git a/csharp/lib/WebServer/obj/rider.project.restore.info b/csharp/lib/WebServer/obj/rider.project.restore.info index 932955da9..1c5428cdb 100644 --- a/csharp/lib/WebServer/obj/rider.project.restore.info +++ b/csharp/lib/WebServer/obj/rider.project.restore.info @@ -1 +1 @@ -16758719413442651 \ No newline at end of file +16769606177554988 \ No newline at end of file diff --git a/csharp/lib/Wireformat/obj/Debug/net6.0/WireFormat.csproj.AssemblyReference.cache b/csharp/lib/Wireformat/obj/Debug/net6.0/WireFormat.csproj.AssemblyReference.cache index 204fdef64..549b913d9 100644 Binary files a/csharp/lib/Wireformat/obj/Debug/net6.0/WireFormat.csproj.AssemblyReference.cache and b/csharp/lib/Wireformat/obj/Debug/net6.0/WireFormat.csproj.AssemblyReference.cache differ