From e4d5997e01c8e303462589d96592659245bd26da Mon Sep 17 00:00:00 2001
From: Jonathan Pobst <jonathan.pobst@microsoft.com>
Date: Tue, 9 Feb 2021 10:09:15 -0600
Subject: [PATCH] Update some project files to SDK-style.

---
 .../ICSharpCode.NRefactory.CSharp.csproj      | 415 +-----------------
 .../ICSharpCode.NRefactory.csproj             | 304 +------------
 2 files changed, 30 insertions(+), 689 deletions(-)

diff --git a/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj b/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj
index 0d12aaaff..4800c43e9 100644
--- a/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj
+++ b/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj
@@ -1,420 +1,43 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <ProjectGuid>{53DCA265-3C3C-42F9-B647-F72BA678122B}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <OutputType>Library</OutputType>
-    <RootNamespace>ICSharpCode.NRefactory.CSharp</RootNamespace>
-    <AssemblyName>ICSharpCode.NRefactory.CSharp</AssemblyName>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <NoStdLib>False</NoStdLib>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <SignAssembly>true</SignAssembly>
+    <TargetFramework>net40</TargetFramework>
+    <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\ICSharpCode.NRefactory.snk</AssemblyOriginatorKeyFile>
-    <DelaySign>False</DelaySign>
-    <AssemblyOriginatorKeyMode>File</AssemblyOriginatorKeyMode>
     <NoWarn>1591,1587,1570</NoWarn>
-    <OutputPath>..\bin\$(Configuration)\</OutputPath>
     <NoWin32Manifest>False</NoWin32Manifest>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <DocumentationFile>$(IntermediateOutputPath)ICSharpCode.NRefactory.CSharp.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
-    <BaseAddress>4194304</BaseAddress>
-    <FileAlignment>4096</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <Optimize>False</Optimize>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <DefineConstants>DEBUG;TRACE;FULL_AST;NET_4_0</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <Optimize>True</Optimize>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <DefineConstants>TRACE;FULL_AST;NET_4_0</DefineConstants>
-    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>PdbOnly</DebugType>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <DefineConstants>$(DefineConstants);FULL_AST;NET_4_0</DefineConstants>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <OutputPath>..\bin\Release\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <DebugSymbols>True</DebugSymbols>
-    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <OutputPath>..\bin\Debug\</OutputPath>
   </PropertyGroup>
+
   <PropertyGroup Condition=" '$(Configuration)' == 'net_4_5_Debug' ">
-    <Optimize>False</Optimize>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <DefineConstants>DEBUG;TRACE;FULL_AST;NET_4_0;NET_4_5</DefineConstants>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Debug|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <DebugSymbols>True</DebugSymbols>
-    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <OutputPath>..\bin\net_4_5_Debug\</OutputPath>
+    <TargetFramework>net45</TargetFramework>
+    <DefineConstants>$(DefineConstants);NET_4_5</DefineConstants>
   </PropertyGroup>
+
   <PropertyGroup Condition=" '$(Configuration)' == 'net_4_5_Release' ">
-    <Optimize>True</Optimize>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <DefineConstants>TRACE;FULL_AST;NET_4_0;NET_4_5</DefineConstants>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <OutputPath>..\bin\net_4_5_Release\</OutputPath>
+    <TargetFramework>net45</TargetFramework>
+    <DefineConstants>$(DefineConstants);NET_4_5</DefineConstants>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
+    <Compile Remove="Refactoring\CodeActions\RemoveFieldRefactoryActionRefactoringAction.cs" />
   </ItemGroup>
+
   <ItemGroup>
     <Compile Include="..\ICSharpCode.NRefactory\Properties\GlobalAssemblyInfo.cs">
       <Link>Properties\GlobalAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="Analysis\ControlFlow.cs" />
