diff options
author | Tiago <tiagonbotelho@hotmail.com> | 2017-12-13 13:43:17 +0300 |
---|---|---|
committer | LUKE BENNETT <lbennett@gitlab.com> | 2017-12-13 17:15:47 +0300 |
commit | f9642476e646be96b38c9a0b8bc549959900e3cf (patch) | |
tree | aa5a82af244a7e8ed4ca7628d84c85ea186bc72a /vendor/gitignore/VisualStudio.gitignore | |
parent | c48ab6b2baac9ab1bd36e00396298e27c6f0332e (diff) |
Merge branch '10-3-gitignore' into 'master'
10.3 gitignore and license templates
Closes #10
See merge request gitlab-org/gitlab-ce!15901
(cherry picked from commit 98eda47a52cab6fd250d25bb24d2457e43fa92d1)
f87f4250 Ran bin/rake gitlab:update_templates
Diffstat (limited to 'vendor/gitignore/VisualStudio.gitignore')
-rw-r--r-- | vendor/gitignore/VisualStudio.gitignore | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/vendor/gitignore/VisualStudio.gitignore b/vendor/gitignore/VisualStudio.gitignore index 509668db67a..6217e6c48e9 100644 --- a/vendor/gitignore/VisualStudio.gitignore +++ b/vendor/gitignore/VisualStudio.gitignore @@ -24,11 +24,14 @@ bld/ [Oo]bj/ [Ll]og/ -# Visual Studio 2015 cache/options directory +# Visual Studio 2015/2017 cache/options directory .vs/ # Uncomment if you have tasks that create the project's static files in wwwroot #wwwroot/ +# Visual Studio 2017 auto generated files +Generated\ Files/ + # MSTest test Results [Tt]est[Rr]esult*/ [Bb]uild[Ll]og.* @@ -51,6 +54,10 @@ project.fragment.lock.json artifacts/ **/Properties/launchSettings.json +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio *_i.c *_p.c *_i.h @@ -247,7 +254,7 @@ FakesAssemblies/ .ntvs_analysis.dat node_modules/ -# Typescript v1 declaration files +# TypeScript v1 declaration files typings/ # Visual Studio 6 build log @@ -303,3 +310,6 @@ __pycache__/ # OpenCover UI analysis results OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ |