Skip to content

Commit ecb551a

Browse files
committed
Support 2016.3 RTM
1 parent 0d3cc36 commit ecb551a

File tree

14 files changed

+526
-1276
lines changed

14 files changed

+526
-1276
lines changed

install/resharper-angularjs.nuspec

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata>
44
<id>JetBrains.AngularJS</id>
55
<title>AngularJS</title>
6-
<version>1.6.2</version>
6+
<version>1.7.0</version>
77
<authors>JetBrains</authors>
88
<owners>JetBrains</owners>
99
<requireLicenseAcceptance>false</requireLicenseAcceptance>
@@ -12,6 +12,9 @@
1212
<iconUrl>https://raw.github.com/JetBrains/resharper-angularjs/master/icon.png</iconUrl>
1313
<description>Code completion and live templates for AngularJS</description>
1414
<releaseNotes>
15+
&#8226; Updated to ReSharper 2016.3
16+
17+
From 1.6.1:
1518
&#8226; Address performance issue with many directives.
1619

1720
From 1.6.1:
@@ -40,7 +43,7 @@ From 1.2.2:
4043
&#8226; Added angular icons to the code completion items
4144
</releaseNotes>
4245
<dependencies>
43-
<dependency id="Wave" version="[6.0]" />
46+
<dependency id="Wave" version="[7.0]" />
4447
</dependencies>
4548
<tags>resharper angular angularjs javascript js typescript</tags>
4649
</metadata>

install/resharper-angularjs.wave07.nuspec

Lines changed: 0 additions & 58 deletions
This file was deleted.

