Merge branch 'master' into removeOldApi

.gitattributes

@@ -3,17 +3,16 @@
 ###############################################################################
 * text=auto encoding=UTF-8
 
-# csc/vbc are shell scripts and should always have unix line endings
+# RunCsc/RunVbc are shell scripts and should always have unix line endings
 # These shell scripts are included in the toolset packages. Normally, the shell
 # scripts in our repo are only run by cloning onto a Linux/Mac machine, and git
 # automatically chooses LF as the line ending.
 #
 # However, right now the toolset packages must be built on Windows, and so the
 # files must be hard-coded to be cloned with LF
-src/Compilers/CSharp/CscCore/csc text eol=lf
-src/Compilers/VisualBasic/VbcCore/vbc text eol=lf
 build/NuGetAdditionalFiles/RunCsc text eol=lf
 build/NuGetAdditionalFiles/RunVbc text eol=lf
+*.sh text eol=lf
 
 ###############################################################################
 # Set default behavior for command prompt diff.

.github/CODEOWNERS

@@ -2,17 +2,17 @@
 # More information: https://github.com/blog/2392-introducing-code-owners 
 
 *.groovy @dotnet/roslyn-infrastructure
-.github/* @dotnet/roslyn-infrastructure
-build/* @dotnet/roslyn-infrastructure
-src/CodeStyle/* @dotnet/roslyn-ide
-src/Compilers/* @dotnet/roslyn-compiler
-src/EditorFeatures/* @dotnet/roslyn-ide
-src/Features/* @dotnet/roslyn-ide
-src/Interactive/* @dotnet/roslyn-interactive
-src/NuGet/* @dotnet/roslyn-infrastructure
-src/Scripting/* @dotnet/roslyn-interactive
-src/Setup/* @dotnet/roslyn-infrastructure
-src/Tools/* @dotnet/roslyn-infrastructure
-src/VisualStudio/* @dotnet/roslyn-ide
-src/Workspaces/* @dotnet/roslyn-ide
+.github/ @dotnet/roslyn-infrastructure
+build/ @dotnet/roslyn-infrastructure
+src/CodeStyle/ @dotnet/roslyn-ide
+src/Compilers/ @dotnet/roslyn-compiler
+src/EditorFeatures/ @dotnet/roslyn-ide
+src/Features/ @dotnet/roslyn-ide
+src/Interactive/ @dotnet/roslyn-interactive
+src/NuGet/ @dotnet/roslyn-infrastructure
+src/Scripting/ @dotnet/roslyn-interactive
+src/Setup/ @dotnet/roslyn-infrastructure
+src/Tools/ @dotnet/roslyn-infrastructure
+src/VisualStudio/ @dotnet/roslyn-ide
+src/Workspaces/ @dotnet/roslyn-ide
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,33 +1,44 @@
-**Customer scenario**
+<details><summary>Ask Mode template not completed</summary>
+
+<!-- This template is not always required. If you aren't sure about whether it's needed or want help filling out the sections,
+submit the pull request and then ask us for help. :) -->
+
+### Customer scenario
 
 What does the customer do to get into this situation, and why do we think this
 is common enough to address for this release.  (Granted, sometimes this will be
 obvious "Open project, VS crashes" but in general, I need to understand how
 common a scenario is)
 
-**Bugs this fixes:**
+### Bugs this fixes
 
 (either VSO or GitHub links)
 
-**Workarounds, if any**
+### Workarounds, if any
 
 Also, why we think they are insufficient for RC vs. RC2, RC3, or RTW
 
-**Risk**
+### Risk
 
 This is generally a measure our how central the affected code is to adjacent
 scenarios and thus how likely your fix is to destabilize a broader area of code
 
-**Performance impact**
+### Performance impact
 
 (with a brief justification for that assessment (e.g. "Low perf impact because no extra allocations/no complexity changes" vs. "Low")
 
-**Is this a regression from a previous update?**
+### Is this a regression from a previous update?
 
-**Root cause analysis:**
+### Root cause analysis
 
 How did we miss it?  What tests are we adding to guard against it in the future?
 
-**How was the bug found?**
+### How was the bug found?
 
 (E.g. customer reported it vs. ad hoc testing)
+
+### Test documentation updated?
+
+If this is a new non-compiler feature or a significant improvement to an existing feature, update https://github.com/dotnet/roslyn/wiki/Manual-Testing once you know which release it is targeting.
+
+</details>

Build.cmd

@@ -1,6 +1,2 @@
 @echo off
-if "%*" == "" (
-    powershell -noprofile -executionPolicy RemoteSigned -file "%~dp0\build\scripts\build.ps1" -build
-) else (
-    powershell -noprofile -executionPolicy RemoteSigned -file "%~dp0\build\scripts\build.ps1" %*
-)
+powershell -noprofile -executionPolicy RemoteSigned -file "%~dp0\build\scripts\build.ps1" -build %*

Directory.Build.props

@@ -0,0 +1,5 @@
+<!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
+<Project>
+  <Import Project="build\Targets\Settings.props" />
+</Project>
+

Directory.Build.targets

@@ -0,0 +1,4 @@
+<!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
+<Project>
+  <Import Project="build\Targets\Imports.targets" />
+</Project>

NuGet.Config

@@ -5,7 +5,7 @@
     <!-- Currently, the repository's version of NuGet.exe and Visual Studio's version
          fight over the format of project.lock.json because the one in the respository
          is newer. To prevent that, turn off package restore. -->
-    <add key="automatic" value="false" />
+    <add key="enabled" value="false" />
   </packageRestore>
   <solution>
     <add key="disableSourceControlIntegration" value="true" />