Skip to content

Commit

Permalink
Remove R# 2016.3 support
Browse files Browse the repository at this point in the history
  • Loading branch information
ulrichb committed Aug 27, 2017
1 parent 0b52e1f commit d69aa3e
Show file tree
Hide file tree
Showing 9 changed files with 7 additions and 156 deletions.
2 changes: 0 additions & 2 deletions Build/Build.ps1
Expand Up @@ -18,7 +18,6 @@ $SolutionFilePath = "ImplicitNullability.sln"
$MSBuildPath = (Get-ChildItem "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2017\*\MSBuild\15.0\Bin\MSBuild.exe").FullName
$NUnitAdditionalArgs = "--x86 --labels=All --agents=1"
$NUnitTestAssemblyPaths = @(
"Src\ImplicitNullability.Plugin.Tests\bin\R20163\$Configuration\ImplicitNullability.Plugin.Tests.R20163.dll"
"Src\ImplicitNullability.Plugin.Tests\bin\R20171\$Configuration\ImplicitNullability.Plugin.Tests.R20171.dll"
"Src\ImplicitNullability.Plugin.Tests\bin\R20172\$Configuration\ImplicitNullability.Plugin.Tests.R20172.dll"
"Src\ImplicitNullability.Samples.Consumer\bin\OfInternalCodeWithIN\$Configuration\ImplicitNullability.Samples.Consumer.OfInternalCodeWithIN.dll"
Expand All @@ -27,7 +26,6 @@ $NUnitFrameworkVersion = "net-4.5"
$TestCoverageFilter = "+[ImplicitNullability*]* -[ImplicitNullability*]ReSharperExtensionsShared.* -[ImplicitNullability.Samples.CodeWithIN.*]* -[ImplicitNullability.Samples.CodeWithoutIN.External]*"
$NuspecPath = "Src\ImplicitNullability.Plugin\ImplicitNullability.nuspec"
$NugetPackProperties = @(
"Version=$(CalcNuGetPackageVersion 20163);Configuration=$Configuration;DependencyVer=[7.0];BinDirInclude=bin\R20163"
"Version=$(CalcNuGetPackageVersion 20171);Configuration=$Configuration;DependencyVer=[8.0];BinDirInclude=bin\R20171"
"Version=$(CalcNuGetPackageVersion 20172);Configuration=$Configuration;DependencyVer=[9.0];BinDirInclude=bin\R20172"
)
Expand Down
19 changes: 4 additions & 15 deletions ImplicitNullability.sln
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26730.8
VisualStudioVersion = 15.0.26730.10
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImplicitNullability.Samples.CodeWithIN.Internal", "Src\ImplicitNullability.Samples.CodeWithIN\ImplicitNullability.Samples.CodeWithIN.Internal.csproj", "{4AF4FFEC-2FAC-426A-B8B2-06F4D9F52392}"
ProjectSection(ProjectDependencies) = postProject
Expand Down Expand Up @@ -30,10 +30,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImplicitNullability.Plugin.
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImplicitNullability.Plugin.Tests.R20172", "Src\ImplicitNullability.Plugin.Tests\ImplicitNullability.Plugin.Tests.R20172.csproj", "{B2619CD9-295A-4436-A83A-26E7AE540FB8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImplicitNullability.Plugin.R20163", "Src\ImplicitNullability.Plugin\ImplicitNullability.Plugin.R20163.csproj", "{DB452FAF-D3A5-4CE9-AA1B-A738CB79F50D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImplicitNullability.Plugin.Tests.R20163", "Src\ImplicitNullability.Plugin.Tests\ImplicitNullability.Plugin.Tests.R20163.csproj", "{1B815C86-2DD2-4B1F-A50A-3BFB7132D99E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImplicitNullability.VsFormatDefinitions", "Src\ImplicitNullability.VsFormatDefinitions\ImplicitNullability.VsFormatDefinitions.csproj", "{06B8BCDD-6F91-42C7-A474-C50CD24C397E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImplicitNullability.Plugin.R20171", "Src\ImplicitNullability.Plugin\ImplicitNullability.Plugin.R20171.csproj", "{2F246B16-414A-4FDF-9DE2-3EC8E51D1B9A}"
Expand Down Expand Up @@ -80,14 +76,6 @@ Global
{B2619CD9-295A-4436-A83A-26E7AE540FB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B2619CD9-295A-4436-A83A-26E7AE540FB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B2619CD9-295A-4436-A83A-26E7AE540FB8}.Release|Any CPU.Build.0 = Release|Any CPU
{DB452FAF-D3A5-4CE9-AA1B-A738CB79F50D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DB452FAF-D3A5-4CE9-AA1B-A738CB79F50D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DB452FAF-D3A5-4CE9-AA1B-A738CB79F50D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DB452FAF-D3A5-4CE9-AA1B-A738CB79F50D}.Release|Any CPU.Build.0 = Release|Any CPU
{1B815C86-2DD2-4B1F-A50A-3BFB7132D99E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1B815C86-2DD2-4B1F-A50A-3BFB7132D99E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1B815C86-2DD2-4B1F-A50A-3BFB7132D99E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1B815C86-2DD2-4B1F-A50A-3BFB7132D99E}.Release|Any CPU.Build.0 = Release|Any CPU
{06B8BCDD-6F91-42C7-A474-C50CD24C397E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{06B8BCDD-6F91-42C7-A474-C50CD24C397E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{06B8BCDD-6F91-42C7-A474-C50CD24C397E}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -116,11 +104,12 @@ Global
{9001EFB4-358F-4C98-AF13-F374E831A06E} = {67859B65-179D-40D0-80DB-003011824913}
{AB1C2F7C-E1AD-40B4-B2C2-8E5CA55B462F} = {67859B65-179D-40D0-80DB-003011824913}
{B2619CD9-295A-4436-A83A-26E7AE540FB8} = {67859B65-179D-40D0-80DB-003011824913}
{DB452FAF-D3A5-4CE9-AA1B-A738CB79F50D} = {67859B65-179D-40D0-80DB-003011824913}
{1B815C86-2DD2-4B1F-A50A-3BFB7132D99E} = {67859B65-179D-40D0-80DB-003011824913}
{06B8BCDD-6F91-42C7-A474-C50CD24C397E} = {67859B65-179D-40D0-80DB-003011824913}
{2F246B16-414A-4FDF-9DE2-3EC8E51D1B9A} = {67859B65-179D-40D0-80DB-003011824913}
{1C93B659-62A2-4539-815D-D20BABB47451} = {67859B65-179D-40D0-80DB-003011824913}
{4979B806-EB66-4C3F-8BB0-7AF284AEB0BD} = {67859B65-179D-40D0-80DB-003011824913}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {4FF51D4C-B501-47FC-943D-395AEB7D3978}
EndGlobalSection
EndGlobal

This file was deleted.

This file was deleted.

Expand Up @@ -154,11 +154,7 @@ private static IReadOnlyCollection<IIssue> RunInspections(ISolution solution, IE
var issues = new List<IIssue>();

using (var lifetime = Lifetimes.Define(solution.GetLifetime()))
#if RESHARPER20163
using (var nullProgressIndicator = NullProgressIndicator.Instance)
#else
using (var nullProgressIndicator = NullProgressIndicator.Create())
#endif
{
var collectInspectionResults = new CollectInspectionResults(solution, lifetime, nullProgressIndicator);

Expand Down
Expand Up @@ -10,7 +10,7 @@
using JetBrains.ReSharper.TestFramework;
using JetBrains.Util;
using NUnit.Framework;
#if RESHARPER20163 || RESHARPER20171
#if RESHARPER20171
using JetBrains.Application.Settings.Store.Implementation;
#else
using JetBrains.Application.Settings.Implementation;
Expand Down
Expand Up @@ -8,7 +8,7 @@
using JetBrains.ReSharper.Feature.Services.Daemon.OptionPages;
using JetBrains.UI.RichText;
using JetBrains.Util;
#if RESHARPER20163 || RESHARPER20171
#if RESHARPER20171
using JetBrains.UI;
using JetBrains.UI.Options;
using JetBrains.UI.Options.OptionsDialog2.SimpleOptions;
Expand Down

This file was deleted.

Expand Up @@ -3,15 +3,12 @@
using JetBrains.Annotations;
using JetBrains.ReSharper.Psi;
using JetBrains.ReSharper.Psi.CodeAnnotations;
using JetBrains.ReSharper.Psi.CSharp;
using JetBrains.ReSharper.Psi.CSharp.Util;
using JetBrains.ReSharper.Psi.Util;
using JetBrains.ReSharper.Psi.Xaml.DeclaredElements;
using JetBrains.Util;
using static JetBrains.ReSharper.Psi.DeclaredElementConstants;
#if !RESHARPER20163
using JetBrains.ReSharper.Psi.CSharp;

#endif

namespace ImplicitNullability.Plugin
{
Expand Down Expand Up @@ -206,14 +203,10 @@ private bool IsExcludedGeneratedCode(ImplicitNullabilityConfiguration configurat
[CanBeNull]
private static IType GetTaskUnderlyingType(IType type)
{
#if RESHARPER20163
return type.GetTaskUnderlyingType();
#else
// Use "latest" language level because this just includes _more_ types (C# 7 "task-like" types) and the nullability
// value we return here also effects _callers_ (whose C# language level we do not know).

return type.GetTasklikeUnderlyingType(CSharpLanguageLevel.Latest);
#endif
}

private static bool IsImplicitNullabilityApplicableToParameterOwner([CanBeNull] IParametersOwner parametersOwner)
Expand Down

0 comments on commit d69aa3e

Please sign in to comment.