Skip to content

Commit c672c42

Browse files
committed
driverset in tagconfig use propertygrid
1 parent 256fa65 commit c672c42

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+587
-681
lines changed

SCADA/Database/db2014.bak

0 Bytes
Binary file not shown.

SCADA/Database/script.sql

93.1 KB
Binary file not shown.

SCADA/Example/BatchCoreTest.exe

-5 KB
Binary file not shown.

SCADA/Example/BatchCoreTest.exe.config

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,9 @@
77
<services>
88
<!-- This section is optional with the new configuration model
99
introduced in .NET Framework 4. -->
10-
<service name="BatchCoreService.DAService" behaviorConfiguration="DAServiceBehavior">
11-
<host>
12-
<baseAddresses>
13-
<add baseAddress="http://localhost:8000/SCADA/service"/>
14-
</baseAddresses>
15-
</host>
16-
<!-- this endpoint is exposed at the base address provided by host: http://localhost:8000/SCADA/service -->
17-
<endpoint address="" binding="basicHttpBinding" bindingConfiguration="Binding1" bindingNamespace="http://BatchCoreService" contract="BatchCoreService.IDataExchangeService"/>
18-
<!-- the mex endpoint is exposed at http://localhost:8000/SCADA/service/mex -->
19-
<endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/>
10+
<service name="BatchCoreService.DAService" >
2011
</service>
2112
</services>
22-
<bindings>
23-
<basicHttpBinding>
24-
<binding name="Binding1" sendTimeout="00:10:00" transferMode="Streamed" messageEncoding="Text" textEncoding="utf-8" maxReceivedMessageSize="9223372036854775807">
25-
</binding>
26-
</basicHttpBinding>
27-
</bindings>
28-
<behaviors>
29-
<serviceBehaviors>
30-
<behavior name="DAServiceBehavior">
31-
<serviceMetadata httpGetEnabled="true"/>
32-
<serviceDebug includeExceptionDetailInFaults="False"/>
33-
</behavior>
34-
</serviceBehaviors>
35-
</behaviors>
3613
</system.serviceModel>
3714
<startup>
3815
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>

SCADA/Example/ClientDriver.dll

0 Bytes
Binary file not shown.

SCADA/Example/CoreTest.exe

0 Bytes
Binary file not shown.

SCADA/Example/DataHelper.dll

0 Bytes
Binary file not shown.

SCADA/Example/DataService.dll

0 Bytes
Binary file not shown.

SCADA/Example/TagConfig.exe

1 KB
Binary file not shown.

SCADA/Program/BatchCoreService/App.config

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,9 @@
77
<services>
88
<!-- This section is optional with the new configuration model
99
introduced in .NET Framework 4. -->
10-
<service name="BatchCoreService.DAService" behaviorConfiguration="DAServiceBehavior">
11-
<host>
12-
<baseAddresses>
13-
<add baseAddress="http://localhost:8000/SCADA/service"/>
14-
</baseAddresses>
15-
</host>
16-
<!-- this endpoint is exposed at the base address provided by host: http://localhost:8000/SCADA/service -->
17-
<endpoint address="" binding="basicHttpBinding" bindingConfiguration="Binding1" bindingNamespace="http://BatchCoreService" contract="BatchCoreService.IDataExchangeService"/>
18-
<!-- the mex endpoint is exposed at http://localhost:8000/SCADA/service/mex -->
19-
<endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/>
10+
<service name="BatchCoreService.DAService">
2011
</service>
2112
</services>
22-
<bindings>
23-
<basicHttpBinding>
24-
<binding name="Binding1" sendTimeout="00:10:00" transferMode="Streamed" messageEncoding="Text" textEncoding="utf-8" maxReceivedMessageSize="9223372036854775807">
25-
</binding>
26-
</basicHttpBinding>
27-
</bindings>
28-
<behaviors>
29-
<serviceBehaviors>
30-
<behavior name="DAServiceBehavior">
31-
<serviceMetadata httpGetEnabled="true"/>
32-
<serviceDebug includeExceptionDetailInFaults="False"/>
33-
</behavior>
34-
</serviceBehaviors>
35-
</behaviors>
3613
</system.serviceModel>
3714
<startup>
3815
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>

SCADA/Program/BatchCoreService/BatchCoreService.csproj

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
<Reference Include="System.Data" />
4242
<Reference Include="System.Management" />
4343
<Reference Include="System.ServiceModel" />
44-
<Reference Include="System.ServiceModel.Web" />
4544
<Reference Include="System.ServiceProcess" />
4645
<Reference Include="System.Windows.Forms" />
4746
<Reference Include="System.Xml" />
@@ -78,12 +77,6 @@
7877
<Name>DataService</Name>
7978
</ProjectReference>
8079
</ItemGroup>
81-
<ItemGroup>
82-
<None Include="App.config">
83-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
84-
<SubType>Designer</SubType>
85-
</None>
86-
</ItemGroup>
8780
<ItemGroup>
8881
<EmbeddedResource Include="BatchCoreService.resx">
8982
<DependentUpon>BatchCoreService.cs</DependentUpon>
@@ -92,6 +85,9 @@
9285
<DependentUpon>ProjectInstaller.cs</DependentUpon>
9386
</EmbeddedResource>
9487
</ItemGroup>
88+
<ItemGroup>
89+
<None Include="App.config" />
90+
</ItemGroup>
9591
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
9692
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
9793
Other similar extension points exist, see Microsoft.Common.targets.

0 commit comments

Comments
 (0)