diff --git a/.gitmodules b/.gitmodules
index 31ca30c..9f69f79 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -8,7 +8,7 @@
 	ignore = dirty
 [submodule "external/cecil"]
 	path = external/cecil
-	url = https://github.com/jbevain/cecil
+	url = https://github.com/SharpKit/cecil
 	ignore = dirty
 [submodule "SDK"]
 	path = SDK
diff --git a/Compiler/CSharp.Tasks/CSharp.Tasks.csproj b/Compiler/CSharp.Tasks/CSharp.Tasks.csproj
deleted file mode 100644
index 8ccdcfc..0000000
--- a/Compiler/CSharp.Tasks/CSharp.Tasks.csproj
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{4D31FC05-54E2-48F7-9DEF-4FDB2179A872}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SharpKit.CSharp.Tasks</RootNamespace>
-    <AssemblyName>SharpKit.CSharp.Tasks</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ReferencePath>$(MSBuildProjectDirectory)..\..\lib\</ReferencePath>
-    <ProductVersion>12.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Build" />
-    <Reference Include="Microsoft.Build.Engine" />
-    <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="Microsoft.Build.Tasks.v4.0" />
-    <Reference Include="Microsoft.Build.Utilities.v4.0" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.ServiceProcess" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="CompilerServiceClient.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Skc.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="SharpKit.CSharp.targets">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="SharpKit.CSharp.Tasks">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-copy $(ProjectDir)*.targets $(ProjectDir)..\skc5\bin\
-copy $(ProjectDir)*.Tasks $(ProjectDir)..\skc5\bin\
-copy $(ProjectDir)..\skc5\bin\SharpKit.CSharp.targets $(ProjectDir)..\skc5\bin\SharpKit.Build.targets
-copy $(TargetDir)*.Tasks.dll $(ProjectDir)..\skc5\bin\</PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-mkdir -p $(ProjectDir)..\skc5\bin
-cp $(ProjectDir)*.targets $(ProjectDir)..\skc5\bin\
-cp $(ProjectDir)*.Tasks $(ProjectDir)..\skc5\bin\
-cp $(ProjectDir)..\skc5\bin\SharpKit.CSharp.targets $(ProjectDir)..\skc5\bin\SharpKit.Build.targets
-cp $(TargetDir)*.Tasks.dll $(ProjectDir)..\skc5\bin\
-    </PostBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/Compiler/CSharp.Tasks/Properties/AssemblyInfo.cs b/Compiler/CSharp.Tasks/Properties/AssemblyInfo.cs
deleted file mode 100644
index c551e93..0000000
--- a/Compiler/CSharp.Tasks/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("SharpKit.CSharp.Tasks")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SharpKit.CSharp.Tasks")]
-[assembly: AssemblyCopyright("Copyright ©  2013")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("3597b3e7-3523-46b6-847d-87d8087c07df")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("5.5.0")]
diff --git a/Compiler/CSharp.Tasks/SharpKit.CSharp.Tasks.csproj b/Compiler/CSharp.Tasks/SharpKit.CSharp.Tasks.csproj
new file mode 100644
index 0000000..20f66d4
--- /dev/null
+++ b/Compiler/CSharp.Tasks/SharpKit.CSharp.Tasks.csproj
@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+    <ReferencePath>$(MSBuildProjectDirectory)..\..\lib\</ReferencePath>
+    <OutputPath>bin</OutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AssemblyVersion>5.5.0</AssemblyVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Remove="Properties\**" />
+    <EmbeddedResource Remove="Properties\**" />
+    <None Remove="Properties\**" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.Build.Tasks" Version="3.8.0-1.20330.5" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="SharpKit.CSharp.targets">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="SharpKit.CSharp.Tasks">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+</Project>
+
+
diff --git a/Compiler/CSharp.Tasks/SharpKit.CSharp.targets b/Compiler/CSharp.Tasks/SharpKit.CSharp.targets
index 6c7a23c..794211a 100644
--- a/Compiler/CSharp.Tasks/SharpKit.CSharp.targets
+++ b/Compiler/CSharp.Tasks/SharpKit.CSharp.targets
@@ -1,34 +1,34 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<!--This is a targets file for Visual Studio-->
-	<Import Project="SharpKit.CSharp.Tasks"/>
-	<PropertyGroup>
-		<SkcToolPath Condition=" '$(SkcToolPath)' == '' ">$(MSBuildThisFileDirectory)</SkcToolPath>
-		<SkcToolExe>skc5.exe</SkcToolExe>
-		<OutputIntermediateAssembly></OutputIntermediateAssembly>
+  <!--This is a targets file for Visual Studio-->
+  <Import Project="SharpKit.CSharp.Tasks"/>
+  <PropertyGroup>
+    <SkcToolPath Condition=" '$(SkcToolPath)' == '' ">$(MSBuildThisFileDirectory)</SkcToolPath>
+    <SkcToolExe>skc5.exe</SkcToolExe>
+    <OutputIntermediateAssembly></OutputIntermediateAssembly>
     <SkcRebuild>false</SkcRebuild>
     <UseSkc Condition="'$(UseSkc)'==''">true</UseSkc>
     <DisableFastUpToDateCheck Condition="'$(UseSkc)'=='true'">true</DisableFastUpToDateCheck>
     <NoStdLib2 Condition="'$(NoCompilerStandardLib)'==''">$(NoStdLib)</NoStdLib2>
