Merge pull request #49 from RapidScada/develop

Merge Develop to Master
RapidScada · Mar 19, 2018 · 96d59bc · 96d59bc
2 parents 62ccdfb + 4069537
commit 96d59bc
Show file tree

Hide file tree

Showing 37 changed files with 1,580 additions and 4 deletions.
diff --git a/ScadaAgent/ScadaAgent/ScadaAgent.sln b/ScadaAgent/ScadaAgent/ScadaAgent.sln
@@ -0,0 +1,49 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27428.2005
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScadaAgentCore", "ScadaAgentCore\ScadaAgentCore.csproj", "{5163526D-91E4-414D-97FE-090E1E7FDA6B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScadaAgentMono", "ScadaAgentMono\ScadaAgentMono.csproj", "{45E8CD64-3FB3-4B29-BFD4-2823D8F2AA02}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScadaAgentService", "ScadaAgentService\ScadaAgentService.csproj", "{593318B1-3CB4-441B-B273-E3F37DF070B5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScadaAgentCtrl", "ScadaAgentCtrl\ScadaAgentCtrl.csproj", "{67AEE6A7-0F2E-4273-8253-231E6BF3C943}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScadaAgentWcf", "ScadaAgentWcf\ScadaAgentWcf.csproj", "{620CFDFB-6484-4EDF-9764-D01C90C1FFA8}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5163526D-91E4-414D-97FE-090E1E7FDA6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5163526D-91E4-414D-97FE-090E1E7FDA6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5163526D-91E4-414D-97FE-090E1E7FDA6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5163526D-91E4-414D-97FE-090E1E7FDA6B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{45E8CD64-3FB3-4B29-BFD4-2823D8F2AA02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{45E8CD64-3FB3-4B29-BFD4-2823D8F2AA02}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{45E8CD64-3FB3-4B29-BFD4-2823D8F2AA02}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{45E8CD64-3FB3-4B29-BFD4-2823D8F2AA02}.Release|Any CPU.Build.0 = Release|Any CPU
+		{593318B1-3CB4-441B-B273-E3F37DF070B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{593318B1-3CB4-441B-B273-E3F37DF070B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{593318B1-3CB4-441B-B273-E3F37DF070B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{593318B1-3CB4-441B-B273-E3F37DF070B5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{67AEE6A7-0F2E-4273-8253-231E6BF3C943}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{67AEE6A7-0F2E-4273-8253-231E6BF3C943}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{67AEE6A7-0F2E-4273-8253-231E6BF3C943}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{67AEE6A7-0F2E-4273-8253-231E6BF3C943}.Release|Any CPU.Build.0 = Release|Any CPU
+		{620CFDFB-6484-4EDF-9764-D01C90C1FFA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{620CFDFB-6484-4EDF-9764-D01C90C1FFA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{620CFDFB-6484-4EDF-9764-D01C90C1FFA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{620CFDFB-6484-4EDF-9764-D01C90C1FFA8}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {CD5FA250-50ED-4B08-B18B-BA49C0EE4193}
+	EndGlobalSection
+EndGlobal
diff --git a/ScadaAgent/ScadaAgent/ScadaAgentCore/ScadaAgentCore.csproj b/ScadaAgent/ScadaAgent/ScadaAgentCore/ScadaAgentCore.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <RootNamespace>Scada.Agent</RootNamespace>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DocumentationFile>bin\Release\netstandard2.0\ScadaAgentCore.xml</DocumentationFile>
+  </PropertyGroup>
+
+</Project>
diff --git a/ScadaAgent/ScadaAgent/ScadaAgentCore/ScadaManager.cs b/ScadaAgent/ScadaAgent/ScadaAgentCore/ScadaManager.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Scada.Agent
+{
+    public class ScadaManager
+    {
+        public double Sum(double a, double b)
+        {
+            return a + b;
+        }
+    }
+}
diff --git a/ScadaAgent/ScadaAgent/ScadaAgentCtrl/App.config b/ScadaAgent/ScadaAgent/ScadaAgentCtrl/App.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+    </startup>
+    <system.serviceModel>
+        <bindings>
+            <basicHttpBinding>
+                <binding name="BasicHttpBinding_AgentSvc" />
+            </basicHttpBinding>
+        </bindings>
+        <client>
+            <endpoint address="http://localhost:10002/ScadaAgent/ScadaAgentSvc/"
+                binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_AgentSvc"
+                contract="ServiceReference1.AgentSvc" name="BasicHttpBinding_AgentSvc" />
+        </client>
+    </system.serviceModel>
+</configuration>
diff --git a/ScadaAgent/ScadaAgent/ScadaAgentCtrl/Connected Services/ServiceReference1/AgentSvc.wsdl b/ScadaAgent/ScadaAgent/ScadaAgentCtrl/Connected Services/ServiceReference1/AgentSvc.wsdl
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<wsdl:definitions xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:tns="http://tempuri.org/" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="AgentSvc" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+  <wsdl:types>
+    <xsd:schema targetNamespace="http://tempuri.org/Imports">
+      <xsd:import schemaLocation="http://localhost:10002/ScadaAgent/ScadaAgentSvc/?xsd=xsd0" namespace="http://tempuri.org/" />
+      <xsd:import schemaLocation="http://localhost:10002/ScadaAgent/ScadaAgentSvc/?xsd=xsd1" namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
+    </xsd:schema>
+  </wsdl:types>
+  <wsdl:message name="AgentSvc_Sum_InputMessage">
+    <wsdl:part name="parameters" element="tns:Sum" />
+  </wsdl:message>
+  <wsdl:message name="AgentSvc_Sum_OutputMessage">
+    <wsdl:part name="parameters" element="tns:SumResponse" />
+  </wsdl:message>
+  <wsdl:portType name="AgentSvc">
+    <wsdl:operation name="Sum">
+      <wsdl:input wsaw:Action="http://tempuri.org/AgentSvc/Sum" message="tns:AgentSvc_Sum_InputMessage" />
+      <wsdl:output wsaw:Action="http://tempuri.org/AgentSvc/SumResponse" message="tns:AgentSvc_Sum_OutputMessage" />
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="BasicHttpBinding_AgentSvc" type="tns:AgentSvc">
+    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" />
+    <wsdl:operation name="Sum">
+      <soap:operation soapAction="http://tempuri.org/AgentSvc/Sum" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="AgentSvc">
+    <wsdl:port name="BasicHttpBinding_AgentSvc" binding="tns:BasicHttpBinding_AgentSvc">
+      <soap:address location="http://localhost:10002/ScadaAgent/ScadaAgentSvc/" />
+    </wsdl:port>
+  </wsdl:service>
+</wsdl:definitions>
diff --git a/ScadaAgent/ScadaAgent/ScadaAgentCtrl/Connected Services/ServiceReference1/Reference.cs b/ScadaAgent/ScadaAgent/ScadaAgentCtrl/Connected Services/ServiceReference1/Reference.cs
@@ -0,0 +1,60 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Scada.Agent.Ctrl.ServiceReference1 {
+
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+    [System.ServiceModel.ServiceContractAttribute(ConfigurationName="ServiceReference1.AgentSvc")]
+    public interface AgentSvc {
+
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/AgentSvc/Sum", ReplyAction="http://tempuri.org/AgentSvc/SumResponse")]
+        double Sum(double a, double b);
+
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/AgentSvc/Sum", ReplyAction="http://tempuri.org/AgentSvc/SumResponse")]
+        System.Threading.Tasks.Task<double> SumAsync(double a, double b);
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+    public interface AgentSvcChannel : Scada.Agent.Ctrl.ServiceReference1.AgentSvc, System.ServiceModel.IClientChannel {
+    }
+
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
+    public partial class AgentSvcClient : System.ServiceModel.ClientBase<Scada.Agent.Ctrl.ServiceReference1.AgentSvc>, Scada.Agent.Ctrl.ServiceReference1.AgentSvc {
+
+        public AgentSvcClient() {
+        }
+
+        public AgentSvcClient(string endpointConfigurationName) : 
+                base(endpointConfigurationName) {
+        }
+
+        public AgentSvcClient(string endpointConfigurationName, string remoteAddress) : 
+                base(endpointConfigurationName, remoteAddress) {
+        }
+
+        public AgentSvcClient(string endpointConfigurationName, System.ServiceModel.EndpointAddress remoteAddress) : 
+                base(endpointConfigurationName, remoteAddress) {
+        }
+
+        public AgentSvcClient(System.ServiceModel.Channels.Binding binding, System.ServiceModel.EndpointAddress remoteAddress) : 
+                base(binding, remoteAddress) {
+        }
+
+        public double Sum(double a, double b) {
+            return base.Channel.Sum(a, b);
+        }
+
+        public System.Threading.Tasks.Task<double> SumAsync(double a, double b) {
+            return base.Channel.SumAsync(a, b);
+        }
+    }
+}
diff --git a/ScadaAgent/ScadaAgent/ScadaAgentCtrl/Connected Services/ServiceReference1/Reference.svcmap b/ScadaAgent/ScadaAgent/ScadaAgentCtrl/Connected Services/ServiceReference1/Reference.svcmap
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ReferenceGroup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ID="881502c2-8070-4388-8144-5128cbd28169" xmlns="urn:schemas-microsoft-com:xml-wcfservicemap">
+  <ClientOptions>
+    <GenerateAsynchronousMethods>false</GenerateAsynchronousMethods>
+    <GenerateTaskBasedAsynchronousMethod>true</GenerateTaskBasedAsynchronousMethod>
+    <EnableDataBinding>true</EnableDataBinding>
+    <ExcludedTypes />
+    <ImportXmlTypes>false</ImportXmlTypes>
+    <GenerateInternalTypes>false</GenerateInternalTypes>
+    <GenerateMessageContracts>false</GenerateMessageContracts>
+    <NamespaceMappings />
+    <CollectionMappings />
+    <GenerateSerializableTypes>true</GenerateSerializableTypes>
+    <Serializer>Auto</Serializer>
+    <UseSerializerForFaults>true</UseSerializerForFaults>
+    <ReferenceAllAssemblies>true</ReferenceAllAssemblies>
+    <ReferencedAssemblies />
+    <ReferencedDataContractTypes />
+    <ServiceContractMappings />
+  </ClientOptions>
+  <MetadataSources>
+    <MetadataSource Address="http://localhost:10002/ScadaAgent/ScadaAgentSvc/" Protocol="http" SourceId="1" />
+  </MetadataSources>
+  <Metadata>
+    <MetadataFile FileName="item.xsd" MetadataType="Schema" ID="5875ee0a-0c3a-4441-ae71-7b5c5ebbfe5b" SourceId="1" SourceUrl="http://localhost:10002/ScadaAgent/ScadaAgentSvc/?xsd=xsd0" />
+    <MetadataFile FileName="item1.xsd" MetadataType="Schema" ID="292a2bd1-1360-479e-ae9a-3cf3e264bac3" SourceId="1" SourceUrl="http://localhost:10002/ScadaAgent/ScadaAgentSvc/?xsd=xsd1" />
+    <MetadataFile FileName="AgentSvc.wsdl" MetadataType="Wsdl" ID="511d0274-7622-48df-973b-a6967efadd92" SourceId="1" SourceUrl="http://localhost:10002/ScadaAgent/ScadaAgentSvc/?wsdl" />
+    <MetadataFile FileName="item.disco" MetadataType="Disco" ID="2b2dbcd6-d973-4fcf-af03-41309cb58a19" SourceId="1" SourceUrl="http://localhost:10002/ScadaAgent/ScadaAgentSvc/?disco" />
+  </Metadata>
+  <Extensions>
+    <ExtensionFile FileName="configuration91.svcinfo" Name="configuration91.svcinfo" />
+    <ExtensionFile FileName="configuration.svcinfo" Name="configuration.svcinfo" />
+  </Extensions>
+</ReferenceGroup>
diff --git a/...gent/ScadaAgent/ScadaAgentCtrl/Connected Services/ServiceReference1/configuration.svcinfo b/...gent/ScadaAgent/ScadaAgentCtrl/Connected Services/ServiceReference1/configuration.svcinfo
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configurationSnapshot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:schemas-microsoft-com:xml-wcfconfigurationsnapshot">
+  <behaviors />
+  <bindings>
+    <binding digest="System.ServiceModel.Configuration.BasicHttpBindingElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089:&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data name=&quot;BasicHttpBinding_AgentSvc&quot; /&gt;" bindingType="basicHttpBinding" name="BasicHttpBinding_AgentSvc" />
+  </bindings>
+  <endpoints>
+    <endpoint normalizedDigest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;http://localhost:10002/ScadaAgent/ScadaAgentSvc/&quot; binding=&quot;basicHttpBinding&quot; bindingConfiguration=&quot;BasicHttpBinding_AgentSvc&quot; contract=&quot;ServiceReference1.AgentSvc&quot; name=&quot;BasicHttpBinding_AgentSvc&quot; /&gt;" digest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;http://localhost:10002/ScadaAgent/ScadaAgentSvc/&quot; binding=&quot;basicHttpBinding&quot; bindingConfiguration=&quot;BasicHttpBinding_AgentSvc&quot; contract=&quot;ServiceReference1.AgentSvc&quot; name=&quot;BasicHttpBinding_AgentSvc&quot; /&gt;" contractName="ServiceReference1.AgentSvc" name="BasicHttpBinding_AgentSvc" />
+  </endpoints>
+</configurationSnapshot>