Merge pull request #39 from asizikov/feature/fake-build

Update SDK 2016.2

Author: asizikov

.editorconfig

@@ -0,0 +1,17 @@
+# Install the EditorConfig VS plugin to automatically apply formatting settings to this solution
+# See http://editorconfig.org/ for syntax
+
+# top-most EditorConfig file
+root = true
+
+[*.config]
+indent_style = space
+indent_size = 2
+
+[*.cs]
+indent_style = space
+indent_size = 4
+
+[*]
+indent_style = space
+indent_size = 4

.gitignore

@@ -184,4 +184,8 @@ FakesAssemblies/
 *.lock.json
 *.nuget.props
 *.nuget.targets
-.vs
+.vs
+
+/.fake
+/build
+/deploy

AsyncSuffix/AsyncSuffix.nuspec renamed to AsyncSuffix.nuspec

@@ -10,15 +10,15 @@
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>Task returning method's naming analyzer. Async methods should have 'Async' suffix.</description>
         <releaseNotes>
-		&#8226;ReSharper 2016.1 support;
-	</releaseNotes>
+            &#8226;ReSharper 2016.2 support;
+    </releaseNotes>
         <language>en-US</language>
         <tags>async method, naming, task</tags>
         <dependencies>
-            <dependency id="Wave" version="[5.0]" />
+            <dependency id="Wave" version="[6.0,7.0)" />
         </dependencies>
     </metadata>
     <files>
-        <file src="bin\Release\Sizikov.AsyncSuffix.dll" target="dotFiles" />
+        <file src="build\Sizikov.AsyncSuffix.dll" target="dotFiles" />
     </files>
 </package>

AsyncSuffix/AsyncSuffix.csproj

@@ -2,17 +2,16 @@ assembly-informational-format: '{NuGetVersion}'
 mode: ContinuousDeployment
 branches:
   master:
-    tag: s
-  releases?[/-]:
     tag: rc
+    increment: Minor
   features?[/-]:
-    tag: useBranchName
+    tag: rc-{BranchName}
     increment: Minor
   (pull|pull\-requests|pr)[/-]:
-    tag: pr
+    tag: rc-pr-{BranchName}
+    increment: Minor
   hotfix(es)?[/-]:
     tag: rc
-  support[/-]:
-    tag: s
+    increment: Patch
   dev(elop)?(ment)?$:
     tag: b

AsyncSuffix/packages.config

@@ -1,78 +1,15 @@
--
-  branches:
-    only:
-      - master
-      - develop
-  configuration: Release
-  platform: Any CPU
-  cache:
-    - packages -> **\packages.config
-    - C:\ProgramData\chocolatey\bin -> appveyor.yml
-    - C:\ProgramData\chocolatey\lib -> appveyor.yml
-  install:
-    - choco install gitversion.portable -y
-  environment:
-    resharper_nuget_api_key:
-      secure: RjiHK3Oxp74LUrI1/vmc2S36zOSRLxFM1Eq0Qn4hixWiou11jFqUbW2ukMNXrazP
-  before_build:
-    - ps: nuget restore
-    - ps: gitversion /l console /output buildserver /updateassemblyinfo /b (get-item env:APPVEYOR_REPO_BRANCH).Value
-  build:
-    project: AsyncSuffix.sln
-    verbosity: minimal
-  test: off
-  after_build:
-    - ps: nuget pack AsyncSuffix/AsyncSuffix.nuspec -Version (get-item env:GitVersion_InformationalVersion).Value
-    - 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 }
-- 
-  branches:
-    only:
-      - /feature/.*/
-  configuration: Release
-  platform: Any CPU
-  pull_requests:
-    do_not_increment_build_number: true
-  cache:
-    - packages -> **\packages.config
-    - C:\ProgramData\chocolatey\bin -> appveyor.yml
-    - C:\ProgramData\chocolatey\lib -> appveyor.yml
-  install:
-    - choco install gitversion.portable -y
-  environment:
-    private_nuget_api_key:
-      secure: JiwfYhXw/Qj6yC2oJcixcgH7gChQmZp8HDPJY1MKxBY=
-  nuget:
-    account_feed: true
-  before_build:
-    - ps: nuget restore
-    - ps: gitversion /l console /output buildserver /updateassemblyinfo /b (get-item env:APPVEYOR_REPO_BRANCH).Value
-  build:
-    project: AsyncSuffix.sln
-    verbosity: minimal
-  test: off
-  after_build:
-    - ps: nuget pack AsyncSuffix/AsyncSuffix.nuspec -Version (get-item env:GitVersion_InformationalVersion).Value
-    - ps: nuget push *.nupkg -ApiKey (get-item env:private_nuget_api_key).Value -Source https://ci.appveyor.com/nuget/asizikov-private/api/v2/package
--
-  branches:
-    only:
-      - /.*/merge/
-  configuration: Release
-  platform: Any CPU
-  pull_requests:
-    do_not_increment_build_number: true
-  cache:
-    - packages -> **\packages.config
-    - C:\ProgramData\chocolatey\bin -> appveyor.yml
-    - C:\ProgramData\chocolatey\lib -> appveyor.yml
-  install:
-    - choco install gitversion.portable -y
-  nuget:
-    account_feed: true
-  before_build:
-    - ps: nuget restore
-    - ps: gitversion /l console /output buildserver /updateassemblyinfo /b (get-item env:APPVEYOR_REPO_BRANCH).Value
-  build:
-    project: AsyncSuffix.sln
-    verbosity: minimal
-  test: off
+init:
+  - git config --global core.autocrlf input
+install: 
+  - choco install gitversion.portable -y
+before_build:
+  - ps: gitversion /l console /output buildserver /b (get-item env:APPVEYOR_REPO_BRANCH).Value 
+build_script:
+  - cmd: build.bat BuildApp
+test: off
+nuget:
+  account_feed: false
+  project_feed: false
+environment:
+  resharper_nuget_api_key:
+    secure: RjiHK3Oxp74LUrI1/vmc2S36zOSRLxFM1Eq0Qn4hixWiou11jFqUbW2ukMNXrazP