-	  <NoStdLib2 Condition="'$(NoCompilerStandardLib)'!=''">$(NoCompilerStandardLib)</NoStdLib2>
-</PropertyGroup>
+    <NoStdLib2 Condition="'$(NoCompilerStandardLib)'!=''">$(NoCompilerStandardLib)</NoStdLib2>
+  </PropertyGroup>
   <Target Name="BeforeRebuild" Condition="'$(UseSkc)'=='true'">
     <PropertyGroup>
       <SkcRebuild>true</SkcRebuild>
     </PropertyGroup>
   </Target>
 
-    <Target Name="BeforeCompile" Condition="'$(UseSkc)'=='true'">
-		<ItemGroup>
-			<_CoreCompileResourceInputs2 Include="@(_CoreCompileResourceInputs);@(CompiledLicenseFile)" />
-			<!--backup the resource inputs before they are deleted by the first CSC-->
-		</ItemGroup>
-		<PropertyGroup>
-			<UseSkc Condition="(('$(BuildingInsideVisualStudio)' == 'true')  and ('$(BuildingProject)' == 'false'))">false</UseSkc>
-		</PropertyGroup>
-		<!--<Message Text="(BuildingInsideVisualStudio):" Importance="high" />-->
-		<!--<Message Text="$(BuildingInsideVisualStudio)" Importance="high" />-->
-	</Target>
-	<Target Name="AfterCompile" Condition="'$(UseSkc)'=='true'">
+  <Target Name="BeforeCompile" Condition="'$(UseSkc)'=='true'">
+    <ItemGroup>
+      <_CoreCompileResourceInputs2 Include="@(_CoreCompileResourceInputs);@(CompiledLicenseFile)" />
+      <!--backup the resource inputs before they are deleted by the first CSC-->
+    </ItemGroup>
+    <PropertyGroup>
+      <UseSkc Condition="(('$(BuildingInsideVisualStudio)' == 'true')  and ('$(BuildingProject)' == 'false'))">false</UseSkc>
+    </PropertyGroup>
+    <!--<Message Text="(BuildingInsideVisualStudio):" Importance="high" />-->
+    <!--<Message Text="$(BuildingInsideVisualStudio)" Importance="high" />-->
+  </Target>
+  <Target Name="AfterCompile" Condition="'$(UseSkc)'=='true'">
     <Skc
       SkcRebuild="$(SkcRebuild)"
 			NoneFiles="@(None)"
@@ -48,6 +48,5 @@
 			UseHostCompilerIfAvailable="$(UseHostCompilerIfAvailable)"
       SkcPlugins="@(SkcPlugin)">
     </Skc>
-		
-	</Target>
+  </Target>
 </Project>
diff --git a/Compiler/CSharp.Tasks/Skc.cs b/Compiler/CSharp.Tasks/Skc.cs
index 555ee22..c7a3b7c 100644
--- a/Compiler/CSharp.Tasks/Skc.cs
+++ b/Compiler/CSharp.Tasks/Skc.cs
@@ -1,34 +1,28 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Microsoft.Build.Utilities;
-using Microsoft.Build.Tasks;
-using System.IO;
+
 using Microsoft.Build.Framework;
-using System.Diagnostics;
+using Microsoft.CodeAnalysis.BuildTasks;
+using System;
 using System.Globalization;
