Skip to content

Commit

Permalink
Merge pull request #72 from RapidScada/develop
Browse files Browse the repository at this point in the history
Merge Develop to Master
  • Loading branch information
2mik authored Jan 27, 2024
2 parents f12d605 + 4c5f47e commit f042bc4
Show file tree
Hide file tree
Showing 779 changed files with 15,103 additions and 2,936 deletions.
2 changes: 1 addition & 1 deletion HowToBuild.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Build with Visual Studio

Build from Command Line
-----------------------
1. Download and install .NET SDK 6.0 for your operating system.
1. Download and install .NET SDK 8.0 for your operating system.

2. Download the source code of Rapid SCADA from the repository:
https://github.com/RapidScada/scada-v6
Expand Down
6 changes: 3 additions & 3 deletions Projects/HelloWorld/BaseXML/DevType.xml
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,9 @@
</DevType>
<DevType>
<DevTypeID>225</DevTypeID>
<Name>Rateos Azimuth</Name>
<Driver>DrvAzimuth</Driver>
<Descr>Azimuth controllers manufactured by Rateos</Descr>
<Name>Azimuth 5.1 Pro</Name>
<Driver>DrvAzimuth51Pro</Driver>
<Descr>Receives data from Azimuth 5.1 Pro controllers manufactured by Rateos</Descr>
</DevType>
<DevType>
<DevTypeID>226</DevTypeID>
Expand Down
6 changes: 3 additions & 3 deletions Projects/WirenBoardDemo/BaseXML/DevType.xml
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,9 @@
</DevType>
<DevType>
<DevTypeID>225</DevTypeID>
<Name>Rateos Azimuth</Name>
<Driver>DrvAzimuth</Driver>
<Descr>Azimuth controllers manufactured by Rateos</Descr>
<Name>Azimuth 5.1 Pro</Name>
<Driver>DrvAzimuth51Pro</Driver>
<Descr>Receives data from Azimuth 5.1 Pro controllers manufactured by Rateos</Descr>
</DevType>
<DevType>
<DevTypeID>226</DevTypeID>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<Authors>Mikhail Shiryaev</Authors>
<Company>Rapid Software LLC</Company>
<Product>Rapid SCADA</Product>
<Copyright>Copyright © 2023</Copyright>
<Copyright>Copyright © 2024</Copyright>
<Version>6.0.1</Version>
<AssemblyVersion>6.0.1.2</AssemblyVersion>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion ScadaAdmin/OpenExtensions/ExtDepAgent/ExtDepAgent.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<Authors>Mikhail Shiryaev</Authors>
<Company>Rapid Software LLC</Company>
<Product>Rapid SCADA</Product>
<Copyright>Copyright © 2023</Copyright>
<Copyright>Copyright © 2024</Copyright>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<Authors>Mikhail Shiryaev</Authors>
<Company>Rapid Software LLC</Company>
<Product>Rapid SCADA</Product>
<Copyright>Copyright © 2023</Copyright>
<Copyright>Copyright © 2024</Copyright>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<Authors>Mikhail Shiryaev</Authors>
<Company>Rapid Software LLC</Company>
<Product>Rapid SCADA</Product>
<Copyright>Copyright © 2023</Copyright>
<Copyright>Copyright © 2024</Copyright>
<Version>6.0.1</Version>
<AssemblyVersion>6.0.1.0</AssemblyVersion>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<Authors>Mikhail Shiryaev</Authors>
<Company>Rapid Software LLC</Company>
<Product>Rapid SCADA</Product>
<Copyright>Copyright © 2023</Copyright>
<Copyright>Copyright © 2024</Copyright>
<Version>6.0.1</Version>
<AssemblyVersion>6.0.1.1</AssemblyVersion>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<Authors>Mikhail Shiryaev</Authors>
<Company>Rapid Software LLC</Company>
<Product>Rapid SCADA</Product>
<Copyright>Copyright © 2023</Copyright>
<Copyright>Copyright © 2024</Copyright>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ScadaAdmin/OpenExtensions/ExtWebConfig/ExtWebConfig.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<Authors>Mikhail Shiryaev</Authors>
<Company>Rapid Software LLC</Company>
<Product>Rapid SCADA</Product>
<Copyright>Copyright © 2023</Copyright>
<Copyright>Copyright © 2024</Copyright>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<Authors>Mikhail Shiryaev</Authors>
<Company>Rapid Software LLC</Company>
<Product>Rapid SCADA</Product>
<Copyright>Copyright © 2023</Copyright>
<Copyright>Copyright © 2024</Copyright>
<Version>6.0.0</Version>
<AssemblyVersion>6.0.0.1</AssemblyVersion>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion ScadaAdmin/ScadaAdmin/ScadaAdmin/Code/AppData.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ScadaAdmin/ScadaAdmin/ScadaAdmin/Code/AppPhrases.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ScadaAdmin/ScadaAdmin/ScadaAdmin/Code/AppState.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ScadaAdmin/ScadaAdmin/ScadaAdmin/Code/AppUtils.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ScadaAdmin/ScadaAdmin/ScadaAdmin/Code/BaseTableItem.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ScadaAdmin/ScadaAdmin/ScadaAdmin/Code/ColumnBuilder.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ScadaAdmin/ScadaAdmin/ScadaAdmin/Code/ColumnInfo.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ScadaAdmin/ScadaAdmin/ScadaAdmin/Code/ColumnKind.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ScadaAdmin/ScadaAdmin/ScadaAdmin/Code/ColumnLength.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ScadaAdmin/ScadaAdmin/ScadaAdmin/Code/ColumnOptions.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ScadaAdmin/ScadaAdmin/ScadaAdmin/Code/ContextMenus.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ScadaAdmin/ScadaAdmin/ScadaAdmin/Code/ExplorerBuilder.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ScadaAdmin/ScadaAdmin/ScadaAdmin/Code/ExplorerNodeType.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ScadaAdmin/ScadaAdmin/ScadaAdmin/Code/ExtensionHolder.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ScadaAdmin/ScadaAdmin/ScadaAdmin/Code/FileCreator.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ScadaAdmin/ScadaAdmin/ScadaAdmin/Code/FileItem.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ScadaAdmin/ScadaAdmin/ScadaAdmin/Code/IDeploymentForm.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ScadaAdmin/ScadaAdmin/ScadaAdmin/Code/KnownFileType.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ScadaAdmin/ScadaAdmin/ScadaAdmin/Code/LiveInstance.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ScadaAdmin/ScadaAdmin/ScadaAdmin/Code/MainFormState.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ScadaAdmin/ScadaAdmin/ScadaAdmin/Forms/FrmAbout.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ScadaAdmin/ScadaAdmin/ScadaAdmin/Forms/FrmFileNew.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ScadaAdmin/ScadaAdmin/ScadaAdmin/Forms/FrmInstanceEdit.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ScadaAdmin/ScadaAdmin/ScadaAdmin/Forms/FrmItemName.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ScadaAdmin/ScadaAdmin/ScadaAdmin/Forms/FrmMain.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ScadaAdmin/ScadaAdmin/ScadaAdmin/Forms/FrmProjectNew.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ScadaAdmin/ScadaAdmin/ScadaAdmin/Forms/FrmProjectProps.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ScadaAdmin/ScadaAdmin/ScadaAdmin/Forms/FrmStartPage.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ScadaAdmin/ScadaAdmin/ScadaAdmin/Forms/FrmTextEditor.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ScadaAdmin/ScadaAdmin/ScadaAdmin/Forms/Tables/FrmCnl.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ScadaAdmin/ScadaAdmin/ScadaAdmin/Forms/Tables/FrmFilter.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Rapid Software LLC
* Copyright 2024 Rapid Software LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Loading

0 comments on commit f042bc4

Please sign in to comment.