Merge branch 'master' of https://github.com/GridProtectionAlliance/op…

…enPDC.git
GridProtectionAlliance · Mar 17, 2017 · e55409d · e55409d
2 parents b41f6de + b9e38a6
commit e55409d
Show file tree

Hide file tree

Showing 19 changed files with 37 additions and 28 deletions.
diff --git a/Build/Scripts/Synchrophasor.version b/Build/Scripts/Synchrophasor.version
@@ -1 +1 @@
-2.4.118.0
+2.4.119.0
diff --git a/Source/Applications/openPDC/openPDC/Properties/AssemblyInfo.cs b/Source/Applications/openPDC/openPDC/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.InteropServices;
 
 // Assembly identity attributes.
-[assembly: AssemblyVersion("2.4.118.0")]
+[assembly: AssemblyVersion("2.4.119.0")]
 
 // Informational attributes.
 [assembly: AssemblyCompany("Grid Protection Alliance")]

diff --git a/Source/Applications/openPDC/openPDCConsole/Properties/AssemblyInfo.cs b/Source/Applications/openPDC/openPDCConsole/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.InteropServices;
 
 // Assembly identity attributes.
-[assembly: AssemblyVersion("2.4.118.0")]
+[assembly: AssemblyVersion("2.4.119.0")]
 
 // Informational attributes.
 [assembly: AssemblyCompany("Grid Protection Alliance")]

diff --git a/Source/Applications/openPDC/openPDCServices/Properties/AssemblyInfo.cs b/Source/Applications/openPDC/openPDCServices/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.InteropServices;
 
 // Assembly identity attributes.
-[assembly: AssemblyVersion("2.4.118.0")]
+[assembly: AssemblyVersion("2.4.119.0")]
 
 // Informational attributes.
 [assembly: AssemblyCompany("Grid Protection Alliance")]

diff --git a/Source/Applications/openPDC/openPDCSetup/openPDCSetup.wxs b/Source/Applications/openPDC/openPDCSetup/openPDCSetup.wxs
@@ -377,7 +377,7 @@
     <ComponentGroup Id="LogFileViewerComponents" Directory="INSTALLFOLDER">
       <Component Id="LogFileViewer">
         <File Id="LogFileViewer.exe" Name="LogFileViewer.exe" Source="$(var.ProjectDir)\LogFileViewer.exe" />
-        <Shortcut Id="LogFileViewerStartMenuShortcut" Name="Log File Viewer" Icon="LogFileViewer.ico.exe" Description="Tool used to analyze log files produced by the openHistorian." WorkingDirectory="INSTALLFOLDER" Directory="ApplicationProgramsFolder" Advertise="yes" />
+        <Shortcut Id="LogFileViewerStartMenuShortcut" Name="Log File Viewer" Icon="LogFileViewer.ico.exe" Description="Tool used to analyze log files produced by the openPDC." WorkingDirectory="INSTALLFOLDER" Directory="ApplicationProgramsFolder" Advertise="yes" />
       </Component>
     </ComponentGroup>
 

diff --git a/Source/Applications/openPDC/openPDCShell/Properties/AssemblyInfo.cs b/Source/Applications/openPDC/openPDCShell/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("2.4.118.0")]
-[assembly: AssemblyVersion("2.4.118.0")]
-[assembly: AssemblyFileVersion("2.4.118.0")]
+// [assembly: AssemblyVersion("2.4.119.0")]
+[assembly: AssemblyVersion("2.4.119.0")]
+[assembly: AssemblyFileVersion("2.4.119.0")]
diff --git a/Source/Applications/openPDC/openPDCShell/openPDCShell.csproj b/Source/Applications/openPDC/openPDCShell/openPDCShell.csproj
@@ -91,7 +91,7 @@
   <ItemGroup>
     <ProjectReference Include="..\openPDC\openPDC.csproj">
       <Project>{0bf2447e-252d-4712-b154-e350af463081}</Project>