-using System.Collections.Specialized;
-using System.Collections;
-//using SharpKit.Build.Tasks.CsbService.Client;
-using System.Configuration;
-using System.ServiceProcess;
-//using System.ServiceModel.Configuration;
-//using System.ServiceModel;
+using System.IO;
+using System.Text;
 
 namespace SharpKit.Build.Tools
 {
 
-    public class Skc : ManagedCompiler
+    public class Skc : Csc
     {
         public Skc()
         {
+            Trace("Init");
         }
 
-        protected override string GenerateFullPathToTool()
+        private void Trace(string message)
         {
-            return Path.Combine(ToolPath, ToolExe);
+            Console.WriteLine("###############################: " + message);
         }
+
+        protected override string ToolNameWithoutExtension => "skc";
+
         private static bool IsLegalIdentifier(string identifier)
         {
             if (identifier.Length == 0)
@@ -263,14 +257,6 @@ protected override bool CallHostObjectToExecute()
         {
             return base.CallHostObjectToExecute();
         }
-        protected override string ToolName
-        {
-            get
-            {
-                return "skc.exe";
-            }
-        }
-
 
     }
 
diff --git a/Compiler/CSharp.Tasks/make.cmd b/Compiler/CSharp.Tasks/make.cmd
index 7156070..049d8c6 100644
--- a/Compiler/CSharp.Tasks/make.cmd
+++ b/Compiler/CSharp.Tasks/make.cmd
@@ -3,11 +3,11 @@
 
 IF not "%1" == "release" (
 
-%msbuild% CSharp.Tasks.csproj
+dotnet build
 
 ) ELSE (
 
-%msbuild% /p:Configuration=Release CSharp.Tasks.csproj
+dotnet build /p:Configuration=Release CSharp.Tasks.csproj
 
 )
 
diff --git a/Compiler/Compiler.sln b/Compiler/Compiler.sln
index cabeccc..04f31d8 100644
--- a/Compiler/Compiler.sln
+++ b/Compiler/Compiler.sln
@@ -1,17 +1,23 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30501.0
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30413.136
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "skc5", "skc5\skc5.csproj", "{6307BDF9-19E4-4925-99DC-29773D8F0AF1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "skc5", "skc5\skc5.csproj", "{6307BDF9-19E4-4925-99DC-29773D8F0AF1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharp.Tasks", "CSharp.Tasks\CSharp.Tasks.csproj", "{4D31FC05-54E2-48F7-9DEF-4FDB2179A872}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharp.Tasks", "CSharp.Tasks\SharpKit.CSharp.Tasks.csproj", "{4D31FC05-54E2-48F7-9DEF-4FDB2179A872}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NRefactory", "NRefactory", "{E09479B2-B122-4FD9-B68E-8A863AC2587D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Cecil", "..\external\cecil\Mono.Cecil.csproj", "{A305E28E-36BE-4E4D-9141-EFE5515506F9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.NRefactory", "..\external\NRefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj", "{9C9FDE34-87E5-4257-A01C-FDA80EFC71D9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.NRefactory.CSharp", "..\external\NRefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj", "{880778E7-07E2-4F6C-A0A6-C7D6BAEAB563}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.NRefactory.Cecil", "..\external\NRefactory\ICSharpCode.NRefactory.Cecil\ICSharpCode.NRefactory.Cecil.csproj", "{9FD870BF-C9EA-4D63-A180-1EB7EFD5E659}"
 EndProject
 Global
-	GlobalSection(SubversionScc) = preSolution
-		Svn-Managed = True
-		Manager = AnkhSVN - Subversion Support for Visual Studio
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|Mixed Platforms = Debug|Mixed Platforms
@@ -41,8 +47,69 @@ Global
 		{4D31FC05-54E2-48F7-9DEF-4FDB2179A872}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4D31FC05-54E2-48F7-9DEF-4FDB2179A872}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4D31FC05-54E2-48F7-9DEF-4FDB2179A872}.Release|x86.ActiveCfg = Release|Any CPU
+		{A305E28E-36BE-4E4D-9141-EFE5515506F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A305E28E-36BE-4E4D-9141-EFE5515506F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A305E28E-36BE-4E4D-9141-EFE5515506F9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A305E28E-36BE-4E4D-9141-EFE5515506F9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A305E28E-36BE-4E4D-9141-EFE5515506F9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A305E28E-36BE-4E4D-9141-EFE5515506F9}.Debug|x86.Build.0 = Debug|Any CPU
+		{A305E28E-36BE-4E4D-9141-EFE5515506F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A305E28E-36BE-4E4D-9141-EFE5515506F9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A305E28E-36BE-4E4D-9141-EFE5515506F9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{A305E28E-36BE-4E4D-9141-EFE5515506F9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{A305E28E-36BE-4E4D-9141-EFE5515506F9}.Release|x86.ActiveCfg = Release|Any CPU
+		{A305E28E-36BE-4E4D-9141-EFE5515506F9}.Release|x86.Build.0 = Release|Any CPU
+		{9C9FDE34-87E5-4257-A01C-FDA80EFC71D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C9FDE34-87E5-4257-A01C-FDA80EFC71D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9C9FDE34-87E5-4257-A01C-FDA80EFC71D9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9C9FDE34-87E5-4257-A01C-FDA80EFC71D9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9C9FDE34-87E5-4257-A01C-FDA80EFC71D9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9C9FDE34-87E5-4257-A01C-FDA80EFC71D9}.Debug|x86.Build.0 = Debug|Any CPU
+		{9C9FDE34-87E5-4257-A01C-FDA80EFC71D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9C9FDE34-87E5-4257-A01C-FDA80EFC71D9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9C9FDE34-87E5-4257-A01C-FDA80EFC71D9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{9C9FDE34-87E5-4257-A01C-FDA80EFC71D9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{9C9FDE34-87E5-4257-A01C-FDA80EFC71D9}.Release|x86.ActiveCfg = Release|Any CPU
+		{9C9FDE34-87E5-4257-A01C-FDA80EFC71D9}.Release|x86.Build.0 = Release|Any CPU
+		{880778E7-07E2-4F6C-A0A6-C7D6BAEAB563}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{880778E7-07E2-4F6C-A0A6-C7D6BAEAB563}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{880778E7-07E2-4F6C-A0A6-C7D6BAEAB563}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{880778E7-07E2-4F6C-A0A6-C7D6BAEAB563}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{880778E7-07E2-4F6C-A0A6-C7D6BAEAB563}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{880778E7-07E2-4F6C-A0A6-C7D6BAEAB563}.Debug|x86.Build.0 = Debug|Any CPU
+		{880778E7-07E2-4F6C-A0A6-C7D6BAEAB563}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{880778E7-07E2-4F6C-A0A6-C7D6BAEAB563}.Release|Any CPU.Build.0 = Release|Any CPU
+		{880778E7-07E2-4F6C-A0A6-C7D6BAEAB563}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{880778E7-07E2-4F6C-A0A6-C7D6BAEAB563}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{880778E7-07E2-4F6C-A0A6-C7D6BAEAB563}.Release|x86.ActiveCfg = Release|Any CPU
+		{880778E7-07E2-4F6C-A0A6-C7D6BAEAB563}.Release|x86.Build.0 = Release|Any CPU
+		{9FD870BF-C9EA-4D63-A180-1EB7EFD5E659}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9FD870BF-C9EA-4D63-A180-1EB7EFD5E659}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9FD870BF-C9EA-4D63-A180-1EB7EFD5E659}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9FD870BF-C9EA-4D63-A180-1EB7EFD5E659}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9FD870BF-C9EA-4D63-A180-1EB7EFD5E659}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9FD870BF-C9EA-4D63-A180-1EB7EFD5E659}.Debug|x86.Build.0 = Debug|Any CPU
+		{9FD870BF-C9EA-4D63-A180-1EB7EFD5E659}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9FD870BF-C9EA-4D63-A180-1EB7EFD5E659}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9FD870BF-C9EA-4D63-A180-1EB7EFD5E659}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{9FD870BF-C9EA-4D63-A180-1EB7EFD5E659}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{9FD870BF-C9EA-4D63-A180-1EB7EFD5E659}.Release|x86.ActiveCfg = Release|Any CPU
+		{9FD870BF-C9EA-4D63-A180-1EB7EFD5E659}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{A305E28E-36BE-4E4D-9141-EFE5515506F9} = {E09479B2-B122-4FD9-B68E-8A863AC2587D}
+		{9C9FDE34-87E5-4257-A01C-FDA80EFC71D9} = {E09479B2-B122-4FD9-B68E-8A863AC2587D}
+		{880778E7-07E2-4F6C-A0A6-C7D6BAEAB563} = {E09479B2-B122-4FD9-B68E-8A863AC2587D}
+		{9FD870BF-C9EA-4D63-A180-1EB7EFD5E659} = {E09479B2-B122-4FD9-B68E-8A863AC2587D}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A0E115D7-0217-43FA-ACB0-82407F484C24}
+	EndGlobalSection
+	GlobalSection(SubversionScc) = preSolution
+		Svn-Managed = True
+		Manager = AnkhSVN - Subversion Support for Visual Studio
+	EndGlobalSection
 EndGlobal
diff --git a/Compiler/skc5/Compiler/CompilerTool.cs b/Compiler/skc5/Compiler/CompilerTool.cs
index 16a62a5..8d2d30f 100644
--- a/Compiler/skc5/Compiler/CompilerTool.cs
+++ b/Compiler/skc5/Compiler/CompilerTool.cs
@@ -918,7 +918,7 @@ void EmbedResources()
                     EmbeddedResourceFiles.Add(att.Filename);
                     var resName = att.ResourceName ?? att.Filename;
                     Log.WriteLine("Embedding {0} -> {1}", att.Filename, resName);
-                    var res = new EmbeddedResource(resName, ManifestResourceAttributes.Public, File.ReadAllBytes(att.Filename));
+                    var res = new EmbeddedResource(resName, Mono.Cecil.ManifestResourceAttributes.Public, File.ReadAllBytes(att.Filename));
                     var res2 = asm.Resources.Where(t => t.Name == res.Name).OfType<EmbeddedResource>().FirstOrDefault();
                     if (res2 == null)
                     {
diff --git a/Compiler/skc5/Compiler/SourceMapping/SourceMapping.cs b/Compiler/skc5/Compiler/SourceMapping/SourceMapping.cs
index 0e880f6..34c2ec0 100644
--- a/Compiler/skc5/Compiler/SourceMapping/SourceMapping.cs
+++ b/Compiler/skc5/Compiler/SourceMapping/SourceMapping.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Web.Script.Serialization;
 using System.IO;
 using System.Runtime.Serialization;
 
diff --git a/Compiler/skc5/Compiler/SourceMapping/SourceMappingV3.cs b/Compiler/skc5/Compiler/SourceMapping/SourceMappingV3.cs
index c00c7fd..2cadb9e 100644
--- a/Compiler/skc5/Compiler/SourceMapping/SourceMappingV3.cs
+++ b/Compiler/skc5/Compiler/SourceMapping/SourceMappingV3.cs
@@ -2,8 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Web.Script.Serialization;
 using System.IO;
+using System.Text.Json;
+using System.Text.Json.Serialization;
 
 namespace SharpKit.Compiler.SourceMapping
 {
@@ -43,7 +44,7 @@ public void SaveAs(string filename)
         {
             if (mappings == null)
                 GenerateMappings();
-            var s = new JavaScriptSerializer().Serialize(this);
+            var s = JsonSerializer.Serialize(this);
             File.WriteAllText(filename, s);
         }
         public int version { get; set; }
@@ -53,13 +54,12 @@ public void SaveAs(string filename)
         public List<string> sources { get; set; }
         public List<string> names { get; set; }
         public string mappings { get; set; }
-        [ScriptIgnore]
+        [JsonIgnore]
         public List<List<SourceMappingV3Item>> ParsedMappings { get; set; }
 
         public static SourceMappingV3Document Load(string filename)
         {
-            var ser = new JavaScriptSerializer();
-            var doc = ser.Deserialize<SourceMappingV3Document>(File.ReadAllText(filename));
+            var doc = JsonSerializer.Deserialize<SourceMappingV3Document>(File.ReadAllText(filename));
             doc.ParseMappings();
             return doc;
         }
diff --git a/Compiler/skc5/Properties/AssemblyInfo.cs b/Compiler/skc5/Properties/AssemblyInfo.cs
index 2d97ace..51db2fb 100644
--- a/Compiler/skc5/Properties/AssemblyInfo.cs
+++ b/Compiler/skc5/Properties/AssemblyInfo.cs
@@ -5,14 +5,6 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("skc5")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("skc5")]
-[assembly: AssemblyCopyright("Copyright ©  2013")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
@@ -20,7 +12,6 @@
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("98ad7271-73df-4455-b85e-f6d1937514f8")]
 
 // Version information for an assembly consists of the following four values:
 //
@@ -32,5 +23,3 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("5.5.0")]
diff --git a/Compiler/skc5/make.cmd b/Compiler/skc5/make.cmd
index 1168b46..c4790ab 100644
--- a/Compiler/skc5/make.cmd
+++ b/Compiler/skc5/make.cmd
@@ -3,11 +3,11 @@
 
 IF not "%1" == "release" (
 
-dotnet msbuild skc5.csproj
+dotnet build
 
 ) ELSE (
 
-dotnet msbuild skc5.csproj /p:Configuration=Release /p:DebugSymbols=false /p:DebugType=None
+dotnet build /p:Configuration=Release /p:DebugSymbols=false /p:DebugType=None
 
 )
 
