Skip to content

Commit

Permalink
Merge branch 'master' into GenDocsGtLtFix
Browse files Browse the repository at this point in the history
  • Loading branch information
ritchiecarroll authored Dec 21, 2024
2 parents a62e946 + 12a2b68 commit 092f638
Show file tree
Hide file tree
Showing 124 changed files with 515 additions and 408 deletions.
103 changes: 103 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"

on:
push:
branches: [ "master" ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ "master" ]
schedule:
- cron: '18 17 * * 5'

jobs:
analyze:
name: Analyze
runs-on: windows-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'csharp' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support

steps:
- name: Checkout repository
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality

- name: Install .NET Framework 4.6
# Install all (latest) SDKs which are used by multi framework projects
run: choco install dotnet4.6

- name: Install .NET Framework 4.6.1 Targeting Pack
run: |
# Install all (latest) SDKs which are used by multi framework projects
Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\"
$InstallPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
$componentsToAdd = @(
"Microsoft.Net.Component.4.6.1.TargetingPack"
)
[string]$workloadArgs = $componentsToAdd | ForEach-Object {" --add " + $_}
$Arguments = ('/c', "vs_installer.exe", 'modify', '--installPath', "`"$InstallPath`"",$workloadArgs, '--quiet', '--norestart', '--nocache')
$process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden
if ($process.ExitCode -eq 0)
{
Write-Host "components have been successfully added"
}
else
{
Write-Host "components were not installed"
exit 1
}
- name: Install .NET Framework 4.6.1
# Install all (latest) SDKs which are used by multi framework projects
run: choco install dotnet4.6.1

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
# - name: Autobuild
# uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.

- name: Setup msbuild
uses: microsoft/[email protected]

- name: Build Grid Solutions Framework
run: |
msbuild Source/GridSolutionsFramework.sln -t:restore,build -p:Configuration=Debug -p:RestorePackagesConfig=true -p:UseSharedCompilation=false -p:PostBuildEvent=
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
2 changes: 1 addition & 1 deletion Build/Scripts/GridSolutionsFramework.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.216.0
2.4.217.0
35 changes: 18 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

### NEW: The GSF libraries are being migrated to .NET Core as the [Gemstone Libraries](https://github.com/gemstone)

[<img src ="https://github.com/gemstone/gemtem/raw/master/docs/img/gemstone-wide-600.png" width="300" height="66" align="right">](https://github.com/gemstone)
Expand All @@ -14,23 +15,23 @@ _**NOTE:** GSF now targets .NET 4.8, any dependent application will need to migr

| Library | Latest Version |
| ------- | --------------- |
| [GSF.Core](https://www.gridprotectionalliance.org/NightlyBuilds/GridSolutionsFramework/Help/html/R_Project_GridSolutionsFramework.htm) | [![NuGet Pre-release](https://buildstats.info/nuget/GSF.Core?includePreReleases=true)](https://www.nuget.org/packages/GSF.Core/) |
| [GSF.Communication](https://www.gridprotectionalliance.org/NightlyBuilds/GridSolutionsFramework/Help/html/N_GSF_Communication.htm) | [![NuGet Pre-release](https://buildstats.info/nuget/GSF.Communication?includePreReleases=true)](https://www.nuget.org/packages/GSF.Communication/) |
| [GSF.Security](https://www.gridprotectionalliance.org/NightlyBuilds/GridSolutionsFramework/Help/html/N_GSF_Security.htm) | [![NuGet Pre-release](https://buildstats.info/nuget/GSF.Security?includePreReleases=true)](https://www.nuget.org/packages/GSF.Security/) |
| [GSF.ServiceProcess](https://www.gridprotectionalliance.org/NightlyBuilds/GridSolutionsFramework/Help/html/N_GSF_ServiceProcess.htm) | [![NuGet Pre-release](https://buildstats.info/nuget/GSF.ServiceProcess?includePreReleases=true)](https://www.nuget.org/packages/GSF.ServiceProcess/) |
| [GSF.TimeSeries](https://www.gridprotectionalliance.org/NightlyBuilds/GridSolutionsFramework/Help/html/R_Project_GridSolutionsFramework.htm) | [![NuGet Pre-release](https://buildstats.info/nuget/GSF.TimeSeries?includePreReleases=true)](https://www.nuget.org/packages/GSF.TimeSeries/) |
| [GSF.Web](https://www.gridprotectionalliance.org/NightlyBuilds/GridSolutionsFramework/Help/html/R_Project_GridSolutionsFramework.htm) | [![NuGet Pre-release](https://buildstats.info/nuget/GSF.Web?includePreReleases=true)](https://www.nuget.org/packages/GSF.Web/) |
| [GSF.Windows](https://www.gridprotectionalliance.org/NightlyBuilds/GridSolutionsFramework/Help/html/N_GSF_Windows.htm) | [![NuGet Pre-release](https://buildstats.info/nuget/GSF.Windows?includePreReleases=true)](https://www.nuget.org/packages/GSF.Windows/) |
| [GSF.Net](https://www.gridprotectionalliance.org/NightlyBuilds/GridSolutionsFramework/Help/html/R_Project_GridSolutionsFramework.htm) | [![NuGet Pre-release](https://buildstats.info/nuget/GSF.Net?includePreReleases=true)](https://www.nuget.org/packages/GSF.Net/) |
| [GSF.Media](https://www.gridprotectionalliance.org/NightlyBuilds/GridSolutionsFramework/Help/html/R_Project_GridSolutionsFramework.htm) | [![NuGet Pre-release](https://buildstats.info/nuget/GSF.Media?includePreReleases=true)](https://www.nuget.org/packages/GSF.Media/) |
| [GSF.Historian](https://www.gridprotectionalliance.org/NightlyBuilds/GridSolutionsFramework/Help/html/R_Project_GridSolutionsFramework.htm) | [![NuGet Pre-release](https://buildstats.info/nuget/GSF.Historian?includePreReleases=true)](https://www.nuget.org/packages/GSF.Historian/) |
| [GSF.PhasorProtocols](https://www.gridprotectionalliance.org/NightlyBuilds/GridSolutionsFramework/Help/html/R_Project_GridSolutionsFramework.htm) | [![NuGet Pre-release](https://buildstats.info/nuget/GSF.PhasorProtocols?includePreReleases=true)](https://www.nuget.org/packages/GSF.PhasorProtocols/) |
| [GSF.COMRADE](https://www.gridprotectionalliance.org/NightlyBuilds/GridSolutionsFramework/Help/html/N_GSF_COMTRADE.htm) | [![NuGet Pre-release](https://buildstats.info/nuget/GSF.COMTRADE?includePreReleases=true)](https://www.nuget.org/packages/GSF.COMTRADE/) |
| [GSF.PQDIF](https://www.gridprotectionalliance.org/NightlyBuilds/GridSolutionsFramework/Help/html/R_Project_GridSolutionsFramework.htm) | [![NuGet Pre-release](https://buildstats.info/nuget/GSF.PQDIF?includePreReleases=true)](https://www.nuget.org/packages/GSF.PQDIF/) |
| [GSF.SELEventParser](https://www.gridprotectionalliance.org/NightlyBuilds/GridSolutionsFramework/Help/html/N_GSF_SELEventParser.htm) | [![NuGet Pre-release](https://buildstats.info/nuget/GSF.SELEventParser?includePreReleases=true)](https://www.nuget.org/packages/GSF.SELEventParser/) |
| [GSF.EMAX](https://www.gridprotectionalliance.org/NightlyBuilds/GridSolutionsFramework/Help/html/N_GSF_EMAX.htm) | [![NuGet Pre-release](https://buildstats.info/nuget/GSF.EMAX?includePreReleases=true)](https://www.nuget.org/packages/GSF.EMAX/) |
| [GSF.ServiceModel](https://www.gridprotectionalliance.org/NightlyBuilds/GridSolutionsFramework/Help/html/N_GSF_ServiceModel.htm) | [![NuGet Pre-release](https://buildstats.info/nuget/GSF.ServiceModel?includePreReleases=true)](https://www.nuget.org/packages/GSF.ServiceModel/) |
| [GSF.ServiceBus](https://www.gridprotectionalliance.org/NightlyBuilds/GridSolutionsFramework/Help/html/N_GSF_ServiceBus.htm) | [![NuGet Pre-release](https://buildstats.info/nuget/GSF.ServiceBus?includePreReleases=true)](https://www.nuget.org/packages/GSF.ServiceBus/) |
| [GSF.Core](https://www.gridprotectionalliance.org/NightlyBuilds/GridSolutionsFramework/Help/html/R_Project_GridSolutionsFramework.htm) | [![NuGet Version](https://img.shields.io/nuget/vpre/GSF.Core)](https://www.nuget.org/packages/GSF.Core/) |
| [GSF.Communication](https://www.gridprotectionalliance.org/NightlyBuilds/GridSolutionsFramework/Help/html/N_GSF_Communication.htm) | [![NuGet Version](https://img.shields.io/nuget/vpre/GSF.Communication)](https://www.nuget.org/packages/GSF.Communication/) |
| [GSF.Security](https://www.gridprotectionalliance.org/NightlyBuilds/GridSolutionsFramework/Help/html/N_GSF_Security.htm) | [![NuGet Version](https://img.shields.io/nuget/vpre/GSF.Security)](https://www.nuget.org/packages/GSF.Security/) |
| [GSF.ServiceProcess](https://www.gridprotectionalliance.org/NightlyBuilds/GridSolutionsFramework/Help/html/N_GSF_ServiceProcess.htm) | [![NuGet Version](https://img.shields.io/nuget/vpre/GSF.ServiceProcess)](https://www.nuget.org/packages/GSF.ServiceProcess/) |
| [GSF.TimeSeries](https://www.gridprotectionalliance.org/NightlyBuilds/GridSolutionsFramework/Help/html/R_Project_GridSolutionsFramework.htm) | [![NuGet Version](https://img.shields.io/nuget/vpre/GSF.TimeSeries)](https://www.nuget.org/packages/GSF.TimeSeries/) |
| [GSF.Web](https://www.gridprotectionalliance.org/NightlyBuilds/GridSolutionsFramework/Help/html/R_Project_GridSolutionsFramework.htm) | [![NuGet Version](https://img.shields.io/nuget/vpre/GSF.Web)](https://www.nuget.org/packages/GSF.Web/) |
| [GSF.Windows](https://www.gridprotectionalliance.org/NightlyBuilds/GridSolutionsFramework/Help/html/N_GSF_Windows.htm) | [![NuGet Version](https://img.shields.io/nuget/vpre/GSF.Windows)](https://www.nuget.org/packages/GSF.Windows/) |
| [GSF.Net](https://www.gridprotectionalliance.org/NightlyBuilds/GridSolutionsFramework/Help/html/R_Project_GridSolutionsFramework.htm) | [![NuGet Version](https://img.shields.io/nuget/vpre/GSF.Net)](https://www.nuget.org/packages/GSF.Net/) |
| [GSF.Media](https://www.gridprotectionalliance.org/NightlyBuilds/GridSolutionsFramework/Help/html/R_Project_GridSolutionsFramework.htm) | [![NuGet Version](https://img.shields.io/nuget/vpre/GSF.Media)](https://www.nuget.org/packages/GSF.Media/) |
| [GSF.Historian](https://www.gridprotectionalliance.org/NightlyBuilds/GridSolutionsFramework/Help/html/R_Project_GridSolutionsFramework.htm) | [![NuGet Version](https://img.shields.io/nuget/vpre/GSF.Historian)](https://www.nuget.org/packages/GSF.Historian/) |
| [GSF.PhasorProtocols](https://www.gridprotectionalliance.org/NightlyBuilds/GridSolutionsFramework/Help/html/R_Project_GridSolutionsFramework.htm) | [![NuGet Version](https://img.shields.io/nuget/vpre/GSF.PhasorProtocols)](https://www.nuget.org/packages/GSF.PhasorProtocols/) |
| [GSF.COMRADE](https://www.gridprotectionalliance.org/NightlyBuilds/GridSolutionsFramework/Help/html/N_GSF_COMTRADE.htm) | [![NuGet Version](https://img.shields.io/nuget/vpre/GSF.COMTRADE)](https://www.nuget.org/packages/GSF.COMTRADE/) |
| [GSF.PQDIF](https://www.gridprotectionalliance.org/NightlyBuilds/GridSolutionsFramework/Help/html/R_Project_GridSolutionsFramework.htm) | [![NuGet Version](https://img.shields.io/nuget/vpre/GSF.PQDIF)](https://www.nuget.org/packages/GSF.PQDIF/) |
| [GSF.SELEventParser](https://www.gridprotectionalliance.org/NightlyBuilds/GridSolutionsFramework/Help/html/N_GSF_SELEventParser.htm) | [![NuGet Version](https://img.shields.io/nuget/vpre/GSF.SELEventParser)](https://www.nuget.org/packages/GSF.SELEventParser/) |
| [GSF.EMAX](https://www.gridprotectionalliance.org/NightlyBuilds/GridSolutionsFramework/Help/html/N_GSF_EMAX.htm) | [![NuGet Version](https://img.shields.io/nuget/vpre/GSF.EMAX)](https://www.nuget.org/packages/GSF.EMAX/) |
| [GSF.ServiceModel](https://www.gridprotectionalliance.org/NightlyBuilds/GridSolutionsFramework/Help/html/N_GSF_ServiceModel.htm) | [![NuGet Version](https://img.shields.io/nuget/vpre/GSF.ServiceModel)](https://www.nuget.org/packages/GSF.ServiceModel/) |
| [GSF.ServiceBus](https://www.gridprotectionalliance.org/NightlyBuilds/GridSolutionsFramework/Help/html/N_GSF_ServiceBus.htm) | [![NuGet Version](https://img.shields.io/nuget/vpre/GSF.ServiceBus)](https://www.nuget.org/packages/GSF.ServiceBus/) |

[Time-series Application Components](http://www.gridprotectionalliance.org/docs/products/gsf/tsl-components-2015.pdf)

Expand Down
4 changes: 2 additions & 2 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

The Grid Protection Alliance (GPA) takes the security of our software products and services seriously. This includes all source code repositories managed through our GitHub organizational sites, specifically: [Grid Protection Alliance](https://github.com/GridProtectionAlliance), [Gemstone Libraries](https://github.com/gemstone), and [Streaming Telemetry Transport Protocol](https://github.com/sttp).

GPA has adopted the following "[definition of security vulnerability](https://gridprotectionalliance.org/VulnerabilityDefinition.asp)" when considering what constitutes a security vulnerability. If you believe you have found a security vulnerability meeting this definition in any GPA-owned repository, please report it to us as described below.
GPA has adopted the following "[definition of security vulnerability](https://gridprotectionalliance.org/VulnerabilityDefinition.html)" when considering what constitutes a security vulnerability. If you believe you have found a security vulnerability meeting this definition in any GPA-owned repository, please report it to us as described below.

## Reporting Security Issues

Expand All @@ -28,4 +28,4 @@ We prefer all communications to be in English.

## Policy

The Grid Protection Alliance follows the principle of [Coordinated Vulnerability Disclosure](https://gridprotectionalliance.org/cvd.asp).
The Grid Protection Alliance follows the principle of [Coordinated Vulnerability Disclosure](https://gridprotectionalliance.org/CVD.html).
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,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.216.0")]
[assembly: AssemblyVersion("2.4.216.0")]
[assembly: AssemblyInformationalVersion("2.4.216-beta")]
// [assembly: AssemblyVersion("2.4.217.0")]
[assembly: AssemblyVersion("2.4.217.0")]
[assembly: AssemblyInformationalVersion("2.4.217-beta")]
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
//
// 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.216.0")]
[assembly: AssemblyVersion("2.4.216.0")]
[assembly: AssemblyInformationalVersion("2.4.216-beta")]
// [assembly: AssemblyVersion("2.4.217.0")]
[assembly: AssemblyVersion("2.4.217.0")]
[assembly: AssemblyInformationalVersion("2.4.217-beta")]

6 changes: 3 additions & 3 deletions Source/Applications/GEPLoadTest/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
//
// 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.216.0")]
[assembly: AssemblyVersion("2.4.216.0")]
[assembly: AssemblyInformationalVersion("2.4.216-beta")]
// [assembly: AssemblyVersion("2.4.217.0")]
[assembly: AssemblyVersion("2.4.217.0")]
[assembly: AssemblyInformationalVersion("2.4.217-beta")]

8 changes: 4 additions & 4 deletions Source/Applications/LibraryTester/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
//
// 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.216.0")]
[assembly: AssemblyVersion("2.4.216.0")]
[assembly: AssemblyFileVersion("2.4.216.0")]
[assembly: AssemblyInformationalVersion("2.4.216-beta")]
// [assembly: AssemblyVersion("2.4.217.0")]
[assembly: AssemblyVersion("2.4.217.0")]
[assembly: AssemblyFileVersion("2.4.217.0")]
[assembly: AssemblyInformationalVersion("2.4.217-beta")]
8 changes: 4 additions & 4 deletions Source/Applications/TsfManager/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
//
// 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.216.0")]
[assembly: AssemblyVersion("2.4.216.0")]
[assembly: AssemblyFileVersion("2.4.216.0")]
[assembly: AssemblyInformationalVersion("2.4.216-beta")]
// [assembly: AssemblyVersion("2.4.217.0")]
[assembly: AssemblyVersion("2.4.217.0")]
[assembly: AssemblyFileVersion("2.4.217.0")]
[assembly: AssemblyInformationalVersion("2.4.217-beta")]
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
//
// 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.216.0")]
[assembly: AssemblyVersion("2.4.216.0")]
[assembly: AssemblyFileVersion("2.4.216.0")]
[assembly: AssemblyInformationalVersion("2.4.216-beta")]
// [assembly: AssemblyVersion("2.4.217.0")]
[assembly: AssemblyVersion("2.4.217.0")]
[assembly: AssemblyFileVersion("2.4.217.0")]
[assembly: AssemblyInformationalVersion("2.4.217-beta")]
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
//
// 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.216.0")]
[assembly: AssemblyVersion("2.4.216.0")]
[assembly: AssemblyFileVersion("2.4.216.0")]
[assembly: AssemblyInformationalVersion("2.4.216-beta")]
// [assembly: AssemblyVersion("2.4.217.0")]
[assembly: AssemblyVersion("2.4.217.0")]
[assembly: AssemblyFileVersion("2.4.217.0")]
[assembly: AssemblyInformationalVersion("2.4.217-beta")]
6 changes: 3 additions & 3 deletions Source/Extensions/GPAVSExtension/My Project/AssemblyInfo.vb
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ Imports System.Runtime.InteropServices
'
' 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.216.0")]
<Assembly: AssemblyVersion("2.4.216.0")>
<Assembly: AssemblyFileVersion("2.4.216.0")>
' [assembly: AssemblyVersion("2.4.217.0")]
<Assembly: AssemblyVersion("2.4.217.0")>
<Assembly: AssemblyFileVersion("2.4.217.0")>
6 changes: 3 additions & 3 deletions Source/Extensions/GPAVSExtension64/My Project/AssemblyInfo.vb
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ Imports System.Runtime.InteropServices
'
' 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.216.0")]
<Assembly: AssemblyVersion("2.4.216.0")>
<Assembly: AssemblyFileVersion("2.4.216.0")>
' [assembly: AssemblyVersion("2.4.217.0")]
<Assembly: AssemblyVersion("2.4.217.0")>
<Assembly: AssemblyFileVersion("2.4.217.0")>
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
//
// 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.216.0")]
[assembly: AssemblyVersion("2.4.216.0")]
[assembly: AssemblyFileVersion("2.4.216.0")]
[assembly: AssemblyInformationalVersion("2.4.216-beta")]
// [assembly: AssemblyVersion("2.4.217.0")]
[assembly: AssemblyVersion("2.4.217.0")]
[assembly: AssemblyFileVersion("2.4.217.0")]
[assembly: AssemblyInformationalVersion("2.4.217-beta")]
Loading

0 comments on commit 092f638

Please sign in to comment.