-      <Name>openPDC %28Applications\openPDC\openPDC%29</Name>
+      <Name>openPDC</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Source/Applications/openPDCManager/Services/Properties/AssemblyInfo.cs b/Source/Applications/openPDCManager/Services/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("2.4.118.0")]
-[assembly: AssemblyVersion("2.4.118.0")]
-[assembly: AssemblyFileVersion("2.4.118.0")]
+// [assembly: AssemblyVersion("2.4.119.0")]
+[assembly: AssemblyVersion("2.4.119.0")]
+[assembly: AssemblyFileVersion("2.4.119.0")]
diff --git a/Source/Applications/openPDCManager/Silverlight/Properties/AssemblyInfo.cs b/Source/Applications/openPDCManager/Silverlight/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.4.118.0")]
-[assembly: AssemblyFileVersion("2.4.118.0")]
+[assembly: AssemblyVersion("2.4.119.0")]
+[assembly: AssemblyFileVersion("2.4.119.0")]
diff --git a/Source/Applications/openPDCManager/UserControls/Properties/AssemblyInfo.cs b/Source/Applications/openPDCManager/UserControls/Properties/AssemblyInfo.cs
@@ -50,6 +50,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("2.4.118.0")]
-[assembly: AssemblyVersion("2.4.118.0")]
+// [assembly: AssemblyVersion("2.4.119.0")]
+[assembly: AssemblyVersion("2.4.119.0")]
 [assembly: AssemblyFileVersion("1.3.11.58011${AfterVersion}]
diff --git a/Source/Applications/openPDCManager/WPF/Properties/AssemblyInfo.cs b/Source/Applications/openPDCManager/WPF/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@
 using System.Windows;
 
 // Assembly identity attributes.
-[assembly: AssemblyVersion("2.4.118.0")]
+[assembly: AssemblyVersion("2.4.119.0")]
 
 // Informational attributes.
 [assembly: AssemblyCompany("Grid Protection Alliance")]

diff --git a/Source/Applications/openPDCManager/Web/Properties/AssemblyInfo.cs b/Source/Applications/openPDCManager/Web/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.4.118.0")]
-[assembly: AssemblyFileVersion("2.4.118.0")]
+[assembly: AssemblyVersion("2.4.119.0")]
+[assembly: AssemblyFileVersion("2.4.119.0")]
diff --git a/Source/Applications/openPDCManager/openPDCManager/Properties/AssemblyInfo.cs b/Source/Applications/openPDCManager/openPDCManager/Properties/AssemblyInfo.cs
@@ -53,6 +53,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("2.4.118.0")]
-[assembly: AssemblyVersion("2.4.118.0")]
-[assembly: AssemblyFileVersion("2.4.118.0")]
+// [assembly: AssemblyVersion("2.4.119.0")]
+[assembly: AssemblyVersion("2.4.119.0")]
+[assembly: AssemblyFileVersion("2.4.119.0")]
diff --git a/Source/Documentation/OpenPDC_workItem9948_ReviewComments.xlsx b/Source/Documentation/OpenPDC_workItem9948_ReviewComments.xlsx
diff --git a/Source/Documentation/WorkItem_9948_Recent Exceptions.docx b/Source/Documentation/WorkItem_9948_Recent Exceptions.docx
diff --git a/Source/Documentation/WorkItem_9948_TestCases.xlsx b/Source/Documentation/WorkItem_9948_TestCases.xlsx
diff --git a/Source/Synchrophasor.sln b/Source/Synchrophasor.sln
@@ -49,6 +49,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		NOTICE.txt = NOTICE.txt
 		openPDC.snk = openPDC.snk
 		Synchrophasor.testrunconfig = Synchrophasor.testrunconfig
+		..\Build\Scripts\Synchrophasor.version = ..\Build\Scripts\Synchrophasor.version
 		Synchrophasor.vsmdi = Synchrophasor.vsmdi
 		Synchrophasor2.vsmdi = Synchrophasor2.vsmdi
 	EndProjectSection
@@ -278,6 +279,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WiX", "WiX", "{6CFC0EB9-861
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "openPDCShell", "Applications\openPDC\openPDCShell\openPDCShell.csproj", "{5D7F9600-E7F9-491C-AD0C-CECBA54F7083}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PostgreSQL", "PostgreSQL", "{73515839-30AD-40E6-809F-A891F2C95599}"
+	ProjectSection(SolutionItems) = preProject
+		Data\PostgreSQL\InitialDataSet.sql = Data\PostgreSQL\InitialDataSet.sql
+		Data\PostgreSQL\openPDC.sql = Data\PostgreSQL\openPDC.sql
+		Data\PostgreSQL\SampleDataSet.sql = Data\PostgreSQL\SampleDataSet.sql
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -500,6 +508,7 @@ Global
 		{6858B393-77B4-4F28-A4B1-14B484C10FB2} = {CE260396-797B-45DF-AC53-E4FC553B57C0}
 		{6CFC0EB9-8610-4200-806B-E2B62B63F8B3} = {A19659A8-EA00-4D5E-90C5-E8ABE7F4FB1C}
 		{5D7F9600-E7F9-491C-AD0C-CECBA54F7083} = {CE260396-797B-45DF-AC53-E4FC553B57C0}
+		{73515839-30AD-40E6-809F-A891F2C95599} = {E7006E3E-A430-4AB2-A6CA-7653D7F62D4B}
 	EndGlobalSection
 	GlobalSection(TestCaseManagementSettings) = postSolution
 		CategoryFile = Synchrophasor2.vsmdi

diff --git a/Source/Tools/ConfigurationSetupUtility/Properties/AssemblyInfo.cs b/Source/Tools/ConfigurationSetupUtility/Properties/AssemblyInfo.cs
@@ -50,6 +50,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("2.4.118.0")]
-[assembly: AssemblyVersion("2.4.118.0")]
-[assembly: AssemblyFileVersion("2.4.118.0")]
+// [assembly: AssemblyVersion("2.4.119.0")]
+[assembly: AssemblyVersion("2.4.119.0")]
+[assembly: AssemblyFileVersion("2.4.119.0")]
diff --git a/Source/Tools/MacrodyneController/Properties/AssemblyInfo.cs b/Source/Tools/MacrodyneController/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("2.4.118.0")]
-[assembly: AssemblyVersion("2.4.118.0")]
-[assembly: AssemblyFileVersion("2.4.118.0")]
+// [assembly: AssemblyVersion("2.4.119.0")]
+[assembly: AssemblyVersion("2.4.119.0")]
+[assembly: AssemblyFileVersion("2.4.119.0")]