-    <Compile Include="Analysis\DefiniteAssignmentAnalysis.cs" />
-    <Compile Include="Analysis\ReachabilityAnalysis.cs" />
-    <Compile Include="Analysis\SemanticHighlightingVisitor.cs" />
-    <Compile Include="Ast\AstNode.cs" />
-    <Compile Include="Ast\AstNodeCollection.cs" />
-    <Compile Include="Ast\AstType.cs" />
-    <Compile Include="Ast\DocumentationReference.cs" />
-    <Compile Include="Ast\IdentifierExpressionBackreference.cs" />
-    <Compile Include="Ast\SyntaxExtensions.cs" />
-    <Compile Include="Ast\SyntaxTree.cs" />
-    <Compile Include="Ast\ComposedType.cs" />
-    <Compile Include="Ast\CSharpModifierToken.cs" />
-    <Compile Include="Ast\CSharpTokenNode.cs" />
-    <Compile Include="Ast\CSharpUtil.cs" />
-    <Compile Include="Ast\DepthFirstAstVisitor.cs" />
-    <Compile Include="Ast\ErrorNode.cs" />
-    <Compile Include="Ast\Expressions\AnonymousMethodExpression.cs" />
-    <Compile Include="Ast\Expressions\AnonymousTypeCreateExpression.cs" />
-    <Compile Include="Ast\Expressions\ArrayCreateExpression.cs">
-      <DependentUpon>ArrayInitializerExpression.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Ast\Expressions\ArrayInitializerExpression.cs" />
-    <Compile Include="Ast\Expressions\AsExpression.cs" />
-    <Compile Include="Ast\Expressions\AssignmentExpression.cs" />
-    <Compile Include="Ast\Expressions\BaseReferenceExpression.cs" />
-    <Compile Include="Ast\Expressions\BinaryOperatorExpression.cs" />
-    <Compile Include="Ast\Expressions\CastExpression.cs" />
-    <Compile Include="Ast\Expressions\CheckedExpression.cs" />
-    <Compile Include="Ast\Expressions\ConditionalExpression.cs" />
-    <Compile Include="Ast\Expressions\DefaultValueExpression.cs" />
-    <Compile Include="Ast\Expressions\DirectionExpression.cs" />
-    <Compile Include="Ast\Expressions\Expression.cs" />
-    <Compile Include="Ast\Expressions\IdentifierExpression.cs" />
-    <Compile Include="Ast\Expressions\IndexerExpression.cs" />
-    <Compile Include="Ast\Expressions\InvocationExpression.cs" />
-    <Compile Include="Ast\Expressions\IsExpression.cs" />
-    <Compile Include="Ast\Expressions\LambdaExpression.cs" />
-    <Compile Include="Ast\Expressions\MemberReferenceExpression.cs" />
-    <Compile Include="Ast\Expressions\NamedArgumentExpression.cs" />
-    <Compile Include="Ast\Expressions\NamedExpression.cs" />
-    <Compile Include="Ast\Expressions\NullReferenceExpression.cs" />
-    <Compile Include="Ast\Expressions\ObjectCreateExpression.cs" />
-    <Compile Include="Ast\Expressions\ParenthesizedExpression.cs" />
-    <Compile Include="Ast\Expressions\PointerReferenceExpression.cs" />
-    <Compile Include="Ast\Expressions\PrimitiveExpression.cs" />
-    <Compile Include="Ast\Expressions\QueryExpression.cs" />
-    <Compile Include="Ast\Expressions\SizeOfExpression.cs" />
-    <Compile Include="Ast\Expressions\StackAllocExpression.cs" />
-    <Compile Include="Ast\Expressions\ThisReferenceExpression.cs" />
-    <Compile Include="Ast\Expressions\TypeOfExpression.cs" />
-    <Compile Include="Ast\Expressions\TypeReferenceExpression.cs" />
-    <Compile Include="Ast\Expressions\UnaryOperatorExpression.cs" />
-    <Compile Include="Ast\Expressions\UncheckedExpression.cs" />
-    <Compile Include="Ast\Expressions\UndocumentedExpression.cs" />
-    <Compile Include="Ast\GeneralScope\Attribute.cs" />
-    <Compile Include="Ast\GeneralScope\AttributeSection.cs" />
-    <Compile Include="Ast\GeneralScope\Comment.cs" />
-    <Compile Include="Ast\GeneralScope\Constraint.cs" />
-    <Compile Include="Ast\GeneralScope\DelegateDeclaration.cs" />
-    <Compile Include="Ast\GeneralScope\ExternAliasDeclaration.cs" />
-    <Compile Include="Ast\GeneralScope\NamespaceDeclaration.cs" />
-    <Compile Include="Ast\GeneralScope\TypeDeclaration.cs" />
-    <Compile Include="Ast\GeneralScope\TypeParameterDeclaration.cs" />
-    <Compile Include="Ast\GeneralScope\UsingAliasDeclaration.cs" />
-    <Compile Include="Ast\GeneralScope\UsingDeclaration.cs" />
-    <Compile Include="Ast\IAstVisitor.cs" />
-    <Compile Include="Ast\Identifier.cs" />
-    <Compile Include="Ast\MemberType.cs" />
-    <Compile Include="Ast\Modifiers.cs" />
-    <Compile Include="Ast\NodeType.cs" />
-    <Compile Include="Ast\ObservableAstVisitor.cs" />
-    <Compile Include="Ast\PrimitiveType.cs" />
-    <Compile Include="Ast\SimpleType.cs" />
-    <Compile Include="Ast\Statements\BlockStatement.cs" />
-    <Compile Include="Ast\Statements\BreakStatement.cs" />
-    <Compile Include="Ast\Statements\CheckedStatement.cs" />
-    <Compile Include="Ast\Statements\ContinueStatement.cs" />
-    <Compile Include="Ast\Statements\DoWhileStatement.cs" />
-    <Compile Include="Ast\Statements\EmptyStatement.cs" />
-    <Compile Include="Ast\Statements\ExpressionStatement.cs" />
-    <Compile Include="Ast\Statements\FixedStatement.cs" />
-    <Compile Include="Ast\Statements\ForeachStatement.cs" />
-    <Compile Include="Ast\Statements\ForStatement.cs" />
-    <Compile Include="Ast\Statements\GotoStatement.cs" />
-    <Compile Include="Ast\Statements\IfElseStatement.cs" />
-    <Compile Include="Ast\Statements\LabelStatement.cs" />
-    <Compile Include="Ast\Statements\LockStatement.cs" />
-    <Compile Include="Ast\Statements\ReturnStatement.cs" />
-    <Compile Include="Ast\Statements\Statement.cs" />
-    <Compile Include="Ast\Statements\SwitchStatement.cs" />
-    <Compile Include="Ast\Statements\ThrowStatement.cs" />
-    <Compile Include="Ast\Statements\TryCatchStatement.cs" />
-    <Compile Include="Ast\Statements\UncheckedStatement.cs" />
-    <Compile Include="Ast\Statements\UnsafeStatement.cs" />
-    <Compile Include="Ast\Statements\UsingStatement.cs" />
-    <Compile Include="Ast\Statements\VariableDeclarationStatement.cs" />
-    <Compile Include="Ast\Statements\WhileStatement.cs" />
-    <Compile Include="Ast\Statements\YieldBreakStatement.cs" />
-    <Compile Include="Ast\Statements\YieldReturnStatement.cs" />
-    <Compile Include="Ast\TypeMembers\Accessor.cs" />
-    <Compile Include="Ast\TypeMembers\EntityDeclaration.cs" />
-    <Compile Include="Ast\TypeMembers\ConstructorDeclaration.cs" />
-    <Compile Include="Ast\TypeMembers\DestructorDeclaration.cs" />
-    <Compile Include="Ast\TypeMembers\EnumMemberDeclaration.cs" />
-    <Compile Include="Ast\TypeMembers\EventDeclaration.cs" />
-    <Compile Include="Ast\TypeMembers\FieldDeclaration.cs" />
-    <Compile Include="Ast\TypeMembers\FixedFieldDeclaration.cs" />
-    <Compile Include="Ast\TypeMembers\FixedVariableInitializer.cs" />
-    <Compile Include="Ast\TypeMembers\IndexerDeclaration.cs" />
-    <Compile Include="Ast\TypeMembers\MethodDeclaration.cs" />
-    <Compile Include="Ast\TypeMembers\OperatorDeclaration.cs" />
-    <Compile Include="Ast\TypeMembers\ParameterDeclaration.cs" />
-    <Compile Include="Ast\TypeMembers\PropertyDeclaration.cs" />
-    <Compile Include="Ast\TypeMembers\VariableInitializer.cs" />
-    <Compile Include="CSharpProjectContent.cs" />
-    <Compile Include="Formatter\CSharpFormattingOptions.cs" />
-    <Compile Include="Formatter\Indent.cs" />
-    <Compile Include="OutputVisitor\CodeDomConvertVisitor.cs" />
-    <Compile Include="OutputVisitor\CSharpAmbience.cs" />
-    <Compile Include="OutputVisitor\InsertMissingTokensDecorator.cs" />
-    <Compile Include="OutputVisitor\InsertParenthesesVisitor.cs" />
-    <Compile Include="OutputVisitor\InsertRequiredSpacesDecorator.cs" />
-    <Compile Include="OutputVisitor\CSharpOutputVisitor.cs" />
-    <Compile Include="OutputVisitor\InsertSpecialsDecorator.cs" />
-    <Compile Include="OutputVisitor\ITokenWriter.cs" />
-    <Compile Include="OutputVisitor\TextWriterOutputFormatter.cs" />
-    <Compile Include="Parser\CompilerSettings.cs" />
-    <Compile Include="Parser\CSharpParser.cs" />
-    <Compile Include="Parser\mcs\anonymous.cs" />
-    <Compile Include="Parser\mcs\argument.cs" />
-    <Compile Include="Parser\mcs\assembly.cs" />
-    <Compile Include="Parser\mcs\assign.cs" />
-    <Compile Include="Parser\mcs\async.cs" />
-    <Compile Include="Parser\mcs\attribute.cs" />
-    <Compile Include="Parser\mcs\cfold.cs" />
-    <Compile Include="Parser\mcs\class.cs" />
-    <Compile Include="Parser\mcs\codegen.cs" />
-    <Compile Include="Parser\mcs\complete.cs" />
-    <Compile Include="Parser\mcs\const.cs" />
-    <Compile Include="Parser\mcs\constant.cs" />
-    <Compile Include="Parser\mcs\context.cs" />
-    <Compile Include="Parser\mcs\convert.cs" />
-    <Compile Include="Parser\mcs\CryptoConvert.cs" />
-    <Compile Include="Parser\mcs\cs-parser.cs" />
-    <Compile Include="Parser\mcs\cs-tokenizer.cs" />
-    <Compile Include="Parser\mcs\decl.cs" />
-    <Compile Include="Parser\mcs\delegate.cs" />
-    <Compile Include="Parser\mcs\doc.cs" />
-    <Compile Include="Parser\mcs\driver.cs" />
-    <Compile Include="Parser\mcs\dynamic.cs" />
-    <Compile Include="Parser\mcs\ecore.cs" />
-    <Compile Include="Parser\mcs\enum.cs" />
-    <Compile Include="Parser\mcs\eval.cs" />
-    <Compile Include="Parser\mcs\expression.cs" />
-    <Compile Include="Parser\mcs\field.cs" />
-    <Compile Include="Parser\mcs\flowanalysis.cs" />
-    <Compile Include="Parser\mcs\generic.cs" />
-    <Compile Include="Parser\mcs\import.cs" />
-    <Compile Include="Parser\mcs\iterators.cs" />
-    <Compile Include="Parser\mcs\lambda.cs" />
-    <Compile Include="Parser\mcs\linq.cs" />
-    <Compile Include="Parser\mcs\literal.cs" />
-    <Compile Include="Parser\mcs\location.cs" />
-    <Compile Include="Parser\mcs\membercache.cs" />
-    <Compile Include="Parser\mcs\method.cs" />
-    <Compile Include="Parser\mcs\modifiers.cs" />
-    <Compile Include="Parser\mcs\MonoSymbolFile.cs" />
-    <Compile Include="Parser\mcs\MonoSymbolTable.cs" />
-    <Compile Include="Parser\mcs\MonoSymbolWriter.cs" />
-    <Compile Include="Parser\mcs\namespace.cs" />
-    <Compile Include="Parser\mcs\nullable.cs" />
-    <Compile Include="Parser\mcs\outline.cs" />
-    <Compile Include="Parser\mcs\parameter.cs" />
-    <Compile Include="Parser\mcs\pending.cs" />
-    <Compile Include="Parser\mcs\property.cs" />
-    <Compile Include="Parser\mcs\reflection.cs" />
-    <Compile Include="Parser\mcs\report.cs" />
-    <Compile Include="Parser\mcs\statement.cs" />
-    <Compile Include="Parser\mcs\support.cs" />
-    <Compile Include="Parser\mcs\symbolwriter.cs" />
-    <Compile Include="Parser\mcs\typemanager.cs" />
-    <Compile Include="Parser\mcs\typespec.cs" />
-    <Compile Include="Parser\mcs\visit.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="QueryExpressionExpander.cs" />
-    <Compile Include="Refactoring\DocumentScript.cs" />
-    <Compile Include="Refactoring\UsingHelper.cs" />
-    <Compile Include="Refactoring\LambdaHelper.cs" />
-    <Compile Include="Refactoring\PatternHelper.cs" />
-    <Compile Include="Refactoring\RefactoringAstHelper.cs" />
-    <Compile Include="Refactoring\RefactoringContext.cs" />
-    <Compile Include="Refactoring\Script.cs" />
-    <Compile Include="Refactoring\TypeSystemAstBuilder.cs" />
-    <Compile Include="Refactoring\VariableReferenceGraph.cs" />
-    <Compile Include="Resolver\CompositeResolveVisitorNavigator.cs" />
-    <Compile Include="Resolver\AwaitResolveResult.cs" />
-    <Compile Include="Resolver\DynamicInvocationResolveResult.cs" />
-    <Compile Include="Resolver\DynamicMemberResolveResult.cs" />
-    <Compile Include="Resolver\CSharpConversions.cs" />
-    <Compile Include="Resolver\CSharpAstResolver.cs" />
-    <Compile Include="Resolver\CSharpInvocationResolveResult.cs" />
-    <Compile Include="Resolver\CSharpOperators.cs" />
-    <Compile Include="Resolver\CSharpResolver.cs" />
-    <Compile Include="Resolver\DetectSkippableNodesNavigator.cs" />
-    <Compile Include="Resolver\CastResolveResult.cs" />
-    <Compile Include="Resolver\FindReferencedEntities.cs" />
-    <Compile Include="Resolver\FindReferences.cs" />
-    <Compile Include="Resolver\FindReferenceSearchScope.cs" />
-    <Compile Include="Resolver\IResolveVisitorNavigator.cs" />
-    <Compile Include="Resolver\LambdaResolveResult.cs" />
-    <Compile Include="Resolver\Log.cs" />
-    <Compile Include="Resolver\MemberLookup.cs" />
-    <Compile Include="Resolver\MethodGroupResolveResult.cs" />
-    <Compile Include="Resolver\NodeListResolveVisitorNavigator.cs" />
-    <Compile Include="Resolver\OverloadResolution.cs" />
-    <Compile Include="Resolver\OverloadResolutionErrors.cs" />
-    <Compile Include="Resolver\RenameCallbackArguments.cs" />
-    <Compile Include="Resolver\ResolveAtLocation.cs" />
-    <Compile Include="Resolver\ResolveVisitor.cs" />
-    <Compile Include="Resolver\TypeInference.cs" />
-    <Compile Include="Completion\ICompletionDataFactory.cs" />
-    <Compile Include="Completion\IParameterCompletionDataFactory.cs" />
-    <Compile Include="NameLookupMode.cs" />
-    <Compile Include="TypeSystem\AliasNamespaceReference.cs" />
-    <Compile Include="TypeSystem\AttributeTypeReference.cs" />
-    <Compile Include="TypeSystem\ConstantValues.cs" />
-    <Compile Include="TypeSystem\CSharpAssembly.cs" />
-    <Compile Include="TypeSystem\CSharpAttribute.cs" />
-    <Compile Include="TypeSystem\CSharpDocumentationComment.cs" />
-    <Compile Include="TypeSystem\CSharpUnresolvedFile.cs" />
-    <Compile Include="TypeSystem\CSharpUnresolvedTypeDefinition.cs" />
-    <Compile Include="TypeSystem\CSharpTypeResolveContext.cs" />
-    <Compile Include="TypeSystem\ResolvedUsingScope.cs" />
-    <Compile Include="TypeSystem\TypeOrNamespaceReference.cs" />
-    <Compile Include="TypeSystem\MemberTypeOrNamespaceReference.cs" />
-    <Compile Include="TypeSystem\SimpleTypeOrNamespaceReference.cs" />
-    <Compile Include="TypeSystem\MethodTypeParameterWithInheritedConstraints.cs" />
-    <Compile Include="TypeSystem\TypeSystemConvertVisitor.cs" />
-    <Compile Include="TypeSystem\UsingScope.cs" />
-    <Compile Include="Ast\GeneralScope\PreProcessorDirective.cs" />
-    <Compile Include="Ast\Expressions\ErrorExpression.cs" />
-    <Compile Include="Completion\CompletionDataWrapper.cs" />
-    <Compile Include="Completion\CSharpCompletionEngine.cs" />
-    <Compile Include="Completion\CSharpCompletionEngineBase.cs" />
-    <Compile Include="Completion\CSharpParameterCompletionEngine.cs" />
-    <Compile Include="Parser\mcs\module.cs" />
-    <Compile Include="Parser\mcs\settings.cs" />
-    <Compile Include="Parser\mcs\SourceMethodBuilder.cs" />
-    <Compile Include="Ast\TokenRole.cs" />
-    <Compile Include="Ast\Roles.cs" />
-    <Compile Include="Refactoring\BaseRefactoringContext.cs" />
-    <Compile Include="Refactoring\CodeIssue.cs" />
-    <Compile Include="Refactoring\CodeAction.cs" />
-    <Compile Include="Refactoring\ContextActionAttribute.cs" />
-    <Compile Include="Refactoring\IssueAttribute.cs" />
-    <Compile Include="Formatter\TextEditorOptions.cs" />
-    <Compile Include="Formatter\GeneratedCodeSettings.cs" />
-    <Compile Include="Ast\GeneralScope\NewLineNode.cs" />
-    <Compile Include="Ast\GeneralScope\WhitespaceNode.cs" />
-    <Compile Include="Ast\GeneralScope\TextNode.cs" />
-    <Compile Include="Formatter\FormattingOptionsFactory.cs" />
-    <Compile Include="Completion\ICompletionContextProvider.cs" />
-    <Compile Include="Refactoring\NamingHelper.cs" />
-    <Compile Include="Parser\SeekableStreamReader.cs" />
-    <Compile Include="Refactoring\LocalReferenceFinder.cs" />
-    <Compile Include="Resolver\AliasTypeResolveResult.cs" />
-    <Compile Include="Resolver\AliasNamespaceResolveResult.cs" />
-    <Compile Include="Resolver\ReducedExtensionMethod.cs" />
-    <Compile Include="Formatter\CSharpFormatter.cs" />
-    <Compile Include="Formatter\FormattingVisitor.cs" />
-    <Compile Include="Formatter\FormattingVisitor_TypeMembers.cs" />
-    <Compile Include="Formatter\FormattingVisitor_Global.cs" />
-    <Compile Include="Formatter\FormattingVisitor_Statements.cs" />
-    <Compile Include="Formatter\FormattingVisitor_Expressions.cs" />
-    <Compile Include="Formatter\FormattingChanges.cs" />
-    <Compile Include="IntroduceQueryExpressions.cs" />
-    <Compile Include="CombineQueryExpressions.cs" />
-    <Compile Include="Refactoring\CodeIssueProvider.cs" />
-    <Compile Include="Refactoring\CodeActionProvider.cs" />
-    <Compile Include="Refactoring\CommonSubIssues.cs" />
-    <Compile Include="PatternMatching\AnyType.cs" />
-    <Compile Include="Analysis\NullValueAnalysis.cs" />
-    <Compile Include="Analysis\NullValueStatus.cs" />
-    <Compile Include="Analysis\DeclarationSpace\LocalDeclarationSpace.cs" />
-    <Compile Include="Analysis\DeclarationSpace\LocalDeclarationSpaceVisitor.cs" />
-    <Compile Include="Refactoring\WordParser.cs" />
-    <Compile Include="Refactoring\TypeGuessing.cs" />
-    <Compile Include="Refactoring\FormatStringHelper.cs" />
-    <Compile Include="IndentEngine\CSharpIndentEngine.cs" />
-    <Compile Include="IndentEngine\CacheIndentEngine.cs" />
-    <Compile Include="IndentEngine\IDocumentIndentEngine.cs" />
-    <Compile Include="IndentEngine\IStateMachineIndentEngine.cs" />
-    <Compile Include="IndentEngine\IndentState.cs" />
-    <Compile Include="IndentEngine\TextPasteIndentEngine.cs" />
-    <Compile Include="IndentEngine\NullIStateMachineIndentEngine.cs" />
-    <Compile Include="Refactoring\CodeGenerationService.cs" />
-    <Compile Include="Formatter\FormattingVisitor_Query.cs" />
-    <Compile Include="Analysis\AnnotationNames.cs" />
-    <Compile Include="Formatter\ConstructFixer.cs" />
-    <Compile Include="Util\CloneableStack.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
-      <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
-      <Name>ICSharpCode.NRefactory</Name>
-    </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup />
-  <ProjectExtensions>
-    <MonoDevelop>
-      <Properties>
-        <Policies>
-          <TextStylePolicy TabsToSpaces="False" EolMarker="Unix" inheritsSet="VisualStudio" inheritsScope="text/plain" scope="text/plain" />
-          <TextStylePolicy FileWidth="120" TabsToSpaces="False" EolMarker="Unix" inheritsSet="VisualStudio" inheritsScope="text/plain" scope="text/x-csharp" />
-          <CSharpFormattingPolicy IndentSwitchBody="True" BeforeMethodDeclarationParentheses="False" BeforeMethodCallParentheses="False" BeforeConstructorDeclarationParentheses="False" BeforeDelegateDeclarationParentheses="False" NewParentheses="False" inheritsSet="Mono" inheritsScope="text/x-csharp" scope="text/x-csharp" />
-          <TextStylePolicy inheritsSet="null" scope="text/x-jay" />
-        </Policies>
-      </Properties>
-    </MonoDevelop>
-  </ProjectExtensions>
+
   <ItemGroup>
     <None Include="Parser\mcs\cs-parser.jay" />
   </ItemGroup>
