one more file

Author: mikeblome

docs/dotnet/dotnet-programming-with-cpp-cli-visual-cpp.md

@@ -12,57 +12,10 @@ ms.author: "mblome"
 ms.workload: ["cplusplus", "dotnet"]
 ---
 # .NET Programming with C++/CLI (Visual C++)
-<<<<<<< HEAD
-C++/CLI is a set of language extensions that enable native C++ code to interoperate with .NET applications. You can create C++/CLI console applications, but Visual Studio no longer provides project templates for creating .NET Windows applications based on C++/CLI; the recommended approach is to use C# to create the user interface and consume C++/CLI code in DLLs.  
-  
+
 **Visual Studio 2015**: By default, CLR projects created with Visual Studio 2015 target .NET Framework 4.5.2. To target .NET Framework 4.6 when you create a new project, in the **New Project** dialog, change the target framework in the dropdown at the top middle of the dialog. To change the target framework for an existing project, close the project, edit the project file (.vcxproj), and change the value of the Target Framework Version to 4.6. Next time you open the project, the settings will take effect. 
 
-**Visual Studio 2017**: In Visual Studio 2017, the default framework is 4.6.1 and the Framework version selector is at the bottom of the **New Project Dialog**. C++/CLI requires the . To install the component, open the Visual Studio Installer 
-  
-## In This Section  
- [C++/CLI Tasks](../dotnet/cpp-cli-tasks.md)  
-  
- [Native and .NET Interoperability](../dotnet/native-and-dotnet-interoperability.md)  
-  
- [Pure and Verifiable Code (C++/CLI)](../dotnet/pure-and-verifiable-code-cpp-cli.md)  
-  
- [Regular Expressions (C++/CLI)](../dotnet/regular-expressions-cpp-cli.md)  
-  
- [File Handling and I/O (C++/CLI)](../dotnet/file-handling-and-i-o-cpp-cli.md)  
-  
- [Graphics Operations (C++/CLI)](../dotnet/graphics-operations-cpp-cli.md)  
-  
- [Windows Operations (C++/CLI)](../dotnet/windows-operations-cpp-cli.md)  
-  
- [Data Access Using ADO.NET (C++/CLI)](../dotnet/data-access-using-adonet-cpp-cli.md)  
-  
- [Interoperability with Other .NET Languages (C++/CLI)](../dotnet/interoperability-with-other-dotnet-languages-cpp-cli.md)  
-  
- [Serialization (C++/CLI)](../dotnet/serialization-cpp-cli.md)  
-  
- [Managed Types (C++/CLI)](../dotnet/managed-types-cpp-cli.md)  
-  
- [Reflection (C++/CLI)](../dotnet/reflection-cpp-cli.md)  
-  
- [Strong Name Assemblies (Assembly Signing) (C++/CLI)](../dotnet/strong-name-assemblies-assembly-signing-cpp-cli.md)  
-  
- [Debug Class (C++/CLI)](../dotnet/debug-class-cpp-cli.md)  
-  
- [STL/CLR Library Reference](../dotnet/stl-clr-library-reference.md)  
-  
- [C++ Support Library](../dotnet/cpp-support-library.md)  
-  
- [Exceptions in C++/CLI](../dotnet/exceptions-in-cpp-cli.md)  
-  
- [Boxing (C++/CLI)](../dotnet/boxing-cpp-cli.md)  
-  
-## See Also  
- [Native and .NET Interoperability](../dotnet/native-and-dotnet-interoperability.md)
-=======
-
-The following topics describe how Visual C++ can target the .NET platform.
-
-By default, CLR projects created with Visual Studio 2015 target .NET Framework 4.5.2. To target .NET Framework 4.6 when you create a new project, in the **New Project** dialog, change the target framework in the dropdown at the top middle of the dialog. To change the target framework for an existing project, close the project, edit the project file (.vcxproj), and change the value of the Target Framework Version to 4.6. Next time you open the project, the settings will take effect.
+**Visual Studio 2017**: In Visual Studio 2017, the default framework is 4.6.1 and the Framework version selector is at the bottom of the **New Project Dialog**. C++/CLI itself is not installed by default. To install the component, open the Visual Studio Installer and choose the C++/CLI component under Visual C++. 
 
 ## In This Section
 
@@ -107,4 +60,3 @@ By default, CLR projects created with Visual Studio 2015 target .NET Framework 4
 ## See Also
 
 [Native and .NET Interoperability](../dotnet/native-and-dotnet-interoperability.md)
->>>>>>> master