Skip to content
This repository was archived by the owner on Mar 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified _Vortex/builder/uvn.exe
Binary file not shown.
34 changes: 7 additions & 27 deletions pipelines/azure-pipelines.yaml
Original file line number Diff line number Diff line change
@@ -1,33 +1,13 @@
resources:
resources:
- repo: self
queue:
name: InxtonPlcBound105
name: selfhosted@mua

steps:
- powershell : >
./pipeline/runbuild.ps1 -properties @{
"msbuild"="`"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild.exe`"";
"nugetToken"="$(AzureNugetToken)";
"publishNugets"=$true;
"updateAssemblyInfo" = $true
"testTargetAmsId" = "172.20.10.105.1.1"
./pipelines/runbuild.ps1 -properties @{
"publishNugets"=$false;
"updateAssemblyInfo" = $true;
"testTargetAmsId" = "172.20.10.2.1.1"
}
displayName: 'Psake build'

- task: PublishBuildArtifacts@1
inputs:
pathtoPublish: .\nugets
artifactName: artifacts_mts
displayName: 'Publish artifacts mts'

- task: PublishBuildArtifacts@1
inputs:
pathtoPublish: .\releaseArtifacts
artifactName: artifacts
displayName: 'Publish artifacts release'

- task: PublishBuildArtifacts@1
inputs:
pathtoPublish: .\pipeline
artifactName: pipeline
displayName: 'Publish pipeline_utils'
displayName: 'Psake build'
19 changes: 18 additions & 1 deletion pipelines/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,32 @@ task NugetRestore -depends Clean {
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
}
}

task GitVersion -depends NugetRestore {
EnsureGitVersion -pathToGitVersion ".\_toolz\gitversion.exe"
$updateAssemblyInfoFlag = if( $updateAssemblyInfo) {"/updateassemblyinfo"} else {""}
$updateAssemblyInfoFlag
$script:gitVersion = & ".\_toolz\gitversion.exe" "$updateAssemblyInfoFlag" "/nofetch" "/config" "$baseDir" | ConvertFrom-Json
$buildNumber =$script:gitVersion.SemVer
Write-Host "##vso[build.updatebuildnumber]$buildNumber"
$plcversion = $script:gitVersion.Major.ToString() + "." + $script:gitVersion.Minor.ToString() + "." + $script:gitVersion.Patch.ToString() +"." + $script:gitVersion.PreReleaseNumber.ToString()

if($script:gitVersion.BuildMetaData -ne "")
{
$v = $script:gitVersion.BuildMetaData.ToString();
}
else
{
$v = $script:gitVersion.PreReleaseNumber.ToString();
}
$plcversion = $script:gitVersion.Major.ToString() + "." + $script:gitVersion.Minor.ToString() + "." + $script:gitVersion.Patch.ToString() +"." + $v
if($updateAssemblyInfo) {.\_Vortex\builder\uvn.exe -v $plcversion}
}

Expand Down
2 changes: 1 addition & 1 deletion src/TcoCore/src/TcoCore.Wpf/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
[assembly:Vortex.Presentation.Wpf.RenderableAssembly()]
[assembly: AssemblyVersion("0.1.0.0")]
[assembly: AssemblyFileVersion("0.1.0.0")]
[assembly: AssemblyInformationalVersion("0.1.0-alpha.91+Branch.dev.Sha.c92e0e9bfa0ff496865612b2535896dee8e930ff")]
[assembly: AssemblyInformationalVersion("0.1.0-azure-pipelines.1+106.Branch.azure-pipelines.Sha.159aa5a1b7c560de94178a2c001121326d3502e6")]
4 changes: 2 additions & 2 deletions src/TcoCore/src/TcoCoreConnector/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System.Reflection;
using System.Reflection;

[assembly: AssemblyVersion("0.1.0.0")]
[assembly: AssemblyFileVersion("0.1.0.0")]
[assembly: AssemblyInformationalVersion("0.1.0-alpha.91+Branch.dev.Sha.c92e0e9bfa0ff496865612b2535896dee8e930ff")]
[assembly: AssemblyInformationalVersion("0.1.0-azure-pipelines.1+106.Branch.azure-pipelines.Sha.159aa5a1b7c560de94178a2c001121326d3502e6")]
6 changes: 2 additions & 4 deletions src/TcoCore/src/TcoCoreConnector/TcoCoreConnector.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Inxton.Package.Vortex.Essentials" Version="1.9.1-alpha.37" />
<PackageReference Include="Inxton.vortex.compiler.console" Version="1.9.1-alpha.37" />
</ItemGroup>
<ItemGroup>
<Compile Update="Properties\Localizations.Designer.cs">
Expand All @@ -21,7 +22,4 @@
<LastGenOutput>Localizations.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
<Exec Command="$(SolutionDir)_Vortex\builder\vortex.compiler.console.exe -s $(SolutionDir)tco.core\tco.core.slnf" />
</Target>
</Project>
</Project>
2 changes: 1 addition & 1 deletion src/TcoCore/src/TcoCoreConnector/_meta/version.info
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.0.91
0.1.0.106
2 changes: 1 addition & 1 deletion src/TcoCore/src/XaeTcoCore/TcoCore/TcoCore.plcproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<Company>Vortex.Library</Company>
<Released>false</Released>
<Title>TcoCore</Title>
<ProjectVersion>0.1.0.91</ProjectVersion>
<ProjectVersion>0.1.0.106</ProjectVersion>
<DefaultNamespace>TcoCore</DefaultNamespace>
<Placeholder>TcoCore</Placeholder>
<Author>Inxton</Author>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<Company>Vortex.Library</Company>
<Released>false</Released>
<Title>TcoCore</Title>
<ProjectVersion>0.1.0.91</ProjectVersion>
<ProjectVersion>0.1.0.106</ProjectVersion>
<DefaultNamespace>TcoCore</DefaultNamespace>
<Placeholder>TcoCore</Placeholder>
<Author>Inxton</Author>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<Company>Vortex.Library</Company>
<Released>false</Released>
<Title>TcoCoreTests</Title>
<ProjectVersion>0.1.0.91</ProjectVersion>
<ProjectVersion>0.1.0.106</ProjectVersion>
<DefaultNamespace>TcoCoreTests</DefaultNamespace>
<Placeholder>TcoCoreTests</Placeholder>
<CombineIds>true</CombineIds>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<Company>Vortex.Library</Company>
<Released>false</Released>
<Title>TcoCoreTests</Title>
<ProjectVersion>0.1.0.91</ProjectVersion>
<ProjectVersion>0.1.0.106</ProjectVersion>
<DefaultNamespace>TcoCoreTests</DefaultNamespace>
<Placeholder>TcoCoreTests</Placeholder>
<CombineIds>true</CombineIds>
Expand Down
2 changes: 1 addition & 1 deletion src/TcoCore/tests/TcoCore.Sandbox.Wpf/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@

[assembly: AssemblyVersion("0.1.0.0")]
[assembly: AssemblyFileVersion("0.1.0.0")]
[assembly: AssemblyInformationalVersion("0.1.0-alpha.91+Branch.dev.Sha.c92e0e9bfa0ff496865612b2535896dee8e930ff")]
[assembly: AssemblyInformationalVersion("0.1.0-azure-pipelines.1+106.Branch.azure-pipelines.Sha.159aa5a1b7c560de94178a2c001121326d3502e6")]

2 changes: 1 addition & 1 deletion src/TcoCore/tests/TcoCoreTestsConnector/_meta/version.info
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.0.91
0.1.0.106
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
[assembly:RenderableAssembly]
[assembly: AssemblyVersion("0.1.0.0")]
[assembly: AssemblyFileVersion("0.1.0.0")]
[assembly: AssemblyInformationalVersion("0.1.0-alpha.91+Branch.dev.Sha.c92e0e9bfa0ff496865612b2535896dee8e930ff")]
[assembly: AssemblyInformationalVersion("0.1.0-azure-pipelines.1+106.Branch.azure-pipelines.Sha.159aa5a1b7c560de94178a2c001121326d3502e6")]
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
[assembly: InternalsVisibleTo("xUnitTcOpenTests")]
[assembly: AssemblyVersion("0.1.0.0")]
[assembly: AssemblyFileVersion("0.1.0.0")]
[assembly: AssemblyInformationalVersion("0.1.0-alpha.91+Branch.dev.Sha.c92e0e9bfa0ff496865612b2535896dee8e930ff")]
[assembly: AssemblyInformationalVersion("0.1.0-azure-pipelines.1+106.Branch.azure-pipelines.Sha.159aa5a1b7c560de94178a2c001121326d3502e6")]
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.0.91
0.1.0.106
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<LibraryReferences>{03f8892c-d1d0-44d2-9e9d-b9c1ad614a91}</LibraryReferences>
<Released>false</Released>
<Title>TcoIoBeckhoff</Title>
<ProjectVersion>0.1.0.91</ProjectVersion>
<ProjectVersion>0.1.0.106</ProjectVersion>
<Author></Author>
<Company>Vortex.Library</Company>
<DefaultNamespace>TcoIoBeckhoff</DefaultNamespace>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<LibraryReferences>{03f8892c-d1d0-44d2-9e9d-b9c1ad614a91}</LibraryReferences>
<Released>false</Released>
<Title>TcoIoBeckhoff</Title>
<ProjectVersion>0.1.0.91</ProjectVersion>
<ProjectVersion>0.1.0.106</ProjectVersion>
<Author></Author>
<Company>Vortex.Library</Company>
<DefaultNamespace>TcoIoBeckhoff</DefaultNamespace>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@

[assembly: AssemblyVersion("0.1.0.0")]
[assembly: AssemblyFileVersion("0.1.0.0")]
[assembly: AssemblyInformationalVersion("0.1.0-alpha.91+Branch.dev.Sha.c92e0e9bfa0ff496865612b2535896dee8e930ff")]
[assembly: AssemblyInformationalVersion("0.1.0-azure-pipelines.1+106.Branch.azure-pipelines.Sha.159aa5a1b7c560de94178a2c001121326d3502e6")]

Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
[assembly:RenderableAssembly]
[assembly: AssemblyVersion("0.1.0.0")]
[assembly: AssemblyFileVersion("0.1.0.0")]
[assembly: AssemblyInformationalVersion("0.1.0-alpha.91+Branch.dev.Sha.c92e0e9bfa0ff496865612b2535896dee8e930ff")]
[assembly: AssemblyInformationalVersion("0.1.0-azure-pipelines.1+106.Branch.azure-pipelines.Sha.159aa5a1b7c560de94178a2c001121326d3502e6")]
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
[assembly: InternalsVisibleTo("xUnitTcOpenTests")]
[assembly: AssemblyVersion("0.1.0.0")]
[assembly: AssemblyFileVersion("0.1.0.0")]
[assembly: AssemblyInformationalVersion("0.1.0-alpha.91+Branch.dev.Sha.c92e0e9bfa0ff496865612b2535896dee8e930ff")]
[assembly: AssemblyInformationalVersion("0.1.0-azure-pipelines.1+106.Branch.azure-pipelines.Sha.159aa5a1b7c560de94178a2c001121326d3502e6")]
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.0.91
0.1.0.106
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<LibraryReferences>{6041bb0d-625b-4e6f-a92c-90179c0efe88}</LibraryReferences>
<Released>false</Released>
<Title>TcoPneumatics</Title>
<ProjectVersion>0.1.0.91</ProjectVersion>
<ProjectVersion>0.1.0.106</ProjectVersion>
<Author>Dustin Hullett</Author>
<Company>Vortex.Library</Company>
<DefaultNamespace>TcoPneumatics</DefaultNamespace>
Expand Down Expand Up @@ -55,7 +55,7 @@
<Namespace>Tc3_Module</Namespace>
</PlaceholderReference>
<PlaceholderReference Include="TcoCore">
<DefaultResolution>TcoCore, 0.1.0.91 (Vortex.Library)</DefaultResolution>
<DefaultResolution>TcoCore, 0.1.0.106 (Vortex.Library)</DefaultResolution>
<Namespace>TcoCore</Namespace>
</PlaceholderReference>
</ItemGroup>
Expand All @@ -66,7 +66,7 @@
</ItemGroup>
<ItemGroup>
<PlaceholderResolution Include="TcoCore">
<Resolution>TcoCore, 0.1.0.91 (Vortex.Library)</Resolution>
<Resolution>TcoCore, 0.1.0.106 (Vortex.Library)</Resolution>
</PlaceholderResolution>
</ItemGroup>
<ProjectExtensions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<LibraryReferences>{6041bb0d-625b-4e6f-a92c-90179c0efe88}</LibraryReferences>
<Released>false</Released>
<Title>TcoPneumatics</Title>
<ProjectVersion>0.1.0.91</ProjectVersion>
<ProjectVersion>0.1.0.106</ProjectVersion>
<Author>Dustin Hullett</Author>
<Company>Vortex.Library</Company>
<DefaultNamespace>TcoPneumatics</DefaultNamespace>
Expand Down Expand Up @@ -55,7 +55,7 @@
<Namespace>Tc3_Module</Namespace>
</PlaceholderReference>
<PlaceholderReference Include="TcoCore">
<DefaultResolution>TcoCore, 0.1.0.91 (Vortex.Library)</DefaultResolution>
<DefaultResolution>TcoCore, 0.1.0.106 (Vortex.Library)</DefaultResolution>
<Namespace>TcoCore</Namespace>
</PlaceholderReference>
</ItemGroup>
Expand All @@ -66,7 +66,7 @@
</ItemGroup>
<ItemGroup>
<PlaceholderResolution Include="TcoCore">
<Resolution>TcoCore, 0.1.0.91 (Vortex.Library)</Resolution>
<Resolution>TcoCore, 0.1.0.106 (Vortex.Library)</Resolution>
</PlaceholderResolution>
</ItemGroup>
<ProjectExtensions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<Released>false</Released>
<Title>TcoPneumaticsTests</Title>
<DefaultNamespace>TcoPneumaticsTests</DefaultNamespace>
<ProjectVersion>0.1.0.91</ProjectVersion>
<ProjectVersion>0.1.0.106</ProjectVersion>
<CombineIds>true</CombineIds>
</PropertyGroup>
<ItemGroup>
Expand Down Expand Up @@ -58,11 +58,11 @@
<Namespace>Tc3_Module</Namespace>
</PlaceholderReference>
<PlaceholderReference Include="TcoCore">
<DefaultResolution>TcoCore, 0.1.0.91 (Vortex.Library)</DefaultResolution>
<DefaultResolution>TcoCore, 0.1.0.106 (Vortex.Library)</DefaultResolution>
<Namespace>TcoCore</Namespace>
</PlaceholderReference>
<PlaceholderReference Include="TcoPneumatics">
<DefaultResolution>TcoPneumatics, 0.1.0.91 (Vortex.Library)</DefaultResolution>
<DefaultResolution>TcoPneumatics, 0.1.0.106 (Vortex.Library)</DefaultResolution>
<Namespace>TcoPneumatics</Namespace>
</PlaceholderReference>
</ItemGroup>
Expand All @@ -73,10 +73,10 @@
</ItemGroup>
<ItemGroup>
<PlaceholderResolution Include="TcoCore">
<Resolution>TcoCore, 0.1.0.91 (Vortex.Library)</Resolution>
<Resolution>TcoCore, 0.1.0.106 (Vortex.Library)</Resolution>
</PlaceholderResolution>
<PlaceholderResolution Include="TcoPneumatics">
<Resolution>TcoPneumatics, 0.1.0.91 (Vortex.Library)</Resolution>
<Resolution>TcoPneumatics, 0.1.0.106 (Vortex.Library)</Resolution>
</PlaceholderResolution>
</ItemGroup>
<ProjectExtensions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<Released>false</Released>
<Title>TcoPneumaticsTests</Title>
<DefaultNamespace>TcoPneumaticsTests</DefaultNamespace>
<ProjectVersion>0.1.0.91</ProjectVersion>
<ProjectVersion>0.1.0.106</ProjectVersion>
<CombineIds>true</CombineIds>
</PropertyGroup>
<ItemGroup>
Expand Down Expand Up @@ -58,11 +58,11 @@
<Namespace>Tc3_Module</Namespace>
</PlaceholderReference>
<PlaceholderReference Include="TcoCore">
<DefaultResolution>TcoCore, 0.1.0.91 (Vortex.Library)</DefaultResolution>
<DefaultResolution>TcoCore, 0.1.0.106 (Vortex.Library)</DefaultResolution>
<Namespace>TcoCore</Namespace>
</PlaceholderReference>
<PlaceholderReference Include="TcoPneumatics">
<DefaultResolution>TcoPneumatics, 0.1.0.91 (Vortex.Library)</DefaultResolution>
<DefaultResolution>TcoPneumatics, 0.1.0.106 (Vortex.Library)</DefaultResolution>
<Namespace>TcoPneumatics</Namespace>
</PlaceholderReference>
</ItemGroup>
Expand All @@ -73,10 +73,10 @@
</ItemGroup>
<ItemGroup>
<PlaceholderResolution Include="TcoCore">
<Resolution>TcoCore, 0.1.0.91 (Vortex.Library)</Resolution>
<Resolution>TcoCore, 0.1.0.106 (Vortex.Library)</Resolution>
</PlaceholderResolution>
<PlaceholderResolution Include="TcoPneumatics">
<Resolution>TcoPneumatics, 0.1.0.91 (Vortex.Library)</Resolution>
<Resolution>TcoPneumatics, 0.1.0.106 (Vortex.Library)</Resolution>
</PlaceholderResolution>
</ItemGroup>
<ProjectExtensions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@

[assembly: AssemblyVersion("0.1.0.0")]
[assembly: AssemblyFileVersion("0.1.0.0")]
[assembly: AssemblyInformationalVersion("0.1.0-alpha.91+Branch.dev.Sha.c92e0e9bfa0ff496865612b2535896dee8e930ff")]
[assembly: AssemblyInformationalVersion("0.1.0-azure-pipelines.1+106.Branch.azure-pipelines.Sha.159aa5a1b7c560de94178a2c001121326d3502e6")]

Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
[assembly: InternalsVisibleTo("xUnitTcOpenTests")]
[assembly: AssemblyVersion("0.1.0.0")]
[assembly: AssemblyFileVersion("0.1.0.0")]
[assembly: AssemblyInformationalVersion("0.1.0-alpha.91+Branch.dev.Sha.c92e0e9bfa0ff496865612b2535896dee8e930ff")]
[assembly: AssemblyInformationalVersion("0.1.0-azure-pipelines.1+106.Branch.azure-pipelines.Sha.159aa5a1b7c560de94178a2c001121326d3502e6")]
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,7 @@
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<RepositoryUrl>https://github.com/PTKu/TcOpen</RepositoryUrl>
<RepositoryType>git</RepositoryType>
</PropertyGroup>
<ItemGroup>
<Content Include="_meta\TcoPneumatics.library" IncludeInPackage="true" Pack="true" PackagePath="lib" CopyToOutputDirectory="PreserveNewest" />
<Content Include="_meta\TcoPneumatics.json" IncludeInPackage="true" Pack="true" PackagePath="lib" CopyToOutputDirectory="PreserveNewest" />
<Content Include="_meta\TcoPneumatics.library" IncludeInPackage="true" Pack="true" PackagePath="lib" CopyToOutputDirectory="PreserveNewest" />
<Content Include="_meta\version.info" IncludeInPackage="true" Pack="true" PackagePath="lib" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Inxton.Package.Vortex.Essentials" Version="1.9.1-alpha.37" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.0.91
0.1.0.106