+
   <ItemGroup>
-    <Folder Include="PatternMatching\" />
-    <Folder Include="IndentEngine\" />
+    <ProjectReference Include="..\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj" />
   </ItemGroup>
+
 </Project>
diff --git a/ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj b/ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj
index c24afdd20..42a3bdbe3 100644
--- a/ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj
+++ b/ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj
@@ -1,306 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <ProjectGuid>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <OutputType>Library</OutputType>
-    <RootNamespace>ICSharpCode.NRefactory</RootNamespace>
-    <AssemblyName>ICSharpCode.NRefactory</AssemblyName>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <ProductVersion>10.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <NoStdLib>False</NoStdLib>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <RunCodeAnalysis>False</RunCodeAnalysis>
+    <TargetFramework>net40</TargetFramework>
     <CodeAnalysisRules>-Microsoft.Design#CA1000;-Microsoft.Design#CA1004;-Microsoft.Design#CA1005;-Microsoft.Design#CA1006;-Microsoft.Design#CA1026;-Microsoft.Design#CA1033;-Microsoft.Design#CA1051;-Microsoft.Design#CA1063;-Microsoft.Naming#CA1702;-Microsoft.Naming#CA1704;-Microsoft.Naming#CA1710;-Microsoft.Naming#CA1716;-Microsoft.Naming#CA1720;-Microsoft.Performance#CA1800;-Microsoft.Security#CA2104</CodeAnalysisRules>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\ICSharpCode.NRefactory.snk</AssemblyOriginatorKeyFile>
