Skip to content

Commit 5d4d683

Browse files
authored
Merge branch 'develop' into master
2 parents ceaf2c1 + 1c7ba57 commit 5d4d683

34 files changed

+385
-559
lines changed

.editorconfig

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Install the EditorConfig VS plugin to automatically apply formatting settings to this solution
2+
# See http://editorconfig.org/ for syntax
3+
4+
# top-most EditorConfig file
5+
root = true
6+
7+
[*.config]
8+
indent_style = space
9+
indent_size = 2
10+
11+
[*.cs]
12+
indent_style = space
13+
indent_size = 4
14+
15+
[*]
16+
indent_style = space
17+
indent_size = 4

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,4 +184,8 @@ FakesAssemblies/
184184
*.lock.json
185185
*.nuget.props
186186
*.nuget.targets
187-
.vs
187+
.vs
188+
189+
/.fake
190+
/build
191+
/deploy

AsyncSuffix/AsyncSuffix.nuspec renamed to AsyncSuffix.nuspec

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,15 @@
1010
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1111
<description>Task returning method's naming analyzer. Async methods should have 'Async' suffix.</description>
1212
<releaseNotes>
13-
&#8226;Performance improvements;
14-
&#8226;Interface implementation excluded from analysis;
15-
</releaseNotes>
13+
&#8226;ReSharper 2016.2 support;
14+
</releaseNotes>
1615
<language>en-US</language>
1716
<tags>async method, naming, task</tags>
1817
<dependencies>
19-
<dependency id="Wave" version="[4.0,5.0)" />
18+
<dependency id="Wave" version="[6.0,7.0)" />
2019
</dependencies>
2120
</metadata>
2221
<files>
23-
<file src="bin\Release\Sizikov.AsyncSuffix.dll" target="dotFiles" />
22+
<file src="build\Sizikov.AsyncSuffix.dll" target="dotFiles" />
2423
</files>
2524
</package>

AsyncSuffix/AsyncSuffix.csproj

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

AsyncSuffix/MethodRenameWorkflow.cs

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

AsyncSuffix/RenameOverloadsPageDecorator.cs

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

AsyncSuffix/packages.config

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

GitVersionConfig.yaml renamed to GitVersion.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,16 @@ assembly-informational-format: '{NuGetVersion}'
22
mode: ContinuousDeployment
33
branches:
44
master:
5-
tag: s
6-
releases?[/-]:
75
tag: rc
6+
increment: Minor
87
features?[/-]:
9-
tag: useBranchName
8+
tag: rc-{BranchName}
109
increment: Minor
1110
(pull|pull\-requests|pr)[/-]:
12-
tag: pr
11+
tag: rc-pr-{BranchName}
12+
increment: Minor
1313
hotfix(es)?[/-]:
1414
tag: rc
15-
support[/-]:
16-
tag: s
15+
increment: Patch
1716
dev(elop)?(ment)?$:
1817
tag: b

README.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# AsyncSuffix plugin for [ReSharper](https://www.jetbrains.com/resharper/) 10
1+
# AsyncSuffix plugin for [ReSharper](https://www.jetbrains.com/resharper/)
22

33
##CI Statuses
44

@@ -23,4 +23,9 @@ Sometimes you have a type which you want to be treated as asynchronous.
2323

2424
Since v1.2.0 plugin supports custom types:
2525

