Skip to content

Commit

Permalink
Merge pull request #22 from Inxton/init-dev
Browse files Browse the repository at this point in the history
add missing files to nuget TcoCore
  • Loading branch information
PTKu authored Apr 6, 2021
2 parents bb2190d + aacc4d8 commit 04ae57e
Show file tree
Hide file tree
Showing 24 changed files with 41 additions and 36 deletions.
2 changes: 1 addition & 1 deletion src/Tc.Prober/src/Tc.Prober/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
[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")]
[assembly: AssemblyInformationalVersion("0.1.0-init-dev.1+217.Branch.init-dev.Sha.8106cc8e723ce3612a1d08c4766c322c45e6cfeb")]
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@
[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")]
[assembly: AssemblyInformationalVersion("0.1.0-init-dev.1+217.Branch.init-dev.Sha.8106cc8e723ce3612a1d08c4766c322c45e6cfeb")]
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<Company>Vortex.Library</Company>
<Released>false</Released>
<Title>PlcTcProberTests</Title>
<ProjectVersion>0.1.0.216</ProjectVersion>
<ProjectVersion>0.1.0.217</ProjectVersion>
<DefaultNamespace>PlcTcProberTests</DefaultNamespace>
<Placeholder>PlcTcProberTests</Placeholder>
</PropertyGroup>
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-init-dev.1+216.Branch.init-dev.Sha.f190c8bf3fa438c8ec80abb753b335c10ad7865f")]
[assembly: AssemblyInformationalVersion("0.1.0-init-dev.1+217.Branch.init-dev.Sha.8106cc8e723ce3612a1d08c4766c322c45e6cfeb")]

Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<Company>Vortex.Library</Company>
<Released>false</Released>
<Title>PlcAppExamples</Title>
<ProjectVersion>0.1.0.216</ProjectVersion>
<ProjectVersion>0.1.0.217</ProjectVersion>
<DefaultNamespace>PlcAppExamples</DefaultNamespace>
<Placeholder>PlcAppExamples</Placeholder>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/TcoCore/src/TcoCore.Wpf/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
[assembly:Vortex.Presentation.Wpf.RenderableAssembly()]
[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")]
[assembly: AssemblyInformationalVersion("0.1.0-init-dev.1+217.Branch.init-dev.Sha.8106cc8e723ce3612a1d08c4766c322c45e6cfeb")]


Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[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")]
[assembly: AssemblyInformationalVersion("0.1.0-init-dev.1+217.Branch.init-dev.Sha.8106cc8e723ce3612a1d08c4766c322c45e6cfeb")]



Expand Down
5 changes: 5 additions & 0 deletions src/TcoCore/src/TcoCoreConnector/TcoCoreConnector.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@
<ItemGroup>
<PackageReference Include="Inxton.Package.Vortex.Essentials" Version="1.9.6-nightly.260" />
<PackageReference Include="Inxton.vortex.compiler.console" Version="1.9.6-nightly.260" />
</ItemGroup>
<ItemGroup>
<Content Include="_meta\TcoCore.library" IncludeInPackage="true" Pack="true" PackagePath="lib" CopyToOutputDirectory="PreserveNewest" />
<Content Include="_meta\TcoCore.json" IncludeInPackage="true" Pack="true" PackagePath="lib" CopyToOutputDirectory="PreserveNewest" />
<Content Include="_meta\version.info" IncludeInPackage="true" Pack="true" PackagePath="lib" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>
<ItemGroup>
<Compile Update="Properties\Localizations.Designer.cs">
Expand Down
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.216</ProjectVersion>
<ProjectVersion>0.1.0.217</ProjectVersion>
<DefaultNamespace>TcoCore</DefaultNamespace>
<Placeholder>TcoCore</Placeholder>
<Author>Inxton</Author>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<DefaultNamespace>TcoCoreExamples</DefaultNamespace>
<Placeholder>TcoCoreExamples</Placeholder>
<Author>Inxton</Author>
<ProjectVersion>0.1.0.216</ProjectVersion>
<ProjectVersion>0.1.0.217</ProjectVersion>
</PropertyGroup>
<ItemGroup>
<Compile Include="Examples\EXAMPLES_PRG.TcPOU">
Expand Down Expand Up @@ -116,7 +116,7 @@
<Namespace>Tc3_Module</Namespace>
</PlaceholderReference>
<PlaceholderReference Include="TcoCore">
<DefaultResolution>TcoCore, 0.1.0.216 (Vortex.Library)</DefaultResolution>
<DefaultResolution>TcoCore, 0.1.0.217 (Vortex.Library)</DefaultResolution>
<Namespace>TcoCore</Namespace>
</PlaceholderReference>
</ItemGroup>
Expand All @@ -127,7 +127,7 @@
</ItemGroup>
<ItemGroup>
<PlaceholderResolution Include="TcoCore">
<Resolution>TcoCore, 0.1.0.216 (Vortex.Library)</Resolution>
<Resolution>TcoCore, 0.1.0.217 (Vortex.Library)</Resolution>
</PlaceholderResolution>
</ItemGroup>
<ProjectExtensions>
Expand Down
6 changes: 3 additions & 3 deletions src/TcoCore/src/XaeTcoCore/TcoCoreTests/TcoCoreTests.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>TcoCoreTests</Title>
<ProjectVersion>0.1.0.216</ProjectVersion>
<ProjectVersion>0.1.0.217</ProjectVersion>
<DefaultNamespace>TcoCoreTests</DefaultNamespace>
<Placeholder>TcoCoreTests</Placeholder>
<CombineIds>true</CombineIds>
Expand Down Expand Up @@ -102,7 +102,7 @@
<Namespace>Tc3_Module</Namespace>
</PlaceholderReference>
<PlaceholderReference Include="TcoCore">
<DefaultResolution>TcoCore, 0.1.0.216 (Vortex.Library)</DefaultResolution>
<DefaultResolution>TcoCore, 0.1.0.217 (Vortex.Library)</DefaultResolution>
<Namespace>TcoCore</Namespace>
</PlaceholderReference>
</ItemGroup>
Expand All @@ -113,7 +113,7 @@
</ItemGroup>
<ItemGroup>
<PlaceholderResolution Include="TcoCore">
<Resolution>TcoCore, 0.1.0.216 (Vortex.Library)</Resolution>
<Resolution>TcoCore, 0.1.0.217 (Vortex.Library)</Resolution>
</PlaceholderResolution>
</ItemGroup>
<ProjectExtensions>
Expand Down
4 changes: 2 additions & 2 deletions src/TcoCore/src/XaeTcoCore/XaeTcoCore.tsproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</ArrayInfo>
</DataType>
</DataTypes>
<Project ProjectGUID="{39D84538-69DF-46F4-9E2F-272A81B72C66}" TargetNetId="172.20.10.2.1.1" Target64Bit="true" ShowHideConfigurations="#x106">
<Project ProjectGUID="{39D84538-69DF-46F4-9E2F-272A81B72C66}" TargetNetId="172.20.10.2.1.1" ShowHideConfigurations="#x106">
<System>
<Tasks>
<Task Id="3" Priority="20" CycleTime="100000" AmsPort="350" AdtTasks="true">
Expand Down Expand Up @@ -66,7 +66,7 @@
</TaskPouOids>
</Instance>
</Project>
<Project GUID="{2266F99A-9250-4E68-A8BB-FC036A975355}" Name="TcoCoreExamples" PrjFilePath="TcoCoreExamples\TcoCoreExamples.plcproj" TmcFilePath="TcoCoreExamples\TcoCoreExamples.tmc" ReloadTmc="true" AmsPort="853" FileArchiveSettings="#x000e" SymbolicMapping="true">
<Project Disabled="true" GUID="{2266F99A-9250-4E68-A8BB-FC036A975355}" Name="TcoCoreExamples" PrjFilePath="TcoCoreExamples\TcoCoreExamples.plcproj" TmcFilePath="TcoCoreExamples\TcoCoreExamples.tmc" ReloadTmc="true" AmsPort="853" FileArchiveSettings="#x000e" SymbolicMapping="true">
<Instance Id="#x08502080" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="TcoCoreExamples\TcoCoreExamples.tmc">
<Name>TcoCoreExamples Instance</Name>
<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
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-init-dev.1+216.Branch.init-dev.Sha.f190c8bf3fa438c8ec80abb753b335c10ad7865f")]
[assembly: AssemblyInformationalVersion("0.1.0-init-dev.1+217.Branch.init-dev.Sha.8106cc8e723ce3612a1d08c4766c322c45e6cfeb")]

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-init-dev.1+216.Branch.init-dev.Sha.f190c8bf3fa438c8ec80abb753b335c10ad7865f")]
[assembly: AssemblyInformationalVersion("0.1.0-init-dev.1+217.Branch.init-dev.Sha.8106cc8e723ce3612a1d08c4766c322c45e6cfeb")]
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-init-dev.1+216.Branch.init-dev.Sha.f190c8bf3fa438c8ec80abb753b335c10ad7865f")]
[assembly: AssemblyInformationalVersion("0.1.0-init-dev.1+217.Branch.init-dev.Sha.8106cc8e723ce3612a1d08c4766c322c45e6cfeb")]
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.216</ProjectVersion>
<ProjectVersion>0.1.0.217</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-init-dev.1+216.Branch.init-dev.Sha.f190c8bf3fa438c8ec80abb753b335c10ad7865f")]
[assembly: AssemblyInformationalVersion("0.1.0-init-dev.1+217.Branch.init-dev.Sha.8106cc8e723ce3612a1d08c4766c322c45e6cfeb")]

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-init-dev.1+216.Branch.init-dev.Sha.f190c8bf3fa438c8ec80abb753b335c10ad7865f")]
[assembly: AssemblyInformationalVersion("0.1.0-init-dev.1+217.Branch.init-dev.Sha.8106cc8e723ce3612a1d08c4766c322c45e6cfeb")]
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-init-dev.1+216.Branch.init-dev.Sha.f190c8bf3fa438c8ec80abb753b335c10ad7865f")]
[assembly: AssemblyInformationalVersion("0.1.0-init-dev.1+217.Branch.init-dev.Sha.8106cc8e723ce3612a1d08c4766c322c45e6cfeb")]
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.216</ProjectVersion>
<ProjectVersion>0.1.0.217</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.216 (Vortex.Library)</DefaultResolution>
<DefaultResolution>TcoCore, 0.1.0.217 (Vortex.Library)</DefaultResolution>
<Namespace>TcoCore</Namespace>
</PlaceholderReference>
</ItemGroup>
Expand All @@ -66,7 +66,7 @@
</ItemGroup>
<ItemGroup>
<PlaceholderResolution Include="TcoCore">
<Resolution>TcoCore, 0.1.0.216 (Vortex.Library)</Resolution>
<Resolution>TcoCore, 0.1.0.217 (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.216</ProjectVersion>
<ProjectVersion>0.1.0.217</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.216 (Vortex.Library)</DefaultResolution>
<DefaultResolution>TcoCore, 0.1.0.217 (Vortex.Library)</DefaultResolution>
<Namespace>TcoCore</Namespace>
</PlaceholderReference>
<PlaceholderReference Include="TcoPneumatics">
<DefaultResolution>TcoPneumatics, 0.1.0.216 (Vortex.Library)</DefaultResolution>
<DefaultResolution>TcoPneumatics, 0.1.0.217 (Vortex.Library)</DefaultResolution>
<Namespace>TcoPneumatics</Namespace>
</PlaceholderReference>
</ItemGroup>
Expand All @@ -73,10 +73,10 @@
</ItemGroup>
<ItemGroup>
<PlaceholderResolution Include="TcoCore">
<Resolution>TcoCore, 0.1.0.216 (Vortex.Library)</Resolution>
<Resolution>TcoCore, 0.1.0.217 (Vortex.Library)</Resolution>
</PlaceholderResolution>
<PlaceholderResolution Include="TcoPneumatics">
<Resolution>TcoPneumatics, 0.1.0.216 (Vortex.Library)</Resolution>
<Resolution>TcoPneumatics, 0.1.0.217 (Vortex.Library)</Resolution>
</PlaceholderResolution>
</ItemGroup>
<ProjectExtensions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</ArrayInfo>
</DataType>
</DataTypes>
<Project ProjectGUID="{2E6C2CE4-12CE-4A6F-A95F-B4C5E04FE0E4}" TargetNetId="172.20.10.104.1.1" Target64Bit="true" ShowHideConfigurations="#x106">
<Project ProjectGUID="{2E6C2CE4-12CE-4A6F-A95F-B4C5E04FE0E4}" TargetNetId="172.20.10.104.1.1" ShowHideConfigurations="#x106">
<System>
<Settings MaxCpus="4"/>
<Tasks>
Expand All @@ -24,7 +24,7 @@
</Tasks>
</System>
<Plc>
<Project GUID="{37585681-C225-40E0-832C-EB8E077A5CE7}" Name="TcoPneumatics" PrjFilePath="TcoPneumatics\TcoPneumatics.plcproj" TmcFilePath="TcoPneumatics\TcoPneumatics.tmc" ReloadTmc="true" AmsPort="851" FileArchiveSettings="#x000e" SymbolicMapping="true">
<Project Disabled="true" GUID="{37585681-C225-40E0-832C-EB8E077A5CE7}" Name="TcoPneumatics" PrjFilePath="TcoPneumatics\TcoPneumatics.plcproj" TmcFilePath="TcoPneumatics\TcoPneumatics.tmc" ReloadTmc="true" AmsPort="851" FileArchiveSettings="#x000e" SymbolicMapping="true">
<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="TcoPneumatics\TcoPneumatics.tmc">
<Name>TcoPneumatics Instance</Name>
<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
Expand All @@ -36,7 +36,7 @@
</Contexts>
</Instance>
</Project>
<Project GUID="{7DB1F25E-9FE8-42FD-A45E-F8FD0ACF6EA7}" Name="TcoPneumaticsTests" PrjFilePath="TcoPneumaticsTests\TcoPneumaticsTests.plcproj" TmcFilePath="TcoPneumaticsTests\TcoPneumaticsTests.tmc" ReloadTmc="true" AmsPort="852" FileArchiveSettings="#x000e" SymbolicMapping="true">
<Project Disabled="true" GUID="{7DB1F25E-9FE8-42FD-A45E-F8FD0ACF6EA7}" Name="TcoPneumaticsTests" PrjFilePath="TcoPneumaticsTests\TcoPneumaticsTests.plcproj" TmcFilePath="TcoPneumaticsTests\TcoPneumaticsTests.tmc" ReloadTmc="true" AmsPort="852" FileArchiveSettings="#x000e" SymbolicMapping="true">
<Instance Id="#x08502040" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="TcoPneumaticsTests\TcoPneumaticsTests.tmc">
<Name>TcoPneumaticsTests Instance</Name>
<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
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-init-dev.1+216.Branch.init-dev.Sha.f190c8bf3fa438c8ec80abb753b335c10ad7865f")]
[assembly: AssemblyInformationalVersion("0.1.0-init-dev.1+217.Branch.init-dev.Sha.8106cc8e723ce3612a1d08c4766c322c45e6cfeb")]

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-init-dev.1+216.Branch.init-dev.Sha.f190c8bf3fa438c8ec80abb753b335c10ad7865f")]
[assembly: AssemblyInformationalVersion("0.1.0-init-dev.1+217.Branch.init-dev.Sha.8106cc8e723ce3612a1d08c4766c322c45e6cfeb")]

0 comments on commit 04ae57e

Please sign in to comment.