Skip to content

Commit e1f8bd3

Browse files
berezovskyiberezovskyi
authored
build: deterministic + unify props (#251)
* build: deterministic + unify props * fix: remove conflicting assembly attrs * build: deterministic paths too * docs: simplify copyright
1 parent fd443bf commit e1f8bd3

File tree

15 files changed

+19
-47
lines changed

15 files changed

+19
-47
lines changed

‎OSLC4Net_SDK/Directory.Build.props

+17
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,34 @@
11
<Project>
2+
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
3+
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
4+
</PropertyGroup>
5+
26
<PropertyGroup>
37
<Version Condition="'$(RELEASE_VERSION)' != ''">$(RELEASE_VERSION)</Version>
48
<VersionPrefix Condition="'$(RELEASE_VERSION)' == ''">999.9.9</VersionPrefix>
59
<VersionSuffix Condition="'$(RELEASE_VERSION)' == ''">ts.$([System.DateTime]::UtcNow.ToString(`yyyyMMddHHmm`))</VersionSuffix>
610
<PackageLicenseExpression>EPL-1.0</PackageLicenseExpression>
711
<Authors>Andrii Berezovskyi and OSLC4Net contributors</Authors>
12+
<Copyright>© Andrii Berezovskyi and OSLC4Net contributors 2023; © IBM 2012</Copyright>
813
<PackageReadmeFile>README.md</PackageReadmeFile>
914
<PackageProjectUrl>https://github.com/OSLC/oslc4net/</PackageProjectUrl>
1015
<RepositoryUrl>https://github.com/OSLC/oslc4net/</RepositoryUrl>
16+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
17+
</PropertyGroup>
18+
19+
<PropertyGroup>
20+
<IncludeSymbols>true</IncludeSymbols>
21+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
22+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
23+
<DeterministicSourcePaths>true</DeterministicSourcePaths>
1124
</PropertyGroup>
25+
26+
1227
<ItemGroup>
28+
<SourceRoot Include="$(MSBuildThisFileDirectory)/"/>
1329
<None Include="$(SolutionDir)\..\README.md" Pack="true" PackagePath="README.md"/>
1430
</ItemGroup>
31+
1532
<PropertyGroup>
1633
<LangVersion>12</LangVersion>
1734
<Nullable>enable</Nullable>

‎OSLC4Net_SDK/OSLC4Net.ChangeManagement/OSLC4Net.ChangeManagementCommon.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<PropertyGroup>
33
<TargetFramework>netstandard2.0</TargetFramework>
44
<OutputType>Library</OutputType>
5-
<RootNamespace>OSLC4Net.ChangeManagement</RootNamespace>
65
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
76
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
8-
<AssemblyTitle>ChangeManagement</AssemblyTitle>
7+
<RootNamespace>OSLC4Net.ChangeManagement</RootNamespace>
8+
<AssemblyTitle>OSLC4Net.ChangeManagement</AssemblyTitle>
99
<Product>OSLC4Net.ChangeManagement</Product>
1010
</PropertyGroup>
1111
<ItemGroup>

‎OSLC4Net_SDK/OSLC4Net.ChangeManagement/Properties/AssemblyInfo.cs

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
using System.Runtime.InteropServices;
33
using OSLC4Net.ChangeManagement;
44
using OSLC4Net.Core.Attribute;
5-
[assembly: AssemblyTrademark("")]
6-
[assembly: AssemblyCulture("")]
75

86
// Setting ComVisible to false makes the types in this assembly not visible
97
// to COM components. If you need to access a type in this assembly from

‎OSLC4Net_SDK/OSLC4Net.Client/OSLC4Net.Client.csproj

-12
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,15 @@
22
<PropertyGroup>
33
<TargetFramework>netstandard2.1</TargetFramework>
44
<OutputType>Library</OutputType>
5-
<PackageLicenseExpression>EPL-1.0</PackageLicenseExpression>
6-
<Authors>Andrii Berezovskyi and OSLC4Net contributors</Authors>
7-
<PackageReadmeFile>README.md</PackageReadmeFile>
8-
<PackageOutputPath>MSBuild_Nuget_Pack/</PackageOutputPath>
9-
<PackageProjectUrl>https://github.com/OSLC/oslc4net/</PackageProjectUrl>
10-
<RepositoryUrl>https://github.com/OSLC/oslc4net/</RepositoryUrl>
115
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
126
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
137
<AssemblyTitle>OSLC4Net.Client</AssemblyTitle>
148
<Product>OSLC4Net.Client</Product>
15-
<Copyright>Copyright OSLC4Net contributors 2023, IBM 2012</Copyright>
169
</PropertyGroup>
1710
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1811
<DocumentationFile>bin\Debug\OSLC4Net.Client.XML</DocumentationFile>
1912
</PropertyGroup>
2013
<ItemGroup>
21-
<PackageReference Include="NuGet.Build.Tasks.Pack">
22-
<!-- REVISIT: do we really need all this? (2024-10) -->
23-
<PrivateAssets>all</PrivateAssets>
24-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
25-
</PackageReference>
2614
<None Include="../../README.md" Pack="true" PackagePath="" />
2715
</ItemGroup>
2816
<ItemGroup>

‎OSLC4Net_SDK/OSLC4Net.Client/Properties/AssemblyInfo.cs

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
using System.Reflection;
22
using System.Runtime.InteropServices;
3-
[assembly: AssemblyTrademark("")]
4-
[assembly: AssemblyCulture("")]
53

64
// Setting ComVisible to false makes the types in this assembly not visible
75
// to COM components. If you need to access a type in this assembly from

‎OSLC4Net_SDK/OSLC4Net.Core.DotNetRdfProvider/OSLC4Net.Core.DotNetRdfProvider.csproj

-4
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,5 @@
1616
<PackageReference Include="Microsoft.AspNet.WebApi.Client" />
1717
<PackageReference Include="Newtonsoft.Json" />
1818
<PackageReference Include="dotNetRdf.Core" />
19-
<PackageReference Include="NuGet.Build.Tasks.Pack">
20-
<PrivateAssets>all</PrivateAssets>
21-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
22-
</PackageReference>
2319
</ItemGroup>
2420
</Project>

‎OSLC4Net_SDK/OSLC4Net.Core.JsonProvider/OSLC4Net.Core.JsonProvider.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<ProjectReference Include="..\OSLC4Net.Core\OSLC4Net.Core.csproj" />
1212
</ItemGroup>
1313
<ItemGroup>
14-
<PackageReference Include="NuGet.Build.Tasks.Pack" />
1514
<PackageReference Include="System.Json" />
1615
<PackageReference Include="log4net" />
1716
<PackageReference Include="Microsoft.AspNet.WebApi.Client" />

‎OSLC4Net_SDK/OSLC4Net.Core.JsonProvider/Properties/AssemblyInfo.cs

-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
// General Information about an assembly is controlled through the following
55
// set of attributes. Change these attribute values to modify the information
66
// associated with an assembly.
7-
[assembly: AssemblyDescription("")]
8-
[assembly: AssemblyCopyright("Copyright OSLC4Net contributors 2023, IBM 2013")]
9-
[assembly: AssemblyTrademark("")]
10-
[assembly: AssemblyCulture("")]
117

128
// Setting ComVisible to false makes the types in this assembly not visible
139
// to COM components. If you need to access a type in this assembly from

‎OSLC4Net_SDK/OSLC4Net.Core.Query/OSLC4Net.Core.Query.csproj

-4
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,5 @@
1616
<ItemGroup>
1717
<PackageReference Include="log4net" />
1818
<PackageReference Include="Antlr3.Runtime" />
19-
<PackageReference Include="NuGet.Build.Tasks.Pack">
20-
<PrivateAssets>all</PrivateAssets>
21-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
22-
</PackageReference>
2319
</ItemGroup>
2420
</Project>

‎OSLC4Net_SDK/OSLC4Net.Core.Query/Properties/AssemblyInfo.cs

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
using System.Reflection;
22
using System.Runtime.InteropServices;
3-
[assembly: AssemblyTrademark("")]
4-
[assembly: AssemblyCulture("")]
53

64
// TODO: improve for better F# interop
75
//[assembly: CLSCompliant(true)]

‎OSLC4Net_SDK/OSLC4Net.Core/OSLC4Net.Core.csproj

-4
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,5 @@
9898

9999
<ItemGroup>
100100
<PackageReference Include="log4net" />
101-
<PackageReference Include="NuGet.Build.Tasks.Pack">
102-
<PrivateAssets>all</PrivateAssets>
103-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
104-
</PackageReference>
105101
</ItemGroup>
106102
</Project>

‎OSLC4Net_SDK/Tests/OSLC4Net.Client.Tests/Properties/AssemblyInfo.cs

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
using System.Reflection;
22
using System.Runtime.InteropServices;
3-
[assembly: AssemblyTrademark("")]
4-
[assembly: AssemblyCulture("")]
53

64
// Setting ComVisible to false makes the types in this assembly not visible
75
// to COM components. If you need to access a type in this assembly from

‎OSLC4Net_SDK/Tests/OSLC4Net.Core.DotNetRdfProviderTests/Properties/AssemblyInfo.cs

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
using System.Reflection;
22
using System.Runtime.InteropServices;
3-
[assembly: AssemblyTrademark("")]
4-
[assembly: AssemblyCulture("")]
53

64
// Setting ComVisible to false makes the types in this assembly not visible
75
// to COM components. If you need to access a type in this assembly from

‎OSLC4Net_SDK/Tests/OSLC4Net.Core.JsonProviderTests/Properties/AssemblyInfo.cs

-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
// General Information about an assembly is controlled through the following
55
// set of attributes. Change these attribute values to modify the information
66
// associated with an assembly.
7-
[assembly: AssemblyDescription("")]
8-
[assembly: AssemblyCopyright("Copyright © IBM 2013")]
9-
[assembly: AssemblyTrademark("")]
10-
[assembly: AssemblyCulture("")]
117

128
// Setting ComVisible to false makes the types in this assembly not visible
139
// to COM components. If you need to access a type in this assembly from

‎OSLC4Net_SDK/Tests/OSLC4Net.Core.QueryTests/Properties/AssemblyInfo.cs

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
using System.Reflection;
22
using System.Runtime.InteropServices;
3-
[assembly: AssemblyTrademark("")]
4-
[assembly: AssemblyCulture("")]
53

64
// Setting ComVisible to false makes the types in this assembly not visible
75
// to COM components. If you need to access a type in this assembly from

0 commit comments

Comments
 (0)