diff --git a/Directory.Build.targets b/Directory.Build.targets
index 341027f..92501fd 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,3 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
+
+  <!-- Create a dummy Test target -->
+  <Target Name="Test" />
+
 </Project>
diff --git a/Project/ICSharpCode.TextEditor.csproj b/Project/ICSharpCode.TextEditor.csproj
index c388e8b..a8aae3c 100644
--- a/Project/ICSharpCode.TextEditor.csproj
+++ b/Project/ICSharpCode.TextEditor.csproj
@@ -1,329 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}</ProjectGuid>
-    <AssemblyName>ICSharpCode.TextEditor</AssemblyName>
-    <OutputTarget>Library</OutputTarget>
-    <WarningLevel>4</WarningLevel>
-    <NoStdLib>False</NoStdLib>
-    <NoConfig>False</NoConfig>
-    <OutputType>Library</OutputType>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>Resources\ICSharpCode.TextEditor.snk</AssemblyOriginatorKeyFile>
-    <RootNamespace>ICSharpCode.TextEditor</RootNamespace>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
-    <BaseAddress>98041856</BaseAddress>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <FileAlignment>4096</FileAlignment>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <RuntimeIdentifier>win</RuntimeIdentifier>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <Optimize>False</Optimize>
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;DATACONSISTENCYTEST</DefineConstants>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <CodeAnalysisRules>-Microsoft.Design#CA1012;-Microsoft.Design#CA2210;-Microsoft.Design#CA1040;-Microsoft.Design#CA1005;-Microsoft.Design#CA1020;-Microsoft.Design#CA1021;-Microsoft.Design#CA1010;-Microsoft.Design#CA1011;-Microsoft.Design#CA1009;-Microsoft.Design#CA1050;-Microsoft.Design#CA1026;-Microsoft.Design#CA1019;-Microsoft.Design#CA1031;-Microsoft.Design#CA1047;-Microsoft.Design#CA1000;-Microsoft.Design#CA1048;-Microsoft.Design#CA1051;-Microsoft.Design#CA1002;-Microsoft.Design#CA1061;-Microsoft.Design#CA1006;-Microsoft.Design#CA1046;-Microsoft.Design#CA1045;-Microsoft.Design#CA1038;-Microsoft.Design#CA1008;-Microsoft.Design#CA1028;-Microsoft.Design#CA1004;-Microsoft.Design#CA1035;-Microsoft.Design#CA1063;-Microsoft.Design#CA1032;-Microsoft.Design#CA1023;-Microsoft.Design#CA1033;-Microsoft.Design#CA1039;-Microsoft.Design#CA1016;-Microsoft.Design#CA1014;-Microsoft.Design#CA1017;-Microsoft.Design#CA1018;-Microsoft.Design#CA1027;-Microsoft.Design#CA1059;-Microsoft.Design#CA1060;-Microsoft.Design#CA1034;-Microsoft.Design#CA1013;-Microsoft.Design#CA1036;-Microsoft.Design#CA1044;-Microsoft.Design#CA1041;-Microsoft.Design#CA1025;-Microsoft.Design#CA1052;-Microsoft.Design#CA1053;-Microsoft.Design#CA1057;-Microsoft.Design#CA1058;-Microsoft.Design#CA1001;-Microsoft.Design#CA1049;-Microsoft.Design#CA1054;-Microsoft.Design#CA1056;-Microsoft.Design#CA1055;-Microsoft.Design#CA1030;-Microsoft.Design#CA1003;-Microsoft.Design#CA1007;-Microsoft.Design#CA1043;-Microsoft.Design#CA1024;-Microsoft.Design#CA1062;-Microsoft.Globalization#CA1301;-Microsoft.Globalization#CA1302;-Microsoft.Globalization#CA1303;-Microsoft.Globalization#CA1306;-Microsoft.Globalization#CA1304;-Microsoft.Globalization#CA1305;-Microsoft.Globalization#CA1300;-Microsoft.Mobility#CA1600;-Microsoft.Mobility#CA1601;-Microsoft.Naming#CA1718;-Microsoft.Naming#CA1720;-Microsoft.Naming#CA1700;-Microsoft.Naming#CA1712;-Microsoft.Naming#CA1713;-Microsoft.Naming#CA1709;-Microsoft.Naming#CA1708;-Microsoft.Naming#CA1715;-Microsoft.Naming#CA1710;-Microsoft.Naming#CA1707;-Microsoft.Naming#CA1722;-Microsoft.Naming#CA1711;-Microsoft.Naming#CA1716;-Microsoft.Naming#CA1705;-Microsoft.Naming#CA1725;-Microsoft.Naming#CA1719;-Microsoft.Naming#CA1721;-Microsoft.Naming#CA1706;-Microsoft.Naming#CA1724;-Microsoft.Naming#CA1726;-Microsoft.Performance#CA1809;-Microsoft.Performance#CA1811;-Microsoft.Performance#CA1812;-Microsoft.Performance#CA1807;-Microsoft.Performance#CA1813;-Microsoft.Performance#CA1823;-Microsoft.Performance#CA1816;-Microsoft.Performance#CA1817;-Microsoft.Performance#CA1800;-Microsoft.Performance#CA1818;-Microsoft.Performance#CA1805;-Microsoft.Performance#CA1810;-Microsoft.Performance#CA1822;-Microsoft.Performance#CA1815;-Microsoft.Performance#CA1814;-Microsoft.Performance#CA1819;-Microsoft.Performance#CA1804;-Microsoft.Performance#CA1820;-Microsoft.Performance#CA1802;-Microsoft.Security#CA2116;-Microsoft.Security#CA2117;-Microsoft.Security#CA2105;-Microsoft.Security#CA2115;-Microsoft.Security#CA2104;-Microsoft.Security#CA2122;-Microsoft.Security#CA2114;-Microsoft.Security#CA2123;-Microsoft.Security#CA2111;-Microsoft.Security#CA2108;-Microsoft.Security#CA2107;-Microsoft.Security#CA2103;-Microsoft.Security#CA2100;-Microsoft.Security#CA2118;-Microsoft.Security#CA2109;-Microsoft.Security#CA2119;-Microsoft.Security#CA2106;-Microsoft.Security#CA2112;-Microsoft.Security#CA2110;-Microsoft.Security#CA2120;-Microsoft.Security#CA2101;-Microsoft.Security#CA2121;-Microsoft.Security#CA2126;-Microsoft.Security#CA2124;-Microsoft.Usage#CA2209;-Microsoft.Usage#CA2236;-Microsoft.Usage#CA2227;-Microsoft.Usage#CA2213;-Microsoft.Usage#CA2216;-Microsoft.Usage#CA2215;-Microsoft.Usage#CA2214;-Microsoft.Usage#CA2222;-Microsoft.Usage#CA2202;-Microsoft.Usage#CA1806;-Microsoft.Usage#CA2217;-Microsoft.Usage#CA2212;-Microsoft.Usage#CA2219;-Microsoft.Usage#CA2201;-Microsoft.Usage#CA2228;-Microsoft.Usage#CA2221;-Microsoft.Usage#CA2220;-Microsoft.Usage#CA2240;-Microsoft.Usage#CA2229;-Microsoft.Usage#CA2238;-Microsoft.Usage#CA2207;-Microsoft.Usage#CA2208;-Microsoft.Usage#CA2235;-Microsoft.Usage#CA2237;-Microsoft.Usage#CA2232;-Microsoft.Usage#CA2223;-Microsoft.Usage#CA2211;-Microsoft.Usage#CA2233;-Microsoft.Usage#CA2225;-Microsoft.Usage#CA2226;-Microsoft.Usage#CA2231;-Microsoft.Usage#CA2224;-Microsoft.Usage#CA2218;-Microsoft.Usage#CA2234;-Microsoft.Usage#CA2241;-Microsoft.Usage#CA2239;-Microsoft.Usage#CA2200;-Microsoft.Usage#CA1801;-Microsoft.Usage#CA2205;-Microsoft.Usage#CA2230</CodeAnalysisRules>
-    <DebugType>full</DebugType>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Optimize>True</Optimize>
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <OutputPath>bin\</OutputPath>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <DebugType>pdbonly</DebugType>
-    <DebugSymbols>true</DebugSymbols>
+    <TargetFramework>net461</TargetFramework>
+    <NoWarn>$(NoWarn),1573,1591,1696,1712</NoWarn>
     <LangVersion>latest</LangVersion>
+
+    <!-- TODO once all project migrated to SDK-style, remove this and move properties to Directory.Build.props -->
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
+  
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
   </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Src\Document\DefaultDocument.cs" />
-    <Compile Include="Src\Document\DocumentEventArgs.cs" />
-    <Compile Include="Src\Document\DocumentFactory.cs" />
-    <Compile Include="Src\Document\HighlightingStrategy\HighlightingDefinitionInvalidException.cs" />
-    <Compile Include="Src\Document\IDocument.cs" />
-    <Compile Include="Src\Document\ISegment.cs" />
-    <Compile Include="Src\Document\LineManager\DeferredEventList.cs" />
-    <Compile Include="Src\Document\LineManager\LineSegmentTree.cs" />
-    <Compile Include="Src\Document\TextAnchor.cs" />
-    <Compile Include="Src\Document\TextLocation.cs" />
-    <Compile Include="Src\Document\TextUtilities.cs" />
-    <Compile Include="Src\Document\BookmarkManager\BookmarkManager.cs" />
-    <Compile Include="Src\Document\BookmarkManager\BookmarkManagerMemento.cs" />
-    <Compile Include="Src\Document\FormattingStrategy\DefaultFormattingStrategy.cs" />
-    <Compile Include="Src\Document\FormattingStrategy\IFormattingStrategy.cs" />
-    <Compile Include="Src\Document\HighlightingStrategy\DefaultHighlightingStrategy.cs" />
-    <Compile Include="Src\Document\HighlightingStrategy\FontContainer.cs" />
-    <Compile Include="Src\Document\HighlightingStrategy\HighlightBackground.cs" />
-    <Compile Include="Src\Document\HighlightingStrategy\HighlightColor.cs" />
-    <Compile Include="Src\Document\HighlightingStrategy\HighlightInfo.cs" />
-    <Compile Include="Src\Document\HighlightingStrategy\HighlightingColorNotFoundException.cs" />
-    <Compile Include="Src\Document\HighlightingStrategy\HighlightingDefinitionParser.cs" />
-    <Compile Include="Src\Document\HighlightingStrategy\HighlightingManager.cs" />
-    <Compile Include="Src\Document\HighlightingStrategy\HighlightingStrategyFactory.cs" />
-    <Compile Include="Src\Document\HighlightingStrategy\HighlightRuleSet.cs" />
-    <Compile Include="Src\Document\HighlightingStrategy\IHighlightingStrategy.cs" />
-    <Compile Include="Src\Document\HighlightingStrategy\NextMarker.cs" />
-    <Compile Include="Src\Document\HighlightingStrategy\PrevMarker.cs" />
-    <Compile Include="Src\Document\HighlightingStrategy\Span.cs" />
-    <Compile Include="Src\Document\HighlightingStrategy\TextWord.cs" />
-    <Compile Include="Src\Document\LineManager\LineManager.cs" />
-    <Compile Include="Src\Document\LineManager\LineSegment.cs" />
-    <Compile Include="Src\Document\LineManager\LineManagerEventArgs.cs" />
-    <Compile Include="Src\Document\TextBufferStrategy\GapTextBufferStrategy.cs" />
-    <Compile Include="Src\Document\TextBufferStrategy\ITextBufferStrategy.cs" />
-    <Compile Include="Src\Document\TextBufferStrategy\StringTextBufferStrategy.cs" />
-    <Compile Include="Src\Util\AugmentableRedBlackTree.cs" />
-    <Compile Include="Src\Util\CheckedList.cs" />
-    <Compile Include="Src\Util\LoggingService.cs" />
-    <Compile Include="Src\Util\LookupTable.cs" />
-    <Compile Include="Src\Util\MouseWheelHandler.cs" />
-    <Compile Include="Src\Util\RedBlackTreeIterator.cs" />
-    <Compile Include="Src\Util\TextUtility.cs" />
-    <Compile Include="Src\Undo\UndoableDelete.cs" />
-    <Compile Include="Src\Undo\UndoableInsert.cs" />
-    <Compile Include="Src\Undo\UndoableReplace.cs" />
-    <Compile Include="Src\Actions\ClipBoardActions.cs" />
-    <Compile Include="Src\Actions\CaretActions.cs" />
-    <Compile Include="Src\Actions\HomeEndActions.cs" />
-    <Compile Include="Src\Actions\IEditAction.cs" />
-    <Compile Include="Src\Actions\MiscActions.cs" />
-    <Compile Include="Src\Actions\SelectionActions.cs" />
-    <Compile Include="Src\Document\Selection\ISelection.cs" />
-    <Compile Include="Src\Document\Selection\DefaultSelection.cs" />
-    <Compile Include="Src\Document\FoldingStrategy\IFoldingStrategy.cs" />
-    <Compile Include="Src\Document\FoldingStrategy\IndentFoldingStrategy.cs" />
-    <Compile Include="Src\Gui\Ime.cs" />
-    <Compile Include="Src\Gui\TextAreaUpdate.cs" />
-    <Compile Include="Src\Document\Selection\SelectionManager.cs" />
-    <Compile Include="Src\Gui\CompletionWindow\ICompletionData.cs" />
-    <Compile Include="Src\Gui\CompletionWindow\ICompletionDataProvider.cs" />
-    <Compile Include="Src\Gui\CompletionWindow\CodeCompletionWindow.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Src\Gui\CompletionWindow\DeclarationViewWindow.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Src\Gui\InsightWindow\IInsightDataProvider.cs" />
-    <Compile Include="Src\Gui\InsightWindow\InsightWindow.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Src\Util\RtfWriter.cs" />
-    <Compile Include="Src\Document\FoldingStrategy\FoldingManager.cs" />
-    <Compile Include="Src\Document\AbstractSegment.cs" />
-    <Compile Include="Src\Document\FoldingStrategy\FoldMarker.cs" />
-    <Compile Include="Src\Util\TipPainter.cs" />
-    <Compile Include="Src\Util\TipSection.cs" />
-    <Compile Include="Src\Util\TipText.cs" />
-    <Compile Include="Src\Util\TipSplitter.cs" />
-    <Compile Include="Src\Util\TipSpacer.cs" />
-    <Compile Include="Src\Util\TipPainterTools.cs" />
-    <Compile Include="Src\Document\ITextEditorProperties.cs" />
-    <Compile Include="Src\Gui\Caret.cs" />
-    <Compile Include="Src\Gui\TextArea.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Src\Gui\TextEditorControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Src\Gui\TextEditorControlBase.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Src\Gui\TextAreaClipboardHandler.cs" />
-    <Compile Include="Src\Gui\TextView.cs" />
-    <Compile Include="Src\Gui\GutterMargin.cs" />
-    <Compile Include="Src\Gui\AbstractMargin.cs" />
-    <Compile Include="Src\Undo\IUndoableOperation.cs" />
-    <Compile Include="Src\Undo\UndoQueue.cs" />
-    <Compile Include="Src\Undo\UndoStack.cs" />
-    <Compile Include="Src\Gui\TextAreaControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Src\Gui\TextAreaMouseHandler.cs" />
-    <Compile Include="Src\Document\HighlightingStrategy\SyntaxModes\ISyntaxModeFileProvider.cs" />
-    <Compile Include="Src\Document\HighlightingStrategy\SyntaxModes\SyntaxMode.cs" />
-    <Compile Include="Src\Document\HighlightingStrategy\SyntaxModes\ResourceSyntaxModeProvider.cs" />
-    <Compile Include="Src\Gui\IconBarMargin.cs" />
-    <Compile Include="Src\Gui\FoldMargin.cs" />
-    <Compile Include="Src\Document\HighlightingStrategy\SyntaxModes\FileSyntaxModeProvider.cs" />
-    <Compile Include="Src\Document\Selection\ColumnRange.cs" />
-    <Compile Include="Src\Gui\TextAreaDragDropHandler.cs" />
-    <Compile Include="Src\Gui\BracketHighlighter.cs" />
-    <Compile Include="Src\Actions\BookmarkActions.cs" />
-    <Compile Include="Src\Actions\FoldActions.cs" />
-    <Compile Include="Src\Actions\FormatActions.cs" />
-    <Compile Include="Src\Document\DefaultTextEditorProperties.cs" />
-    <Compile Include="Src\Document\MarkerStrategy\MarkerStrategy.cs" />
-    <Compile Include="Src\Document\MarkerStrategy\TextMarker.cs" />
-    <Compile Include="Src\Gui\CompletionWindow\AbstractCompletionWindow.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Src\Gui\CompletionWindow\CodeCompletionListView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Src\Gui\BrushRegistry.cs" />
-    <Compile Include="Src\Gui\HRuler.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Src\Document\BookmarkManager\Bookmark.cs" />
-    <Compile Include="Src\Document\BookmarkManager\BookmarkEventHandler.cs" />
-    <Compile Include="Src\Util\Win32Util.cs" />
-    <EmbeddedResource Include="Resources\ASPX.xshd" />
-    <EmbeddedResource Include="Resources\ActionScript.xshd" />
-    <EmbeddedResource Include="Resources\Ada.xshd" />
-    <EmbeddedResource Include="Resources\ANTLR.xshd" />
-    <EmbeddedResource Include="Resources\Assembly.xshd" />
-    <EmbeddedResource Include="Resources\AutoHotkey.xshd" />
-    <EmbeddedResource Include="Resources\Batch.xshd" />
-    <EmbeddedResource Include="Resources\C#.xshd" />
-    <EmbeddedResource Include="Resources\C++.xshd" />
-    <EmbeddedResource Include="Resources\C.xshd" />
-    <EmbeddedResource Include="Resources\Ceylon.xshd" />
-    <EmbeddedResource Include="Resources\ChucK.xshd" />
-    <EmbeddedResource Include="Resources\Clojure.xshd" />
-    <EmbeddedResource Include="Resources\Cocoa.xshd" />
-    <EmbeddedResource Include="Resources\CoffeeScript.xshd" />
-    <EmbeddedResource Include="Resources\Cool.xshd" />
-    <EmbeddedResource Include="Resources\CSS.xshd" />
-    <EmbeddedResource Include="Resources\D.xshd" />
-    <EmbeddedResource Include="Resources\Dart.xshd" />
-    <EmbeddedResource Include="Resources\Delphi.xshd" />
-    <EmbeddedResource Include="Resources\Eiffel.xshd" />
-    <EmbeddedResource Include="Resources\Elixir.xshd" />
-    <EmbeddedResource Include="Resources\Erlang.xshd" />
-    <EmbeddedResource Include="Resources\F#.xshd" />
-    <EmbeddedResource Include="Resources\Falcon.xshd" />
-    <EmbeddedResource Include="Resources\Fantom.xshd" />
-    <EmbeddedResource Include="Resources\Fortran95.xshd" />
-    <EmbeddedResource Include="Resources\Go.xshd" />
-    <EmbeddedResource Include="Resources\Groovy.xshd" />
-    <EmbeddedResource Include="Resources\Gui4Cli.xshd" />
-    <EmbeddedResource Include="Resources\Haskell.xshd" />
-    <EmbeddedResource Include="Resources\Haxe.xshd" />
-    <EmbeddedResource Include="Resources\HTML.xshd" />
-    <EmbeddedResource Include="Resources\Icon.xshd" />
-    <None Include="Resources\ICSharpCode.TextEditor.snk" />
-    <EmbeddedResource Include="Resources\TextEditorControl.bmp" />
-    <EmbeddedResource Include="Resources\Mode.xsd" />
-    <EmbeddedResource Include="Resources\RightArrow.cur" />
-    <EmbeddedResource Include="Resources\SyntaxModes.xml" />
-    <EmbeddedResource Include="Resources\Tex-Mode.xshd" />
-    <Compile Include="Src\Util\FileReader.cs" />
-    <EmbeddedResource Include="Resources\Boo.xshd" />
-    <Compile Include="Src\Gui\DrawableLine.cs" />
-    <Compile Include="Src\Gui\ToolTipRequestEventArgs.cs" />
-    <Compile Include="Src\Document\HighlightingStrategy\SpanStack.cs" />
-    <Compile Include="Src\Util\WeakCollection.cs" />
-    <EmbeddedResource Include="Resources\Patch-Mode.xshd" />
-    <EmbeddedResource Include="Resources\ILYC.xshd" />
-    <EmbeddedResource Include="Resources\INI.xshd" />
-    <EmbeddedResource Include="Resources\Io.xshd" />
-    <EmbeddedResource Include="Resources\Java.xshd" />
-    <EmbeddedResource Include="Resources\JavaScript.xshd" />
-    <EmbeddedResource Include="Resources\JSON.xshd" />
-    <EmbeddedResource Include="Resources\Julia.xshd" />
-    <EmbeddedResource Include="Resources\Just BASIC.xshd" />
-    <EmbeddedResource Include="Resources\KiXtart.xshd" />
-    <EmbeddedResource Include="Resources\Kotlin.xshd" />
-    <EmbeddedResource Include="Resources\Lean.xshd" />
-    <EmbeddedResource Include="Resources\Lisp.xshd" />
-    <EmbeddedResource Include="Resources\Lua.xshd" />
-    <EmbeddedResource Include="Resources\Nemerle.xshd" />
-    <EmbeddedResource Include="Resources\Nim.xshd" />
-    <EmbeddedResource Include="Resources\Objective-C.xshd" />
-    <EmbeddedResource Include="Resources\OCaml.xshd" />
-    <EmbeddedResource Include="Resources\ParaSail.xshd" />
-    <EmbeddedResource Include="Resources\Pascal.xshd" />
-    <EmbeddedResource Include="Resources\PHP.xshd" />
-    <EmbeddedResource Include="Resources\Pike.xshd" />
-    <EmbeddedResource Include="Resources\PowerShell.xshd" />
-    <EmbeddedResource Include="Resources\Prolog.xshd" />
-    <EmbeddedResource Include="Resources\PureScript.xshd" />
-    <EmbeddedResource Include="Resources\Python.xshd" />
-    <EmbeddedResource Include="Resources\R.xshd" />
-    <EmbeddedResource Include="Resources\Registry.xshd" />
-    <EmbeddedResource Include="Resources\Resource.xshd" />
-    <EmbeddedResource Include="Resources\Rexx.xshd" />
-    <EmbeddedResource Include="Resources\Rust.xshd" />
-    <EmbeddedResource Include="Resources\Scala.xshd" />
-    <EmbeddedResource Include="Resources\Scheme.xshd" />
-    <EmbeddedResource Include="Resources\Solidity.xshd" />
-    <EmbeddedResource Include="Resources\Spike.xshd" />
-    <EmbeddedResource Include="Resources\SQF.xshd" />
-    <EmbeddedResource Include="Resources\SQL.xshd" />
-    <EmbeddedResource Include="Resources\Swift.xshd" />
-    <EmbeddedResource Include="Resources\TCL.xshd" />
-    <EmbeddedResource Include="Resources\Thrift.xshd" />
-    <EmbeddedResource Include="Resources\TypeScript.xshd" />
-    <EmbeddedResource Include="Resources\Vala.xshd" />
-    <EmbeddedResource Include="Resources\VBNET.xshd" />
-    <EmbeddedResource Include="Resources\VBScript.xshd" />
-    <EmbeddedResource Include="Resources\Verilog.xshd" />
-    <EmbeddedResource Include="Resources\VHDL.xshd" />
-    <EmbeddedResource Include="Resources\Volt.xshd" />
-    <EmbeddedResource Include="Resources\VS Solution.xshd" />
-    <EmbeddedResource Include="Resources\X10.xshd" />
-    <EmbeddedResource Include="Resources\XC.xshd" />
-    <EmbeddedResource Include="Resources\XML.xshd" />
-    <EmbeddedResource Include="Resources\Xtend.xshd" />
-    <EmbeddedResource Include="Resources\Markdown.xshd" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
+
   <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
+    <EmbeddedResource Include="Resources\*.*" />
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="System.ValueTuple">
-      <Version>4.5.0</Version>
-    </PackageReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
+
+</Project>