Skip to content

Commit 7f3c42f

Browse files
PatrickRitchiePatrickRitchie
committed
Added MTConnect.NET.Builder project
- Builder project is used to build the Agent application installer, Nuget libraries, and Docker images - Switched to using Directory.Build.props file instead of AssemblyInfo.cs for setting assembly version
1 parent c9deb3b commit 7f3c42f

60 files changed

Lines changed: 2466 additions & 311 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@ bld/
2424

2525
[Nn]uget/
2626

27+
# Builder
28+
build/output
29+
build/schemas
30+
build/styles
31+
build/MTConnect.NET.Builder/config.production.yaml
32+
2733
[Nn]ode_modules/
2834

2935
gulpfile.js

‎Directory.Build.props‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<Project>
2+
<PropertyGroup>
3+
<VersionPrefix>6.9.0</VersionPrefix>
4+
<VersionSuffix></VersionSuffix>
5+
<Copyright>Copyright (c) 2025 TrakHound Inc., All Rights Reserved.</Copyright>
6+
<Company>TrakHound Inc.</Company>
7+
<PackageTags>mtconnect;iiot;iot;cnc;</PackageTags>
8+
<RepositoryUrl>https://github.com/TrakHound/MTConnect.NET</RepositoryUrl>
9+
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
10+
</PropertyGroup>
11+
</Project>