GitVersionConfig.yaml renamed to GitVersion.yml

@@ -0,0 +1,5 @@
+@echo off
+cls
+"tools\nuget\NuGet.exe" "Install" "FAKE" "-OutputDirectory" "packages" "-ExcludeVersion"
+"tools\nuget\NuGet.exe" restore ./src/AsyncSuffix.sln
+"packages\FAKE\tools\Fake.exe" build.fsx

appveyor.yml

@@ -0,0 +1,96 @@
+// include Fake lib
+#r @"packages/FAKE/tools/FakeLib.dll"
+open Fake
+open Fake.AppVeyor
+
+// Project parameters
+
+let buildDir = "./build/"
+let packagingDir = "./.deploy/"
+let baseVersion = "2016.2.0"
+
+let version = 
+        match buildServer with 
+        | AppVeyor -> environVar "GitVersion_NuGetVersionV2"
+        | _ ->  baseVersion + "-local"
+
+let isPullRequest = 
+    let prNumber = 
+        match buildServer with 
+        | AppVeyor -> environVarOrNone "APPVEYOR_PULL_REQUEST_NUMBER"
+        | _ ->  None
+    match prNumber with
+    | Some(_) -> true
+    | None -> false
+
+// NuGet
+let projectName = "AsyncSuffix"
+let nuspecFileName = projectName + ".nuspec"
+let packageName = "Sizikov." + projectName
+let galleryUri = "https://resharper-plugins.jetbrains.com"
+
+let apiKey = 
+        match buildServer with 
+        | AppVeyor -> environVar "resharper_nuget_api_key"
+        | _ ->  "Nothing here"
+
+
+Target "Clean" (fun _ ->
+    CleanDirs [buildDir; packagingDir]
+)
+
+Target "BuildApp" (fun _ ->
+    !! "src/**/*.csproj"
+        |> MSBuild buildDir "Build" [ "Configuration", "Release" ]
+        |> Log "AppBuild-Output: "
+)
+
+Target "Default" (fun _ ->
+    DoNothing()
+)
+Target "CreatePackage" (fun _ ->
+    NuGet (fun p -> 
+        {p with
+            OutputPath = packagingDir
+            WorkingDir = "."
+            Version = version
+            Publish = false }) 
+            nuspecFileName
+)
+
+Target "PublishPackage" (fun _ -> 
+    let branch = Fake.Git.Information.getBranchName "."
+    if branch = "master" then
+        if isLocalBuild then
+            trace "Package can only be published from Appveyor build"
+        else
+            match buildServer with 
+            | AppVeyor -> 
+                    if isPullRequest then
+                        trace "Skip publish from PR"
+                    else 
+                        NuGetPublish (fun p ->
+                        { p with
+                            AccessKey = apiKey
+                            PublishUrl = galleryUri
+                            NoPackageAnalysis = true
+                            Publish = true
+                            WorkingDir = packagingDir
+                            OutputPath = packagingDir
+                            Project = packageName
+                            Version = version
+                        })
+            | _ ->  trace "Do not publish from local build"
+    else 
+        trace "Package can only be published from master branch"
+        DoNothing()
+
+)
+
+"Clean"
+  ==> "BuildApp"
+  ==> "CreatePackage"
+  ==> "PublishPackage"
+  ==> "Default"
+
+RunTargetOrDefault "Default"