-    <DelaySign>False</DelaySign>
-    <AssemblyOriginatorKeyMode>File</AssemblyOriginatorKeyMode>
-    <WarningLevel>4</WarningLevel>
     <NoWarn>1591</NoWarn>
-    <OutputPath>..\bin\$(Configuration)\</OutputPath>
     <NoWin32Manifest>False</NoWin32Manifest>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <DocumentationFile>$(IntermediateOutputPath)ICSharpCode.NRefactory.xml</DocumentationFile>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
-    <BaseAddress>465371136</BaseAddress>
-    <FileAlignment>4096</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <Optimize>False</Optimize>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-    <StartAction>Project</StartAction>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <Optimize>True</Optimize>
-    <DefineConstants>TRACE</DefineConstants>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <DebugSymbols>True</DebugSymbols>
-    <OutputPath>..\bin\Debug\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>PdbOnly</DebugType>
-    <OutputPath>..\bin\Release\</OutputPath>
-  </PropertyGroup>
+
   <PropertyGroup Condition=" '$(Configuration)' == 'net_4_5_Debug' ">
-    <Optimize>False</Optimize>
-    <DefineConstants>DEBUG;TRACE;NET_4_5</DefineConstants>
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-    <StartAction>Project</StartAction>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Debug|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <DebugSymbols>True</DebugSymbols>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <OutputPath>..\bin\net_4_5_Debug\</OutputPath>
+    <TargetFramework>net45</TargetFramework>
   </PropertyGroup>
