build: deterministic + unify props (#251)

* build: deterministic + unify props * fix: remove conflicting assembly attrs * build: deterministic paths too * docs: simplify copyright
OSLC · Dec 7, 2024 · e1f8bd3 · e1f8bd3
1 parent fd443bf
commit e1f8bd3
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 47 deletions.
diff --git a/OSLC4Net_SDK/Directory.Build.props b/OSLC4Net_SDK/Directory.Build.props
@@ -1,17 +1,34 @@
 <Project>
+  <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Version Condition="'$(RELEASE_VERSION)' != ''">$(RELEASE_VERSION)</Version>
     <VersionPrefix Condition="'$(RELEASE_VERSION)' == ''">999.9.9</VersionPrefix>
     <VersionSuffix Condition="'$(RELEASE_VERSION)' == ''">ts.$([System.DateTime]::UtcNow.ToString(`yyyyMMddHHmm`))</VersionSuffix>
     <PackageLicenseExpression>EPL-1.0</PackageLicenseExpression>
     <Authors>Andrii Berezovskyi and OSLC4Net contributors</Authors>
+    <Copyright>© Andrii Berezovskyi and OSLC4Net contributors 2023; © IBM 2012</Copyright>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageProjectUrl>https://github.com/OSLC/oslc4net/</PackageProjectUrl>
     <RepositoryUrl>https://github.com/OSLC/oslc4net/</RepositoryUrl>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <DeterministicSourcePaths>true</DeterministicSourcePaths>
   </PropertyGroup>
+
+
   <ItemGroup>
+    <SourceRoot Include="$(MSBuildThisFileDirectory)/"/>
     <None Include="$(SolutionDir)\..\README.md" Pack="true" PackagePath="README.md"/>
   </ItemGroup>
+
   <PropertyGroup>
     <LangVersion>12</LangVersion>
     <Nullable>enable</Nullable>

diff --git a/OSLC4Net_SDK/OSLC4Net.ChangeManagement/OSLC4Net.ChangeManagementCommon.csproj b/OSLC4Net_SDK/OSLC4Net.ChangeManagement/OSLC4Net.ChangeManagementCommon.csproj
@@ -2,10 +2,10 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <OutputType>Library</OutputType>
-    <RootNamespace>OSLC4Net.ChangeManagement</RootNamespace>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <AssemblyTitle>ChangeManagement</AssemblyTitle>
+    <RootNamespace>OSLC4Net.ChangeManagement</RootNamespace>
+    <AssemblyTitle>OSLC4Net.ChangeManagement</AssemblyTitle>
     <Product>OSLC4Net.ChangeManagement</Product>
   </PropertyGroup>
   <ItemGroup>

diff --git a/OSLC4Net_SDK/OSLC4Net.ChangeManagement/Properties/AssemblyInfo.cs b/OSLC4Net_SDK/OSLC4Net.ChangeManagement/Properties/AssemblyInfo.cs
@@ -2,8 +2,6 @@
 using System.Runtime.InteropServices;
 using OSLC4Net.ChangeManagement;
 using OSLC4Net.Core.Attribute;
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from

diff --git a/OSLC4Net_SDK/OSLC4Net.Client/OSLC4Net.Client.csproj b/OSLC4Net_SDK/OSLC4Net.Client/OSLC4Net.Client.csproj
@@ -2,27 +2,15 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <OutputType>Library</OutputType>
-    <PackageLicenseExpression>EPL-1.0</PackageLicenseExpression>
-    <Authors>Andrii Berezovskyi and OSLC4Net contributors</Authors>
-    <PackageReadmeFile>README.md</PackageReadmeFile>
-    <PackageOutputPath>MSBuild_Nuget_Pack/</PackageOutputPath>
-    <PackageProjectUrl>https://github.com/OSLC/oslc4net/</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/OSLC/oslc4net/</RepositoryUrl>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AssemblyTitle>OSLC4Net.Client</AssemblyTitle>
     <Product>OSLC4Net.Client</Product>
-    <Copyright>Copyright OSLC4Net contributors 2023, IBM 2012</Copyright>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DocumentationFile>bin\Debug\OSLC4Net.Client.XML</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NuGet.Build.Tasks.Pack">
-      <!-- REVISIT: do we really need all this? (2024-10) -->
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <None Include="../../README.md" Pack="true" PackagePath="" />
   </ItemGroup>
   <ItemGroup>

diff --git a/OSLC4Net_SDK/OSLC4Net.Client/Properties/AssemblyInfo.cs b/OSLC4Net_SDK/OSLC4Net.Client/Properties/AssemblyInfo.cs
@@ -1,7 +1,5 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from

diff --git a/OSLC4Net_SDK/OSLC4Net.Core.DotNetRdfProvider/OSLC4Net.Core.DotNetRdfProvider.csproj b/OSLC4Net_SDK/OSLC4Net.Core.DotNetRdfProvider/OSLC4Net.Core.DotNetRdfProvider.csproj
@@ -16,9 +16,5 @@
     <PackageReference Include="Microsoft.AspNet.WebApi.Client" />
     <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="dotNetRdf.Core" />
-    <PackageReference Include="NuGet.Build.Tasks.Pack">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
   </ItemGroup>
 </Project>
diff --git a/OSLC4Net_SDK/OSLC4Net.Core.JsonProvider/OSLC4Net.Core.JsonProvider.csproj b/OSLC4Net_SDK/OSLC4Net.Core.JsonProvider/OSLC4Net.Core.JsonProvider.csproj
@@ -11,7 +11,6 @@
     <ProjectReference Include="..\OSLC4Net.Core\OSLC4Net.Core.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NuGet.Build.Tasks.Pack" />
     <PackageReference Include="System.Json" />
     <PackageReference Include="log4net" />
     <PackageReference Include="Microsoft.AspNet.WebApi.Client" />

diff --git a/OSLC4Net_SDK/OSLC4Net.Core.JsonProvider/Properties/AssemblyInfo.cs b/OSLC4Net_SDK/OSLC4Net.Core.JsonProvider/Properties/AssemblyInfo.cs
@@ -4,10 +4,6 @@
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyCopyright("Copyright OSLC4Net contributors 2023, IBM 2013")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from

diff --git a/OSLC4Net_SDK/OSLC4Net.Core.Query/OSLC4Net.Core.Query.csproj b/OSLC4Net_SDK/OSLC4Net.Core.Query/OSLC4Net.Core.Query.csproj
@@ -16,9 +16,5 @@
   <ItemGroup>
     <PackageReference Include="log4net" />
     <PackageReference Include="Antlr3.Runtime" />
-    <PackageReference Include="NuGet.Build.Tasks.Pack">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
   </ItemGroup>
 </Project>
diff --git a/OSLC4Net_SDK/OSLC4Net.Core.Query/Properties/AssemblyInfo.cs b/OSLC4Net_SDK/OSLC4Net.Core.Query/Properties/AssemblyInfo.cs
@@ -1,7 +1,5 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // TODO: improve for better F# interop
 //[assembly: CLSCompliant(true)]

diff --git a/OSLC4Net_SDK/OSLC4Net.Core/OSLC4Net.Core.csproj b/OSLC4Net_SDK/OSLC4Net.Core/OSLC4Net.Core.csproj
@@ -98,9 +98,5 @@
 
   <ItemGroup>
     <PackageReference Include="log4net" />
-    <PackageReference Include="NuGet.Build.Tasks.Pack">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
   </ItemGroup>
 </Project>
diff --git a/OSLC4Net_SDK/Tests/OSLC4Net.Client.Tests/Properties/AssemblyInfo.cs b/OSLC4Net_SDK/Tests/OSLC4Net.Client.Tests/Properties/AssemblyInfo.cs
@@ -1,7 +1,5 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from

diff --git a/OSLC4Net_SDK/Tests/OSLC4Net.Core.DotNetRdfProviderTests/Properties/AssemblyInfo.cs b/OSLC4Net_SDK/Tests/OSLC4Net.Core.DotNetRdfProviderTests/Properties/AssemblyInfo.cs
@@ -1,7 +1,5 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from

diff --git a/OSLC4Net_SDK/Tests/OSLC4Net.Core.JsonProviderTests/Properties/AssemblyInfo.cs b/OSLC4Net_SDK/Tests/OSLC4Net.Core.JsonProviderTests/Properties/AssemblyInfo.cs
@@ -4,10 +4,6 @@
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyCopyright("Copyright © IBM 2013")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from

diff --git a/OSLC4Net_SDK/Tests/OSLC4Net.Core.QueryTests/Properties/AssemblyInfo.cs b/OSLC4Net_SDK/Tests/OSLC4Net.Core.QueryTests/Properties/AssemblyInfo.cs
@@ -1,7 +1,5 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from