Skip to content

Commit

Permalink
Merge pull request #45 from e563b7/dev
Browse files Browse the repository at this point in the history
Upgrade to support 2016.3
  • Loading branch information
asizikov authored Jan 16, 2017
2 parents f8e31ca + 1be8fdd commit 4a6501f
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 23 deletions.
4 changes: 2 additions & 2 deletions AsyncSuffix.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Task returning method's naming analyzer. Async methods should have 'Async' suffix.</description>
<releaseNotes>
&#8226;ReSharper 2016.2 support;
&#8226;ReSharper 2016.3 support;
</releaseNotes>
<language>en-US</language>
<tags>async method, naming, task</tags>
<dependencies>
<dependency id="Wave" version="[6.0,7.0)" />
<dependency id="Wave" version="[7.0,8.0)" />
</dependencies>
</metadata>
<files>
Expand Down
2 changes: 1 addition & 1 deletion build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ open Fake.AppVeyor

let buildDir = "./build/"
let packagingDir = "./.deploy/"
let baseVersion = "2016.2.0"
let baseVersion = "2016.3.0"

let version =
match buildServer with
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
HighlightingGroupIds.BestPractice,
"Consider adding Async suffix",
"According to Microsoft guidelines a method which is Task-returning and is asynchronous in nature should have an 'Async' suffix. ",
Severity.SUGGESTION,
false)]
Severity.SUGGESTION)]
namespace Sizikov.AsyncSuffix.Analyzer
{
[ConfigurableSeverityHighlighting(SeverityId, CSharpLanguage.Name, OverlapResolve = OverlapResolveKind.WARNING)]
Expand Down
2 changes: 1 addition & 1 deletion src/AsyncSuffix/AsyncSuffix.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<HostFullIdentifier>ReSharperPlatformVs14Plugins</HostFullIdentifier>
<RootNamespace>Sizikov.AsyncSuffix</RootNamespace>
<AssemblyName>Sizikov.AsyncSuffix</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<StartAction>Program</StartAction>
<StartProgram>$(DevEnvDir)\devenv.exe</StartProgram>
Expand Down
29 changes: 15 additions & 14 deletions src/AsyncSuffix/AsyncSuffix.nuget.targets
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,20 @@
<ImportGroup>
<Import Project="$(NuGetPackageRoot)\Antlr2.Tools\2.7.6.4\build\Antlr2.Tools.targets" Condition="Exists('$(NuGetPackageRoot)\Antlr2.Tools\2.7.6.4\build\Antlr2.Tools.targets')" />
<Import Project="$(NuGetPackageRoot)\JetBrains.Build.Platform.Tasks.ThemedIconsPacker\2.0.20151217.1\build\JetBrains.Build.Platform.Tasks.ThemedIconsPacker.Targets" Condition="Exists('$(NuGetPackageRoot)\JetBrains.Build.Platform.Tasks.ThemedIconsPacker\2.0.20151217.1\build\JetBrains.Build.Platform.Tasks.ThemedIconsPacker.Targets')" />
<Import Project="$(NuGetPackageRoot)\JetBrains.Platform.Core.Ide\106.0.20160818.163532\build\JetBrains.Platform.Core.Ide.Targets" Condition="Exists('$(NuGetPackageRoot)\JetBrains.Platform.Core.Ide\106.0.20160818.163532\build\JetBrains.Platform.Core.Ide.Targets')" />
<Import Project="$(NuGetPackageRoot)\JetBrains.Platform.Core.Shell\106.0.20160818.163301\build\JetBrains.Platform.Core.Shell.Targets" Condition="Exists('$(NuGetPackageRoot)\JetBrains.Platform.Core.Shell\106.0.20160818.163301\build\JetBrains.Platform.Core.Shell.Targets')" />
<Import Project="$(NuGetPackageRoot)\JetBrains.Platform.Core.Text\106.0.20160818.163532\build\JetBrains.Platform.Core.Text.Targets" Condition="Exists('$(NuGetPackageRoot)\JetBrains.Platform.Core.Text\106.0.20160818.163532\build\JetBrains.Platform.Core.Text.Targets')" />
<Import Project="$(NuGetPackageRoot)\JetBrains.Platform.Interop.dotMemoryUnit.Framework\106.0.20160818.163532\build\JetBrains.Platform.Interop.dotMemoryUnit.Framework.Targets" Condition="Exists('$(NuGetPackageRoot)\JetBrains.Platform.Interop.dotMemoryUnit.Framework\106.0.20160818.163532\build\JetBrains.Platform.Interop.dotMemoryUnit.Framework.Targets')" />
<Import Project="$(NuGetPackageRoot)\JetBrains.Platform.Interop.dotMemoryUnit.Interop\106.0.20160818.163532\build\JetBrains.Platform.Interop.dotMemoryUnit.Interop.Targets" Condition="Exists('$(NuGetPackageRoot)\JetBrains.Platform.Interop.dotMemoryUnit.Interop\106.0.20160818.163532\build\JetBrains.Platform.Interop.dotMemoryUnit.Interop.Targets')" />
<Import Project="$(NuGetPackageRoot)\JetBrains.Platform.RdProtocol\106.0.20160818.163532\build\JetBrains.Platform.RdProtocol.Targets" Condition="Exists('$(NuGetPackageRoot)\JetBrains.Platform.RdProtocol\106.0.20160818.163532\build\JetBrains.Platform.RdProtocol.Targets')" />
<Import Project="$(NuGetPackageRoot)\JetBrains.Platform.Symbols\106.0.20160818.163532\build\JetBrains.Platform.Symbols.Targets" Condition="Exists('$(NuGetPackageRoot)\JetBrains.Platform.Symbols\106.0.20160818.163532\build\JetBrains.Platform.Symbols.Targets')" />
<Import Project="$(NuGetPackageRoot)\JetBrains.Platform.Tests.Framework\106.0.20160818.163532\build\JetBrains.Platform.Tests.Framework.Targets" Condition="Exists('$(NuGetPackageRoot)\JetBrains.Platform.Tests.Framework\106.0.20160818.163532\build\JetBrains.Platform.Tests.Framework.Targets')" />
<Import Project="$(NuGetPackageRoot)\JetBrains.Psi.Features.Core\106.0.20160818.164034\build\JetBrains.Psi.Features.Core.Targets" Condition="Exists('$(NuGetPackageRoot)\JetBrains.Psi.Features.Core\106.0.20160818.164034\build\JetBrains.Psi.Features.Core.Targets')" />
<Import Project="$(NuGetPackageRoot)\JetBrains.Psi.Features.src\106.0.20160818.164034\build\JetBrains.Psi.Features.src.Targets" Condition="Exists('$(NuGetPackageRoot)\JetBrains.Psi.Features.src\106.0.20160818.164034\build\JetBrains.Psi.Features.src.Targets')" />
<Import Project="$(NuGetPackageRoot)\JetBrains.Psi.Features.Tasks\106.0.20160818.164034\build\JetBrains.Psi.Features.Tasks.Targets" Condition="Exists('$(NuGetPackageRoot)\JetBrains.Psi.Features.Tasks\106.0.20160818.164034\build\JetBrains.Psi.Features.Tasks.Targets')" />
<Import Project="$(NuGetPackageRoot)\JetBrains.Psi.Features.test.Framework\106.0.20160818.164034\build\JetBrains.Psi.Features.test.Framework.Targets" Condition="Exists('$(NuGetPackageRoot)\JetBrains.Psi.Features.test.Framework\106.0.20160818.164034\build\JetBrains.Psi.Features.test.Framework.Targets')" />
<Import Project="$(NuGetPackageRoot)\JetBrains.Psi.Features.UnitTesting\106.0.20160818.164034\build\JetBrains.Psi.Features.UnitTesting.Targets" Condition="Exists('$(NuGetPackageRoot)\JetBrains.Psi.Features.UnitTesting\106.0.20160818.164034\build\JetBrains.Psi.Features.UnitTesting.Targets')" />
<Import Project="$(NuGetPackageRoot)\JetBrains.ReSharper.SDK.Internal\106.0.20160818.171542\build\JetBrains.ReSharper.SDK.Internal.Targets" Condition="Exists('$(NuGetPackageRoot)\JetBrains.ReSharper.SDK.Internal\106.0.20160818.171542\build\JetBrains.ReSharper.SDK.Internal.Targets')" />
<Import Project="$(NuGetPackageRoot)\JetBrains.Platform.Core.Ide\107.0.20161222.212632\build\JetBrains.Platform.Core.Ide.Targets" Condition="Exists('$(NuGetPackageRoot)\JetBrains.Platform.Core.Ide\107.0.20161222.212632\build\JetBrains.Platform.Core.Ide.Targets')" />
<Import Project="$(NuGetPackageRoot)\JetBrains.Platform.Core.Shell\107.0.20161222.212316\build\JetBrains.Platform.Core.Shell.Targets" Condition="Exists('$(NuGetPackageRoot)\JetBrains.Platform.Core.Shell\107.0.20161222.212316\build\JetBrains.Platform.Core.Shell.Targets')" />
<Import Project="$(NuGetPackageRoot)\JetBrains.Platform.Core.Text\107.0.20161222.212632\build\JetBrains.Platform.Core.Text.Targets" Condition="Exists('$(NuGetPackageRoot)\JetBrains.Platform.Core.Text\107.0.20161222.212632\build\JetBrains.Platform.Core.Text.Targets')" />
<Import Project="$(NuGetPackageRoot)\JetBrains.Platform.Interop.dotMemoryUnit.Framework\107.0.20161222.212632\build\JetBrains.Platform.Interop.dotMemoryUnit.Framework.Targets" Condition="Exists('$(NuGetPackageRoot)\JetBrains.Platform.Interop.dotMemoryUnit.Framework\107.0.20161222.212632\build\JetBrains.Platform.Interop.dotMemoryUnit.Framework.Targets')" />
<Import Project="$(NuGetPackageRoot)\JetBrains.Platform.Interop.dotMemoryUnit.Interop\107.0.20161222.212632\build\JetBrains.Platform.Interop.dotMemoryUnit.Interop.Targets" Condition="Exists('$(NuGetPackageRoot)\JetBrains.Platform.Interop.dotMemoryUnit.Interop\107.0.20161222.212632\build\JetBrains.Platform.Interop.dotMemoryUnit.Interop.Targets')" />
<Import Project="$(NuGetPackageRoot)\JetBrains.Platform.Interop.dotMemoryUnit.Interop.Ide\107.0.20161222.212632\build\JetBrains.Platform.Interop.dotMemoryUnit.Interop.Ide.Targets" Condition="Exists('$(NuGetPackageRoot)\JetBrains.Platform.Interop.dotMemoryUnit.Interop.Ide\107.0.20161222.212632\build\JetBrains.Platform.Interop.dotMemoryUnit.Interop.Ide.Targets')" />
<Import Project="$(NuGetPackageRoot)\JetBrains.Platform.RdProtocol\107.0.20161222.212632\build\JetBrains.Platform.RdProtocol.Targets" Condition="Exists('$(NuGetPackageRoot)\JetBrains.Platform.RdProtocol\107.0.20161222.212632\build\JetBrains.Platform.RdProtocol.Targets')" />
<Import Project="$(NuGetPackageRoot)\JetBrains.Platform.Symbols\107.0.20161222.212632\build\JetBrains.Platform.Symbols.Targets" Condition="Exists('$(NuGetPackageRoot)\JetBrains.Platform.Symbols\107.0.20161222.212632\build\JetBrains.Platform.Symbols.Targets')" />
<Import Project="$(NuGetPackageRoot)\JetBrains.Platform.Tests.Framework\107.0.20161222.212632\build\JetBrains.Platform.Tests.Framework.Targets" Condition="Exists('$(NuGetPackageRoot)\JetBrains.Platform.Tests.Framework\107.0.20161222.212632\build\JetBrains.Platform.Tests.Framework.Targets')" />
<Import Project="$(NuGetPackageRoot)\JetBrains.Psi.Features.Core\107.0.20161222.213045\build\JetBrains.Psi.Features.Core.Targets" Condition="Exists('$(NuGetPackageRoot)\JetBrains.Psi.Features.Core\107.0.20161222.213045\build\JetBrains.Psi.Features.Core.Targets')" />
<Import Project="$(NuGetPackageRoot)\JetBrains.Psi.Features.src\107.0.20161222.213045\build\JetBrains.Psi.Features.src.Targets" Condition="Exists('$(NuGetPackageRoot)\JetBrains.Psi.Features.src\107.0.20161222.213045\build\JetBrains.Psi.Features.src.Targets')" />
<Import Project="$(NuGetPackageRoot)\JetBrains.Psi.Features.Tasks\107.0.20161222.213045\build\JetBrains.Psi.Features.Tasks.Targets" Condition="Exists('$(NuGetPackageRoot)\JetBrains.Psi.Features.Tasks\107.0.20161222.213045\build\JetBrains.Psi.Features.Tasks.Targets')" />
<Import Project="$(NuGetPackageRoot)\JetBrains.Psi.Features.test.Framework\107.0.20161222.213045\build\JetBrains.Psi.Features.test.Framework.Targets" Condition="Exists('$(NuGetPackageRoot)\JetBrains.Psi.Features.test.Framework\107.0.20161222.213045\build\JetBrains.Psi.Features.test.Framework.Targets')" />
<Import Project="$(NuGetPackageRoot)\JetBrains.Psi.Features.UnitTesting\107.0.20161222.213045\build\JetBrains.Psi.Features.UnitTesting.Targets" Condition="Exists('$(NuGetPackageRoot)\JetBrains.Psi.Features.UnitTesting\107.0.20161222.213045\build\JetBrains.Psi.Features.UnitTesting.Targets')" />
<Import Project="$(NuGetPackageRoot)\JetBrains.ReSharper.SDK.Internal\107.0.20161223.160207\build\JetBrains.ReSharper.SDK.Internal.Targets" Condition="Exists('$(NuGetPackageRoot)\JetBrains.ReSharper.SDK.Internal\107.0.20161223.160207\build\JetBrains.ReSharper.SDK.Internal.Targets')" />
</ImportGroup>
</Project>
6 changes: 3 additions & 3 deletions src/AsyncSuffix/project.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"dependencies": {
"JetBrains.Annotations": "10.1.5",
"JetBrains.ReSharper.SDK": "2016.2.20160818.171542"
"JetBrains.Annotations": "10.2.1",
"JetBrains.ReSharper.SDK": "2016.3.20161223.160207"
},
"frameworks": {
".NETFramework,Version=v4.0": {}
".NETFramework,Version=v4.5": {}
},
"runtimes": {
"win": {}
Expand Down

0 comments on commit 4a6501f

Please sign in to comment.