+
   <PropertyGroup Condition=" '$(Configuration)' == 'net_4_5_Release' ">
-    <Optimize>True</Optimize>
-    <DefineConstants>TRACE;NET_4_5</DefineConstants>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_4_5_Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <OutputPath>..\bin\net_4_5_Release\</OutputPath>
+    <TargetFramework>net45</TargetFramework>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Analysis\AbiComparer.cs" />
-    <Compile Include="Analysis\TypeGraph.cs" />
-    <Compile Include="Analysis\TypeGraphNode.cs" />
-    <Compile Include="Documentation\DocumentationComment.cs" />
-    <Compile Include="Documentation\GetPotentiallyNestedClassTypeReference.cs" />
-    <Compile Include="Documentation\IDocumentationProvider.cs" />
-    <Compile Include="Editor\IDocument.cs" />
-    <Compile Include="Editor\IDocumentLine.cs" />
-    <Compile Include="Editor\ISegment.cs" />
-    <Compile Include="Editor\ITextAnchor.cs" />
-    <Compile Include="Editor\ITextSource.cs" />
-    <Compile Include="Editor\ReadOnlyDocument.cs" />
-    <Compile Include="Editor\StringBuilderDocument.cs" />
-    <Compile Include="Editor\StringTextSource.cs" />
-    <Compile Include="Editor\TextChangeEventArgs.cs" />
-    <Compile Include="Editor\TextSourceVersionProvider.cs" />
-    <Compile Include="IAnnotatable.cs" />
-    <Compile Include="PatternMatching\BacktrackingInfo.cs" />
-    <Compile Include="PatternMatching\Choice.cs" />
-    <Compile Include="PatternMatching\AnyNode.cs" />
-    <Compile Include="PatternMatching\Backreference.cs" />
-    <Compile Include="PatternMatching\INode.cs" />
-    <Compile Include="PatternMatching\Match.cs" />
-    <Compile Include="PatternMatching\NamedNode.cs" />
-    <Compile Include="PatternMatching\OptionalNode.cs" />
-    <Compile Include="PatternMatching\Repeat.cs" />
-    <Compile Include="PatternMatching\Pattern.cs" />
-    <Compile Include="Documentation\XmlDocumentationProvider.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\GlobalAssemblyInfo.cs" />
-    <Compile Include="Role.cs" />
-    <Compile Include="Semantics\AmbiguousResolveResult.cs" />
-    <Compile Include="Semantics\ArrayAccessResolveResult.cs" />
-    <Compile Include="Semantics\ArrayCreateResolveResult.cs" />
-    <Compile Include="Semantics\ByReferenceResolveResult.cs" />
-    <Compile Include="Semantics\ConstantResolveResult.cs" />
-    <Compile Include="Semantics\ConversionResolveResult.cs" />
-    <Compile Include="Semantics\SizeOfResolveResult.cs" />
-    <Compile Include="Semantics\ErrorResolveResult.cs" />
-    <Compile Include="Semantics\Conversion.cs" />
-    <Compile Include="Semantics\ForEachResolveResult.cs" />
-    <Compile Include="Semantics\InitializedObjectResolveResult.cs" />
-    <Compile Include="Semantics\InvocationResolveResult.cs" />
-    <Compile Include="Semantics\LocalResolveResult.cs" />
-    <Compile Include="Semantics\MemberResolveResult.cs" />
-    <Compile Include="Semantics\NamedArgumentResolveResult.cs" />
-    <Compile Include="Semantics\NamespaceResolveResult.cs" />
-    <Compile Include="Semantics\OperatorResolveResult.cs" />
-    <Compile Include="Semantics\ResolveResult.cs" />
-    <Compile Include="Semantics\ThisResolveResult.cs" />
-    <Compile Include="Semantics\TypeIsResolveResult.cs" />
-    <Compile Include="Semantics\TypeOfResolveResult.cs" />
-    <Compile Include="Semantics\TypeResolveResult.cs" />
-    <Compile Include="Semantics\UnknownMemberResolveResult.cs" />
-    <Compile Include="TextLocation.cs" />
-    <Compile Include="TypeSystem\Accessibility.cs" />
-    <Compile Include="TypeSystem\AnonymousType.cs" />
-    <Compile Include="TypeSystem\ArrayType.cs" />
-    <Compile Include="TypeSystem\AssemblyQualifiedTypeName.cs" />
-    <Compile Include="TypeSystem\ByReferenceType.cs" />
-    <Compile Include="TypeSystem\ComHelper.cs" />
-    <Compile Include="TypeSystem\DefaultSolutionSnapshot.cs" />
-    <Compile Include="TypeSystem\DomRegion.cs" />
-    <Compile Include="TypeSystem\EntityType.cs" />
-    <Compile Include="TypeSystem\ICodeContext.cs" />
-    <Compile Include="TypeSystem\Implementation\BlobReader.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultVariable.cs" />
-    <Compile Include="TypeSystem\Implementation\ResolvedAttributeBlob.cs" />
-    <Compile Include="TypeSystem\Implementation\UnresolvedAttributeBlob.cs" />
-    <Compile Include="TypeSystem\Implementation\UnresolvedSecurityDeclarationBlob.cs" />
-    <Compile Include="TypeSystem\ISymbol.cs" />
-    <Compile Include="TypeSystem\TaskType.cs" />
-    <Compile Include="TypeSystem\TypeParameterSubstitution.cs" />
-    <Compile Include="TypeSystem\TypeSystemExtensions.cs" />
-    <Compile Include="TypeSystem\FullTypeName.cs" />
-    <Compile Include="TypeSystem\IAmbience.cs" />
-    <Compile Include="TypeSystem\IAssembly.cs" />
-    <Compile Include="TypeSystem\IAttribute.cs" />
-    <Compile Include="TypeSystem\ICompilation.cs" />
-    <Compile Include="TypeSystem\IConstantValue.cs" />
-    <Compile Include="TypeSystem\IEntity.cs" />
-    <Compile Include="TypeSystem\IEvent.cs" />
-    <Compile Include="TypeSystem\IField.cs" />
-    <Compile Include="TypeSystem\IFreezable.cs" />
-    <Compile Include="TypeSystem\IInterningProvider.cs" />
-    <Compile Include="TypeSystem\IMember.cs" />
-    <Compile Include="TypeSystem\IMethod.cs" />
-    <Compile Include="TypeSystem\Implementation\AbstractFreezable.cs" />
-    <Compile Include="TypeSystem\Implementation\AbstractResolvedEntity.cs" />
-    <Compile Include="TypeSystem\Implementation\AbstractResolvedMember.cs" />
-    <Compile Include="TypeSystem\Implementation\AbstractResolvedTypeParameter.cs" />
-    <Compile Include="TypeSystem\Implementation\AbstractType.cs" />
-    <Compile Include="TypeSystem\Implementation\AbstractUnresolvedEntity.cs" />
-    <Compile Include="TypeSystem\Implementation\AbstractUnresolvedMember.cs" />
-    <Compile Include="TypeSystem\Implementation\AccessorOwnerMemberReference.cs" />
-    <Compile Include="TypeSystem\Implementation\BaseTypeCollector.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultAssemblyReference.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultAttribute.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultMemberReference.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultParameter.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultResolvedEvent.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultResolvedField.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultResolvedMethod.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultResolvedProperty.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultResolvedTypeDefinition.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultResolvedTypeParameter.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultUnresolvedAssembly.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultUnresolvedAttribute.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultUnresolvedEvent.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultUnresolvedField.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultUnresolvedMethod.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultUnresolvedParameter.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultUnresolvedProperty.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultUnresolvedTypeDefinition.cs" />
-    <Compile Include="TypeSystem\Implementation\DefaultUnresolvedTypeParameter.cs" />
-    <Compile Include="TypeSystem\Implementation\DummyTypeParameter.cs" />
-    <Compile Include="TypeSystem\Implementation\ExplicitInterfaceImplementationMemberReference.cs" />
-    <Compile Include="TypeSystem\Implementation\FullNameAndTypeParameterCount.cs" />
-    <Compile Include="TypeSystem\Implementation\GetClassTypeReference.cs" />
-    <Compile Include="TypeSystem\Implementation\GetMembersHelper.cs" />
-    <Compile Include="TypeSystem\Implementation\KnownTypeCache.cs" />
-    <Compile Include="TypeSystem\Implementation\MergedNamespace.cs" />
-    <Compile Include="TypeSystem\Implementation\MinimalCorlib.cs" />
-    <Compile Include="TypeSystem\Implementation\NestedTypeReference.cs" />
-    <Compile Include="TypeSystem\Implementation\SimpleCompilation.cs" />
-    <Compile Include="TypeSystem\Implementation\SimpleConstantValue.cs" />
-    <Compile Include="TypeSystem\Implementation\SimpleInterningProvider.cs" />
-    <Compile Include="TypeSystem\Implementation\SpecializedEvent.cs" />
-    <Compile Include="TypeSystem\Implementation\SpecializedField.cs" />
-    <Compile Include="TypeSystem\Implementation\SpecializedMember.cs" />
-    <Compile Include="TypeSystem\Implementation\SpecializedMethod.cs" />
-    <Compile Include="TypeSystem\Implementation\SpecializedProperty.cs" />
-    <Compile Include="TypeSystem\Implementation\SpecializingMemberReference.cs" />
-    <Compile Include="TypeSystem\Implementation\TypeParameterReference.cs" />
-    <Compile Include="TypeSystem\Implementation\TypeWithElementType.cs" />
-    <Compile Include="TypeSystem\Implementation\UnknownType.cs" />
-    <Compile Include="TypeSystem\Implementation\VoidTypeDefinition.cs" />
-    <Compile Include="TypeSystem\INamedElement.cs" />
-    <Compile Include="TypeSystem\INamespace.cs" />
-    <Compile Include="TypeSystem\InheritanceHelper.cs" />
-    <Compile Include="TypeSystem\IntersectionType.cs" />
-    <Compile Include="TypeSystem\IParameter.cs" />
-    <Compile Include="TypeSystem\IParameterizedMember.cs" />
-    <Compile Include="TypeSystem\IUnresolvedFile.cs" />
-    <Compile Include="TypeSystem\IProjectContent.cs" />
-    <Compile Include="TypeSystem\IProperty.cs" />
-    <Compile Include="TypeSystem\ISolutionSnapshot.cs" />
-    <Compile Include="TypeSystem\ISupportsInterning.cs" />
-    <Compile Include="TypeSystem\IType.cs" />
-    <Compile Include="TypeSystem\ITypeDefinition.cs" />
-    <Compile Include="TypeSystem\ITypeParameter.cs" />
-    <Compile Include="TypeSystem\ITypeReference.cs" />
-    <Compile Include="TypeSystem\KnownTypeReference.cs" />
-    <Compile Include="TypeSystem\NullableType.cs" />
-    <Compile Include="TypeSystem\ParameterizedType.cs" />
-    <Compile Include="TypeSystem\ParameterListComparer.cs" />
-    <Compile Include="TypeSystem\ProjectReference.cs" />
-    <Compile Include="TypeSystem\ReflectionNameParseException.cs" />
-    <Compile Include="TypeSystem\SimpleTypeResolveContext.cs" />
-    <Compile Include="TypeSystem\TopLevelTypeName.cs" />
-    <Compile Include="TypeSystem\TypeKind.cs" />
-    <Compile Include="TypeSystem\TypeVisitor.cs" />
-    <Compile Include="TypeSystem\IVariable.cs" />
-    <Compile Include="TypeSystem\PointerType.cs" />
-    <Compile Include="TypeSystem\ReflectionHelper.cs" />
-    <Compile Include="TypeSystem\SpecialType.cs" />
-    <Compile Include="Utils\7BitEncodedInts.cs" />
-    <Compile Include="Utils\BitVector16.cs" />
-    <Compile Include="Utils\BusyManager.cs" />
-    <Compile Include="Utils\CacheManager.cs" />
-    <Compile Include="Utils\CallbackOnDispose.cs" />
-    <Compile Include="Utils\CSharpPrimitiveCast.cs" />
-    <Compile Include="Utils\EmptyList.cs" />
-    <Compile Include="Utils\ExtensionMethods.cs" />
-    <Compile Include="Utils\FastSerializer.cs" />
-    <Compile Include="Utils\GraphVizGraph.cs" />
-    <Compile Include="Utils\ImmutableStack.cs" />
-    <Compile Include="Utils\KeyComparer.cs" />
-    <Compile Include="Utils\LazyInit.cs" />
-    <Compile Include="Utils\MultiDictionary.cs" />
-    <Compile Include="Utils\Platform.cs" />
-    <Compile Include="Utils\ProjectedList.cs" />
-    <Compile Include="Utils\ReferenceComparer.cs" />
-    <Compile Include="Utils\TreeTraversal.cs" />
-    <Compile Include="TypeSystem\Error.cs" />
-    <Compile Include="Completion\ICompletionData.cs" />
-    <Compile Include="Completion\DisplayFlags.cs" />
-    <Compile Include="Completion\IEntityCompletionData.cs" />
-    <Compile Include="Completion\CompletionCategory.cs" />
-    <Compile Include="Completion\IParameterDataProvider.cs" />
-    <Compile Include="Completion\IVariableCompletionData.cs" />
-    <Compile Include="Documentation\IdStringProvider.cs" />
-    <Compile Include="Documentation\IdStringMemberReference.cs" />
-    <Compile Include="Utils\CompositeFormatStringParser\CompositeFormatStringParser.cs" />
-    <Compile Include="Utils\CompositeFormatStringParser\TextSegment.cs" />
-    <Compile Include="Utils\CompositeFormatStringParser\FormatItem.cs" />
-    <Compile Include="Utils\CompositeFormatStringParser\FormatStringSegmentBase.cs" />
-    <Compile Include="Utils\CompositeFormatStringParser\IFormatStringSegment.cs" />
-    <Compile Include="Utils\CompositeFormatStringParser\IFormatStringError.cs" />
-    <Compile Include="Completion\CompletionExtensionMethods.cs" />
-    <Compile Include="Refactoring\IssueMarker.cs" />
-    <Compile Include="Refactoring\Severity.cs" />
-    <Compile Include="Analysis\SymbolCollector.cs" />
-    <Compile Include="TypeSystem\AssemblyLoader.cs" />
-    <Compile Include="Editor\UnicodeNewline.cs" />
-    <Compile Include="Completion\FrameworkLookup.cs" />
-    <Compile Include="Utils\ComparableList.cs" />
-    <Compile Include="PatternMatching\AnyNodeOrNull.cs" />
-    <Compile Include="Editor\ITextPasteHandler.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Completion\" />
-    <Folder Include="TypeSystem\" />
-    <Folder Include="Utils\CompositeFormatStringParser\" />
-    <Folder Include="Refactoring\" />
-  </ItemGroup>
+
   <ItemGroup>
     <None Include="..\doc\Pattern Matching.html">
       <Link>PatternMatching\Pattern Matching.html</Link>
@@ -309,5 +27,5 @@
       <Link>Documentation\XML Documentation.html</Link>
     </None>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+
+</Project>