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 6a833fdc4c3ef8739726b1c17a93a4990b6059be Author: Shad Storhaug <[email protected]> AuthorDate: Thu Apr 15 03:42:00 2021 +0700 Lucene.Net.CodeAnalysis: Downgraded from .NET Standard 2.0 to .NET Standard 1.3 to support VS2017. Added missing dependencies on Microsoft.CodeAnalysis.CSharp and Microsoft.CodeAnalysis.VisualBasic and adjusted version numbers using this reference: https://roslyn-analyzers.readthedocs.io/en/latest/how-to-start.html. (fixes #394) --- build/Dependencies.props | 6 ++++-- src/Lucene.Net/Lucene.Net.csproj | 4 ++-- .../Lucene.Net.CodeAnalysis.CSharp.csproj | 3 ++- .../Lucene.Net.CodeAnalysis.VisualBasic.csproj | 3 ++- src/dotnet/Lucene.Net.CodeAnalysis/Version.props | 4 ++-- .../Lucene.Net.Tests.CodeAnalysis.csproj | 2 +- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/build/Dependencies.props b/build/Dependencies.props index c89d0e2..5102437 100644 --- a/build/Dependencies.props +++ b/build/Dependencies.props @@ -43,8 +43,10 @@ <MicrosoftAspNetCoreHttpAbstractionsPackageVersion>2.0.0</MicrosoftAspNetCoreHttpAbstractionsPackageVersion> <MicrosoftAspNetCoreTestHostPackageVersion>2.0.0</MicrosoftAspNetCoreTestHostPackageVersion> <MicrosoftCodeAnalysisAnalyzersPackageVersion>2.9.8</MicrosoftCodeAnalysisAnalyzersPackageVersion> - <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>3.4.0</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion> - <MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>3.4.0</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion> + <MicrosoftCodeAnalysisCSharpPackageVersion>2.6.1</MicrosoftCodeAnalysisCSharpPackageVersion> + <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion> + <MicrosoftCodeAnalysisVisualBasicPackageVersion>2.6.1</MicrosoftCodeAnalysisVisualBasicPackageVersion> + <MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>$(MicrosoftCodeAnalysisVisualBasicPackageVersion)</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion> <MicrosoftExtensionsConfigurationPackageVersion_NET4_5_1>1.1.2</MicrosoftExtensionsConfigurationPackageVersion_NET4_5_1> <MicrosoftExtensionsConfigurationAbstractionsPackageVersion_NET4_5_1>$(MicrosoftExtensionsConfigurationPackageVersion_NET4_5_1)</MicrosoftExtensionsConfigurationAbstractionsPackageVersion_NET4_5_1> <MicrosoftExtensionsConfigurationCommandLinePackageVersion_NET4_5_1>$(MicrosoftExtensionsConfigurationPackageVersion_NET4_5_1)</MicrosoftExtensionsConfigurationCommandLinePackageVersion_NET4_5_1> diff --git a/src/Lucene.Net/Lucene.Net.csproj b/src/Lucene.Net/Lucene.Net.csproj index 40ab6bc..551bd53 100644 --- a/src/Lucene.Net/Lucene.Net.csproj +++ b/src/Lucene.Net/Lucene.Net.csproj @@ -36,8 +36,8 @@ <PropertyGroup Label="NuGet Package File Paths"> <LuceneNetDotNetDir>$(SolutionDir)src\dotnet\</LuceneNetDotNetDir> <LuceneNetCodeAnalysisToolsDir>$(LuceneNetDotNetDir)Lucene.Net.CodeAnalysis\tools\</LuceneNetCodeAnalysisToolsDir> - <LuceneNetCodeAnalysisCSAssemblyFile>$(LuceneNetDotNetDir)\Lucene.Net.CodeAnalysis.CSharp\bin\$(Configuration)\netstandard2.0\*.dll</LuceneNetCodeAnalysisCSAssemblyFile> - <LuceneNetCodeAnalysisVBAssemblyFile>$(LuceneNetDotNetDir)\Lucene.Net.CodeAnalysis.VisualBasic\bin\$(Configuration)\netstandard2.0\*.dll</LuceneNetCodeAnalysisVBAssemblyFile> + <LuceneNetCodeAnalysisCSAssemblyFile>$(LuceneNetDotNetDir)\Lucene.Net.CodeAnalysis.CSharp\bin\$(Configuration)\netstandard1.3\*.dll</LuceneNetCodeAnalysisCSAssemblyFile> + <LuceneNetCodeAnalysisVBAssemblyFile>$(LuceneNetDotNetDir)\Lucene.Net.CodeAnalysis.VisualBasic\bin\$(Configuration)\netstandard1.3\*.dll</LuceneNetCodeAnalysisVBAssemblyFile> </PropertyGroup> <ItemGroup Label="NuGet Package Files"> diff --git a/src/dotnet/Lucene.Net.CodeAnalysis.CSharp/Lucene.Net.CodeAnalysis.CSharp.csproj b/src/dotnet/Lucene.Net.CodeAnalysis.CSharp/Lucene.Net.CodeAnalysis.CSharp.csproj index 01d3849..287b9df 100644 --- a/src/dotnet/Lucene.Net.CodeAnalysis.CSharp/Lucene.Net.CodeAnalysis.CSharp.csproj +++ b/src/dotnet/Lucene.Net.CodeAnalysis.CSharp/Lucene.Net.CodeAnalysis.CSharp.csproj @@ -22,7 +22,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFramework>netstandard2.0</TargetFramework> + <TargetFramework>netstandard1.3</TargetFramework> <IncludeBuildOutput>false</IncludeBuildOutput> </PropertyGroup> @@ -30,6 +30,7 @@ <ItemGroup> <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="$(MicrosoftCodeAnalysisAnalyzersPackageVersion)" PrivateAssets="all" /> + <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" /> <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion)" PrivateAssets="all" /> <PackageReference Update="NETStandard.Library" PrivateAssets="all" /> </ItemGroup> diff --git a/src/dotnet/Lucene.Net.CodeAnalysis.VisualBasic/Lucene.Net.CodeAnalysis.VisualBasic.csproj b/src/dotnet/Lucene.Net.CodeAnalysis.VisualBasic/Lucene.Net.CodeAnalysis.VisualBasic.csproj index 9ac08af..96fddc8 100644 --- a/src/dotnet/Lucene.Net.CodeAnalysis.VisualBasic/Lucene.Net.CodeAnalysis.VisualBasic.csproj +++ b/src/dotnet/Lucene.Net.CodeAnalysis.VisualBasic/Lucene.Net.CodeAnalysis.VisualBasic.csproj @@ -22,7 +22,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFramework>netstandard2.0</TargetFramework> + <TargetFramework>netstandard1.3</TargetFramework> <IncludeBuildOutput>false</IncludeBuildOutput> </PropertyGroup> @@ -30,6 +30,7 @@ <ItemGroup> <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="$(MicrosoftCodeAnalysisAnalyzersPackageVersion)" PrivateAssets="all" /> + <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(MicrosoftCodeAnalysisVisualBasicPackageVersion)" /> <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="$(MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion)" PrivateAssets="all" /> <PackageReference Update="NETStandard.Library" PrivateAssets="all" /> </ItemGroup> diff --git a/src/dotnet/Lucene.Net.CodeAnalysis/Version.props b/src/dotnet/Lucene.Net.CodeAnalysis/Version.props index dee7b35..86cc7ef 100644 --- a/src/dotnet/Lucene.Net.CodeAnalysis/Version.props +++ b/src/dotnet/Lucene.Net.CodeAnalysis/Version.props @@ -20,9 +20,9 @@ <!-- Visual Studio doesn't reload analyzers with changes if you don't manually bump the assembly version on each change to the analyzer (or the install/uninstall scripts). See: https://github.com/dotnet/roslyn/issues/4381#issuecomment-342867710 - IMPORTANT: Make sure you update the AssemblyVersionRevision number on every code change! + IMPORTANT: Make sure you update the AssemblyVersionRevision number on every code/dependency/script change! --> - <AssemblyVersionRevision>1</AssemblyVersionRevision> + <AssemblyVersionRevision>10</AssemblyVersionRevision> <AssemblyMajorMinorPatchPattern>^\d+\.\d+\.\d+</AssemblyMajorMinorPatchPattern> <AssemblyMajorMinorPatch>$([System.Text.RegularExpressions.Regex]::Match($(AssemblyVersion), $(AssemblyMajorMinorPatchPattern)))</AssemblyMajorMinorPatch> diff --git a/src/dotnet/Lucene.Net.Tests.CodeAnalysis/Lucene.Net.Tests.CodeAnalysis.csproj b/src/dotnet/Lucene.Net.Tests.CodeAnalysis/Lucene.Net.Tests.CodeAnalysis.csproj index d896582..f575471 100644 --- a/src/dotnet/Lucene.Net.Tests.CodeAnalysis/Lucene.Net.Tests.CodeAnalysis.csproj +++ b/src/dotnet/Lucene.Net.Tests.CodeAnalysis/Lucene.Net.Tests.CodeAnalysis.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one
