From da8529cabd68864a030481165762120e0d8de60b Mon Sep 17 00:00:00 2001 From: Andrew Moorcroft Date: Thu, 16 Jan 2020 10:13:53 +0000 Subject: [PATCH 1/2] Added x64 platform configuration for dotnet. --- dotnet/IEC61850forCSharp/IEC61850.NET.csproj | 20 ++ dotnet/authenticate/authenticate.csproj | 22 +- .../client_example_async.csproj | 22 +- .../client_example_setting_groups.csproj | 22 +- dotnet/control/control.csproj | 22 +- dotnet/datasets/datasets.csproj | 22 +- dotnet/dotnet.sln | 202 ++++++++++++------ dotnet/example1/example1.csproj | 20 ++ dotnet/example2/example2.csproj | 22 +- dotnet/example3/example3.csproj | 22 +- dotnet/files/files.csproj | 22 +- .../goose_subscriber/goose_subscriber.csproj | 22 +- dotnet/log_client/log_client.csproj | 22 +- dotnet/model_browsing/model_browsing.csproj | 22 +- .../report_new_dataset.csproj | 22 +- dotnet/reporting/reporting.csproj | 20 ++ dotnet/server1/server1.csproj | 20 ++ dotnet/sv_subscriber/sv_subscriber.csproj | 20 ++ dotnet/tests/tests.csproj | 20 ++ .../tls_client_example.csproj | 22 +- .../tls_server_example.csproj | 22 +- 21 files changed, 556 insertions(+), 74 deletions(-) diff --git a/dotnet/IEC61850forCSharp/IEC61850.NET.csproj b/dotnet/IEC61850forCSharp/IEC61850.NET.csproj index 4aa6af86..b72dc01a 100644 --- a/dotnet/IEC61850forCSharp/IEC61850.NET.csproj +++ b/dotnet/IEC61850forCSharp/IEC61850.NET.csproj @@ -26,6 +26,26 @@ 4 false + + true + full + x64 + false + bin\x64\Debug + DEBUG; + prompt + 4 + false + + + none + x64 + true + bin\x64\Release + prompt + 4 + false + diff --git a/dotnet/authenticate/authenticate.csproj b/dotnet/authenticate/authenticate.csproj index c05c41f8..879918c1 100644 --- a/dotnet/authenticate/authenticate.csproj +++ b/dotnet/authenticate/authenticate.csproj @@ -1,4 +1,4 @@ - + Debug @@ -26,6 +26,26 @@ 4 true + + true + full + x64 + false + bin\x64\Debug + DEBUG; + prompt + 4 + true + + + none + x64 + true + bin\x64\Release + prompt + 4 + true + diff --git a/dotnet/client_example_async/client_example_async.csproj b/dotnet/client_example_async/client_example_async.csproj index 17879d2c..1a86e4bb 100644 --- a/dotnet/client_example_async/client_example_async.csproj +++ b/dotnet/client_example_async/client_example_async.csproj @@ -1,4 +1,4 @@ - + Debug @@ -27,6 +27,26 @@ 4 true + + true + full + x64 + false + bin\x64\Debug + DEBUG; + prompt + 4 + true + + + none + x64 + true + bin\x64\Release + prompt + 4 + true + diff --git a/dotnet/client_example_setting_groups/client_example_setting_groups.csproj b/dotnet/client_example_setting_groups/client_example_setting_groups.csproj index 9030d71b..6e0b18db 100644 --- a/dotnet/client_example_setting_groups/client_example_setting_groups.csproj +++ b/dotnet/client_example_setting_groups/client_example_setting_groups.csproj @@ -1,4 +1,4 @@ - + Debug @@ -27,6 +27,26 @@ 4 true + + true + full + x64 + false + bin\x64\Debug + DEBUG; + prompt + 4 + true + + + none + x64 + true + bin\x64\Release + prompt + 4 + true + diff --git a/dotnet/control/control.csproj b/dotnet/control/control.csproj index efe7f4ca..39c8dd32 100644 --- a/dotnet/control/control.csproj +++ b/dotnet/control/control.csproj @@ -1,4 +1,4 @@ - + Debug @@ -26,6 +26,26 @@ 4 true + + true + full + x64 + false + bin\x64\Debug + DEBUG; + prompt + 4 + true + + + none + x64 + true + bin\x64\Release + prompt + 4 + true + diff --git a/dotnet/datasets/datasets.csproj b/dotnet/datasets/datasets.csproj index 312ccbfd..701e2bc0 100644 --- a/dotnet/datasets/datasets.csproj +++ b/dotnet/datasets/datasets.csproj @@ -1,4 +1,4 @@ - + Debug @@ -26,6 +26,26 @@ 4 true + + true + full + x64 + false + bin\x64\Debug + DEBUG; + prompt + 4 + true + + + none + x64 + true + bin\x64\Release + prompt + 4 + true + diff --git a/dotnet/dotnet.sln b/dotnet/dotnet.sln index c2ab42d8..718617ba 100644 --- a/dotnet/dotnet.sln +++ b/dotnet/dotnet.sln @@ -51,89 +51,171 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0BECEC77-2315-4B95-AFF9-E6007E644BBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0BECEC77-2315-4B95-AFF9-E6007E644BBF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0BECEC77-2315-4B95-AFF9-E6007E644BBF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0BECEC77-2315-4B95-AFF9-E6007E644BBF}.Release|Any CPU.Build.0 = Release|Any CPU - {0DA95476-B149-450B-AC36-01CEECFC1A43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0DA95476-B149-450B-AC36-01CEECFC1A43}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0DA95476-B149-450B-AC36-01CEECFC1A43}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0DA95476-B149-450B-AC36-01CEECFC1A43}.Release|Any CPU.Build.0 = Release|Any CPU - {1285372C-2E62-494A-A661-8D5D3873318C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1285372C-2E62-494A-A661-8D5D3873318C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1285372C-2E62-494A-A661-8D5D3873318C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1285372C-2E62-494A-A661-8D5D3873318C}.Release|Any CPU.Build.0 = Release|Any CPU - {14C71267-2F38-460D-AA55-6803EE80AFB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {14C71267-2F38-460D-AA55-6803EE80AFB4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14C71267-2F38-460D-AA55-6803EE80AFB4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {14C71267-2F38-460D-AA55-6803EE80AFB4}.Release|Any CPU.Build.0 = Release|Any CPU - {2A226B6D-1D1F-4BFE-B8CC-158116F71270}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A226B6D-1D1F-4BFE-B8CC-158116F71270}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A226B6D-1D1F-4BFE-B8CC-158116F71270}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A226B6D-1D1F-4BFE-B8CC-158116F71270}.Release|Any CPU.Build.0 = Release|Any CPU - {44651D2D-3252-4FD5-8B8B-5552DBE1B499}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {44651D2D-3252-4FD5-8B8B-5552DBE1B499}.Debug|Any CPU.Build.0 = Debug|Any CPU - {44651D2D-3252-4FD5-8B8B-5552DBE1B499}.Release|Any CPU.ActiveCfg = Release|Any CPU - {44651D2D-3252-4FD5-8B8B-5552DBE1B499}.Release|Any CPU.Build.0 = Release|Any CPU + {C35D624E-5506-4560-8074-1728F1FA1A4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C35D624E-5506-4560-8074-1728F1FA1A4D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C35D624E-5506-4560-8074-1728F1FA1A4D}.Debug|x64.ActiveCfg = Debug|x64 + {C35D624E-5506-4560-8074-1728F1FA1A4D}.Debug|x64.Build.0 = Debug|x64 + {C35D624E-5506-4560-8074-1728F1FA1A4D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C35D624E-5506-4560-8074-1728F1FA1A4D}.Release|Any CPU.Build.0 = Release|Any CPU + {C35D624E-5506-4560-8074-1728F1FA1A4D}.Release|x64.ActiveCfg = Release|x64 + {C35D624E-5506-4560-8074-1728F1FA1A4D}.Release|x64.Build.0 = Release|x64 + {C616A6DF-831E-443C-9310-3F343A6E3D1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C616A6DF-831E-443C-9310-3F343A6E3D1A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C616A6DF-831E-443C-9310-3F343A6E3D1A}.Debug|x64.ActiveCfg = Debug|x64 + {C616A6DF-831E-443C-9310-3F343A6E3D1A}.Debug|x64.Build.0 = Debug|x64 + {C616A6DF-831E-443C-9310-3F343A6E3D1A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C616A6DF-831E-443C-9310-3F343A6E3D1A}.Release|Any CPU.Build.0 = Release|Any CPU + {C616A6DF-831E-443C-9310-3F343A6E3D1A}.Release|x64.ActiveCfg = Release|x64 + {C616A6DF-831E-443C-9310-3F343A6E3D1A}.Release|x64.Build.0 = Release|x64 {59B85486-F48D-4978-BD35-8F5C3A8288D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {59B85486-F48D-4978-BD35-8F5C3A8288D4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {59B85486-F48D-4978-BD35-8F5C3A8288D4}.Debug|x64.ActiveCfg = Debug|x64 + {59B85486-F48D-4978-BD35-8F5C3A8288D4}.Debug|x64.Build.0 = Debug|x64 {59B85486-F48D-4978-BD35-8F5C3A8288D4}.Release|Any CPU.ActiveCfg = Release|Any CPU {59B85486-F48D-4978-BD35-8F5C3A8288D4}.Release|Any CPU.Build.0 = Release|Any CPU + {59B85486-F48D-4978-BD35-8F5C3A8288D4}.Release|x64.ActiveCfg = Release|x64 + {59B85486-F48D-4978-BD35-8F5C3A8288D4}.Release|x64.Build.0 = Release|x64 + {D5C7DD38-032A-49B6-B74F-FFD9724A8AE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D5C7DD38-032A-49B6-B74F-FFD9724A8AE4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D5C7DD38-032A-49B6-B74F-FFD9724A8AE4}.Debug|x64.ActiveCfg = Debug|x64 + {D5C7DD38-032A-49B6-B74F-FFD9724A8AE4}.Debug|x64.Build.0 = Debug|x64 + {D5C7DD38-032A-49B6-B74F-FFD9724A8AE4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D5C7DD38-032A-49B6-B74F-FFD9724A8AE4}.Release|Any CPU.Build.0 = Release|Any CPU + {D5C7DD38-032A-49B6-B74F-FFD9724A8AE4}.Release|x64.ActiveCfg = Release|x64 + {D5C7DD38-032A-49B6-B74F-FFD9724A8AE4}.Release|x64.Build.0 = Release|x64 + {C351CFA4-E54E-49A1-86CE-69643535541A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C351CFA4-E54E-49A1-86CE-69643535541A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C351CFA4-E54E-49A1-86CE-69643535541A}.Debug|x64.ActiveCfg = Debug|x64 + {C351CFA4-E54E-49A1-86CE-69643535541A}.Debug|x64.Build.0 = Debug|x64 + {C351CFA4-E54E-49A1-86CE-69643535541A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C351CFA4-E54E-49A1-86CE-69643535541A}.Release|Any CPU.Build.0 = Release|Any CPU + {C351CFA4-E54E-49A1-86CE-69643535541A}.Release|x64.ActiveCfg = Release|x64 + {C351CFA4-E54E-49A1-86CE-69643535541A}.Release|x64.Build.0 = Release|x64 + {9E29B4CE-EE5F-4CA6-85F6-5D1FF8B27BF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9E29B4CE-EE5F-4CA6-85F6-5D1FF8B27BF8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9E29B4CE-EE5F-4CA6-85F6-5D1FF8B27BF8}.Debug|x64.ActiveCfg = Debug|x64 + {9E29B4CE-EE5F-4CA6-85F6-5D1FF8B27BF8}.Debug|x64.Build.0 = Debug|x64 + {9E29B4CE-EE5F-4CA6-85F6-5D1FF8B27BF8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9E29B4CE-EE5F-4CA6-85F6-5D1FF8B27BF8}.Release|Any CPU.Build.0 = Release|Any CPU + {9E29B4CE-EE5F-4CA6-85F6-5D1FF8B27BF8}.Release|x64.ActiveCfg = Release|x64 + {9E29B4CE-EE5F-4CA6-85F6-5D1FF8B27BF8}.Release|x64.Build.0 = Release|x64 + {2A226B6D-1D1F-4BFE-B8CC-158116F71270}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2A226B6D-1D1F-4BFE-B8CC-158116F71270}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2A226B6D-1D1F-4BFE-B8CC-158116F71270}.Debug|x64.ActiveCfg = Debug|x64 + {2A226B6D-1D1F-4BFE-B8CC-158116F71270}.Debug|x64.Build.0 = Debug|x64 + {2A226B6D-1D1F-4BFE-B8CC-158116F71270}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2A226B6D-1D1F-4BFE-B8CC-158116F71270}.Release|Any CPU.Build.0 = Release|Any CPU + {2A226B6D-1D1F-4BFE-B8CC-158116F71270}.Release|x64.ActiveCfg = Release|x64 + {2A226B6D-1D1F-4BFE-B8CC-158116F71270}.Release|x64.Build.0 = Release|x64 + {0BECEC77-2315-4B95-AFF9-E6007E644BBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0BECEC77-2315-4B95-AFF9-E6007E644BBF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0BECEC77-2315-4B95-AFF9-E6007E644BBF}.Debug|x64.ActiveCfg = Debug|x64 + {0BECEC77-2315-4B95-AFF9-E6007E644BBF}.Debug|x64.Build.0 = Debug|x64 + {0BECEC77-2315-4B95-AFF9-E6007E644BBF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0BECEC77-2315-4B95-AFF9-E6007E644BBF}.Release|Any CPU.Build.0 = Release|Any CPU + {0BECEC77-2315-4B95-AFF9-E6007E644BBF}.Release|x64.ActiveCfg = Release|x64 + {0BECEC77-2315-4B95-AFF9-E6007E644BBF}.Release|x64.Build.0 = Release|x64 + {FBDFE530-DBEB-474B-BA54-9AB287DD57B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FBDFE530-DBEB-474B-BA54-9AB287DD57B3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FBDFE530-DBEB-474B-BA54-9AB287DD57B3}.Debug|x64.ActiveCfg = Debug|x64 + {FBDFE530-DBEB-474B-BA54-9AB287DD57B3}.Debug|x64.Build.0 = Debug|x64 + {FBDFE530-DBEB-474B-BA54-9AB287DD57B3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FBDFE530-DBEB-474B-BA54-9AB287DD57B3}.Release|Any CPU.Build.0 = Release|Any CPU + {FBDFE530-DBEB-474B-BA54-9AB287DD57B3}.Release|x64.ActiveCfg = Release|x64 + {FBDFE530-DBEB-474B-BA54-9AB287DD57B3}.Release|x64.Build.0 = Release|x64 + {77127456-19B9-4D1A-AEF9-40F8D1C5695E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {77127456-19B9-4D1A-AEF9-40F8D1C5695E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {77127456-19B9-4D1A-AEF9-40F8D1C5695E}.Debug|x64.ActiveCfg = Debug|x64 + {77127456-19B9-4D1A-AEF9-40F8D1C5695E}.Debug|x64.Build.0 = Debug|x64 + {77127456-19B9-4D1A-AEF9-40F8D1C5695E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {77127456-19B9-4D1A-AEF9-40F8D1C5695E}.Release|Any CPU.Build.0 = Release|Any CPU + {77127456-19B9-4D1A-AEF9-40F8D1C5695E}.Release|x64.ActiveCfg = Release|x64 + {77127456-19B9-4D1A-AEF9-40F8D1C5695E}.Release|x64.Build.0 = Release|x64 {5E5D0FE0-DF44-48D8-A10E-1FB07D34DEA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5E5D0FE0-DF44-48D8-A10E-1FB07D34DEA2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5E5D0FE0-DF44-48D8-A10E-1FB07D34DEA2}.Debug|x64.ActiveCfg = Debug|x64 + {5E5D0FE0-DF44-48D8-A10E-1FB07D34DEA2}.Debug|x64.Build.0 = Debug|x64 {5E5D0FE0-DF44-48D8-A10E-1FB07D34DEA2}.Release|Any CPU.ActiveCfg = Release|Any CPU {5E5D0FE0-DF44-48D8-A10E-1FB07D34DEA2}.Release|Any CPU.Build.0 = Release|Any CPU - {6734BF52-2D0D-476B-8EA2-C9C2D1D69B03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6734BF52-2D0D-476B-8EA2-C9C2D1D69B03}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6734BF52-2D0D-476B-8EA2-C9C2D1D69B03}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6734BF52-2D0D-476B-8EA2-C9C2D1D69B03}.Release|Any CPU.Build.0 = Release|Any CPU + {5E5D0FE0-DF44-48D8-A10E-1FB07D34DEA2}.Release|x64.ActiveCfg = Release|x64 + {5E5D0FE0-DF44-48D8-A10E-1FB07D34DEA2}.Release|x64.Build.0 = Release|x64 {71485F99-2976-45E6-B73D-4946E594C15C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {71485F99-2976-45E6-B73D-4946E594C15C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {71485F99-2976-45E6-B73D-4946E594C15C}.Debug|x64.ActiveCfg = Debug|x64 + {71485F99-2976-45E6-B73D-4946E594C15C}.Debug|x64.Build.0 = Debug|x64 {71485F99-2976-45E6-B73D-4946E594C15C}.Release|Any CPU.ActiveCfg = Release|Any CPU {71485F99-2976-45E6-B73D-4946E594C15C}.Release|Any CPU.Build.0 = Release|Any CPU - {71902641-776A-47D8-9C0E-9ACBBEAC1370}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {71902641-776A-47D8-9C0E-9ACBBEAC1370}.Debug|Any CPU.Build.0 = Debug|Any CPU - {71902641-776A-47D8-9C0E-9ACBBEAC1370}.Release|Any CPU.ActiveCfg = Release|Any CPU - {71902641-776A-47D8-9C0E-9ACBBEAC1370}.Release|Any CPU.Build.0 = Release|Any CPU - {77127456-19B9-4D1A-AEF9-40F8D1C5695E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {77127456-19B9-4D1A-AEF9-40F8D1C5695E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {77127456-19B9-4D1A-AEF9-40F8D1C5695E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {77127456-19B9-4D1A-AEF9-40F8D1C5695E}.Release|Any CPU.Build.0 = Release|Any CPU + {71485F99-2976-45E6-B73D-4946E594C15C}.Release|x64.ActiveCfg = Release|x64 + {71485F99-2976-45E6-B73D-4946E594C15C}.Release|x64.Build.0 = Release|x64 + {14C71267-2F38-460D-AA55-6803EE80AFB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {14C71267-2F38-460D-AA55-6803EE80AFB4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {14C71267-2F38-460D-AA55-6803EE80AFB4}.Debug|x64.ActiveCfg = Debug|x64 + {14C71267-2F38-460D-AA55-6803EE80AFB4}.Debug|x64.Build.0 = Debug|x64 + {14C71267-2F38-460D-AA55-6803EE80AFB4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {14C71267-2F38-460D-AA55-6803EE80AFB4}.Release|Any CPU.Build.0 = Release|Any CPU + {14C71267-2F38-460D-AA55-6803EE80AFB4}.Release|x64.ActiveCfg = Release|x64 + {14C71267-2F38-460D-AA55-6803EE80AFB4}.Release|x64.Build.0 = Release|x64 {9286D2AB-96ED-4631-AB3C-ED20FF5D6E6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9286D2AB-96ED-4631-AB3C-ED20FF5D6E6C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9286D2AB-96ED-4631-AB3C-ED20FF5D6E6C}.Debug|x64.ActiveCfg = Debug|x64 + {9286D2AB-96ED-4631-AB3C-ED20FF5D6E6C}.Debug|x64.Build.0 = Debug|x64 {9286D2AB-96ED-4631-AB3C-ED20FF5D6E6C}.Release|Any CPU.ActiveCfg = Release|Any CPU {9286D2AB-96ED-4631-AB3C-ED20FF5D6E6C}.Release|Any CPU.Build.0 = Release|Any CPU - {9E29B4CE-EE5F-4CA6-85F6-5D1FF8B27BF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9E29B4CE-EE5F-4CA6-85F6-5D1FF8B27BF8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9E29B4CE-EE5F-4CA6-85F6-5D1FF8B27BF8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9E29B4CE-EE5F-4CA6-85F6-5D1FF8B27BF8}.Release|Any CPU.Build.0 = Release|Any CPU + {9286D2AB-96ED-4631-AB3C-ED20FF5D6E6C}.Release|x64.ActiveCfg = Release|x64 + {9286D2AB-96ED-4631-AB3C-ED20FF5D6E6C}.Release|x64.Build.0 = Release|x64 + {6734BF52-2D0D-476B-8EA2-C9C2D1D69B03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6734BF52-2D0D-476B-8EA2-C9C2D1D69B03}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6734BF52-2D0D-476B-8EA2-C9C2D1D69B03}.Debug|x64.ActiveCfg = Debug|x64 + {6734BF52-2D0D-476B-8EA2-C9C2D1D69B03}.Debug|x64.Build.0 = Debug|x64 + {6734BF52-2D0D-476B-8EA2-C9C2D1D69B03}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6734BF52-2D0D-476B-8EA2-C9C2D1D69B03}.Release|Any CPU.Build.0 = Release|Any CPU + {6734BF52-2D0D-476B-8EA2-C9C2D1D69B03}.Release|x64.ActiveCfg = Release|x64 + {6734BF52-2D0D-476B-8EA2-C9C2D1D69B03}.Release|x64.Build.0 = Release|x64 + {1285372C-2E62-494A-A661-8D5D3873318C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1285372C-2E62-494A-A661-8D5D3873318C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1285372C-2E62-494A-A661-8D5D3873318C}.Debug|x64.ActiveCfg = Debug|x64 + {1285372C-2E62-494A-A661-8D5D3873318C}.Debug|x64.Build.0 = Debug|x64 + {1285372C-2E62-494A-A661-8D5D3873318C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1285372C-2E62-494A-A661-8D5D3873318C}.Release|Any CPU.Build.0 = Release|Any CPU + {1285372C-2E62-494A-A661-8D5D3873318C}.Release|x64.ActiveCfg = Release|x64 + {1285372C-2E62-494A-A661-8D5D3873318C}.Release|x64.Build.0 = Release|x64 + {44651D2D-3252-4FD5-8B8B-5552DBE1B499}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {44651D2D-3252-4FD5-8B8B-5552DBE1B499}.Debug|Any CPU.Build.0 = Debug|Any CPU + {44651D2D-3252-4FD5-8B8B-5552DBE1B499}.Debug|x64.ActiveCfg = Debug|x64 + {44651D2D-3252-4FD5-8B8B-5552DBE1B499}.Debug|x64.Build.0 = Debug|x64 + {44651D2D-3252-4FD5-8B8B-5552DBE1B499}.Release|Any CPU.ActiveCfg = Release|Any CPU + {44651D2D-3252-4FD5-8B8B-5552DBE1B499}.Release|Any CPU.Build.0 = Release|Any CPU + {44651D2D-3252-4FD5-8B8B-5552DBE1B499}.Release|x64.ActiveCfg = Release|x64 + {44651D2D-3252-4FD5-8B8B-5552DBE1B499}.Release|x64.Build.0 = Release|x64 {B63F7A81-1D3A-4F2F-A7C2-D6F77E5BD307}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B63F7A81-1D3A-4F2F-A7C2-D6F77E5BD307}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B63F7A81-1D3A-4F2F-A7C2-D6F77E5BD307}.Debug|x64.ActiveCfg = Debug|x64 + {B63F7A81-1D3A-4F2F-A7C2-D6F77E5BD307}.Debug|x64.Build.0 = Debug|x64 {B63F7A81-1D3A-4F2F-A7C2-D6F77E5BD307}.Release|Any CPU.ActiveCfg = Release|Any CPU {B63F7A81-1D3A-4F2F-A7C2-D6F77E5BD307}.Release|Any CPU.Build.0 = Release|Any CPU - {C351CFA4-E54E-49A1-86CE-69643535541A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C351CFA4-E54E-49A1-86CE-69643535541A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C351CFA4-E54E-49A1-86CE-69643535541A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C351CFA4-E54E-49A1-86CE-69643535541A}.Release|Any CPU.Build.0 = Release|Any CPU - {C35D624E-5506-4560-8074-1728F1FA1A4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C35D624E-5506-4560-8074-1728F1FA1A4D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C35D624E-5506-4560-8074-1728F1FA1A4D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C35D624E-5506-4560-8074-1728F1FA1A4D}.Release|Any CPU.Build.0 = Release|Any CPU - {C616A6DF-831E-443C-9310-3F343A6E3D1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C616A6DF-831E-443C-9310-3F343A6E3D1A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C616A6DF-831E-443C-9310-3F343A6E3D1A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C616A6DF-831E-443C-9310-3F343A6E3D1A}.Release|Any CPU.Build.0 = Release|Any CPU - {D5C7DD38-032A-49B6-B74F-FFD9724A8AE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5C7DD38-032A-49B6-B74F-FFD9724A8AE4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5C7DD38-032A-49B6-B74F-FFD9724A8AE4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5C7DD38-032A-49B6-B74F-FFD9724A8AE4}.Release|Any CPU.Build.0 = Release|Any CPU - {FBDFE530-DBEB-474B-BA54-9AB287DD57B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FBDFE530-DBEB-474B-BA54-9AB287DD57B3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FBDFE530-DBEB-474B-BA54-9AB287DD57B3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FBDFE530-DBEB-474B-BA54-9AB287DD57B3}.Release|Any CPU.Build.0 = Release|Any CPU + {B63F7A81-1D3A-4F2F-A7C2-D6F77E5BD307}.Release|x64.ActiveCfg = Release|x64 + {B63F7A81-1D3A-4F2F-A7C2-D6F77E5BD307}.Release|x64.Build.0 = Release|x64 + {0DA95476-B149-450B-AC36-01CEECFC1A43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0DA95476-B149-450B-AC36-01CEECFC1A43}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0DA95476-B149-450B-AC36-01CEECFC1A43}.Debug|x64.ActiveCfg = Debug|x64 + {0DA95476-B149-450B-AC36-01CEECFC1A43}.Debug|x64.Build.0 = Debug|x64 + {0DA95476-B149-450B-AC36-01CEECFC1A43}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0DA95476-B149-450B-AC36-01CEECFC1A43}.Release|Any CPU.Build.0 = Release|Any CPU + {0DA95476-B149-450B-AC36-01CEECFC1A43}.Release|x64.ActiveCfg = Release|x64 + {0DA95476-B149-450B-AC36-01CEECFC1A43}.Release|x64.Build.0 = Release|x64 + {71902641-776A-47D8-9C0E-9ACBBEAC1370}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {71902641-776A-47D8-9C0E-9ACBBEAC1370}.Debug|Any CPU.Build.0 = Debug|Any CPU + {71902641-776A-47D8-9C0E-9ACBBEAC1370}.Debug|x64.ActiveCfg = Debug|x64 + {71902641-776A-47D8-9C0E-9ACBBEAC1370}.Debug|x64.Build.0 = Debug|x64 + {71902641-776A-47D8-9C0E-9ACBBEAC1370}.Release|Any CPU.ActiveCfg = Release|Any CPU + {71902641-776A-47D8-9C0E-9ACBBEAC1370}.Release|Any CPU.Build.0 = Release|Any CPU + {71902641-776A-47D8-9C0E-9ACBBEAC1370}.Release|x64.ActiveCfg = Release|x64 + {71902641-776A-47D8-9C0E-9ACBBEAC1370}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(NestedProjects) = preSolution EndGlobalSection diff --git a/dotnet/example1/example1.csproj b/dotnet/example1/example1.csproj index 592905b5..195403ee 100644 --- a/dotnet/example1/example1.csproj +++ b/dotnet/example1/example1.csproj @@ -26,6 +26,26 @@ 4 true + + true + full + x64 + false + bin\x64\Debug + DEBUG; + prompt + 4 + true + + + none + x64 + true + bin\x64\Release + prompt + 4 + true + diff --git a/dotnet/example2/example2.csproj b/dotnet/example2/example2.csproj index 612fcdb5..5b0f0f9f 100644 --- a/dotnet/example2/example2.csproj +++ b/dotnet/example2/example2.csproj @@ -1,4 +1,4 @@ - + Debug @@ -26,6 +26,26 @@ 4 true + + true + full + x64 + false + bin\x64\Debug + DEBUG; + prompt + 4 + true + + + none + x64 + true + bin\x64\Release + prompt + 4 + true + diff --git a/dotnet/example3/example3.csproj b/dotnet/example3/example3.csproj index 4f60434a..2dde454c 100644 --- a/dotnet/example3/example3.csproj +++ b/dotnet/example3/example3.csproj @@ -1,4 +1,4 @@ - + Debug @@ -26,6 +26,26 @@ 4 true + + true + full + x64 + false + bin\x64\Debug + DEBUG; + prompt + 4 + true + + + none + x64 + true + bin\x64\Release + prompt + 4 + true + diff --git a/dotnet/files/files.csproj b/dotnet/files/files.csproj index ba8c3186..5e18b6b7 100644 --- a/dotnet/files/files.csproj +++ b/dotnet/files/files.csproj @@ -1,4 +1,4 @@ - + Debug @@ -26,6 +26,26 @@ 4 true + + true + full + x64 + false + bin\x64\Debug + DEBUG; + prompt + 4 + true + + + none + x64 + true + bin\x64\Release + prompt + 4 + true + diff --git a/dotnet/goose_subscriber/goose_subscriber.csproj b/dotnet/goose_subscriber/goose_subscriber.csproj index 077b65df..99f2cb90 100644 --- a/dotnet/goose_subscriber/goose_subscriber.csproj +++ b/dotnet/goose_subscriber/goose_subscriber.csproj @@ -1,4 +1,4 @@ - + Debug @@ -27,6 +27,26 @@ 4 true + + true + full + x64 + false + bin\x64\Debug + DEBUG; + prompt + 4 + true + + + none + x64 + true + bin\x64\Release + prompt + 4 + true + diff --git a/dotnet/log_client/log_client.csproj b/dotnet/log_client/log_client.csproj index f9defe5c..c2cb9bb1 100644 --- a/dotnet/log_client/log_client.csproj +++ b/dotnet/log_client/log_client.csproj @@ -1,4 +1,4 @@ - + Debug @@ -27,6 +27,26 @@ 4 true + + true + full + x64 + false + bin\x64\Debug + DEBUG; + prompt + 4 + true + + + none + x64 + true + bin\x64\Release + prompt + 4 + true + diff --git a/dotnet/model_browsing/model_browsing.csproj b/dotnet/model_browsing/model_browsing.csproj index 8162b3f8..0651af17 100644 --- a/dotnet/model_browsing/model_browsing.csproj +++ b/dotnet/model_browsing/model_browsing.csproj @@ -1,4 +1,4 @@ - + Debug @@ -26,6 +26,26 @@ 4 true + + true + full + x64 + false + bin\x64\Debug + DEBUG; + prompt + 4 + true + + + none + x64 + true + bin\x64\Release + prompt + 4 + true + diff --git a/dotnet/report_new_dataset/report_new_dataset.csproj b/dotnet/report_new_dataset/report_new_dataset.csproj index ccf2dc93..4cf745e3 100644 --- a/dotnet/report_new_dataset/report_new_dataset.csproj +++ b/dotnet/report_new_dataset/report_new_dataset.csproj @@ -1,4 +1,4 @@ - + Debug @@ -26,6 +26,26 @@ 4 true + + true + full + x64 + false + bin\x64\Debug + DEBUG; + prompt + 4 + true + + + none + x64 + true + bin\x64\Release + prompt + 4 + true + diff --git a/dotnet/reporting/reporting.csproj b/dotnet/reporting/reporting.csproj index 53a5829e..bf2895b0 100644 --- a/dotnet/reporting/reporting.csproj +++ b/dotnet/reporting/reporting.csproj @@ -42,6 +42,26 @@ 4 true + + true + full + x64 + false + bin\x64\Debug + DEBUG; + prompt + 4 + true + + + none + x64 + true + bin\x64\Release + prompt + 4 + true + diff --git a/dotnet/server1/server1.csproj b/dotnet/server1/server1.csproj index d1c45eeb..e393b40a 100644 --- a/dotnet/server1/server1.csproj +++ b/dotnet/server1/server1.csproj @@ -29,6 +29,26 @@ 4 true + + true + full + x64 + false + bin\x64\Debug + DEBUG; + prompt + 4 + true + + + none + x64 + true + bin\x64\Release + prompt + 4 + true + diff --git a/dotnet/sv_subscriber/sv_subscriber.csproj b/dotnet/sv_subscriber/sv_subscriber.csproj index 4d0fa10d..5c66e820 100644 --- a/dotnet/sv_subscriber/sv_subscriber.csproj +++ b/dotnet/sv_subscriber/sv_subscriber.csproj @@ -28,6 +28,26 @@ 4 true + + true + full + x64 + false + bin\x64\Debug + DEBUG; + prompt + 4 + true + + + none + x64 + true + bin\x64\Release + prompt + 4 + true + diff --git a/dotnet/tests/tests.csproj b/dotnet/tests/tests.csproj index ecaf4e89..0c98f844 100644 --- a/dotnet/tests/tests.csproj +++ b/dotnet/tests/tests.csproj @@ -26,6 +26,26 @@ 4 false + + true + full + x64 + false + bin\x64\Debug + DEBUG; + prompt + 4 + false + + + none + x64 + true + bin\x64\Release + prompt + 4 + false + diff --git a/dotnet/tls_client_example/tls_client_example.csproj b/dotnet/tls_client_example/tls_client_example.csproj index 389abef9..4db66ec5 100644 --- a/dotnet/tls_client_example/tls_client_example.csproj +++ b/dotnet/tls_client_example/tls_client_example.csproj @@ -1,4 +1,4 @@ - + Debug @@ -27,6 +27,26 @@ 4 true + + true + full + x64 + false + bin\x64\Debug + DEBUG; + prompt + 4 + true + + + none + x64 + true + bin\x64\Release + prompt + 4 + true + diff --git a/dotnet/tls_server_example/tls_server_example.csproj b/dotnet/tls_server_example/tls_server_example.csproj index 012dd760..237a781e 100644 --- a/dotnet/tls_server_example/tls_server_example.csproj +++ b/dotnet/tls_server_example/tls_server_example.csproj @@ -1,4 +1,4 @@ - + Debug @@ -27,6 +27,26 @@ 4 true + + true + full + x64 + false + bin\x64\Debug + DEBUG; + prompt + 4 + true + + + none + x64 + true + bin\x64\Release + prompt + 4 + true + From e274fcee91971e7fa78794189205604c41288408 Mon Sep 17 00:00:00 2001 From: Andrew Moorcroft Date: Thu, 16 Jan 2020 11:08:09 +0000 Subject: [PATCH 2/2] Updated tests model.cfg referencing to be consistent with other projects. --- dotnet/tests/Test.cs | 20 ++++++++++---------- dotnet/tests/tests.csproj | 5 ++++- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dotnet/tests/Test.cs b/dotnet/tests/Test.cs index a835d92b..19b698d3 100644 --- a/dotnet/tests/Test.cs +++ b/dotnet/tests/Test.cs @@ -200,7 +200,7 @@ namespace tests [Test ()] public void CreateModelFromFile() { - IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("../../model.cfg"); + IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("model.cfg"); Assert.NotNull (iedModel); } @@ -208,7 +208,7 @@ namespace tests [Test ()] public void StartStopSimpleServer() { - IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("../../model.cfg"); + IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("model.cfg"); IedServer iedServer = new IedServer (iedModel); @@ -228,7 +228,7 @@ namespace tests [Test ()] public void ConnectToServer() { - IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("../../model.cfg"); + IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("model.cfg"); IedServer iedServer = new IedServer (iedModel); @@ -252,7 +252,7 @@ namespace tests [Test ()] public void ReadNonExistingObject() { - IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("../../model.cfg"); + IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("model.cfg"); IedServer iedServer = new IedServer (iedModel); @@ -276,7 +276,7 @@ namespace tests [Test ()] public void AccessDataModelServerSide() { - IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("../../model.cfg"); + IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("model.cfg"); ModelNode modelNode = iedModel.GetModelNodeByShortObjectReference ("GenericIO/GGIO1.AnIn1"); @@ -292,7 +292,7 @@ namespace tests [Test ()] public void AccessDataModelClientServer() { - IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile("../../model.cfg"); + IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile("model.cfg"); @@ -333,7 +333,7 @@ namespace tests public void ControlWriteAccessToServer() { - IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("../../model.cfg"); + IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("model.cfg"); IEC61850.Server.DataAttribute opDlTmms = (IEC61850.Server.DataAttribute) iedModel.GetModelNodeByShortObjectReference("GenericIO/PDUP1.OpDlTmms.setVal"); IEC61850.Server.DataAttribute rsDlTmms = (IEC61850.Server.DataAttribute)iedModel.GetModelNodeByShortObjectReference ("GenericIO/PDUP1.RsDlTmms.setVal"); @@ -389,7 +389,7 @@ namespace tests public void WriteAccessPolicy() { - IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("../../model.cfg"); + IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("model.cfg"); IEC61850.Server.DataAttribute opDlTmms = (IEC61850.Server.DataAttribute) iedModel.GetModelNodeByShortObjectReference("GenericIO/PDUP1.OpDlTmms.setVal"); IEC61850.Server.DataAttribute rsDlTmms = (IEC61850.Server.DataAttribute)iedModel.GetModelNodeByShortObjectReference("GenericIO/PDUP1.RsDlTmms.setVal"); @@ -435,7 +435,7 @@ namespace tests [Ignore("has to be fixed")] public void ControlHandler() { - IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("../../model.cfg"); + IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("model.cfg"); DataObject spcso1 = (DataObject)iedModel.GetModelNodeByShortObjectReference ("GenericIO/GGIO1.SPCSO1"); @@ -486,7 +486,7 @@ namespace tests [Test()] public void ConnectionHandler() { - IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("../../model.cfg"); + IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("model.cfg"); int handlerCalled = 0; int connectionCount = 0; diff --git a/dotnet/tests/tests.csproj b/dotnet/tests/tests.csproj index 0c98f844..d7cc20a3 100644 --- a/dotnet/tests/tests.csproj +++ b/dotnet/tests/tests.csproj @@ -38,7 +38,7 @@ false - none + none x64 true bin\x64\Release @@ -57,6 +57,9 @@ + + PreserveNewest +