This is an automated email from the ASF dual-hosted git repository. nightowl888 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/lucenenet.git
commit 83ee0a48313c0431160d31323a6c60b51ca6fb43 Author: Shad Storhaug <[email protected]> AuthorDate: Mon Jul 15 17:05:05 2019 +0700 Removed Version.proj file and moved the version properties into the root Directory.Build.props file --- Directory.Build.props | 14 +++++++++ Lucene.Net.sln | 1 - Version.proj | 36 ---------------------- build/build.ps1 | 6 ++-- .../Lucene.Net.Analysis.Common.csproj | 1 - .../Lucene.Net.Analysis.Kuromoji.csproj | 1 - .../Lucene.Net.Analysis.Phonetic.csproj | 1 - .../Lucene.Net.Analysis.SmartCn.csproj | 1 - .../Lucene.Net.Analysis.Stempel.csproj | 1 - .../Lucene.Net.Benchmark.csproj | 1 - .../Lucene.Net.Classification.csproj | 1 - src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj | 1 - src/Lucene.Net.Demo/Lucene.Net.Demo.csproj | 1 - .../Lucene.Net.Expressions.csproj | 1 - src/Lucene.Net.Facet/Lucene.Net.Facet.csproj | 1 - src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj | 1 - .../Lucene.Net.Highlighter.csproj | 1 - src/Lucene.Net.Join/Lucene.Net.Join.csproj | 1 - src/Lucene.Net.Memory/Lucene.Net.Memory.csproj | 1 - src/Lucene.Net.Misc/Lucene.Net.Misc.csproj | 1 - src/Lucene.Net.Queries/Lucene.Net.Queries.csproj | 1 - .../Lucene.Net.QueryParser.csproj | 1 - .../Lucene.Net.Replicator.csproj | 1 - src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj | 1 - src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj | 1 - src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj | 1 - .../Lucene.Net.TestFramework.csproj | 1 - .../Lucene.Net.Tests.Analysis.Common.csproj | 1 - .../Lucene.Net.Tests.Analysis.Kuromoji.csproj | 1 - .../Lucene.Net.Tests.Analysis.Phonetic.csproj | 1 - .../Lucene.Net.Tests.Analysis.SmartCn.csproj | 1 - .../Lucene.Net.Tests.Analysis.Stempel.csproj | 1 - .../Lucene.Net.Tests.Benchmark.csproj | 1 - .../Lucene.Net.Tests.Classification.csproj | 1 - .../Lucene.Net.Tests.Codecs.csproj | 1 - .../Lucene.Net.Tests.Demo.csproj | 1 - .../Lucene.Net.Tests.Expressions.csproj | 1 - .../Lucene.Net.Tests.Facet.csproj | 1 - .../Lucene.Net.Tests.Grouping.csproj | 1 - .../Lucene.Net.Tests.Highlighter.csproj | 1 - .../Lucene.Net.Tests.Join.csproj | 1 - .../Lucene.Net.Tests.Memory.csproj | 1 - .../Lucene.Net.Tests.Misc.csproj | 1 - .../Lucene.Net.Tests.Queries.csproj | 1 - .../Lucene.Net.Tests.QueryParser.csproj | 1 - .../Lucene.Net.Tests.Replicator.csproj | 1 - .../Lucene.Net.Tests.Sandbox.csproj | 1 - .../Lucene.Net.Tests.Spatial.csproj | 1 - .../Lucene.Net.Tests.Suggest.csproj | 1 - src/Lucene.Net.Tests/Lucene.Net.Tests.csproj | 1 - src/Lucene.Net/Lucene.Net.csproj | 1 - src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj | 1 - .../Lucene.Net.Replicator.AspNetCore.csproj | 1 - .../Lucene.Net.Tests.ICU.csproj | 1 - .../Lucene.Net.Tests.Cli.csproj | 2 -- src/dotnet/tools/lucene-cli/lucene-cli.csproj | 1 - 56 files changed, 17 insertions(+), 93 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index fc37121..31f0f94 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -21,6 +21,20 @@ <Project> <Import Project="build\Dependencies.props" /> + <!-- IMPORTANT: When these values are changed, the CI counter number should also be reset. --> + <PropertyGroup Label="Version of Builds"> + <!-- IMPORTANT: VersionPrefix must always be the same as the Lucene version this is based on. + Never increment it for an individual build - only increment this when an entire version's changes + are ported over from Lucene. This is what determines the version of all of the NuGet packages and binaries. + For patching a production build, we will add a 4th segment (4.8.0.1) since it would be confusing to increment to + 4.8.1 if we haven't actually ported over the changes from Lucene 4.8.1. --> + <VersionPrefix>4.8.0</VersionPrefix> + + <!-- .NET enforces AssemblyVersion as the "major" version (when strong-named), + so AssemblyVersion should only be changed for each major version release. --> + <AssemblyVersion>4.0.0</AssemblyVersion> + </PropertyGroup> + <PropertyGroup Label="NuGet Package Defaults"> <IsPackable>false</IsPackable> </PropertyGroup> diff --git a/Lucene.Net.sln b/Lucene.Net.sln index bdfcaaf..c985b95 100644 --- a/Lucene.Net.sln +++ b/Lucene.Net.sln @@ -34,7 +34,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{4016BDAB build\NuGet.props = build\NuGet.props build\TestReferences.Common.targets = build\TestReferences.Common.targets TestTargetFramework.proj = TestTargetFramework.proj - Version.proj = Version.proj EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{4DF7EACE-2B25-43F6-B558-8520BF20BD76}" diff --git a/Version.proj b/Version.proj deleted file mode 100644 index d603e38..0000000 --- a/Version.proj +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. - ---> -<Project> - - <!-- IMPORTANT: When these values are changed, the TeamCity counter number should also be reset. --> - <PropertyGroup> - <!-- IMPORTANT: VersionPrefix must always be the same as the Lucene version this is based on. - Never increment it for an individual build - only increment this when an entire version's changes - are ported over from Lucene. This is what determines the version of all of the NuGet packages and binaries. --> - <VersionPrefix>4.8.0</VersionPrefix> - - <!-- .NET enforces AssemblyVersion as the "major" version (when strong-named), - so AssemblyVersion should only be changed for each major version release. --> - <AssemblyVersion>4.0.0</AssemblyVersion> - </PropertyGroup> - -</Project> diff --git a/build/build.ps1 b/build/build.ps1 index 8b1b652..899434b 100644 --- a/build/build.ps1 +++ b/build/build.ps1 @@ -26,7 +26,6 @@ properties { [string]$test_results_directory = "$release_directory/TestResults" [string]$publish_directory = "$release_directory/Publish" [string]$solutionFile = "$base_directory/Lucene.Net.sln" - [string]$versionFile = "$base_directory/Version.proj" [string]$sdkPath = "$env:programfiles/dotnet/sdk" [string]$sdkVersion = "2.2.300" [string]$globalJsonFile = "$base_directory/global.json" @@ -54,6 +53,7 @@ properties { $backedUpFiles = New-Object System.Collections.ArrayList + task default -depends Pack task Clean -description "This task cleans up the build directory" { @@ -250,10 +250,10 @@ function Get-Package-Version() { return $env:PackageVersion } else { #Get the version info - $versionFile = "$base_directory/Version.proj" + $versionFile = "$base_directory/Directory.Build.props" $xml = [xml](Get-Content $versionFile) - $versionPrefix = $xml.Project.PropertyGroup.VersionPrefix + $versionPrefix = ([string]$xml.Project.PropertyGroup.VersionPrefix).Trim() if ([string]::IsNullOrWhiteSpace($versionSuffix)) { # this is a production release - use 4 segment version number 0.0.0.0 diff --git a/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj b/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj index 6b6c159..4a83c67 100644 --- a/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj +++ b/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj @@ -21,7 +21,6 @@ --> <Project Sdk="Microsoft.NET.Sdk"> - <Import Project="$(SolutionDir)Version.proj" /> <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> diff --git a/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj b/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj index 679979f..1d027e2 100644 --- a/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj +++ b/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj @@ -21,7 +21,6 @@ --> <Project Sdk="Microsoft.NET.Sdk"> - <Import Project="$(SolutionDir)Version.proj" /> <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> diff --git a/src/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.csproj b/src/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.csproj index 3eeb02b..33e5b57 100644 --- a/src/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.csproj +++ b/src/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.csproj @@ -21,7 +21,6 @@ --> <Project Sdk="Microsoft.NET.Sdk"> - <Import Project="$(SolutionDir)Version.proj" /> <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> diff --git a/src/Lucene.Net.Analysis.SmartCn/Lucene.Net.Analysis.SmartCn.csproj b/src/Lucene.Net.Analysis.SmartCn/Lucene.Net.Analysis.SmartCn.csproj index d75c8f8..60df0a4 100644 --- a/src/Lucene.Net.Analysis.SmartCn/Lucene.Net.Analysis.SmartCn.csproj +++ b/src/Lucene.Net.Analysis.SmartCn/Lucene.Net.Analysis.SmartCn.csproj @@ -21,7 +21,6 @@ --> <Project Sdk="Microsoft.NET.Sdk"> - <Import Project="$(SolutionDir)Version.proj" /> <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> diff --git a/src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj b/src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj index d5dcc11..869f298 100644 --- a/src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj +++ b/src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj @@ -21,7 +21,6 @@ --> <Project Sdk="Microsoft.NET.Sdk"> - <Import Project="$(SolutionDir)Version.proj" /> <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> diff --git a/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj b/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj index e8605d6..7f97ee7 100644 --- a/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj +++ b/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj @@ -21,7 +21,6 @@ --> <Project Sdk="Microsoft.NET.Sdk"> - <Import Project="$(SolutionDir)Version.proj" /> <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> diff --git a/src/Lucene.Net.Classification/Lucene.Net.Classification.csproj b/src/Lucene.Net.Classification/Lucene.Net.Classification.csproj index 1831384..7e80480 100644 --- a/src/Lucene.Net.Classification/Lucene.Net.Classification.csproj +++ b/src/Lucene.Net.Classification/Lucene.Net.Classification.csproj @@ -21,7 +21,6 @@ --> <Project Sdk="Microsoft.NET.Sdk"> - <Import Project="$(SolutionDir)Version.proj" /> <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> diff --git a/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj b/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj index 4ca8a3b..c37d2b1 100644 --- a/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj +++ b/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj @@ -21,7 +21,6 @@ --> <Project Sdk="Microsoft.NET.Sdk"> - <Import Project="$(SolutionDir)Version.proj" /> <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> diff --git a/src/Lucene.Net.Demo/Lucene.Net.Demo.csproj b/src/Lucene.Net.Demo/Lucene.Net.Demo.csproj index 9f23ae7..88f5210 100644 --- a/src/Lucene.Net.Demo/Lucene.Net.Demo.csproj +++ b/src/Lucene.Net.Demo/Lucene.Net.Demo.csproj @@ -21,7 +21,6 @@ --> <Project Sdk="Microsoft.NET.Sdk"> - <Import Project="$(SolutionDir)Version.proj" /> <!-- Demo is deployed through the dotnet/tools/lucene-cli package --> <PropertyGroup> diff --git a/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj b/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj index a4be81a..68ed9af 100644 --- a/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj +++ b/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj @@ -21,7 +21,6 @@ --> <Project Sdk="Microsoft.NET.Sdk"> - <Import Project="$(SolutionDir)Version.proj" /> <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> diff --git a/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj b/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj index 94668e3..bc1c6b2 100644 --- a/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj +++ b/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj @@ -21,7 +21,6 @@ --> <Project Sdk="Microsoft.NET.Sdk"> - <Import Project="$(SolutionDir)Version.proj" /> <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> diff --git a/src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj b/src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj index 8c2543e..2e2f5aa 100644 --- a/src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj +++ b/src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj @@ -21,7 +21,6 @@ --> <Project Sdk="Microsoft.NET.Sdk"> - <Import Project="$(SolutionDir)Version.proj" /> <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> diff --git a/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj b/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj index beabc81..9eed3b2 100644 --- a/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj +++ b/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj @@ -21,7 +21,6 @@ --> <Project Sdk="Microsoft.NET.Sdk"> - <Import Project="$(SolutionDir)Version.proj" /> <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> diff --git a/src/Lucene.Net.Join/Lucene.Net.Join.csproj b/src/Lucene.Net.Join/Lucene.Net.Join.csproj index 3a50ca8..dd282c8 100644 --- a/src/Lucene.Net.Join/Lucene.Net.Join.csproj +++ b/src/Lucene.Net.Join/Lucene.Net.Join.csproj @@ -21,7 +21,6 @@ --> <Project Sdk="Microsoft.NET.Sdk"> - <Import Project="$(SolutionDir)Version.proj" /> <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> diff --git a/src/Lucene.Net.Memory/Lucene.Net.Memory.csproj b/src/Lucene.Net.Memory/Lucene.Net.Memory.csproj index 0db69ca..5bcb143 100644 --- a/src/Lucene.Net.Memory/Lucene.Net.Memory.csproj +++ b/src/Lucene.Net.Memory/Lucene.Net.Memory.csproj @@ -21,7 +21,6 @@ --> <Project Sdk="Microsoft.NET.Sdk"> - <Import Project="$(SolutionDir)Version.proj" /> <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> diff --git a/src/Lucene.Net.Misc/Lucene.Net.Misc.csproj b/src/Lucene.Net.Misc/Lucene.Net.Misc.csproj index 6d951ec..fbdc51b 100644 --- a/src/Lucene.Net.Misc/Lucene.Net.Misc.csproj +++ b/src/Lucene.Net.Misc/Lucene.Net.Misc.csproj @@ -21,7 +21,6 @@ --> <Project Sdk="Microsoft.NET.Sdk"> - <Import Project="$(SolutionDir)Version.proj" /> <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> diff --git a/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj b/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj index 8acad94..cdcb187 100644 --- a/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj +++ b/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj @@ -21,7 +21,6 @@ --> <Project Sdk="Microsoft.NET.Sdk"> - <Import Project="$(SolutionDir)Version.proj" /> <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> diff --git a/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj b/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj index 138367c..b331207 100644 --- a/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj +++ b/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj @@ -21,7 +21,6 @@ --> <Project Sdk="Microsoft.NET.Sdk"> - <Import Project="$(SolutionDir)Version.proj" /> <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> diff --git a/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj b/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj index a924a31..cd59401 100644 --- a/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj +++ b/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj @@ -21,7 +21,6 @@ --> <Project Sdk="Microsoft.NET.Sdk"> - <Import Project="$(SolutionDir)Version.proj" /> <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> diff --git a/src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj b/src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj index dc641b6..77abfff 100644 --- a/src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj +++ b/src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj @@ -21,7 +21,6 @@ --> <Project Sdk="Microsoft.NET.Sdk"> - <Import Project="$(SolutionDir)Version.proj" /> <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> diff --git a/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj b/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj index 265dc86..c23ed96 100644 --- a/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj +++ b/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj @@ -21,7 +21,6 @@ --> <Project Sdk="Microsoft.NET.Sdk"> - <Import Project="$(SolutionDir)Version.proj" /> <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> diff --git a/src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj b/src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj index c7a00cc..245ff95 100644 --- a/src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj +++ b/src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj @@ -21,7 +21,6 @@ --> <Project Sdk="Microsoft.NET.Sdk"> - <Import Project="$(SolutionDir)Version.proj" /> <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> diff --git a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj index 7859499..dc54660 100644 --- a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj +++ b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj @@ -21,7 +21,6 @@ --> <Project Sdk="Microsoft.NET.Sdk"> - <Import Project="$(SolutionDir)Version.proj" /> <!-- This package is currently not being deployed to NuGet because it only works with NUnit and has many quality issues --> <!--<Import Project="$(SolutionDir)build/NuGet.props" />--> diff --git a/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj b/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj index a938523..834c0ee 100644 --- a/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj +++ b/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj @@ -22,7 +22,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <Import Project="$(SolutionDir)TestTargetFramework.proj" /> - <Import Project="$(SolutionDir)Version.proj" /> <PropertyGroup> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> diff --git a/src/Lucene.Net.Tests.Analysis.Kuromoji/Lucene.Net.Tests.Analysis.Kuromoji.csproj b/src/Lucene.Net.Tests.Analysis.Kuromoji/Lucene.Net.Tests.Analysis.Kuromoji.csproj index cfe3de3..650fc72 100644 --- a/src/Lucene.Net.Tests.Analysis.Kuromoji/Lucene.Net.Tests.Analysis.Kuromoji.csproj +++ b/src/Lucene.Net.Tests.Analysis.Kuromoji/Lucene.Net.Tests.Analysis.Kuromoji.csproj @@ -22,7 +22,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <Import Project="$(SolutionDir)TestTargetFramework.proj" /> - <Import Project="$(SolutionDir)Version.proj" /> <PropertyGroup> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> diff --git a/src/Lucene.Net.Tests.Analysis.Phonetic/Lucene.Net.Tests.Analysis.Phonetic.csproj b/src/Lucene.Net.Tests.Analysis.Phonetic/Lucene.Net.Tests.Analysis.Phonetic.csproj index 36c5c51..2963dfb 100644 --- a/src/Lucene.Net.Tests.Analysis.Phonetic/Lucene.Net.Tests.Analysis.Phonetic.csproj +++ b/src/Lucene.Net.Tests.Analysis.Phonetic/Lucene.Net.Tests.Analysis.Phonetic.csproj @@ -22,7 +22,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <Import Project="$(SolutionDir)TestTargetFramework.proj" /> - <Import Project="$(SolutionDir)Version.proj" /> <PropertyGroup> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> diff --git a/src/Lucene.Net.Tests.Analysis.SmartCn/Lucene.Net.Tests.Analysis.SmartCn.csproj b/src/Lucene.Net.Tests.Analysis.SmartCn/Lucene.Net.Tests.Analysis.SmartCn.csproj index aaca15c..eb11c15 100644 --- a/src/Lucene.Net.Tests.Analysis.SmartCn/Lucene.Net.Tests.Analysis.SmartCn.csproj +++ b/src/Lucene.Net.Tests.Analysis.SmartCn/Lucene.Net.Tests.Analysis.SmartCn.csproj @@ -22,7 +22,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <Import Project="$(SolutionDir)TestTargetFramework.proj" /> - <Import Project="$(SolutionDir)Version.proj" /> <PropertyGroup> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> diff --git a/src/Lucene.Net.Tests.Analysis.Stempel/Lucene.Net.Tests.Analysis.Stempel.csproj b/src/Lucene.Net.Tests.Analysis.Stempel/Lucene.Net.Tests.Analysis.Stempel.csproj index 4c9ec15..8cb8ed3 100644 --- a/src/Lucene.Net.Tests.Analysis.Stempel/Lucene.Net.Tests.Analysis.Stempel.csproj +++ b/src/Lucene.Net.Tests.Analysis.Stempel/Lucene.Net.Tests.Analysis.Stempel.csproj @@ -22,7 +22,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <Import Project="$(SolutionDir)TestTargetFramework.proj" /> - <Import Project="$(SolutionDir)Version.proj" /> <PropertyGroup> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> diff --git a/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj b/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj index 2daeb57..583a5a8 100644 --- a/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj +++ b/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj @@ -22,7 +22,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <Import Project="$(SolutionDir)TestTargetFramework.proj" /> - <Import Project="$(SolutionDir)Version.proj" /> <PropertyGroup> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> diff --git a/src/Lucene.Net.Tests.Classification/Lucene.Net.Tests.Classification.csproj b/src/Lucene.Net.Tests.Classification/Lucene.Net.Tests.Classification.csproj index 3f13d8e..ab6d67e 100644 --- a/src/Lucene.Net.Tests.Classification/Lucene.Net.Tests.Classification.csproj +++ b/src/Lucene.Net.Tests.Classification/Lucene.Net.Tests.Classification.csproj @@ -22,7 +22,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <Import Project="$(SolutionDir)TestTargetFramework.proj" /> - <Import Project="$(SolutionDir)Version.proj" /> <PropertyGroup> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> diff --git a/src/Lucene.Net.Tests.Codecs/Lucene.Net.Tests.Codecs.csproj b/src/Lucene.Net.Tests.Codecs/Lucene.Net.Tests.Codecs.csproj index a57069c..aaaf0b2 100644 --- a/src/Lucene.Net.Tests.Codecs/Lucene.Net.Tests.Codecs.csproj +++ b/src/Lucene.Net.Tests.Codecs/Lucene.Net.Tests.Codecs.csproj @@ -22,7 +22,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <Import Project="$(SolutionDir)TestTargetFramework.proj" /> - <Import Project="$(SolutionDir)Version.proj" /> <PropertyGroup> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> diff --git a/src/Lucene.Net.Tests.Demo/Lucene.Net.Tests.Demo.csproj b/src/Lucene.Net.Tests.Demo/Lucene.Net.Tests.Demo.csproj index 703a56a..ba24b98 100644 --- a/src/Lucene.Net.Tests.Demo/Lucene.Net.Tests.Demo.csproj +++ b/src/Lucene.Net.Tests.Demo/Lucene.Net.Tests.Demo.csproj @@ -22,7 +22,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <Import Project="$(SolutionDir)TestTargetFramework.proj" /> - <Import Project="$(SolutionDir)Version.proj" /> <PropertyGroup> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> diff --git a/src/Lucene.Net.Tests.Expressions/Lucene.Net.Tests.Expressions.csproj b/src/Lucene.Net.Tests.Expressions/Lucene.Net.Tests.Expressions.csproj index a1dce95..6bb4638 100644 --- a/src/Lucene.Net.Tests.Expressions/Lucene.Net.Tests.Expressions.csproj +++ b/src/Lucene.Net.Tests.Expressions/Lucene.Net.Tests.Expressions.csproj @@ -22,7 +22,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <Import Project="$(SolutionDir)TestTargetFramework.proj" /> - <Import Project="$(SolutionDir)Version.proj" /> <PropertyGroup> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> diff --git a/src/Lucene.Net.Tests.Facet/Lucene.Net.Tests.Facet.csproj b/src/Lucene.Net.Tests.Facet/Lucene.Net.Tests.Facet.csproj index f900ad3..f638552 100644 --- a/src/Lucene.Net.Tests.Facet/Lucene.Net.Tests.Facet.csproj +++ b/src/Lucene.Net.Tests.Facet/Lucene.Net.Tests.Facet.csproj @@ -22,7 +22,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <Import Project="$(SolutionDir)TestTargetFramework.proj" /> - <Import Project="$(SolutionDir)Version.proj" /> <PropertyGroup> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> diff --git a/src/Lucene.Net.Tests.Grouping/Lucene.Net.Tests.Grouping.csproj b/src/Lucene.Net.Tests.Grouping/Lucene.Net.Tests.Grouping.csproj index 0b28f35..1aed0b2 100644 --- a/src/Lucene.Net.Tests.Grouping/Lucene.Net.Tests.Grouping.csproj +++ b/src/Lucene.Net.Tests.Grouping/Lucene.Net.Tests.Grouping.csproj @@ -22,7 +22,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <Import Project="$(SolutionDir)TestTargetFramework.proj" /> - <Import Project="$(SolutionDir)Version.proj" /> <PropertyGroup> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> diff --git a/src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.csproj b/src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.csproj index 424dda5..e991498 100644 --- a/src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.csproj +++ b/src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.csproj @@ -22,7 +22,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <Import Project="$(SolutionDir)TestTargetFramework.proj" /> - <Import Project="$(SolutionDir)Version.proj" /> <PropertyGroup> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> diff --git a/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj b/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj index f6d3cc2..c204151 100644 --- a/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj +++ b/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj @@ -22,7 +22,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <Import Project="$(SolutionDir)TestTargetFramework.proj" /> - <Import Project="$(SolutionDir)Version.proj" /> <PropertyGroup> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> diff --git a/src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj b/src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj index 27c9718..4b7d98f 100644 --- a/src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj +++ b/src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj @@ -22,7 +22,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <Import Project="$(SolutionDir)TestTargetFramework.proj" /> - <Import Project="$(SolutionDir)Version.proj" /> <PropertyGroup> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> diff --git a/src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.csproj b/src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.csproj index 69d2bec..e856388 100644 --- a/src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.csproj +++ b/src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.csproj @@ -22,7 +22,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <Import Project="$(SolutionDir)TestTargetFramework.proj" /> - <Import Project="$(SolutionDir)Version.proj" /> <PropertyGroup> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> diff --git a/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj b/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj index 9566cc0..2c82394 100644 --- a/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj +++ b/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj @@ -22,7 +22,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <Import Project="$(SolutionDir)TestTargetFramework.proj" /> - <Import Project="$(SolutionDir)Version.proj" /> <PropertyGroup> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> diff --git a/src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj b/src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj index 2087e79..75351ac 100644 --- a/src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj +++ b/src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj @@ -22,7 +22,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <Import Project="$(SolutionDir)TestTargetFramework.proj" /> - <Import Project="$(SolutionDir)Version.proj" /> <PropertyGroup> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> diff --git a/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.csproj b/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.csproj index 3b455b5..fee148e 100644 --- a/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.csproj +++ b/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.csproj @@ -22,7 +22,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <Import Project="$(SolutionDir)TestTargetFramework.proj" /> - <Import Project="$(SolutionDir)Version.proj" /> <PropertyGroup> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> diff --git a/src/Lucene.Net.Tests.Sandbox/Lucene.Net.Tests.Sandbox.csproj b/src/Lucene.Net.Tests.Sandbox/Lucene.Net.Tests.Sandbox.csproj index 6493551..08221f2 100644 --- a/src/Lucene.Net.Tests.Sandbox/Lucene.Net.Tests.Sandbox.csproj +++ b/src/Lucene.Net.Tests.Sandbox/Lucene.Net.Tests.Sandbox.csproj @@ -22,7 +22,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <Import Project="$(SolutionDir)TestTargetFramework.proj" /> - <Import Project="$(SolutionDir)Version.proj" /> <PropertyGroup> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> diff --git a/src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj b/src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj index 84b07d6..2897faa 100644 --- a/src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj +++ b/src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj @@ -22,7 +22,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <Import Project="$(SolutionDir)TestTargetFramework.proj" /> - <Import Project="$(SolutionDir)Version.proj" /> <PropertyGroup> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> diff --git a/src/Lucene.Net.Tests.Suggest/Lucene.Net.Tests.Suggest.csproj b/src/Lucene.Net.Tests.Suggest/Lucene.Net.Tests.Suggest.csproj index e494488..5d7e4f8 100644 --- a/src/Lucene.Net.Tests.Suggest/Lucene.Net.Tests.Suggest.csproj +++ b/src/Lucene.Net.Tests.Suggest/Lucene.Net.Tests.Suggest.csproj @@ -22,7 +22,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <Import Project="$(SolutionDir)TestTargetFramework.proj" /> - <Import Project="$(SolutionDir)Version.proj" /> <PropertyGroup> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> diff --git a/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj b/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj index b660bd1..8aa3170 100644 --- a/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj +++ b/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj @@ -22,7 +22,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <Import Project="$(SolutionDir)TestTargetFramework.proj" /> - <Import Project="$(SolutionDir)Version.proj" /> <PropertyGroup> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> diff --git a/src/Lucene.Net/Lucene.Net.csproj b/src/Lucene.Net/Lucene.Net.csproj index 9ef91a4..55a85cd 100644 --- a/src/Lucene.Net/Lucene.Net.csproj +++ b/src/Lucene.Net/Lucene.Net.csproj @@ -21,7 +21,6 @@ --> <Project Sdk="Microsoft.NET.Sdk"> - <Import Project="$(SolutionDir)Version.proj" /> <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> diff --git a/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj b/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj index 50ba5e2..7357a56 100644 --- a/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj +++ b/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj @@ -21,7 +21,6 @@ --> <Project Sdk="Microsoft.NET.Sdk"> - <Import Project="$(SolutionDir)Version.proj" /> <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> diff --git a/src/dotnet/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.csproj b/src/dotnet/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.csproj index 1c8ccfe..c8a4a1b 100644 --- a/src/dotnet/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.csproj +++ b/src/dotnet/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.csproj @@ -21,7 +21,6 @@ --> <Project Sdk="Microsoft.NET.Sdk"> - <Import Project="$(SolutionDir)Version.proj" /> <!-- For now, we are not deploying this to NuGet.org --> <!--<Import Project="$(SolutionDir)build/NuGet.props" />--> diff --git a/src/dotnet/Lucene.Net.Tests.ICU/Lucene.Net.Tests.ICU.csproj b/src/dotnet/Lucene.Net.Tests.ICU/Lucene.Net.Tests.ICU.csproj index 808c106..d796595 100644 --- a/src/dotnet/Lucene.Net.Tests.ICU/Lucene.Net.Tests.ICU.csproj +++ b/src/dotnet/Lucene.Net.Tests.ICU/Lucene.Net.Tests.ICU.csproj @@ -22,7 +22,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <Import Project="$(SolutionDir)TestTargetFramework.proj" /> - <Import Project="$(SolutionDir)Version.proj" /> <PropertyGroup> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> diff --git a/src/dotnet/tools/Lucene.Net.Tests.Cli/Lucene.Net.Tests.Cli.csproj b/src/dotnet/tools/Lucene.Net.Tests.Cli/Lucene.Net.Tests.Cli.csproj index 43ccffb..a594948 100644 --- a/src/dotnet/tools/Lucene.Net.Tests.Cli/Lucene.Net.Tests.Cli.csproj +++ b/src/dotnet/tools/Lucene.Net.Tests.Cli/Lucene.Net.Tests.Cli.csproj @@ -21,8 +21,6 @@ --> <Project Sdk="Microsoft.NET.Sdk"> - <Import Project="$(SolutionDir)Version.proj" /> - <PropertyGroup> <TargetFramework>netcoreapp2.1</TargetFramework> diff --git a/src/dotnet/tools/lucene-cli/lucene-cli.csproj b/src/dotnet/tools/lucene-cli/lucene-cli.csproj index 48b6e8c..a77e788 100644 --- a/src/dotnet/tools/lucene-cli/lucene-cli.csproj +++ b/src/dotnet/tools/lucene-cli/lucene-cli.csproj @@ -21,7 +21,6 @@ --> <Project Sdk="Microsoft.NET.Sdk"> - <Import Project="$(SolutionDir)Version.proj" /> <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup>