diff --git a/Compiler/skc5/skc5.csproj b/Compiler/skc5/skc5.csproj
index bd4d66a..c92b7e8 100644
--- a/Compiler/skc5/skc5.csproj
+++ b/Compiler/skc5/skc5.csproj
@@ -1,46 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{6307BDF9-19E4-4925-99DC-29773D8F0AF1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SharpKit</RootNamespace>
-    <AssemblyName>skc5</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
+    <TargetFramework>net5</TargetFramework>
     <ReferencePath>$(MSBuildProjectDirectory)..\..\lib\</ReferencePath>
-    <ProductVersion>12.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <Prefer32Bit>false</Prefer32Bit>
+    <OutputPath>bin</OutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AssemblyVersion>5.5.0</AssemblyVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="3.1.1" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\external\cecil\Mono.Cecil.csproj" />
+    <ProjectReference Include="..\..\external\NRefactory\ICSharpCode.NRefactory.Cecil\ICSharpCode.NRefactory.Cecil.csproj" />
+    <ProjectReference Include="..\..\external\NRefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj" />
+    <ProjectReference Include="..\..\external\NRefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj" />
+    <ProjectReference Include="..\CSharp.Tasks\SharpKit.CSharp.Tasks.csproj" />
+  </ItemGroup>
+
   <ItemGroup>
     <Reference Include="AjaxMin">
       <HintPath>..\..\external\AjaxMin\AjaxMinDll\bin\AjaxMinDll.dll</HintPath>
@@ -48,145 +26,8 @@
     <Reference Include="corex">
       <HintPath>..\..\external\corex\src\corex\bin\corex.dll</HintPath>
     </Reference>
-    <Reference Include="ICSharpCode.NRefactory">
-      <HintPath Condition=" '$(Configuration)' == 'Debug'">..\..\external\NRefactory\bin\net_4_5_Debug\ICSharpCode.NRefactory.dll</HintPath>
-      <HintPath Condition=" '$(Configuration)' == 'Release'">..\..\external\NRefactory\bin\net_4_5_Release\ICSharpCode.NRefactory.dll</HintPath>
-    </Reference>
-    <Reference Include="ICSharpCode.NRefactory.Cecil">
-      <HintPath Condition=" '$(Configuration)' == 'Debug'">..\..\external\NRefactory\bin\net_4_5_Debug\ICSharpCode.NRefactory.Cecil.dll</HintPath>
-      <HintPath Condition=" '$(Configuration)' == 'Release'">..\..\external\NRefactory\bin\net_4_5_Release\ICSharpCode.NRefactory.Cecil.dll</HintPath>
-    </Reference>
-    <Reference Include="ICSharpCode.NRefactory.CSharp">
-      <HintPath Condition=" '$(Configuration)' == 'Debug'">..\..\external\NRefactory\bin\net_4_5_Debug\ICSharpCode.NRefactory.CSharp.dll</HintPath>
-      <HintPath Condition=" '$(Configuration)' == 'Release'">..\..\external\NRefactory\bin\net_4_5_Release\ICSharpCode.NRefactory.CSharp.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Cecil">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath Condition=" '$(Configuration)' == 'Debug'">..\..\external\cecil\bin\net_4_0_Debug\Mono.Cecil.dll</HintPath>
-      <HintPath Condition=" '$(Configuration)' == 'Release'">..\..\external\cecil\bin\net_4_0_Release\Mono.Cecil.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Management" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.ServiceProcess" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Compiler\ClrResolveVisitor.cs" />
-    <Compile Include="Compiler\CsToJs\TsMemberConverter.cs" />
-    <Compile Include="JavaScript\Ast\JsModel.Visitor.generated.cs" />
-    <Compile Include="JavaScript\JsCodeInliner.cs" />
-    <Compile Include="Compiler\Extensions_Collections.cs" />
-    <Compile Include="Compiler\CommentsExporter.cs" />
-    <Compile Include="Compiler\CompilerConfiguration.cs" />
-    <Compile Include="Compiler\CompilerLogger.cs" />
-    <Compile Include="Compiler\CompilerService.cs" />
-    <Compile Include="Compiler\CompilerTool.cs" />
-    <Compile Include="Compiler\CompilerToolArgs.cs" />
-    <Compile Include="Compiler\CompilerToolCommon.cs" />
-    <Compile Include="Compiler\Console.cs" />
-    <Compile Include="Compiler\CsToJs\Extensions.cs" />
-    <Compile Include="Compiler\CsToJs\ResolveResultConverter_Invocation.cs" />
-    <Compile Include="Compiler\Cs2.cs" />
-    <Compile Include="Compiler\CsEntityExt.cs" />
-    <Compile Include="Compiler\CsExternalMetadata.cs" />
-    <Compile Include="Compiler\CssCompressor.cs" />
-    <Compile Include="Compiler\CssCompressorExtensions.cs" />
-    <Compile Include="Compiler\Extensions_Metadata.cs" />
-    <Compile Include="Compiler\FileMerger.cs" />
-    <Compile Include="Compiler\FileUtils.cs" />
-    <Compile Include="Compiler\CsToJs\AstNodeConverter.cs" />
-    <Compile Include="Compiler\CsToJs\ResolveResultConverter.cs" />
-    <Compile Include="Compiler\CsToJs\ResolveResultConverter_Operator.cs" />
-    <Compile Include="Compiler\JsMinifier.cs" />
-    <Compile Include="Compiler\CsToJs\TypeConverter.cs" />
-    <Compile Include="Compiler\CsToJs\MemberConverter.cs" />
-    <Compile Include="Compiler\CsToJs\MemberConverter_Clr.cs" />
-    <Compile Include="Compiler\CsToJs\MemberConverter_ExtJs.cs" />
-    <Compile Include="Compiler\CsToJs\MemberConverter_Global.cs" />
-    <Compile Include="Compiler\CsToJs\MemberConverter_Native.cs" />
-    <Compile Include="Compiler\Manifest.cs" />
-    <Compile Include="Compiler\NotifyNavigator.cs" />
-    <Compile Include="Compiler\Plugin\ICompiler.cs" />
-    <Compile Include="Compiler\Plugin\ICompilerPlugin.cs" />
-    <Compile Include="Compiler\Plugin\ICSharpModel.cs" />
-    <Compile Include="Compiler\Program.cs" />
-    <Compile Include="Compiler\WindowsService.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Compiler\SharpKitVersionInfo.cs" />
-    <Compile Include="Compiler\Sk.cs" />
-    <Compile Include="Compiler\SkJs.cs" />
-    <Compile Include="Compiler\SkJsFile.cs" />
-    <Compile Include="Compiler\SkProject.cs" />
-    <Compile Include="Compiler\SourceMapping\Base64.cs" />
-    <Compile Include="Compiler\SourceMapping\Base64VLQ.cs" />
-    <Compile Include="Compiler\SourceMapping\SkSourceMappingGenerator.cs" />
-    <Compile Include="Compiler\SourceMapping\SourceMapping.cs" />
-    <Compile Include="Compiler\SourceMapping\SourceMappingHelper.cs" />
-    <Compile Include="Compiler\SourceMapping\SourceMappingV3.cs" />
-    <Compile Include="Compiler\YieldRefactorer.cs" />
-    <Compile Include="JavaScript\Ast\Extensions.cs" />
-    <Compile Include="JavaScript\Ast\JsFormatter_Minified.cs" />
-    <Compile Include="JavaScript\Ast\JsFormatter_CSharp.cs" />
-    <Compile Include="JavaScript\Ast\IAnnotatable.cs" />
-    <Compile Include="JavaScript\Ast\Js.cs" />
-    <Compile Include="JavaScript\Ast\JsFile.cs" />
-    <Compile Include="JavaScript\Ast\JsFormatter_Default.cs" />
-    <Compile Include="JavaScript\Ast\JsModel.cs" />
-    <Compile Include="JavaScript\Ast\JsModel.generated.cs" />
-    <Compile Include="JavaScript\Ast\JsModel.Linq.cs" />
-    <Compile Include="JavaScript\Ast\JsModel.Clone.generated.cs" />
-    <Compile Include="JavaScript\Ast\JsModelExtensions.cs" />
-    <Compile Include="JavaScript\Ast\JsToken.cs" />
-    <Compile Include="JavaScript\Ast\JsWriter.cs" />
-    <Compile Include="JavaScript\JsAttributes.cs" />
-    <Compile Include="JavaScript\JsAttributesEx.cs" />
-    <Compile Include="JavaScript\Ast\JsFormatter.cs" />
-    <Compile Include="JavaScript\Ast\JsTokenWriter.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TypeScript\TsEntity.cs" />
-    <Compile Include="TypeScript\TsWriter.cs" />
-    <Compile Include="TypeScript\VisitableWriter.cs" />
-    <Compile Include="Utils\Analytics\Mp2.cs" />
-    <Compile Include="Utils\Misc\CSharpHelper.cs" />
-    <Compile Include="Utils\Misc\EnumerableHelper.cs" />
-    <Compile Include="Utils\Misc\JavaScriptHelper.cs" />
-    <Compile Include="Utils\Misc\JsonServer.cs" />
-    <Compile Include="Utils\Misc\ProcessHelper.cs" />
-    <Compile Include="Utils\Misc\StopwatchHelper.cs" />
-    <Compile Include="Utils\Misc\XExtensions.cs" />
-    <Compile Include="Utils\Misc\XmlHelper.cs" />
-    <Compile Include="Utils\Misc\XSerializer.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config">
-      <SubType>Designer</SubType>
-    </None>
-    <Compile Include="JavaScript\Ast\JsModel.Clone.cs" />
-    <None Include="NuGet.nuspec" />
-    <None Include="SharpKit.pfx" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">rem xcopy $(TargetDir)*.* C:\Windows\Microsoft.NET\Framework\v4.0.30319\SharpKit\5\ /C /Y /d</PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-	#cp $(TargetDir)*.* C:\Windows\Microsoft.NET\Framework\v4.0.30319\SharpKit\5\ /C /Y /d
-	</PostBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
+
+</Project>
+
+
diff --git a/SDK b/SDK
index 66a6e64..822b931 160000
--- a/SDK
+++ b/SDK
@@ -1 +1 @@
-Subproject commit 66a6e64436c6254b60b7ea5aee54d026fff78237
+Subproject commit 822b931905d7316db189c4a046037074e8b1a057
diff --git a/external/AjaxMin b/external/AjaxMin
index b90b35b..ca78916 160000
--- a/external/AjaxMin
+++ b/external/AjaxMin
@@ -1 +1 @@
-Subproject commit b90b35b60181ae1ef5be0df5a783fdc9a9ad1752
+Subproject commit ca7891646da6d5be22b0614838b45dbf234a06af
diff --git a/external/NRefactory b/external/NRefactory
index bf6c674..79bbe8b 160000
--- a/external/NRefactory
+++ b/external/NRefactory
@@ -1 +1 @@
-Subproject commit bf6c674791768028861dbf50bcbd0519af7fd839
+Subproject commit 79bbe8b4ddb1fb18edfed1b83f63a330ca426be4
diff --git a/external/cecil b/external/cecil
index db1e41d..3edd588 160000
--- a/external/cecil
+++ b/external/cecil
@@ -1 +1 @@
-Subproject commit db1e41dc16ab35f4aa6149ea4b60e8f940a5b82a
+Subproject commit 3edd588bd7b513425dd11141b9cae1c7beb2ecda
diff --git a/external/corex b/external/corex
index 00d8127..5f1e4c1 160000
--- a/external/corex
+++ b/external/corex
@@ -1 +1 @@
-Subproject commit 00d81278282e28c7b05903a86126118aa8c0ce53
+Subproject commit 5f1e4c12b29d90cce29dea5af8872a31f4c2cd76
diff --git a/external/make.cmd b/external/make.cmd
index 02e092c..6a4bcc1 100644
--- a/external/make.cmd
+++ b/external/make.cmd
@@ -3,20 +3,20 @@
 
 IF not "%1" == "release" (
 
-dotnet msbuild 												    /p:Configuration=net_4_0_Release cecil/Mono.Cecil.csproj    /verbosity:minimal
-dotnet msbuild NRefactory/NRefactory.sln                       	/p:Configuration=net_4_5_Debug 								/verbosity:minimal
-dotnet msbuild corex/corex.sln 																								/verbosity:minimal
-dotnet msbuild AjaxMin/AjaxMinDll/AjaxMinDll.sln 																			/verbosity:minimal
-dotnet msbuild SharpZipLib/src/ICSharpCode.SharpZLib.csproj 																/verbosity:minimal
-dotnet msbuild octokit.net/Octokit/Octokit-Mono.csproj 																		/verbosity:minimal
+dotnet build 												    /p:Configuration=net_4_0_Release cecil/Mono.Cecil.csproj    /verbosity:minimal
+dotnet build NRefactory/NRefactory.sln                       	/p:Configuration=net_4_5_Debug 								/verbosity:minimal
+dotnet build corex/corex.sln 																								/verbosity:minimal
+dotnet build AjaxMin/AjaxMinDll/AjaxMinDll.sln 				    															/verbosity:minimal
+dotnet build SharpZipLib/src/ICSharpCode.SharpZLib.csproj 		    														/verbosity:minimal
+dotnet build octokit.net/Octokit/Octokit-Mono.csproj 																		/verbosity:minimal
  
 ) ELSE (
 
-dotnet msbuild cecil/Mono.Cecil.csproj                          /p:Configuration=net_4_0_Release /p:DebugSymbols=false /p:DebugType=None /verbosity:minimal
-dotnet msbuild NRefactory/NRefactory.sln                        /p:Configuration=net_4_5_Release /p:DebugSymbols=false /p:DebugType=None /verbosity:minimal
-dotnet msbuild corex/corex.sln                                  /p:Configuration=Release         /p:DebugSymbols=false /p:DebugType=None /verbosity:minimal
-dotnet msbuild AjaxMin/AjaxMinDll/AjaxMinDll.sln                /p:Configuration=Release         /p:DebugSymbols=false /p:DebugType=None /verbosity:minimal
-dotnet msbuild SharpZipLib/src/ICSharpCode.SharpZLib.csproj     /p:Configuration=Release         /p:DebugSymbols=false /p:DebugType=None /verbosity:minimal
-dotnet msbuild octokit.net/Octokit/Octokit-Mono.csproj	        /p:Configuration=Release         /p:DebugSymbols=false /p:DebugType=None /verbosity:minimal
+dotnet build cecil/Mono.Cecil.csproj                          /p:Configuration=net_4_0_Release /p:DebugSymbols=false /p:DebugType=None /verbosity:minimal
+dotnet build NRefactory/NRefactory.sln                        /p:Configuration=net_4_5_Release /p:DebugSymbols=false /p:DebugType=None /verbosity:minimal
+dotnet build corex/corex.sln                                  /p:Configuration=Release         /p:DebugSymbols=false /p:DebugType=None /verbosity:minimal
+dotnet build AjaxMin/AjaxMinDll/AjaxMinDll.sln                /p:Configuration=Release         /p:DebugSymbols=false /p:DebugType=None /verbosity:minimal
+dotnet build SharpZipLib/src/ICSharpCode.SharpZLib.csproj     /p:Configuration=Release         /p:DebugSymbols=false /p:DebugType=None /verbosity:minimal
+dotnet build octokit.net/Octokit/Octokit-Mono.csproj	      /p:Configuration=Release         /p:DebugSymbols=false /p:DebugType=None /verbosity:minimal
 
 )