Simplify cspoj through use of props and targets files

build/default.ps1

@@ -62,10 +62,12 @@ task Test {
 
     # TODO: Move to using dotnet test to execute the unit tests
     # the below works however the output format needs to be tweeked.
-    exec { dotnet test ..\tests\NHapi.NUnit\NHapi.NUnit.csproj -c Release -f net461 --no-restore --no-build }
-    exec { dotnet test ..\tests\NHapi.Base.NUnit\NHapi.Base.NUnit.csproj -c Release -f net461 --no-restore --no-build }
-    exec { dotnet test ..\tests\NHapi.NUnit\NHapi.NUnit.csproj -c Release -f netcoreapp3.1 --no-restore --no-build }
-    exec { dotnet test ..\tests\NHapi.Base.NUnit\NHapi.Base.NUnit.csproj -c Release -f netcoreapp3.1 --no-restore --no-build }
+    exec { dotnet test ..\tests\NHapi.NUnit\NHapi.NUnit.csproj -r TestResults -c Release -f net461 --no-restore --no-build }
+    exec { dotnet test ..\tests\NHapi.Base.NUnit\NHapi.Base.NUnit.csproj -r TestResults -c Release -f net461 --no-restore --no-build }
+    exec { dotnet test ..\tests\NHapi.NUnit.SourceGeneration\NHapi.NUnit.SourceGeneration.csproj -r TestResults -c Release -f net461 --no-restore --no-build }
+    exec { dotnet test ..\tests\NHapi.NUnit.SourceGeneration\NHapi.NUnit.SourceGeneration.csproj -r TestResults -c Release -f net6.0 --no-restore --no-build }
+    exec { dotnet test ..\tests\NHapi.NUnit\NHapi.NUnit.csproj -r TestResults -c Release -f net6.0 --no-restore --no-build }
+    exec { dotnet test ..\tests\NHapi.Base.NUnit\NHapi.Base.NUnit.csproj -r TestResults -c Release -f net6.0 --no-restore --no-build }
 }
 
 Task Package -depends Build {

src/Directory.Build.props

@@ -0,0 +1,21 @@
+<Project>
+  <PropertyGroup>
+    <IsPackable Condition=" '$(IsPackable)' == '' ">true</IsPackable>
+    <GenerateAssemblyInfo Condition=" '$(GenerateAssemblyInfo)' == '' ">true</GenerateAssemblyInfo>
+    <IncludeCommonPackageInfo>false</IncludeCommonPackageInfo>
+    <IncludeCommonAssemblyAttributes>false</IncludeCommonAssemblyAttributes>
+    <!-- Other -->
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
+
+  <!-- Signed Assemblies -->
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <AssemblyOriginatorKeyFile>..\..\NHapi.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <PublicKey>0024000004800000940000000602000000240000525341310004000001000100b938fa88814fb99f1d02dfce84c41f38eb1ca31f694b706248e6e21ceed1b1d150416c1375603c7a5dd6d3b2cdec97ccbbdd7a1d6fac61a1ad96ebf88e889ba113913c2f36890ea75108a1d8a23affc0c87357f07dec77c69a519215d0d4043759397b1a8fea1dc881b440ba4232ad4e24d7a8d90bb004549cf4f9dd2d6c13d8</PublicKey>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\SharedAssemblyInfo.cs" Link="Properties\SharedAssemblyInfo.cs" />
+  </ItemGroup>
+</Project>

src/Directory.Build.targets

@@ -0,0 +1,33 @@
+<Project>
+  <!-- Common Package Attributes (nuspec) -->
+  <PropertyGroup Condition=" '$(IsPackable)' == 'true' And '$(IncludeCommonPackageInfo)' == 'true' ">
+    <Authors>Chad Chenoweth;Duane Edwards;Jake Aitchison</Authors>
+    <PackageLicenseExpression>MPL-2.0</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/nHapiNET/nHapi</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/nHapiNET/nHapi.git</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PackageTags>HL7;parsing;healthcare;HAPI;xml</PackageTags>
+    <PackageReleaseNotes>https://github.com/nHapiNET/nHapi/releases/tag/v$(Version)</PackageReleaseNotes>
+    <PackageReadmeFile>docs\README.md</PackageReadmeFile>
+  </PropertyGroup>
+
+  <!-- Common Packed Files -->
+  <ItemGroup Condition=" '$(IsPackable)' == 'true' And '$(IncludeCommonPackageInfo)' == 'true' ">
+    <None Include="..\..\README.md" Pack="true" PackagePath="\docs\" />
+  </ItemGroup>
+
+  <!-- Common Assembly Attributes -->
+  <PropertyGroup Condition=" '$(GenerateAssemblyInfo)' == 'true' And '$(IncludeCommonAssemblyAttributes)' == 'true' ">
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(IsPackable)' == 'true' And '$(IncludeCommonPackageInfo)' == 'true' And '$(Configuration)' == 'Release' ">
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+  </PropertyGroup>
+
+  <!-- Build Time Tools (Includes commit sha in AssemblyInfo etc)-->
+  <ItemGroup Condition=" '$(IsPackable)' == 'true' And '$(IncludeCommonPackageInfo)' == 'true' And '$(Configuration)' == 'Release' ">
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" IsImplicitlyDefined="true" />
+  </ItemGroup>
+</Project>

src/ModelGenerator/ModelGenerator.csproj

@@ -3,22 +3,14 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>net35;net6.0</TargetFrameworks>
-    <AssemblyOriginatorKeyFile>..\..\NHapi.snk</AssemblyOriginatorKeyFile>
+    <IsPackable>false</IsPackable>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
   <ItemGroup>
     <AdditionalFiles Include="$(SolutionDir)stylecop.json" Link="Properties\stylecop.json" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Include="..\..\NHapi.snk" Link="NHapi.snk" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Include="..\SharedAssemblyInfo.cs" Link="Properties\SharedAssemblyInfo.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Update="Properties\Settings.Designer.cs">
       <DesignTimeSharedInput>True</DesignTimeSharedInput>

src/NHapi.Base/NHapi.Base.csproj

@@ -4,39 +4,21 @@
     <TargetFrameworks>net35;netstandard2.0</TargetFrameworks>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
     <PackageId>nhapi.base</PackageId>
-    <PackageVersion>3.0.4</PackageVersion>
-    <Authors>Chad Chenoweth;Duane Edwards;Jake Aitchison</Authors>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageProjectUrl>https://github.com/nHapiNET/nHapi</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/nHapiNET/nHapi.git</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <Description>The core components for parsing/encoding HL7 messages. Contains the base classes and interfaces for datatypes, segments, and messages.</Description>
-    <PackageTags>HL7;parsing;healthcare;HAPI;xml</PackageTags>
-    <PackageReleaseNotes>https://github.com/nHapiNET/nHapi/releases/tag/v3.0.4</PackageReleaseNotes>
-    <PackageReadmeFile>docs\README.md</PackageReadmeFile>
-    <AssemblyOriginatorKeyFile>..\..\NHapi.snk</AssemblyOriginatorKeyFile>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <Version>3.0.4</Version>
+    <PackageDescription>The core components for parsing/encoding HL7 messages. Contains the base classes and interfaces for datatypes, segments, and messages.</PackageDescription>
+    <Description>NHapi Common Library</Description>
     <NoWarn>1591</NoWarn>
+    <IncludeCommonPackageInfo>true</IncludeCommonPackageInfo>
+    <IncludeCommonAssemblyAttributes>true</IncludeCommonAssemblyAttributes>
   </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-
+
   <ItemGroup>
-    <AdditionalFiles Include="$(SolutionDir)stylecop.json" Link="Properties\stylecop.json" />
+    <InternalsVisibleTo Include="$(AssemblyName).NUnit" />
+    <InternalsVisibleTo Include="NHapi.SourceGeneration" />
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\..\NHapi.snk" Link="NHapi.snk" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="..\..\README.md" Pack="true" PackagePath="\docs\" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Include="..\SharedAssemblyInfo.cs" Link="Properties\SharedAssemblyInfo.cs" />
+    <AdditionalFiles Include="$(SolutionDir)stylecop.json" Link="Properties\stylecop.json" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">

src/NHapi.Model.V21/NHapi.Model.V21.csproj

@@ -4,37 +4,14 @@
     <TargetFrameworks>net35;netstandard2.0</TargetFrameworks>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
     <PackageId>nhapi.model.v21</PackageId>
-    <PackageVersion>3.0.2</PackageVersion>
-    <Authors>Chad Chenoweth;Duane Edwards;Jake Aitchison</Authors>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageProjectUrl>https://github.com/nHapiNET/nHapi</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/nHapiNET/nHapi.git</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <Description>Contains the data types, segments, and messages that follow the HL7 2.1 schema.</Description>
-    <PackageTags>HL7;parsing;healthcare;HAPI;xml</PackageTags>
-    <PackageReleaseNotes>https://github.com/nHapiNET/nHapi/releases/tag/v3.0.2</PackageReleaseNotes>
-    <PackageReadmeFile>docs\README.md</PackageReadmeFile>
-    <AssemblyOriginatorKeyFile>..\..\NHapi.snk</AssemblyOriginatorKeyFile>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <Version>3.0.2</Version>
+    <PackageDescription>Contains the data types, segments, and messages that follow the HL7 2.1 schema.</PackageDescription>
+    <Description>NHapi Model V.2.1</Description>
+    <IncludeCommonPackageInfo>true</IncludeCommonPackageInfo>
+    <IncludeCommonAssemblyAttributes>true</IncludeCommonAssemblyAttributes>
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="..\..\NHapi.snk" Link="NHapi.snk" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="..\..\README.md" Pack="true" PackagePath="\docs\" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Include="..\SharedAssemblyInfo.cs" Link="Properties\SharedAssemblyInfo.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <EmbeddedResource Include="EventMapping\EventMap.properties" />
   </ItemGroup>

src/NHapi.Model.V22/NHapi.Model.V22.csproj

@@ -4,37 +4,14 @@
     <TargetFrameworks>net35;netstandard2.0</TargetFrameworks>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
     <PackageId>nhapi.model.v22</PackageId>
-    <PackageVersion>3.0.2</PackageVersion>
-    <Authors>Chad Chenoweth;Duane Edwards;Jake Aitchison</Authors>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageProjectUrl>https://github.com/nHapiNET/nHapi</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/nHapiNET/nHapi.git</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <Description>Contains the data types, segments, and messages that follow the HL7 2.2 schema.</Description>
-    <PackageTags>HL7;parsing;healthcare;HAPI;xml</PackageTags>
-    <PackageReleaseNotes>https://github.com/nHapiNET/nHapi/releases/tag/v3.0.2</PackageReleaseNotes>
-    <PackageReadmeFile>docs\README.md</PackageReadmeFile>
-    <AssemblyOriginatorKeyFile>..\..\NHapi.snk</AssemblyOriginatorKeyFile>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <Version>3.0.2</Version>
+    <PackageDescription>Contains the data types, segments, and messages that follow the HL7 2.2 schema.</PackageDescription>
+    <Description>NHapi Model V.2.2</Description>
+    <IncludeCommonPackageInfo>true</IncludeCommonPackageInfo>
+    <IncludeCommonAssemblyAttributes>true</IncludeCommonAssemblyAttributes>
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="..\..\NHapi.snk" Link="NHapi.snk" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="..\..\README.md" Pack="true" PackagePath="\docs\" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Include="..\SharedAssemblyInfo.cs" Link="Properties\SharedAssemblyInfo.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <EmbeddedResource Include="EventMapping\EventMap.properties" />
   </ItemGroup>

src/NHapi.Model.V22_ZSegments/NHapi.Model.V22_ZSegments.csproj

@@ -2,20 +2,11 @@
 
   <PropertyGroup>
     <TargetFrameworks>net35;netstandard2.0</TargetFrameworks>
-    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
-    <AssemblyOriginatorKeyFile>..\..\NHapi.snk</AssemblyOriginatorKeyFile>
+    <IsPackable>false</IsPackable>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="..\..\NHapi.snk" Link="NHapi.snk" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\NHapi.Base\NHapi.Base.csproj" />
     <ProjectReference Include="..\NHapi.Model.V22\NHapi.Model.V22.csproj" />

src/NHapi.Model.V22_ZSegments/AssemblyInfo.cs → src/NHapi.Model.V22_ZSegments/Properties/AssemblyInfo.cs

@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // Information about this assembly is defined by the following
@@ -11,15 +10,11 @@
 [assembly: AssemblyTitle("NHapi.Model.V22CustomizedSample")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("NHapi.Model.V22CustomizedSample")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // This sets the default COM visibility of types in the assembly to invisible.
 // If you need to expose a type to COM, use [ComVisible(true)] on that type.
-[assembly: ComVisible(false)]
+// [assembly: ComVisible(false)]
 
 // The assembly version has following format :
 //
@@ -29,4 +24,4 @@
 // numbers with the '*' character (the default):
 
 [assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyFileVersion("3.0.0.0")]

src/NHapi.Model.V23/NHapi.Model.V23.csproj

@@ -4,37 +4,14 @@
     <TargetFrameworks>net35;netstandard2.0</TargetFrameworks>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
     <PackageId>nhapi.model.v23</PackageId>
-    <PackageVersion>3.0.2</PackageVersion>
-    <Authors>Chad Chenoweth;Duane Edwards;Jake Aitchison</Authors>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageProjectUrl>https://github.com/nHapiNET/nHapi</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/nHapiNET/nHapi.git</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <Description>Contains the data types, segments, and messages that follow the HL7 2.3 schema.</Description>
-    <PackageTags>HL7;parsing;healthcare;HAPI;xml</PackageTags>
-    <PackageReleaseNotes>https://github.com/nHapiNET/nHapi/releases/tag/v3.0.2</PackageReleaseNotes>
-    <PackageReadmeFile>docs\README.md</PackageReadmeFile>
-    <AssemblyOriginatorKeyFile>..\..\NHapi.snk</AssemblyOriginatorKeyFile>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <Version>3.0.2</Version>
+    <PackageDescription>Contains the data types, segments, and messages that follow the HL7 2.3 schema.</PackageDescription>
+    <Description>NHapi Model V.2.3</Description>
+    <IncludeCommonPackageInfo>true</IncludeCommonPackageInfo>
+    <IncludeCommonAssemblyAttributes>true</IncludeCommonAssemblyAttributes>
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="..\..\NHapi.snk" Link="NHapi.snk" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="..\..\README.md" Pack="true" PackagePath="\docs\" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Include="..\SharedAssemblyInfo.cs" Link="Properties\SharedAssemblyInfo.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <EmbeddedResource Include="EventMapping\EventMap.properties" />
   </ItemGroup>