src/packages/repositories.config

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/resharper-angularjs.sln

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "resharper-angularjs", "resh
77
EndProject
88
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tests", "..\test\src\test.resharper-angularjs\tests.csproj", "{8E0BE7C0-CB94-4993-94F3-A91961F8A809}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "resharper-angularjs.wave07", "resharper-angularjs\resharper-angularjs.wave07.csproj", "{F50A2291-6669-4B1B-AF18-A63FDE7F9649}"
11-
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tests.wave07", "..\test\src\test.resharper-angularjs\tests.wave07.csproj", "{BFB236A2-9D68-403D-8CE2-9B4C69B067FA}"
13-
EndProject
1410
Global
1511
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1612
Debug|Any CPU = Debug|Any CPU
@@ -25,14 +21,6 @@ Global
2521
{8E0BE7C0-CB94-4993-94F3-A91961F8A809}.Debug|Any CPU.Build.0 = Debug|Any CPU
2622
{8E0BE7C0-CB94-4993-94F3-A91961F8A809}.Release|Any CPU.ActiveCfg = Release|Any CPU
2723
{8E0BE7C0-CB94-4993-94F3-A91961F8A809}.Release|Any CPU.Build.0 = Release|Any CPU
28-
{F50A2291-6669-4B1B-AF18-A63FDE7F9649}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
29-
{F50A2291-6669-4B1B-AF18-A63FDE7F9649}.Debug|Any CPU.Build.0 = Debug|Any CPU
30-
{F50A2291-6669-4B1B-AF18-A63FDE7F9649}.Release|Any CPU.ActiveCfg = Release|Any CPU
31-
{F50A2291-6669-4B1B-AF18-A63FDE7F9649}.Release|Any CPU.Build.0 = Release|Any CPU
32-
{BFB236A2-9D68-403D-8CE2-9B4C69B067FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33-
{BFB236A2-9D68-403D-8CE2-9B4C69B067FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
34-
{BFB236A2-9D68-403D-8CE2-9B4C69B067FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
35-
{BFB236A2-9D68-403D-8CE2-9B4C69B067FA}.Release|Any CPU.Build.0 = Release|Any CPU
3624
EndGlobalSection
3725
GlobalSection(SolutionProperties) = preSolution
3826
HideSolutionNode = FALSE

src/resharper-angularjs/Feature/Services/Caches/JsDocFileProcessor.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,7 @@ public void ProcessJsDocFile(IJsDocFile jsDocFile)
5757
if (!string.IsNullOrEmpty(name))
5858
name = name.Substring(name.IndexOf(':') + 1);
5959

60-
#if WAVE07
6160
var nameOffset = nameTag.GetDocumentStartOffset().Offset;
62-
#else
63-
var nameOffset = nameTag.GetDocumentStartOffset().TextRange.StartOffset;
64-
#endif
6561

6662
var ngdocValue = ngdocTag.DescriptionText;
6763
if (!string.IsNullOrEmpty(name) && !string.IsNullOrEmpty(ngdocValue))

src/resharper-angularjs/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
[assembly: AssemblyConfiguration("")]
2525
[assembly: AssemblyCompany("JetBrains")]
2626
[assembly: AssemblyProduct("resharper-angularjs")]
27-
[assembly: AssemblyCopyright("Copyright © JetBrains, 2013")]
27+
[assembly: AssemblyCopyright("Copyright © JetBrains, 2016")]
2828
[assembly: AssemblyTrademark("")]
2929
[assembly: AssemblyCulture("")]
3030

3131
// Use a static version value so that ReSharper Build won't rebuild referencing assemblies
32-
[assembly: AssemblyVersion("1.6.3.0")]
32+
[assembly: AssemblyVersion("1.7.0.0")]
3333

Lines changed: 58 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,61 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Antlr2.Runtime" version="2.7.7.02" targetFramework="net40" />
4-
<package id="Antlr2.Tools" version="2.7.6.4" targetFramework="net40" />
5-
<package id="AsyncBridge.JetBrains" version="0.1.1.0" targetFramework="net40" />
6-
<package id="AsyncIO" version="0.1.18.0" targetFramework="net40" />
7-
<package id="DotNetZip.Reduced" version="1.9.1.8" targetFramework="net40" />
8-
<package id="JetBrains.Annotations" version="10.1.5" targetFramework="net40" />
9-
<package id="JetBrains.Build.Platform.Tasks.ThemedIconsPacker" version="2.0.20151217.1" targetFramework="net40" developmentDependency="true" />
10-
<package id="JetBrains.ExternalAnnotations" version="10.2.0" targetFramework="net40" />
11-
<package id="JetBrains.Mono.Posix" version="0.1" targetFramework="net40" />
12-
<package id="JetBrains.Platform.Core.Ide" version="106.0.20160818.163532" targetFramework="net40" />
13-
<package id="JetBrains.Platform.Core.Shell" version="106.0.20160818.163301" targetFramework="net40" />
14-
<package id="JetBrains.Platform.Core.Text" version="106.0.20160818.163532" targetFramework="net40" />
15-
<package id="JetBrains.Platform.Installer" version="106.0.20160818.163532" targetFramework="net40" />
16-
<package id="JetBrains.Platform.Interop.dotMemoryUnit.Framework" version="106.0.20160818.163532" targetFramework="net40" />
17-
<package id="JetBrains.Platform.Interop.dotMemoryUnit.Interop" version="106.0.20160818.163532" targetFramework="net40" />
18-
<package id="JetBrains.Platform.Lib.DevExpress" version="2.0.20150224.0" targetFramework="net40" />
19-
<package id="JetBrains.Platform.Lib.Microsoft.Deployment.Compression.Cab" version="2.0.20140304.0" targetFramework="net40" />
20-
<package id="JetBrains.Platform.Lib.Microsoft.Deployment.WindowsInstaller" version="2.0.20140821.0" targetFramework="net40" />
21-
<package id="JetBrains.Platform.Lib.System.Windows.Interactivity" version="2.0.20140318.0" targetFramework="net40" />
22-
<package id="JetBrains.Platform.Lib.VisualStudio.AnyVs.ShellInterop.PrivateBuild" version="2.0.20140304.0" targetFramework="net40" />
23-
<package id="JetBrains.Platform.Lib.WpfContrib" version="2.0.20150225.0" targetFramework="net40" />
24-
<package id="JetBrains.Platform.RdProtocol" version="106.0.20160818.163532" targetFramework="net40" />
25-
<package id="JetBrains.Platform.Symbols" version="106.0.20160818.163532" targetFramework="net40" />
26-
<package id="JetBrains.Platform.Tests.Framework" version="106.0.20160818.163532" targetFramework="net40" />
27-
<package id="JetBrains.Platform.VisualStudio" version="106.0.20160818.163532" targetFramework="net40" />
28-
<package id="JetBrains.Psi.Features.Core" version="106.0.20160818.164034" targetFramework="net40" />
29-
<package id="JetBrains.Psi.Features.Cpp.Src" version="106.0.20160818.165003" targetFramework="net40" />
30-
<package id="JetBrains.Psi.Features.SolutionBuilder" version="106.0.20160818.164034" targetFramework="net40" />
31-
<package id="JetBrains.Psi.Features.src" version="106.0.20160818.164034" targetFramework="net40" />
32-
<package id="JetBrains.Psi.Features.Tasks" version="106.0.20160818.164034" targetFramework="net40" />
33-
<package id="JetBrains.Psi.Features.test.Framework" version="106.0.20160818.164034" targetFramework="net40" />
34-
<package id="JetBrains.Psi.Features.UnitTesting" version="106.0.20160818.164034" targetFramework="net40" />
35-
<package id="JetBrains.Psi.Features.VisualStudio" version="106.0.20160818.164034" targetFramework="net40" />
36-
<package id="JetBrains.ReSharper.SDK" version="2016.2.20160818.171542" targetFramework="net40" developmentDependency="true" />
37-
<package id="JetBrains.ReSharper.SDK.Internal" version="106.0.20160818.171542" targetFramework="net40" />
38-
<package id="JetBrains.WinDbg.SymStore" version="10.0.10586.20151201" targetFramework="net40" developmentDependency="true" />
39-
<package id="Microsoft.VC100.CRT.JetBrains" version="10.00.40219.2" targetFramework="net40" />
40-
<package id="Microsoft.VC120.CRT.JetBrains" version="12.0.21005.2" targetFramework="net40" />
41-
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net40" />
42-
<package id="NetMQ" version="3.3.3.1" targetFramework="net40" />
43-
<package id="Newtonsoft35.Json" version="7.0.1" targetFramework="net40" />
44-
<package id="NuGet.Core" version="2.12.0" targetFramework="net40" />
45-
<package id="NuGet.Core.Ultimate" version="3.3.2" targetFramework="net40" />
46-
<package id="NUnit" version="2.6.4" targetFramework="net40" />
47-
<package id="NUnit.ReSharperRunner2" version="2.6.408" targetFramework="net40" />
48-
<package id="NUnit.ReSharperRunner3" version="3.0.12" targetFramework="net40" />
49-
<package id="NVelocity" version="1.0.3" targetFramework="net40" />
50-
<package id="SharpZipLib.JetBrains.Stripped" version="0.86.20150204.1" targetFramework="net40" />
51-
<package id="Sprache.JetBrains" version="2.0.0.44" targetFramework="net40" />
52-
<package id="Vestris.ResourceLib.JetBrains" version="1.4.20150303.0" targetFramework="net40" />
53-
<package id="Wave" version="6.0.0.0" targetFramework="net40" />
54-
<package id="Windows7APICodePack.JetBrains.Stripped" version="1.1.20150225.0" targetFramework="net40" />
55-
<package id="xmlrpcnet" version="2.5.0" targetFramework="net40" />
56-
<package id="xunit.abstractions.JetBrains" version="2.0.0" targetFramework="net40" />
57-
<package id="xunit.JetBrains" version="1.9.2" targetFramework="net40" />
58-
<package id="xunit.runner.utility.JetBrains" version="2.2.0" targetFramework="net40" />
3+
<package id="Antlr2.Runtime" version="2.7.7.02" targetFramework="net45" />
4+
<package id="Antlr2.Tools" version="2.7.6.4" targetFramework="net45" />
5+
<package id="DotNetZip.Reduced" version="1.9.1.8" targetFramework="net45" />
6+
<package id="ICSharpCode.NRefactory" version="5.5.1" targetFramework="net45" />
7+
<package id="JetBrains.Annotations" version="10.2.1" targetFramework="net45" />
8+
<package id="JetBrains.Build.Platform.Tasks.ThemedIconsPacker" version="2.0.20151217.1" targetFramework="net45" developmentDependency="true" />
9+
<package id="JetBrains.ExternalAnnotations" version="10.2.5" targetFramework="net45" />
10+
<package id="JetBrains.MSBuild.Xplat.Engine" version="20161013.1.0" targetFramework="net45" />
11+
<package id="JetBrains.NuGet.Core" version="2.13.0" targetFramework="net45" />
12+
<package id="JetBrains.NuGet.Ultimate" version="3.5.0.1" targetFramework="net45" />
13+
<package id="JetBrains.Platform.Core.Ide" version="107.0.20161214.153643" targetFramework="net45" />
14+
<package id="JetBrains.Platform.Core.Shell" version="107.0.20161214.153252" targetFramework="net45" />
15+
<package id="JetBrains.Platform.Core.Text" version="107.0.20161214.153643" targetFramework="net45" />
16+
<package id="JetBrains.Platform.Interop.dotMemoryUnit.Framework" version="107.0.20161214.153643" targetFramework="net45" />
17+
<package id="JetBrains.Platform.Interop.dotMemoryUnit.Interop" version="107.0.20161214.153643" targetFramework="net45" />
18+
<package id="JetBrains.Platform.Interop.dotMemoryUnit.Interop.Ide" version="107.0.20161214.153643" targetFramework="net45" />
19+
<package id="JetBrains.Platform.Lib.DevExpress" version="2.0.20150224.0" targetFramework="net45" />
20+
<package id="JetBrains.Platform.Lib.Microsoft.Deployment.Compression.Cab" version="2.0.20140304.0" targetFramework="net45" />
21+
<package id="JetBrains.Platform.Lib.System.Windows.Interactivity" version="2.0.20140318.0" targetFramework="net45" />
22+
<package id="JetBrains.Platform.Lib.WpfContrib" version="2.0.20150225.0" targetFramework="net45" />
23+
<package id="JetBrains.Platform.RdProtocol" version="107.0.20161214.153643" targetFramework="net45" />
24+
<package id="JetBrains.Platform.Symbols" version="107.0.20161214.153643" targetFramework="net45" />
25+
<package id="JetBrains.Platform.Tests.Framework" version="107.0.20161214.153643" targetFramework="net45" />
26+
<package id="JetBrains.Psi.Features.Core" version="107.0.20161215.131222" targetFramework="net45" />
27+
<package id="JetBrains.Psi.Features.src" version="107.0.20161215.131222" targetFramework="net45" />
28+
<package id="JetBrains.Psi.Features.Tasks" version="107.0.20161215.131222" targetFramework="net45" />
29+
<package id="JetBrains.Psi.Features.test.Framework" version="107.0.20161215.131222" targetFramework="net45" />
30+
<package id="JetBrains.Psi.Features.UnitTesting" version="107.0.20161215.131222" targetFramework="net45" />
31+
<package id="JetBrains.ReSharper.SDK" version="2016.3.20161215.134837" targetFramework="net45" developmentDependency="true" />
32+
<package id="JetBrains.ReSharper.SDK.Internal" version="107.0.20161215.134837" targetFramework="net45" />
33+
<package id="Microsoft.Owin" version="3.0.1" targetFramework="net45" />
34+
<package id="Microsoft.Owin.FileSystems" version="3.0.1" targetFramework="net45" />
35+
<package id="Microsoft.Owin.Host.HttpListener" version="3.0.1" targetFramework="net45" />
36+
<package id="Microsoft.Owin.Hosting" version="3.0.1" targetFramework="net45" />
37+
<package id="Microsoft.Owin.StaticFiles" version="3.0.1" targetFramework="net45" />
38+
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net45" />
39+
<package id="Mono.Cecil" version="0.9.6.1" targetFramework="net45" />
40+
<package id="Mono.Debugger.Soft" version="1.0.20161020.46" targetFramework="net45" />
41+
<package id="Mono.Debugging" version="1.0.20161020.46" targetFramework="net45" />
42+
<package id="Mono.Debugging.Soft" version="1.0.20161020.46" targetFramework="net45" />
43+
<package id="Mono.Debugging.Win32" version="1.0.20161020.46" targetFramework="net45" />
44+
<package id="Mono.VSCodeDebugging" version="1.0.20161019.44" targetFramework="net45" />
45+
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
46+
<package id="NUnit" version="2.6.4" targetFramework="net45" />
47+
<package id="NUnit.ReSharperRunner2" version="2.6.408" targetFramework="net45" />
48+
<package id="NUnit.ReSharperRunner3" version="3.0.12" targetFramework="net45" />
49+
<package id="NVelocity" version="1.0.3" targetFramework="net45" />
50+
<package id="Owin" version="1.0" targetFramework="net45" />
51+
<package id="sharpcompress" version="0.11.6" targetFramework="net45" />
52+
<package id="SharpZipLib.JetBrains.Stripped" version="0.87.20160802.0" targetFramework="net45" />
53+
<package id="Sprache.JetBrains" version="2.0.0.44" targetFramework="net45" />
54+
<package id="Vestris.ResourceLib.JetBrains" version="1.4.20150303.0" targetFramework="net45" />
55+
<package id="Wave" version="7.0.0.0" targetFramework="net45" />
56+
<package id="Windows7APICodePack.JetBrains.Stripped" version="1.1.20150225.0" targetFramework="net45" />
57+
<package id="xmlrpcnet" version="2.5.0" targetFramework="net45" />
58+
<package id="xunit.abstractions.JetBrains" version="2.0.0" targetFramework="net45" />
59+
<package id="xunit.JetBrains" version="1.9.2" targetFramework="net45" />
60+
<package id="xunit.runner.utility.JetBrains" version="2.2.0" targetFramework="net45" />
5961
</packages>

0 commit comments

Comments
 (0)