‎MTConnect.NET.sln‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{14375E03
77
EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{BBF53739-168D-4635-8595-083AC0C65E4C}"
99
ProjectSection(SolutionItems) = preProject
10-
build\AssemblyInfo.cs = build\AssemblyInfo.cs
10+
Directory.Build.props = Directory.Build.props
1111
EndProjectSection
1212
EndProject
1313
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{0957974A-CA4D-45DD-A0CB-2C4A9CD03350}"
@@ -117,6 +117,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Templates", "Templates", "{
117117
EndProject
118118
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Agent", "templates\mtconnect.net-agent\content\MTConnect.NET-Embedded-Agent\Agent.csproj", "{FF3FACB1-C470-4C7F-9A4B-F364BE1E32B3}"
119119
EndProject
120+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MTConnect.NET.Builder", "build\MTConnect.NET.Builder\MTConnect.NET.Builder.csproj", "{FC9965F9-63B4-3BE9-FD8E-28B7C8E19A19}"
121+
EndProject
120122
Global
121123
GlobalSection(SolutionConfigurationPlatforms) = preSolution
122124
Debug|Any CPU = Debug|Any CPU
@@ -413,6 +415,14 @@ Global
413415
{FF3FACB1-C470-4C7F-9A4B-F364BE1E32B3}.Package|Any CPU.Build.0 = Debug|Any CPU
414416
{FF3FACB1-C470-4C7F-9A4B-F364BE1E32B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
415417
{FF3FACB1-C470-4C7F-9A4B-F364BE1E32B3}.Release|Any CPU.Build.0 = Release|Any CPU
418+
{FC9965F9-63B4-3BE9-FD8E-28B7C8E19A19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
419+
{FC9965F9-63B4-3BE9-FD8E-28B7C8E19A19}.Debug|Any CPU.Build.0 = Debug|Any CPU
420+
{FC9965F9-63B4-3BE9-FD8E-28B7C8E19A19}.Docker|Any CPU.ActiveCfg = Release|Any CPU
421+
{FC9965F9-63B4-3BE9-FD8E-28B7C8E19A19}.Docker|Any CPU.Build.0 = Release|Any CPU
422+
{FC9965F9-63B4-3BE9-FD8E-28B7C8E19A19}.Package|Any CPU.ActiveCfg = Debug|Any CPU
423+
{FC9965F9-63B4-3BE9-FD8E-28B7C8E19A19}.Package|Any CPU.Build.0 = Debug|Any CPU
424+
{FC9965F9-63B4-3BE9-FD8E-28B7C8E19A19}.Release|Any CPU.ActiveCfg = Release|Any CPU
425+
{FC9965F9-63B4-3BE9-FD8E-28B7C8E19A19}.Release|Any CPU.Build.0 = Release|Any CPU
416426
EndGlobalSection
417427
GlobalSection(SolutionProperties) = preSolution
418428
HideSolutionNode = FALSE
@@ -457,6 +467,7 @@ Global
457467
{A9DF36FC-4EF7-4BFB-B47D-F1C10227631A} = {FFF032D3-7446-4CAF-A3E3-CF9C4E1A5DCC}
458468
{24C98CF3-CC93-4696-A036-8FD1E16F2E7E} = {FFF032D3-7446-4CAF-A3E3-CF9C4E1A5DCC}
459469
{FF3FACB1-C470-4C7F-9A4B-F364BE1E32B3} = {D7873DF2-16DB-4B19-A100-C0089DF37488}
470+
{FC9965F9-63B4-3BE9-FD8E-28B7C8E19A19} = {BBF53739-168D-4635-8595-083AC0C65E4C}
460471
EndGlobalSection
461472
GlobalSection(ExtensibilityGlobals) = postSolution
462473
SolutionGuid = {CC13D3AD-18BF-4695-AB2A-087EF0885B20}

‎adapter/MTConnect.NET-Adapter/MTConnect.NET-Adapter.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,11 @@
1616

1717
<PropertyGroup>
1818
<Configurations>Debug;Release;Docker</Configurations>
19-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
2019
<AssemblyName>adapter</AssemblyName>
2120
<OutputType>Exe</OutputType>
2221
<RootNamespace>MTConnect</RootNamespace>
2322
<StartupObject>MTConnect.Applications.Program</StartupObject>
2423
<Nullable>disable</Nullable>
25-
<Company></Company>
26-
<Copyright></Copyright>
2724
</PropertyGroup>
2825

2926
<ItemGroup>

‎adapter/MTConnect.NET-Applications-Adapter/MTConnect.NET-Applications-Adapter.csproj‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@
1717
<PropertyGroup>
1818
<RootNamespace>MTConnect</RootNamespace>
1919
<Configurations>Debug;Release;Package</Configurations>
20-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
21-
22-
<Copyright>Copyright (c) 2025 TrakHound Inc., All Rights Reserved.</Copyright>
23-
<PackageTags>mtconnect;iiot;iot;cnc;</PackageTags>
24-
<RepositoryUrl>https://github.com/TrakHound/MTConnect.NET</RepositoryUrl>
2520

2621
<Description>MTConnect.NET-Applications-Adapter contains classes to fully implement an MTConnect SHDR Adapter application. Supports MTConnect Versions up to 2.5. Supports .NET Framework 4.6.1 up to .NET 9</Description>
2722

@@ -36,14 +31,6 @@
3631
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
3732
</PropertyGroup>
3833

39-
<ItemGroup Condition="'$(Configuration)'=='Debug'">
40-
<Compile Include="..\..\build\AssemblyInfo.cs" Link="Properties\AssemblyInfo.cs" />
41-
</ItemGroup>
42-
43-
<ItemGroup Condition="'$(Configuration)'=='Release'">
44-
<Compile Include="..\..\build\AssemblyInfo.cs" Link="Properties\AssemblyInfo.cs" />
45-
</ItemGroup>
46-
4734
<PropertyGroup Condition="'$(Configuration)'=='Package'">
4835
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
4936
</PropertyGroup>

‎adapter/Modules/MTConnect.NET-AdapterModule-MQTT/MTConnect.NET-AdapterModule-MQTT.csproj‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@
1717
<PropertyGroup>
1818
<RootNamespace>MTConnect</RootNamespace>
1919
<Configurations>Debug;Release;Package</Configurations>
20-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
21-
22-
<Copyright>Copyright (c) 2025 TrakHound Inc., All Rights Reserved.</Copyright>
23-
<PackageTags>mtconnect;iiot;iot;cnc;</PackageTags>
24-
<RepositoryUrl>https://github.com/TrakHound/MTConnect.NET</RepositoryUrl>
2520

2621
<Description>MTConnect.NET-AdapterModule-MQTT implements an adapter to send input data to an MQTT Broker to be read by an MTConnect Agent for Adapter Applications. Supports MTConnect Versions up to 2.5. Supports .NET Framework 4.6.1 up to .NET 9</Description>
2722
<PackageReadmeFile>README-Nuget.md</PackageReadmeFile>
@@ -37,14 +32,6 @@
3732
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
3833
</PropertyGroup>
3934

40-
<ItemGroup Condition="'$(Configuration)'=='Debug'">
41-
<Compile Include="..\..\..\build\AssemblyInfo.cs" Link="Properties\AssemblyInfo.cs" />
42-
</ItemGroup>
43-
44-
<ItemGroup Condition="'$(Configuration)'=='Release'">
45-
<Compile Include="..\..\..\build\AssemblyInfo.cs" Link="Properties\AssemblyInfo.cs" />
46-
</ItemGroup>
47-
4835
<PropertyGroup Condition="'$(Configuration)'=='Package'">
4936
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
5037
</PropertyGroup>

‎adapter/Modules/MTConnect.NET-AdapterModule-SHDR/MTConnect.NET-AdapterModule-SHDR.csproj‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@
1717
<PropertyGroup>
1818
<RootNamespace>MTConnect</RootNamespace>
1919
<Configurations>Debug;Release;Package</Configurations>
20-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
21-
22-
<Copyright>Copyright (c) 2025 TrakHound Inc., All Rights Reserved.</Copyright>
23-
<PackageTags>mtconnect;iiot;iot;cnc;</PackageTags>
24-
<RepositoryUrl>https://github.com/TrakHound/MTConnect.NET</RepositoryUrl>
2520

2621
<Description>MTConnect.NET-AdapterModule-SHDR implements the MTConnect SHDR Protocol for Adapter Applications. Supports MTConnect Versions up to 2.5. Supports .NET Framework 4.6.1 up to .NET 9</Description>
2722
<PackageReadmeFile>README-Nuget.md</PackageReadmeFile>
@@ -37,14 +32,6 @@
3732
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
3833
</PropertyGroup>
3934

40-
<ItemGroup Condition="'$(Configuration)'=='Debug'">
41-
<Compile Include="..\..\..\build\AssemblyInfo.cs" Link="Properties\AssemblyInfo.cs" />
42-
</ItemGroup>
43-
44-
<ItemGroup Condition="'$(Configuration)'=='Release'">
45-
<Compile Include="..\..\..\build\AssemblyInfo.cs" Link="Properties\AssemblyInfo.cs" />
46-
</ItemGroup>
47-
4835
<PropertyGroup Condition="'$(Configuration)'=='Package'">
4936
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
5037
</PropertyGroup>

‎agent/MTConnect.NET-Agent/MTConnect.NET-Agent.csproj‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,19 @@
1616

1717
<PropertyGroup>
1818
<Configurations>Debug;Release;Docker</Configurations>
19-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
2019
<AssemblyName>agent</AssemblyName>
20+
<Product>MTConnect.NET Agent</Product>
21+
<Description>.NET MTConnect Agent for Data Collection</Description>
2122
<OutputType>Exe</OutputType>
2223
<RootNamespace>MTConnect</RootNamespace>
2324
<StartupObject>MTConnect.Applications.Program</StartupObject>
2425
<Nullable>disable</Nullable>
25-
<Company></Company>
26-
<Copyright></Copyright>
2726
</PropertyGroup>
2827

2928
<ItemGroup>
3029
<None Remove="NLog.config" />
3130
</ItemGroup>
3231

33-
<ItemGroup>
34-
<Compile Include="..\..\build\AssemblyInfo.cs" Link="Properties\AssemblyInfo.cs" />
35-
</ItemGroup>
36-
3732
<ItemGroup>
3833
<Content Include="NLog.config">
3934
<PackagePath>contentFiles\any\any;content</PackagePath>

‎agent/MTConnect.NET-Applications-Agents/MTConnect.NET-Applications-Agents.csproj‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@
1717
<PropertyGroup>
1818
<RootNamespace>MTConnect</RootNamespace>
1919
<Configurations>Debug;Release;Package</Configurations>
20-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
21-
22-
<Copyright>Copyright (c) 2025 TrakHound Inc., All Rights Reserved.</Copyright>
23-
<PackageTags>mtconnect;iiot;iot;cnc;</PackageTags>
24-
<RepositoryUrl>https://github.com/TrakHound/MTConnect.NET</RepositoryUrl>
2520

2621
<Description>MTConnect.NET-Applications-Agents contains classes to fully implement an MTConnect Agent application. Supports MTConnect Versions up to 2.5. Supports .NET Framework 4.6.1 up to .NET 9</Description>
2722

@@ -36,14 +31,6 @@
3631
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
3732
</PropertyGroup>
3833

39-
<ItemGroup Condition="'$(Configuration)'=='Debug'">
40-
<Compile Include="..\..\build\AssemblyInfo.cs" Link="Properties\AssemblyInfo.cs" />
41-
</ItemGroup>
42-
43-
<ItemGroup Condition="'$(Configuration)'=='Release'">
44-
<Compile Include="..\..\build\AssemblyInfo.cs" Link="Properties\AssemblyInfo.cs" />
45-
</ItemGroup>
46-
4734
<PropertyGroup Condition="'$(Configuration)'=='Package'">
4835
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
4936
</PropertyGroup>

‎agent/Modules/MTConnect.NET-AgentModule-HttpAdapter/MTConnect.NET-AgentModule-HttpAdapter.csproj‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@
1717
<PropertyGroup>
1818
<RootNamespace>MTConnect</RootNamespace>
1919
<Configurations>Debug;Release;Package</Configurations>
20-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
21-
22-
<Copyright>Copyright (c) 2025 TrakHound Inc., All Rights Reserved.</Copyright>
23-
<PackageTags>mtconnect;iiot;iot;cnc;</PackageTags>
24-
<RepositoryUrl>https://github.com/TrakHound/MTConnect.NET</RepositoryUrl>
2520

2621
<Description>MTConnect.NET-AgentModule-HttpAdapter implements the MTConnect HTTP Client Protocol to read from other MTConnect Agents for use with the MTConnectAgentApplication class in the MTConnect.NET-Applications-Agent library. Supports MTConnect Versions up to 2.5. Supports .NET Framework 4.6.1 up to .NET 9</Description>
2722
<PackageReadmeFile>README-Nuget.md</PackageReadmeFile>
@@ -37,14 +32,6 @@
3732
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
3833
</PropertyGroup>
3934

40-
<ItemGroup Condition="'$(Configuration)'=='Debug'">
41-
<Compile Include="..\..\..\build\AssemblyInfo.cs" Link="Properties\AssemblyInfo.cs" />
42-
</ItemGroup>
43-
44-
<ItemGroup Condition="'$(Configuration)'=='Release'">
45-
<Compile Include="..\..\..\build\AssemblyInfo.cs" Link="Properties\AssemblyInfo.cs" />
46-
</ItemGroup>
47-
4835
<PropertyGroup Condition="'$(Configuration)'=='Package'">
4936
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
5037
</PropertyGroup>

0 commit comments

Comments
 (0)