Init dev

.github/ISSUE_TEMPLATE/development.md

@@ -0,0 +1,10 @@
+---
+name: Development
+about: Suggestion for improvement in development process
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+

.gitignore

@@ -27,6 +27,9 @@ bld/
 *.VisualState.xml
 TestResult.xml
 
+# dotnet test results
+*.trx
+
 # Build Results of an ATL Project
 [Dd]ebugPS/
 [Rr]eleasePS/
@@ -216,6 +219,12 @@ _Vortex/
 CompilerCache.md
 log.txt
 pal.txt
+_meta/
+_generated/
+*.g.cs
+*.lbz
+version.info
+*.plcproj.version.update
 
 # IVF Tools
 _toolz/
@@ -226,3 +235,4 @@ nugets/
 
 
 
+*.TcCD

README.md

@@ -5,7 +5,7 @@
 [![Open Source? Yes!](https://badgen.net/badge/Open%20Source%20%3F/Yes%21/blue?icon=github)](https://github.com/TcOpenGroup/TcOpen)
 [![TcOpen Slack ](https://img.shields.io/badge/Slack-channel-ff69b4.svg)](https://tcopendevelopment.slack.com/)
 [![Awesome Badges](https://img.shields.io/badge/badges-awesome-green.svg)](https://github.com/TcOpenGroup/TcOpen#awesome-twincat-3-projects-)
-![Azure DevOps builds (branch)](https://img.shields.io/azure-devops/build/petokurhajec0964/tc3/TcOpenGroup.TcOpen/dev)
+[![Build Status](https://dev.azure.com/petokurhajec0964/tc3/_apis/build/status/TcOpenGroup.TcOpen?branchName=dev)](https://dev.azure.com/petokurhajec0964/tc3/_build/latest?definitionId=6&branchName=dev)
 
 # TcOpen
 

TcOpen.build.slnf

@@ -2,6 +2,10 @@
   "solution": {
     "path": "TcOpen.sln",
     "projects": [
+      "src\\Tc.Prober\\src\\Tc.Prober\\Tc.Prober.csproj",
+      "src\\Tc.Prober\\tests\\PlcTcProberTestsConnector\\PlcTcProberTestsConnector.csproj",
+      "src\\Tc.Prober\\tests\\Tc.ProberTest\\Tc.ProberTest.csproj",
+      "src\\Tc.Prober\\tests\\TcProber\\TcProber.tsproj",    
       "src\\TcoCore\\src\\TcoCore.Wpf\\TcoCore.Wpf.csproj",
       "src\\TcoCore\\src\\TcoCoreConnector\\TcoCoreConnector.csproj",
       "src\\TcoCore\\src\\XaeTcoCore\\XaeTcoCore.tsproj",
@@ -14,8 +18,7 @@
       "src\\TcoIoBeckhoff\\src\\XaeTcoIoBeckhoff\\XaeTcoIoBeckhoff.tsproj",
       "src\\TcoPneumatics\\src\\TcoPneumatics.Wpf\\TcoPneumatics.Wpf.csproj",
       "src\\TcoPneumatics\\src\\TcoPneumaticsConnector\\TcoPneumaticsConnector.csproj",
-      "src\\TcoPneumatics\\src\\XaeTcoPneumatics\\XaeTcoPneumatics.tsproj",
-      "src\\TcoPneumatics\\tests\\Sandbox\\PlcOpen.Wpf.Sandbox\\TcoPneumatics.Wpf.Sandbox.csproj",
+      "src\\TcoPneumatics\\src\\XaeTcoPneumatics\\XaeTcoPneumatics.tsproj",      
       "src\\TcoPneumatics\\tests\\TcoPneumaticsTestsConnector\\TcoPneumaticsTestsConnector.csproj",
       "src\\TcoPneumatics\\tests\\TcoPneumaticsTests_nUnit\\TcoPneumaticsTests_nUnit.csproj"      
     ]

TcOpen.plc.slnf

@@ -2,6 +2,7 @@
   "solution": {
     "path": "TcOpen.sln",
     "projects": [   
+      "src\\Tc.Prober\\tests\\TcProber\\TcProber.tsproj",
       "src\\TcoCore\\src\\XaeTcoCore\\XaeTcoCore.tsproj",      
       "src\\TcoIoBeckhoff\\src\\XaeTcoIoBeckhoff\\XaeTcoIoBeckhoff.tsproj",      
       "src\\TcoPneumatics\\src\\XaeTcoPneumatics\\XaeTcoPneumatics.tsproj"      

ivc.ps1

@@ -0,0 +1,4 @@
+.\_Vortex\builder\vortex.compiler.console.exe -s  .\src\TcoCore\TcoCore.slnf
+.\_Vortex\builder\vortex.compiler.console.exe -s .\src\TcoIoBeckhoff\TcoIoBeckhoff.slnf
+.\_Vortex\builder\vortex.compiler.console.exe -s .\src\TcoPneumatics\TcoPneumatics.slnf
+.\_Vortex\builder\vortex.compiler.console.exe -s .\src\TcoApplicationExamples\TcoApplicationExamples.slnf

pipelines/azure-pipelines.yaml

@@ -6,9 +6,8 @@ queue:
 steps:
 - powershell : > 
     ./pipelines/runbuild.ps1 -properties @{     
-     "publishNugets"=$false;
+     "publishNugets"=$true;
      "updateAssemblyInfo" = $true;
-     "testTargetAmsId" = "172.20.10.2.1.1";
      "isTestingEnabled" = $true
      }   
   displayName: 'Psake build'
@@ -20,5 +19,5 @@ steps:
 - task: PublishTestResults@2
   inputs:
     testResultsFormat: 'NUnit'
-    testResultsFiles: '**/TEST-*.xml'
+    testResultsFiles: '**/*TEST*.xml'
     testRunTitle: 'TcoUnitTests'

pipelines/build.ps1

@@ -11,7 +11,8 @@
   $gitVersion
   $msbuild = '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\MSBuild\Current\Bin\MSBuild.exe"'
   $dotnet = '"C:\Program Files\dotnet\dotnet.exe"'
-  $testTargetAmsId = ""
+  $devenv = "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\Common7\IDE\devenv.com"
+  $testTargetAmsId = ([System.Environment]::GetEnvironmentVariable('Tc3Target'))
 }
 
 task default -depends CloseVs, Tests, CreatePackages, Finish
@@ -43,6 +44,8 @@ task Clean -depends Start {
   CleanObjBin
   RemoveTcBins
   RemoveTcProjBins
+  RemoveGenerated
+  RemoveMeta
   mkdir .\_Vortex\builder -ErrorAction SilentlyContinue 
   mkdir .\.nuget -ErrorAction SilentlyContinue 
   mkdir .\_toolz -ErrorAction SilentlyContinue 
@@ -52,18 +55,26 @@ task Clean -depends Start {
 
 task NugetRestore -depends Clean {
    EnsureNuget
-   $command = $msbuild + " -t:restore /p:Configuration=$buildConfig -v:$msbuildVerbosity /consoleloggerparameters:ErrorsOnly TcOpen.build.slnf"
+   # $command = $msbuild + " -t:restore /p:Configuration=$buildConfig -v:$msbuildVerbosity /consoleloggerparameters:ErrorsOnly TcOpen.build.slnf"
+   $command = $dotnet + " restore TcOpen.build.slnf"
+
    Write-Host $command
    exec{
        cmd /c $command
    }
 
-   # To Restore IVC into _Vortex directory
-   $command = $msbuild + " -v:$msbuildVerbosity /consoleloggerparameters:ErrorsOnly src\TcoCore\TcoCore.slnf"
-   Write-Host $command
-   exec{
-       cmd /c $command
-   }   
+   try {
+      # Try to Restore IVC into _Vortex directory
+      # May fail due to missing g.cs files
+      $command = $msbuild + " -v:$msbuildVerbosity /consoleloggerparameters:ErrorsOnly src\TcoCore\TcoCore.slnf"
+      Write-Host $command
+      cmd /c $command
+
+   }
+   catch {
+     # Swallow
+   }
+
 } 
 
 task GitVersion -depends NugetRestore {
@@ -90,11 +101,14 @@ task OpenVisualStudio -depends GitVersion {
   Start-Process .\TcOpen.plc.slnf
 }
 
+
 task BuildWithInxtonBuilder -depends OpenVisualStudio {
-  $projects = @(     
+  $projects = @(  
+     "src\Tc.Prober\Tc.Prober.slnf",   
      "src\TcoCore\TcoCore.slnf",
      "src\TcoIoBeckhoff\TcoIoBeckhoff.slnf",
      "src\TcoPneumatics\TcoPneumatics.slnf"
+     "src\TcoApplicationExamples\TcoApplicationExamples.slnf"
    )
 
    foreach($project in $projects)
@@ -127,24 +141,24 @@ task CloseVs -depends Build {
 
 task Tests -depends CloseVs  -precondition { return $isTestingEnabled } {
 
-  & "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\Common7\IDE\devenv.com" .\TcOpen.plc.slnf /Rebuild "$buildConfig|TwinCAT RT (x64)"
+  & $devenv .\TcOpen.plc.slnf /Rebuild "$buildConfig|TwinCAT RT (x64)"
 
   $BootDir = $solutionDir +"\src\TcoCore\src\XaeTcoCore\"
   .\pipelines\utils\Load-XaeProject.ps1 $testTargetAmsId $BootDir
   exec{   
-    dotnet test .\src\TcoCore\TcoCore.slnf -c $buildConfig -f net48 -v $msbuildVerbosity
+    dotnet test .\src\TcoCore\TcoCore.slnf -c $buildConfig -f net48 -v $msbuildVerbosity -l:"trx;LogFileName=TEST-TcoCore.xml"
   }
 
   $BootDir = $solutionDir +"\src\TcoIoBeckhoff\src\XaeTcoIoBeckhoff\"
   .\pipelines\utils\Load-XaeProject.ps1 $testTargetAmsId $BootDir
   exec{   
-    dotnet test .\src\TcoIoBeckhoff\TcoIoBeckhoff.slnf -c $buildConfig -f net48 -v $msbuildVerbosity
+    dotnet test .\src\TcoIoBeckhoff\TcoIoBeckhoff.slnf -c $buildConfig -f net48 -v $msbuildVerbosity -l:"trx;LogFileName=TEST-TcoIoBeckhoff.xml"
   }
 
   $BootDir = $solutionDir +"src\TcoPneumatics\src\XaeTcoPneumatics\"
   .\pipelines\utils\Load-XaeProject.ps1 $testTargetAmsId $BootDir
   exec{   
-    dotnet test .\src\TcoPneumatics\TcoPneumatics.slnf -c $buildConfig -f net48 -v $msbuildVerbosity
+    dotnet test .\src\TcoPneumatics\TcoPneumatics.slnf -c $buildConfig -f net48 -v $msbuildVerbosity -l:"trx;LogFileName=TEST-TcoPneumatics.xml"
   }
   .\pipelines\utils\CleanupTargetBoot.ps1 $testTargetAmsId
 
@@ -179,8 +193,7 @@ task CreatePackages -depends ClearPackages {
 }
 
 task PublishPackages -depends CreatePackages -precondition {return $publishNugets} {
-  Write-Host "About to"
-  PushNugets -folderWithNugets .\nugets\dependants -token $nugetToken -source $nugetSource
+  Write-Host "About to" 
   PushNugets -folderWithNugets .\nugets -token $nugetToken -source $nugetSource
 }
 

pipelines/tcobuildutils.psm1

@@ -198,6 +198,42 @@ function RemoveTcProjBins {
     }
 }
 
+function RemoveGenerated {
+    GetRootDirectoryOf "*.csproj" | ForEach-Object { 
+        Push-Location ($_)
+
+        $removeFolders = @( ".\_generated")
+        # $removeFolderContent = @(".\_meta\*", ".\_meta\*")
+
+        $folder = $_.Replace("Microsoft.PowerShell.Core\FileSystem::","")
+
+        foreach($item in ($removeFolders)){
+            Write-Host "In $folder trying to remove $item"
+            Remove-Item -r $item  -ErrorAction SilentlyContinue
+        }
+
+        Pop-Location
+    }
+}
+
+function RemoveMeta {
+    GetRootDirectoryOf "*.csproj" | ForEach-Object { 
+        Push-Location ($_)
+
+        $removeFolders = @( ".\_meta")
+        # $removeFolderContent = @(".\_meta\*", ".\_meta\*")
+
+        $folder = $_.Replace("Microsoft.PowerShell.Core\FileSystem::","")
+
+        foreach($item in ($removeFolders)){
+            Write-Host "In $folder trying to remove $item"
+            Remove-Item -r $item  -ErrorAction SilentlyContinue
+        }
+
+        Pop-Location
+    }
+}
+
 function GitVersionToPlcVersion{
     param($gitVersion)
     return $gitVersion.Major.ToString() + "." + $gitVersion.Minor.ToString() + "." + $gitVersion.Patch.ToString() + "." + $gitVersion.PreReleaseNumber.ToString()

src/Tc.Prober/Tc.Prober.slnf

@@ -0,0 +1,11 @@
+{
+  "solution": {
+    "path": "..\\..\\TcOpen.sln",
+    "projects": [
+      "src\\Tc.Prober\\src\\Tc.Prober\\Tc.Prober.csproj",
+      "src\\Tc.Prober\\tests\\PlcTcProberTestsConnector\\PlcTcProberTestsConnector.csproj",
+      "src\\Tc.Prober\\tests\\Tc.ProberTest\\Tc.ProberTest.csproj",
+      "src\\Tc.Prober\\tests\\TcProber\\TcProber.tsproj",    
+    ]
+  }
+}

src/Tc.Prober/src/Tc.Prober/Properties/AssemblyInfo.cs

@@ -0,0 +1,8 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly:InternalsVisibleTo("Tc.ProberTest")]
+[assembly: AssemblyVersion("0.1.0.0")]
+[assembly: AssemblyFileVersion("0.1.0.0")]
+[assembly: AssemblyInformationalVersion("0.1.0-init-dev.1+216.Branch.init-dev.Sha.f190c8bf3fa438c8ec80abb753b335c10ad7865f")]

src/Tc.Prober/src/Tc.Prober/Recorder/DummyRecorder.cs

@@ -0,0 +1,20 @@
+namespace Tc.Prober.Recorder
+{
+    internal class DummyRecorder : IRecorder
+    {
+        public void Act()
+        {
+
+        }
+
+        public void Begin(string fileName)
+        {
+
+        }
+
+        public void End(string fileName)
+        {
+
+        }
+    }
+}

src/Tc.Prober/src/Tc.Prober/Recorder/Graver.cs

@@ -0,0 +1,66 @@
+namespace Tc.Prober.Recorder
+{
+    using Newtonsoft.Json;
+    using System.IO;
+    using System.Linq;
+    using Vortex.Connector;
+
+    internal class Graver<T, P> : RecorderBase<T, P>, IRecorder where T : IVortexObject, new() where P : IPlain, new()
+    {
+        public Graver(T obj, long minUniqueFrames = 10) : base(obj)
+        {
+            MinUniqueFrames = minUniqueFrames;
+        }
+
+        private long MinUniqueFrames { get; }
+
+        public void Stop(string fileName)
+        {
+            var squashedRecording = Squash(this.recording);
+
+
+            if (squashedRecording.Frames.LongCount() < MinUniqueFrames)
+            {
+                throw new InsufficientNumberOfFramesException($"There is no sufficient number of unique frames recorded ('{squashedRecording.Frames.LongCount()}'). Minimum required number of frames is '{MinUniqueFrames}'. " +
+                                                              $"You can modify the value by setting 'minUniqueFrames' construction parameter.");
+            }
+
+            using (StreamWriter sw = new StreamWriter(fileName))
+            {
+                using (JsonWriter writer = new JsonTextWriter(sw))
+                {
+                    var serializer = new Newtonsoft.Json.JsonSerializer();
+                    serializer.Serialize(writer, squashedRecording);
+                }
+            }
+        }
+
+        private string FileName { get; }
+        private IValueTag Stamper { get; }
+
+        public void StartRecording()
+        {
+            recording.StartRecording();
+        }
+
+        public void RecordFrame()
+        {
+            recording.AddRecordFrame(new RecordFrame<P>() { Object = (P)GetPlainerCopyNow(Object) });
+        }
+
+        public void Begin(string fileName)
+        {
+            this.StartRecording();
+        }
+
+        public void Act()
+        {
+            this.RecordFrame();
+        }
+
+        public void End(string fileName)
+        {
+            this.Stop(fileName);
+        }
+    }
+}

src/Tc.Prober/src/Tc.Prober/Recorder/IRecorder.cs

@@ -0,0 +1,9 @@
+namespace Tc.Prober.Recorder
+{
+    public interface IRecorder
+    {
+        void Begin(string fileName);
+        void Act();
+        void End(string fileName);
+    }
+}

src/Tc.Prober/src/Tc.Prober/Recorder/InsufficientNumberOfFramesException.cs

@@ -0,0 +1,24 @@
+namespace Tc.Prober.Recorder
+{
+    using System;
+    using System.Runtime.Serialization;
+
+    public class InsufficientNumberOfFramesException : Exception
+    {
+        public InsufficientNumberOfFramesException()
+        {
+        }
+
+        public InsufficientNumberOfFramesException(string message) : base(message)
+        {
+        }
+
+        public InsufficientNumberOfFramesException(string message, Exception innerException) : base(message, innerException)
+        {
+        }
+
+        protected InsufficientNumberOfFramesException(SerializationInfo info, StreamingContext context) : base(info, context)
+        {
+        }
+    }
+}