Updated GSF dependencies.

GridProtectionAlliance · Jun 3, 2023 · ab34a66 · ab34a66
1 parent 38e3a26
commit ab34a66
Show file tree

Hide file tree

Showing 83 changed files with 7 additions and 1 deletion.
diff --git a/Build/Scripts/MasterBuild.buildproj b/Build/Scripts/MasterBuild.buildproj
@@ -115,6 +115,8 @@
     <ForceBuild>$(ForceBuild)</ForceBuild>
     <!-- Skips the versioning process and just executes build steps. -->
     <SkipVersioning>$(SkipVersioning)</SkipVersioning>
+    <!-- Pushes changes into a branch named after the version. -->
+    <PushToVersionBranch>$(PushToVersionBranch)</PushToVersionBranch>
     <!-- Prevents the build script from pushing to the remote repository. -->
     <DoNotPush>$(DoNotPush)</DoNotPush>
     <!--Executes build without running unit tests when true.-->
@@ -488,9 +490,13 @@
   <Target Name="BeforePushToServer"/>
 
   <Target Name="CorePushToServer" Condition="'$(DoNotPush)' == 'false' And '$(SkipVersioning)' != 'true'">
+    <PropertyGroup>
+      <RemoteBranch>$(GitBranch)</RemoteBranch>
+      <RemoteBranch Condition="'$(PushToVersionBranch)' == 'true'">$(BuildTag)</RemoteBranch>
+    </PropertyGroup>
     <!-- Commit all of the pending changes. -->
     <Message Text="Pushing changes to Git server..." />
-    <Exec Command="%22$(GitClient)%22 push origin $(GitBranch):$(GitBranch)" WorkingDirectory="$(LocalFolder)" ContinueOnError="true"  />
+    <Exec Command="%22$(GitClient)%22 push origin $(GitBranch):$(RemoteBranch)" WorkingDirectory="$(LocalFolder)" ContinueOnError="true"  />
   </Target>
 
   <Target Name="AfterPushToServer"/>

