This is an automated email from the ASF dual-hosted git repository.
ptupitsyn pushed a commit to branch ignite-2.12
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/ignite-2.12 by this push:
new 2fcd56f IGNITE-15779 .NET: Fix Schema project version and examples
packaging (#9524)
2fcd56f is described below
commit 2fcd56f4ebf66abd09b7c590294159d470a0540c
Author: Pavel Tupitsyn <[email protected]>
AuthorDate: Mon Oct 25 23:04:51 2021 +0300
IGNITE-15779 .NET: Fix Schema project version and examples packaging (#9524)
* Add `SharedAssemblyInfo` to `Apache.Ignite.Schema`.
* Fix build.ps1 to pack example sources without building them.
* Add `$versionSuffix` to the build script for nightly versions.
* Add explicit PackageId to csproj files.
(cherry picked from commit b94a6751330c631335dd4e9569c557833382f295)
---
assembly/release-apache-ignite-base.xml | 3 +++
.../Apache.Ignite.AspNet/Apache.Ignite.AspNet.csproj | 1 +
.../Apache.Ignite.EntityFramework.csproj | 1 +
.../Apache.Ignite.Linq/Apache.Ignite.Linq.csproj | 1 +
.../Apache.Ignite.Log4Net/Apache.Ignite.Log4Net.csproj | 1 +
.../Apache.Ignite.NLog/Apache.Ignite.NLog.csproj | 1 +
.../Apache.Ignite.Schema/Apache.Ignite.Schema.csproj | 3 +++
modules/platforms/dotnet/build.ps1 | 18 +++++++++---------
packaging/rpm/apache-ignite.spec | 1 +
9 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/assembly/release-apache-ignite-base.xml
b/assembly/release-apache-ignite-base.xml
index 27294b5..ea16113 100644
--- a/assembly/release-apache-ignite-base.xml
+++ b/assembly/release-apache-ignite-base.xml
@@ -78,6 +78,9 @@
<fileSet>
<directory>modules/platforms/dotnet/bin</directory>
<outputDirectory>/platforms/dotnet/bin</outputDirectory>
+ <excludes>
+ <exclude>libs/**</exclude>
+ </excludes>
</fileSet>
<!-- Move .Net docs. -->
diff --git
a/modules/platforms/dotnet/Apache.Ignite.AspNet/Apache.Ignite.AspNet.csproj
b/modules/platforms/dotnet/Apache.Ignite.AspNet/Apache.Ignite.AspNet.csproj
index 4d63caf..808f904 100644
--- a/modules/platforms/dotnet/Apache.Ignite.AspNet/Apache.Ignite.AspNet.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.AspNet/Apache.Ignite.AspNet.csproj
@@ -10,6 +10,7 @@
<DelaySign>false</DelaySign>
<AssemblyOriginatorKeyFile>Apache.Ignite.AspNet.snk</AssemblyOriginatorKeyFile>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
+ <PackageId>Apache.Ignite.AspNet</PackageId>
<Description>Apache Ignite ASP.NET Integration. Output Cache Provider:
caches page output in a distributed in-memory cache. Session State Store
Provider: stores session state data in a distributed in-memory
cache.</Description>
<CodeAnalysisRuleSet>..\Apache.Ignite.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
diff --git
a/modules/platforms/dotnet/Apache.Ignite.EntityFramework/Apache.Ignite.EntityFramework.csproj
b/modules/platforms/dotnet/Apache.Ignite.EntityFramework/Apache.Ignite.EntityFramework.csproj
index 53f4091..645c98d 100644
---
a/modules/platforms/dotnet/Apache.Ignite.EntityFramework/Apache.Ignite.EntityFramework.csproj
+++
b/modules/platforms/dotnet/Apache.Ignite.EntityFramework/Apache.Ignite.EntityFramework.csproj
@@ -10,6 +10,7 @@
<DelaySign>false</DelaySign>
<AssemblyOriginatorKeyFile>Apache.Ignite.EntityFramework.snk</AssemblyOriginatorKeyFile>
<IsPackable>true</IsPackable>
+ <PackageId>Apache.Ignite.EntityFramework</PackageId>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Description>Apache Ignite EntityFramework Second Level Cache: caches EF
query results in a distributed in-memory cache.</Description>
<CodeAnalysisRuleSet>..\Apache.Ignite.ruleset</CodeAnalysisRuleSet>
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Linq/Apache.Ignite.Linq.csproj
b/modules/platforms/dotnet/Apache.Ignite.Linq/Apache.Ignite.Linq.csproj
index 5516794..38f251b 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Linq/Apache.Ignite.Linq.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Linq/Apache.Ignite.Linq.csproj
@@ -10,6 +10,7 @@
<DelaySign>false</DelaySign>
<AssemblyOriginatorKeyFile>Apache.Ignite.Linq.snk</AssemblyOriginatorKeyFile>
<IsPackable>true</IsPackable>
+ <PackageId>Apache.Ignite.Linq</PackageId>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Description>Apache Ignite LINQ Provider. Query distributed in-memory data
in a strongly-typed manner and with IDE support. All Ignite SQL features are
supported: distributed joins, groupings, aggregates, field queries, and
more.</Description>
<CodeAnalysisRuleSet>..\Apache.Ignite.ruleset</CodeAnalysisRuleSet>
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Log4Net/Apache.Ignite.Log4Net.csproj
b/modules/platforms/dotnet/Apache.Ignite.Log4Net/Apache.Ignite.Log4Net.csproj
index ced2797..b85e154 100644
---
a/modules/platforms/dotnet/Apache.Ignite.Log4Net/Apache.Ignite.Log4Net.csproj
+++
b/modules/platforms/dotnet/Apache.Ignite.Log4Net/Apache.Ignite.Log4Net.csproj
@@ -10,6 +10,7 @@
<DelaySign>false</DelaySign>
<AssemblyOriginatorKeyFile>Apache.Ignite.Log4Net.snk</AssemblyOriginatorKeyFile>
<IsPackable>true</IsPackable>
+ <PackageId>Apache.Ignite.Log4Net</PackageId>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Description>Apache Ignite log4net Logger.</Description>
<CodeAnalysisRuleSet>..\Apache.Ignite.ruleset</CodeAnalysisRuleSet>
diff --git
a/modules/platforms/dotnet/Apache.Ignite.NLog/Apache.Ignite.NLog.csproj
b/modules/platforms/dotnet/Apache.Ignite.NLog/Apache.Ignite.NLog.csproj
index c3bf379..5ae8666 100644
--- a/modules/platforms/dotnet/Apache.Ignite.NLog/Apache.Ignite.NLog.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.NLog/Apache.Ignite.NLog.csproj
@@ -10,6 +10,7 @@
<DelaySign>false</DelaySign>
<AssemblyOriginatorKeyFile>Apache.Ignite.NLog.snk</AssemblyOriginatorKeyFile>
<IsPackable>true</IsPackable>
+ <PackageId>Apache.Ignite.NLog</PackageId>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Description>Apache Ignite NLog Logger.</Description>
<CodeAnalysisRuleSet>..\Apache.Ignite.ruleset</CodeAnalysisRuleSet>
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Schema/Apache.Ignite.Schema.csproj
b/modules/platforms/dotnet/Apache.Ignite.Schema/Apache.Ignite.Schema.csproj
index 481f3b3..a31de93 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Schema/Apache.Ignite.Schema.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Schema/Apache.Ignite.Schema.csproj
@@ -4,9 +4,12 @@
<IncludeBuildOutput>false</IncludeBuildOutput>
<Description>XSD file describes the structure of
IgniteConfigurationSection and enables Intellisense(TM) when editing
IgniteConfigurationSection in app.config and web.config in Visual
Studio.</Description>
<IsPackable>true</IsPackable>
+ <PackageId>Apache.Ignite.Schema</PackageId>
<NoWarn>NU5128</NoWarn> <!-- Some target frameworks declared in the
dependencies group of the nuspec and the lib/ref folder do not have exact
matches in the other location. -->
+ <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<ItemGroup>
+ <Compile Include="..\SharedAssemblyInfo.cs" />
<None Include="..\Apache.Ignite.Core\IgniteConfigurationSection.xsd"
Pack="true" PackagePath="content"/>
<None Include="..\Apache.Ignite.Core\IgniteClientConfigurationSection.xsd"
Pack="true" PackagePath="content"/>
</ItemGroup>
diff --git a/modules/platforms/dotnet/build.ps1
b/modules/platforms/dotnet/build.ps1
index 4ee71ab2..74e247e 100644
--- a/modules/platforms/dotnet/build.ps1
+++ b/modules/platforms/dotnet/build.ps1
@@ -85,7 +85,8 @@ param (
[string]$configuration="Release",
[string]$mavenOpts="-U
-P-lgpl,-scala,-all-scala,-spark-2.4,-examples,-test,-benchmarks
-Dmaven.javadoc.skip=true",
[string]$jarDirs="modules\indexing\target,modules\core\target,modules\spring\target",
- [string]$version=""
+ [string]$version="",
+ [string]$versionSuffix=""
)
# 0) Functions
@@ -203,23 +204,22 @@ if (!$skipNuGet) {
# Detect version
$ver = if ($version) { $version } else { (gi
Apache.Ignite.Core\bin\Release\netstandard2.0\Apache.Ignite.Core.dll).VersionInfo.ProductVersion
}
+ $ver = "$ver$versionSuffix"
Exec "dotnet pack Apache.Ignite.sln -c Release -o $nupkgDir
/p:Version=$ver"
echo "NuGet packages created in '$pwd\$nupkgDir'."
# Examples template
- if (!$skipExamples) {
- # Copy csproj to current dir temporarily: dotnet-new templates can't
be packed with parent dir content.
- Copy-Item
.\templates\public\Apache.Ignite.Examples\Apache.Ignite.Examples.csproj $pwd
+ # Copy csproj to current dir temporarily: dotnet-new templates can't be
packed with parent dir content.
+ Copy-Item
.\templates\public\Apache.Ignite.Examples\Apache.Ignite.Examples.csproj $pwd
- Exec "dotnet pack Apache.Ignite.Examples.csproj --output $nupkgDir
-p:PackageVersion=$ver"
+ Exec "dotnet pack Apache.Ignite.Examples.csproj --output $nupkgDir
-p:PackageVersion=$ver"
- Remove-Item Apache.Ignite.Examples.csproj
- Remove-Item bin\Debug -Force -Recurse
+ Remove-Item Apache.Ignite.Examples.csproj
+ Remove-Item bin\Debug -Force -Recurse
- echo "Examples template NuGet package created in '$pwd\$nupkgDir'."
- }
+ echo "Examples template NuGet package created in '$pwd\$nupkgDir'."
}
# 4) Build Examples
diff --git a/packaging/rpm/apache-ignite.spec b/packaging/rpm/apache-ignite.spec
index 002bc7a..e438fb1 100644
--- a/packaging/rpm/apache-ignite.spec
+++ b/packaging/rpm/apache-ignite.spec
@@ -3,6 +3,7 @@
%define _libdir /usr/lib
%define _log %{_var}/log
%define _sharedstatedir /var/lib
+%define _binaries_in_noarch_packages_terminate_build 0
#-------------------------------------------------------------------------------
