Lucene.Net.Tests.Cli: Added ComonAssemblyInfo.cs reference, moved build options to common section of project.json and fixed AssemblyInfo attributes to remove conflicts.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/d0e5d981 Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/d0e5d981 Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/d0e5d981 Branch: refs/heads/master Commit: d0e5d981b8fa4ab80c21c4aa57622484475ac4d0 Parents: 18a934c Author: Shad Storhaug <[email protected]> Authored: Tue Jul 11 12:51:00 2017 +0700 Committer: Shad Storhaug <[email protected]> Committed: Tue Jul 11 12:51:00 2017 +0700 ---------------------------------------------------------------------- .../Properties/AssemblyInfo.cs | 6 ++--- src/tools/Lucene.Net.Tests.Cli/project.json | 27 ++++++++++++-------- 2 files changed, 19 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d0e5d981/src/tools/Lucene.Net.Tests.Cli/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --git a/src/tools/Lucene.Net.Tests.Cli/Properties/AssemblyInfo.cs b/src/tools/Lucene.Net.Tests.Cli/Properties/AssemblyInfo.cs index a5b2792..17c698d 100644 --- a/src/tools/Lucene.Net.Tests.Cli/Properties/AssemblyInfo.cs +++ b/src/tools/Lucene.Net.Tests.Cli/Properties/AssemblyInfo.cs @@ -22,10 +22,10 @@ using System.Runtime.InteropServices; // 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: AssemblyTitle("Lucene.Net.Tests.Cli")] +[assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Lucene.Net.Tests.Cli")] -[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 http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d0e5d981/src/tools/Lucene.Net.Tests.Cli/project.json ---------------------------------------------------------------------- diff --git a/src/tools/Lucene.Net.Tests.Cli/project.json b/src/tools/Lucene.Net.Tests.Cli/project.json index 9ff17e3..8e779c5 100644 --- a/src/tools/Lucene.Net.Tests.Cli/project.json +++ b/src/tools/Lucene.Net.Tests.Cli/project.json @@ -1,6 +1,21 @@ { "version": "4.8.0", "title": "Lucene.Net.Tests.Cli", + "buildOptions": { + "compile": { + "includeFiles": [ + "../../CommonAssemblyInfo.cs" + ], + "excludeFiles": [ + "SourceCode/TestInputForParser.cs" + ] + }, + "embed": { + "includeFiles": [ + "SourceCode/TestInputForParser.cs" + ] + } + }, "dependencies": { "dotnet-test-nunit-teamcity": "3.4.0-beta-3", "lucene-cli": "4.8.0", @@ -14,17 +29,7 @@ "imports": "dnxcore50", "buildOptions": { "debugType": "portable", - "define": [ "NETSTANDARD" ], - "compile": { - "excludeFiles": [ - "SourceCode/TestInputForParser.cs" - ] - }, - "embed": { - "includeFiles": [ - "SourceCode/TestInputForParser.cs" - ] - } + "define": [ "NETSTANDARD" ] } } },