diff --git a/Source/Applications/PTPSync/PTPSyncSetup/CSVDataManager.exe b/Source/Applications/PTPSync/PTPSyncSetup/CSVDataManager.exe
diff --git a/Source/Applications/PTPSync/PTPSyncSetup/ConfigCrypter.exe b/Source/Applications/PTPSync/PTPSyncSetup/ConfigCrypter.exe
diff --git a/Source/Applications/PTPSync/PTPSyncSetup/ConfigurationEditor.exe b/Source/Applications/PTPSync/PTPSyncSetup/ConfigurationEditor.exe
diff --git a/Source/Applications/PTPSync/PTPSyncSetup/DNP3ConfigGenerator.exe b/Source/Applications/PTPSync/PTPSyncSetup/DNP3ConfigGenerator.exe
diff --git a/Source/Applications/PTPSync/PTPSyncSetup/DataMigrationUtility.exe b/Source/Applications/PTPSync/PTPSyncSetup/DataMigrationUtility.exe
diff --git a/Source/Applications/PTPSync/PTPSyncSetup/HistorianPlaybackUtility.exe b/Source/Applications/PTPSync/PTPSyncSetup/HistorianPlaybackUtility.exe
diff --git a/Source/Applications/PTPSync/PTPSyncSetup/HistorianView.exe b/Source/Applications/PTPSync/PTPSyncSetup/HistorianView.exe
diff --git a/Source/Applications/PTPSync/PTPSyncSetup/LogFileViewer.exe b/Source/Applications/PTPSync/PTPSyncSetup/LogFileViewer.exe
diff --git a/Source/Applications/PTPSync/PTPSyncSetup/NoInetFixUtil.exe b/Source/Applications/PTPSync/PTPSyncSetup/NoInetFixUtil.exe
diff --git a/Source/Applications/PTPSync/PTPSyncSetup/StatHistorianReportGenerator.exe b/Source/Applications/PTPSync/PTPSyncSetup/StatHistorianReportGenerator.exe
diff --git a/Source/Dependencies/GSF/AdoAdapters.dll b/Source/Dependencies/GSF/AdoAdapters.dll
diff --git a/Source/Dependencies/GSF/ArchivistAdapters.dll b/Source/Dependencies/GSF/ArchivistAdapters.dll
diff --git a/Source/Dependencies/GSF/AudioAdapters.dll b/Source/Dependencies/GSF/AudioAdapters.dll
diff --git a/Source/Dependencies/GSF/AzureEventHubAdapters.dll b/Source/Dependencies/GSF/AzureEventHubAdapters.dll
diff --git a/Source/Dependencies/GSF/COMTRADEAdapters.dll b/Source/Dependencies/GSF/COMTRADEAdapters.dll
diff --git a/Source/Dependencies/GSF/CsvAdapters.dll b/Source/Dependencies/GSF/CsvAdapters.dll
diff --git a/Source/Dependencies/GSF/DataQualityMonitoring.dll b/Source/Dependencies/GSF/DataQualityMonitoring.dll
diff --git a/Source/Dependencies/GSF/DeviceStatAdapters.dll b/Source/Dependencies/GSF/DeviceStatAdapters.dll
diff --git a/Source/Dependencies/GSF/Dnp3Adapters.dll b/Source/Dependencies/GSF/Dnp3Adapters.dll
diff --git a/Source/Dependencies/GSF/DynamicCalculator.dll b/Source/Dependencies/GSF/DynamicCalculator.dll
diff --git a/Source/Dependencies/GSF/EpriExport.dll b/Source/Dependencies/GSF/EpriExport.dll
diff --git a/Source/Dependencies/GSF/FileAdapters.dll b/Source/Dependencies/GSF/FileAdapters.dll
diff --git a/Source/Dependencies/GSF/FtpAdapters.dll b/Source/Dependencies/GSF/FtpAdapters.dll
diff --git a/Source/Dependencies/GSF/GSF.ASN1.dll b/Source/Dependencies/GSF/GSF.ASN1.dll
diff --git a/Source/Dependencies/GSF/GSF.COMTRADE.dll b/Source/Dependencies/GSF/GSF.COMTRADE.dll
diff --git a/Source/Dependencies/GSF/GSF.Communication.dll b/Source/Dependencies/GSF/GSF.Communication.dll
diff --git a/Source/Dependencies/GSF/GSF.Core.dll b/Source/Dependencies/GSF/GSF.Core.dll
diff --git a/Source/Dependencies/GSF/GSF.EMAX.dll b/Source/Dependencies/GSF/GSF.EMAX.dll
diff --git a/Source/Dependencies/GSF/GSF.Geo.dll b/Source/Dependencies/GSF/GSF.Geo.dll
diff --git a/Source/Dependencies/GSF/GSF.Historian.dll b/Source/Dependencies/GSF/GSF.Historian.dll
diff --git a/Source/Dependencies/GSF/GSF.InstallerActions.CA.dll b/Source/Dependencies/GSF/GSF.InstallerActions.CA.dll
diff --git a/Source/Dependencies/GSF/GSF.MMS.dll b/Source/Dependencies/GSF/GSF.MMS.dll
diff --git a/Source/Dependencies/GSF/GSF.Media.dll b/Source/Dependencies/GSF/GSF.Media.dll
diff --git a/Source/Dependencies/GSF/GSF.Net.dll b/Source/Dependencies/GSF/GSF.Net.dll
diff --git a/Source/Dependencies/GSF/GSF.PQDIF.dll b/Source/Dependencies/GSF/GSF.PQDIF.dll
diff --git a/Source/Dependencies/GSF/GSF.PQDS.dll b/Source/Dependencies/GSF/GSF.PQDS.dll
diff --git a/Source/Dependencies/GSF/GSF.PhasorProtocols.UI.WPF.dll b/Source/Dependencies/GSF/GSF.PhasorProtocols.UI.WPF.dll
diff --git a/Source/Dependencies/GSF/GSF.PhasorProtocols.UI.dll b/Source/Dependencies/GSF/GSF.PhasorProtocols.UI.dll
diff --git a/Source/Dependencies/GSF/GSF.PhasorProtocols.dll b/Source/Dependencies/GSF/GSF.PhasorProtocols.dll
diff --git a/Source/Dependencies/GSF/GSF.SELEventParser.dll b/Source/Dependencies/GSF/GSF.SELEventParser.dll
diff --git a/Source/Dependencies/GSF/GSF.Security.dll b/Source/Dependencies/GSF/GSF.Security.dll
diff --git a/Source/Dependencies/GSF/GSF.ServiceBus.dll b/Source/Dependencies/GSF/GSF.ServiceBus.dll
diff --git a/Source/Dependencies/GSF/GSF.ServiceModel.dll b/Source/Dependencies/GSF/GSF.ServiceModel.dll
diff --git a/Source/Dependencies/GSF/GSF.ServiceProcess.dll b/Source/Dependencies/GSF/GSF.ServiceProcess.dll
diff --git a/Source/Dependencies/GSF/GSF.TimeSeries.Transport.UI.WPF.dll b/Source/Dependencies/GSF/GSF.TimeSeries.Transport.UI.WPF.dll
diff --git a/Source/Dependencies/GSF/GSF.TimeSeries.Transport.UI.dll b/Source/Dependencies/GSF/GSF.TimeSeries.Transport.UI.dll
diff --git a/Source/Dependencies/GSF/GSF.TimeSeries.UI.WPF.dll b/Source/Dependencies/GSF/GSF.TimeSeries.UI.WPF.dll
diff --git a/Source/Dependencies/GSF/GSF.TimeSeries.UI.dll b/Source/Dependencies/GSF/GSF.TimeSeries.UI.dll
diff --git a/Source/Dependencies/GSF/GSF.TimeSeries.dll b/Source/Dependencies/GSF/GSF.TimeSeries.dll
diff --git a/Source/Dependencies/GSF/GSF.Web.dll b/Source/Dependencies/GSF/GSF.Web.dll
diff --git a/Source/Dependencies/GSF/GSF.Windows.dll b/Source/Dependencies/GSF/GSF.Windows.dll
diff --git a/Source/Dependencies/GSF/GrafanaAdapters.dll b/Source/Dependencies/GSF/GrafanaAdapters.dll
diff --git a/Source/Dependencies/GSF/Hadoop.Replication.dll b/Source/Dependencies/GSF/Hadoop.Replication.dll
diff --git a/Source/Dependencies/GSF/HistorianAdapters.dll b/Source/Dependencies/GSF/HistorianAdapters.dll
diff --git a/Source/Dependencies/GSF/ICCPExport.dll b/Source/Dependencies/GSF/ICCPExport.dll
diff --git a/Source/Dependencies/GSF/InfluxDBAdapters.dll b/Source/Dependencies/GSF/InfluxDBAdapters.dll
diff --git a/Source/Dependencies/GSF/KafkaAdapters.dll b/Source/Dependencies/GSF/KafkaAdapters.dll
diff --git a/Source/Dependencies/GSF/MetadataAdapters.dll b/Source/Dependencies/GSF/MetadataAdapters.dll
diff --git a/Source/Dependencies/GSF/ModbusAdapters.dll b/Source/Dependencies/GSF/ModbusAdapters.dll
diff --git a/Source/Dependencies/GSF/MongoAdapters.dll b/Source/Dependencies/GSF/MongoAdapters.dll
diff --git a/Source/Dependencies/GSF/MySqlAdapters.dll b/Source/Dependencies/GSF/MySqlAdapters.dll
diff --git a/Source/Dependencies/GSF/OneSecondFrequencyAverager.dll b/Source/Dependencies/GSF/OneSecondFrequencyAverager.dll
diff --git a/Source/Dependencies/GSF/PIAdapters.dll b/Source/Dependencies/GSF/PIAdapters.dll
diff --git a/Source/Dependencies/GSF/PhasorProtocolAdapters.dll b/Source/Dependencies/GSF/PhasorProtocolAdapters.dll
diff --git a/Source/Dependencies/GSF/PhasorWebUI.dll b/Source/Dependencies/GSF/PhasorWebUI.dll
diff --git a/Source/Dependencies/GSF/PowerCalculations.UI.WPF.dll b/Source/Dependencies/GSF/PowerCalculations.UI.WPF.dll
diff --git a/Source/Dependencies/GSF/PowerCalculations.UI.dll b/Source/Dependencies/GSF/PowerCalculations.UI.dll
diff --git a/Source/Dependencies/GSF/PowerCalculations.dll b/Source/Dependencies/GSF/PowerCalculations.dll
diff --git a/Source/Dependencies/GSF/SqlClr/GSF.Core.SqlClr.dll b/Source/Dependencies/GSF/SqlClr/GSF.Core.SqlClr.dll
diff --git a/Source/Dependencies/GSF/TestingAdapters.dll b/Source/Dependencies/GSF/TestingAdapters.dll
diff --git a/Source/Dependencies/GSF/ValidateAssemblyBindings.exe b/Source/Dependencies/GSF/ValidateAssemblyBindings.exe
diff --git a/Source/Dependencies/GSF/WavInputAdapter.dll b/Source/Dependencies/GSF/WavInputAdapter.dll
diff --git a/Source/Dependencies/GSF/eDNAAdapters.dll b/Source/Dependencies/GSF/eDNAAdapters.dll
diff --git a/Source/Dependencies/GSF/en/GSF.PhasorProtocols.UI.WPF.resources.dll b/Source/Dependencies/GSF/en/GSF.PhasorProtocols.UI.WPF.resources.dll
diff --git a/Source/Dependencies/GSF/en/GSF.TimeSeries.Transport.UI.WPF.resources.dll b/Source/Dependencies/GSF/en/GSF.TimeSeries.Transport.UI.WPF.resources.dll
diff --git a/Source/Dependencies/GSF/en/GSF.TimeSeries.UI.WPF.resources.dll b/Source/Dependencies/GSF/en/GSF.TimeSeries.UI.WPF.resources.dll
diff --git a/Source/Dependencies/GSF/es/GSF.PhasorProtocols.UI.WPF.resources.dll b/Source/Dependencies/GSF/es/GSF.PhasorProtocols.UI.WPF.resources.dll
diff --git a/Source/Dependencies/GSF/es/GSF.TimeSeries.Transport.UI.WPF.resources.dll b/Source/Dependencies/GSF/es/GSF.TimeSeries.Transport.UI.WPF.resources.dll
diff --git a/Source/Dependencies/GSF/es/GSF.TimeSeries.UI.WPF.resources.dll b/Source/Dependencies/GSF/es/GSF.TimeSeries.UI.WPF.resources.dll
diff --git a/Source/Dependencies/GSF/zh/GSF.PhasorProtocols.UI.WPF.resources.dll b/Source/Dependencies/GSF/zh/GSF.PhasorProtocols.UI.WPF.resources.dll
diff --git a/Source/Dependencies/GSF/zh/GSF.TimeSeries.Transport.UI.WPF.resources.dll b/Source/Dependencies/GSF/zh/GSF.TimeSeries.Transport.UI.WPF.resources.dll
diff --git a/Source/Dependencies/GSF/zh/GSF.TimeSeries.UI.WPF.resources.dll b/Source/Dependencies/GSF/zh/GSF.TimeSeries.UI.WPF.resources.dll