Merge remote-tracking branch 'upstream/stabilization' into...
Merge remote-tracking branch 'upstream/stabilization' into merge-stabilization-into-future-stabilization20160311-015018 Conflicts: Makefile cibuild.cmd src/Compilers/CSharp/CscCore/project.lock.json src/Compilers/CSharp/Portable/project.lock.json src/Compilers/CSharp/Test/CommandLine/project.lock.json src/Compilers/CSharp/Test/Emit/project.lock.json src/Compilers/CSharp/Test/Performance/project.lock.json src/Compilers/CSharp/Test/Semantic/project.lock.json src/Compilers/CSharp/Test/Symbol/project.lock.json src/Compilers/CSharp/Test/Syntax/project.lock.json src/Compilers/CSharp/Test/WinRT/project.lock.json src/Compilers/CSharp/csc/project.json src/Compilers/CSharp/csc/project.lock.json src/Compilers/Core/CodeAnalysisTest/project.lock.json src/Compilers/Core/MSBuildTask/Desktop/project.lock.json src/Compilers/Core/MSBuildTask/Portable/project.lock.json src/Compilers/Core/MSBuildTaskTests/project.lock.json src/Compilers/Core/Portable/project.lock.json src/Compilers/Extension/project.lock.json src/Compilers/Server/PortableServer/project.lock.json src/Compilers/Server/VBCSCompiler/project.lock.json src/Compilers/Server/VBCSCompilerTests/project.lock.json src/Compilers/Test/Resources/Core/project.lock.json src/Compilers/Test/Utilities/CSharp/project.lock.json src/Compilers/Test/Utilities/VisualBasic/project.lock.json src/Compilers/VisualBasic/Portable/project.lock.json src/Compilers/VisualBasic/Test/CommandLine/project.lock.json src/Compilers/VisualBasic/Test/Emit/project.lock.json src/Compilers/VisualBasic/Test/Performance/project.lock.json src/Compilers/VisualBasic/Test/Semantic/project.lock.json src/Compilers/VisualBasic/Test/Symbol/project.lock.json src/Compilers/VisualBasic/Test/Syntax/project.lock.json src/Compilers/VisualBasic/VbcCore/project.lock.json src/Compilers/VisualBasic/vbc/project.json src/Compilers/VisualBasic/vbc/project.lock.json src/Debugging/Microsoft.DiaSymReader.PortablePdb.Tests/project.lock.json src/Debugging/Microsoft.DiaSymReader.PortablePdb/project.lock.json src/EditorFeatures/CSharp/project.lock.json src/EditorFeatures/CSharpTest/project.lock.json src/EditorFeatures/CSharpTest2/project.lock.json src/EditorFeatures/Core/project.lock.json src/EditorFeatures/Test/project.lock.json src/EditorFeatures/Test2/project.lock.json src/EditorFeatures/TestUtilities/project.lock.json src/EditorFeatures/Text/project.lock.json src/EditorFeatures/VisualBasic/project.lock.json src/EditorFeatures/VisualBasicTest/project.lock.json src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/project.lock.json src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/project.lock.json src/ExpressionEvaluator/CSharp/Test/ResultProvider/project.lock.json src/ExpressionEvaluator/Core/Source/ExpressionCompiler/project.lock.json src/ExpressionEvaluator/Core/Source/ResultProvider/NetFX20/project.lock.json src/ExpressionEvaluator/Core/Test/ExpressionCompiler/project.lock.json src/ExpressionEvaluator/Core/Test/ResultProvider/project.lock.json src/ExpressionEvaluator/VisualBasic/Source/ExpressionCompiler/project.lock.json src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/project.lock.json src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/project.lock.json src/Features/CSharp/Portable/project.lock.json src/Features/Core/Portable/project.lock.json src/Features/VisualBasic/Portable/project.lock.json src/Interactive/CsiCore/project.lock.json src/Interactive/EditorFeatures/CSharp/project.lock.json src/Interactive/EditorFeatures/Core/project.lock.json src/Interactive/EditorFeatures/VisualBasic/project.lock.json src/Interactive/Features/project.lock.json src/Interactive/Host/project.lock.json src/Interactive/HostTest/project.lock.json src/Interactive/VbiCore/project.lock.json src/Interactive/csi/project.lock.json src/Interactive/vbi/project.lock.json src/InteractiveWindow/EditorTest/project.lock.json src/Samples/CSharp/APISampleUnitTests/project.lock.json src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers.Test/project.lock.json src/Samples/CSharp/Analyzers/CSharpAnalyzers/CSharpAnalyzers/project.lock.json src/Samples/CSharp/ConsoleClassifier/project.lock.json src/Samples/CSharp/ConvertToAutoProperty/project.lock.json src/Samples/CSharp/ConvertToConditional/Impl/project.lock.json src/Samples/CSharp/ConvertToConditional/Test/project.lock.json src/Samples/CSharp/CopyPasteWithUsing/project.lock.json src/Samples/CSharp/FormatSolution/project.lock.json src/Samples/CSharp/ImplementNotifyPropertyChanged/Impl/project.lock.json src/Samples/CSharp/ImplementNotifyPropertyChanged/Test/project.lock.json src/Samples/CSharp/MakeConst/Impl/project.lock.json src/Samples/CSharp/RefOutModifier/project.lock.json src/Samples/CSharp/TreeTransforms/project.lock.json src/Samples/Shared/UnitTestFramework/project.lock.json src/Samples/VisualBasic/APISampleUnitTests/project.lock.json src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers.Test/project.lock.json src/Samples/VisualBasic/Analyzers/BasicAnalyzers/BasicAnalyzers/project.lock.json src/Samples/VisualBasic/ConsoleClassifier/project.lock.json src/Samples/VisualBasic/ConvertToAutoProperty/Impl/project.lock.json src/Samples/VisualBasic/ConvertToAutoProperty/Test/project.lock.json src/Samples/VisualBasic/FormatSolution/project.lock.json src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Impl/project.lock.json src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Test/project.lock.json src/Samples/VisualBasic/MakeConst/Impl/project.lock.json src/Samples/VisualBasic/RemoveByVal/Impl/project.lock.json src/Samples/VisualBasic/RemoveByVal/Test/project.lock.json src/Samples/VisualBasic/TreeTransforms/project.lock.json src/Scripting/CSharp/project.lock.json src/Scripting/CSharpTest.Desktop/project.lock.json src/Scripting/CSharpTest/project.lock.json src/Scripting/Core/project.lock.json src/Scripting/CoreTest.Desktop/project.lock.json src/Scripting/CoreTest/project.lock.json src/Scripting/VisualBasic/project.lock.json src/Scripting/VisualBasicTest.Desktop/project.lock.json src/Scripting/VisualBasicTest/project.lock.json src/Test/DeployDesktopTestRuntime/project.lock.json src/Test/Diagnostics/project.lock.json src/Test/PdbUtilities/project.lock.json src/Test/Performance/Fixture/project.lock.json src/Test/Utilities/Desktop/project.lock.json src/Test/Utilities/Portable.FX45/project.lock.json src/Test/Utilities/Portable/project.json src/Test/Utilities/Portable/project.lock.json src/Test/Utilities/Runtime.FX46/project.json src/Tools/Source/MetadataVisualizer/project.lock.json src/Tools/Source/Pdb2Xml/project.lock.json src/VisualStudio/CSharp/Impl/project.lock.json src/VisualStudio/CSharp/Repl/project.lock.json src/VisualStudio/CSharp/Test/project.lock.json src/VisualStudio/Core/Def/project.lock.json src/VisualStudio/Core/Impl/project.lock.json src/VisualStudio/Core/SolutionExplorerShim/project.lock.json src/VisualStudio/Core/Test/project.lock.json src/VisualStudio/InteractiveServices/project.lock.json src/VisualStudio/Setup/project.lock.json src/VisualStudio/SetupInteractive/project.lock.json src/VisualStudio/VisualBasic/Impl/project.lock.json src/VisualStudio/VisualBasic/Repl/project.lock.json src/VisualStudio/VisualStudioDiagnosticsToolWindow/project.lock.json src/VisualStudio/VisualStudioInteractiveComponents/project.lock.json src/Workspaces/CSharp/Portable/project.lock.json src/Workspaces/CSharpTest/project.lock.json src/Workspaces/Core/Desktop/project.lock.json src/Workspaces/Core/Portable/project.lock.json src/Workspaces/CoreTest/project.lock.json src/Workspaces/VisualBasic/Portable/project.lock.json src/Workspaces/VisualBasicTest/project.lock.json
显示
- src/Compilers/CSharp/CscCore/project.lock.json 5 个添加, 61 个删除src/Compilers/CSharp/CscCore/project.lock.json
- src/Compilers/CSharp/Portable/project.lock.json 1 个添加, 1 个删除src/Compilers/CSharp/Portable/project.lock.json
- src/Compilers/CSharp/Test/CommandLine/project.lock.json 1 个添加, 1 个删除src/Compilers/CSharp/Test/CommandLine/project.lock.json
- src/Compilers/CSharp/Test/Emit/project.lock.json 1 个添加, 1 个删除src/Compilers/CSharp/Test/Emit/project.lock.json
- src/Compilers/CSharp/Test/Performance/project.lock.json 1 个添加, 1 个删除src/Compilers/CSharp/Test/Performance/project.lock.json
- src/Compilers/CSharp/Test/Semantic/project.lock.json 1 个添加, 1 个删除src/Compilers/CSharp/Test/Semantic/project.lock.json
- src/Compilers/CSharp/Test/Symbol/project.lock.json 1 个添加, 1 个删除src/Compilers/CSharp/Test/Symbol/project.lock.json
- src/Compilers/CSharp/Test/Syntax/project.lock.json 1 个添加, 1 个删除src/Compilers/CSharp/Test/Syntax/project.lock.json
- src/Compilers/CSharp/Test/WinRT/project.lock.json 1 个添加, 1 个删除src/Compilers/CSharp/Test/WinRT/project.lock.json
- src/Compilers/CSharp/csc/project.lock.json 1 个添加, 1 个删除src/Compilers/CSharp/csc/project.lock.json
- src/Compilers/Core/CodeAnalysisTest/project.lock.json 1 个添加, 1 个删除src/Compilers/Core/CodeAnalysisTest/project.lock.json
- src/Compilers/Core/MSBuildTask/Desktop/project.lock.json 1 个添加, 1 个删除src/Compilers/Core/MSBuildTask/Desktop/project.lock.json
- src/Compilers/Core/MSBuildTask/Portable/project.lock.json 1 个添加, 1 个删除src/Compilers/Core/MSBuildTask/Portable/project.lock.json
- src/Compilers/Core/MSBuildTaskTests/project.lock.json 1 个添加, 1 个删除src/Compilers/Core/MSBuildTaskTests/project.lock.json
- src/Compilers/Core/Portable/project.lock.json 1 个添加, 1 个删除src/Compilers/Core/Portable/project.lock.json
- src/Compilers/Extension/project.lock.json 1 个添加, 1 个删除src/Compilers/Extension/project.lock.json
- src/Compilers/Server/PortableServer/project.lock.json 5 个添加, 61 个删除src/Compilers/Server/PortableServer/project.lock.json
- src/Compilers/Server/VBCSCompiler/project.lock.json 1 个添加, 1 个删除src/Compilers/Server/VBCSCompiler/project.lock.json
- src/Compilers/Server/VBCSCompilerTests/project.lock.json 1 个添加, 1 个删除src/Compilers/Server/VBCSCompilerTests/project.lock.json
- src/Compilers/Test/Resources/Core/project.lock.json 1 个添加, 1 个删除src/Compilers/Test/Resources/Core/project.lock.json
加载中
想要评论请 注册 或 登录