26-
![customasynctype](https://cloud.githubusercontent.com/assets/819053/11931954/0b9996ca-a7f2-11e5-8fce-99a82449737a.PNG)
26+
![customasynctype](https://cloud.githubusercontent.com/assets/819053/11931954/0b9996ca-a7f2-11e5-8fce-99a82449737a.PNG)
27+
28+
##Thanks to
29+
* JetBrains for [Open Source license](https://www.jetbrains.com/buy/opensource/)
30+
* [Matt Ellis](https://twitter.com/citizenmatt) for technical support
31+
* [Serjic Shkredov](https://twitter.com/serjic) for suggestions

appveyor.yml

Lines changed: 15 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,15 @@
1-
-
2-
branches:
3-
only:
4-
- master
5-
- develop
6-
configuration: Release
7-
platform: Any CPU
8-
cache:
9-
- packages -> **\packages.config
10-
- C:\ProgramData\chocolatey\bin -> appveyor.yml
11-
- C:\ProgramData\chocolatey\lib -> appveyor.yml
12-
install:
13-
- choco install gitversion.portable -y
14-
environment:
15-
resharper_nuget_api_key:
16-
secure: RjiHK3Oxp74LUrI1/vmc2S36zOSRLxFM1Eq0Qn4hixWiou11jFqUbW2ukMNXrazP
17-
before_build:
18-
- ps: nuget restore
19-
- ps: gitversion /l console /output buildserver /updateassemblyinfo /b (get-item env:APPVEYOR_REPO_BRANCH).Value
20-
build:
21-
project: AsyncSuffix.sln
22-
verbosity: minimal
23-
test: off
24-
after_build:
25-
- ps: nuget pack AsyncSuffix/AsyncSuffix.nuspec -Version (get-item env:GitVersion_InformationalVersion).Value
26-
- ps: if(-not $env:APPVEYOR_PULL_REQUEST_NUMBER){ nuget push *.nupkg -ApiKey (get-item env:resharper_nuget_api_key).Value -Source https://resharper-plugins.jetbrains.com }
27-
-
28-
branches:
29-
only:
30-
- /feature/.*/
31-
configuration: Release
32-
platform: Any CPU
33-
pull_requests:
34-
do_not_increment_build_number: true
35-
cache:
36-
- packages -> **\packages.config
37-
- C:\ProgramData\chocolatey\bin -> appveyor.yml
38-
- C:\ProgramData\chocolatey\lib -> appveyor.yml
39-
install:
40-
- choco install gitversion.portable -y
41-
environment:
42-
private_nuget_api_key:
43-
secure: JiwfYhXw/Qj6yC2oJcixcgH7gChQmZp8HDPJY1MKxBY=
44-
nuget:
45-
account_feed: true
46-
before_build:
47-
- ps: nuget restore
48-
- ps: gitversion /l console /output buildserver /updateassemblyinfo /b (get-item env:APPVEYOR_REPO_BRANCH).Value
49-
build:
50-
project: AsyncSuffix.sln
51-
verbosity: minimal
52-
test: off
53-
after_build:
54-
- ps: nuget pack AsyncSuffix/AsyncSuffix.nuspec -Version (get-item env:GitVersion_InformationalVersion).Value
55-
- ps: nuget push *.nupkg -ApiKey (get-item env:private_nuget_api_key).Value -Source https://ci.appveyor.com/nuget/asizikov-private/api/v2/package
56-
-
57-
branches:
58-
only:
59-
- /.*/merge/
60-
configuration: Release
61-
platform: Any CPU
62-
pull_requests:
63-
do_not_increment_build_number: true
64-
cache:
65-
- packages -> **\packages.config
66-
- C:\ProgramData\chocolatey\bin -> appveyor.yml
67-
- C:\ProgramData\chocolatey\lib -> appveyor.yml
68-
install:
69-
- choco install gitversion.portable -y
70-
nuget:
71-
account_feed: true
72-
before_build:
73-
- ps: nuget restore
74-
- ps: gitversion /l console /output buildserver /updateassemblyinfo /b (get-item env:APPVEYOR_REPO_BRANCH).Value
75-
build:
76-
project: AsyncSuffix.sln
77-
verbosity: minimal
78-
test: off
1+
init:
2+
- git config --global core.autocrlf input
3+
install:
4+
- choco install gitversion.portable -y
5+
before_build:
6+
- ps: gitversion /l console /output buildserver /b (get-item env:APPVEYOR_REPO_BRANCH).Value
7+
build_script:
8+
- cmd: build.bat BuildApp
9+
test: off
10+
nuget:
11+
account_feed: false
12+
project_feed: false
13+
environment:
14+
resharper_nuget_api_key:
15+
secure: RjiHK3Oxp74LUrI1/vmc2S36zOSRLxFM1Eq0Qn4hixWiou11jFqUbW2ukMNXrazP

0 commit comments

Comments
 (0)