diff --git a/src/managed/BlogRunner.Core/BlogRunner.Core.csproj b/src/managed/BlogRunner.Core/BlogRunner.Core.csproj
index 5280760a..4aaacefb 100644
--- a/src/managed/BlogRunner.Core/BlogRunner.Core.csproj
+++ b/src/managed/BlogRunner.Core/BlogRunner.Core.csproj
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\writer.build.settings" />
   <PropertyGroup>
     <ProjectGuid>{1F76020F-DBB5-4F43-B530-C85EF9461A61}</ProjectGuid>
     <RootNamespace>BlogRunner.Core</RootNamespace>
     <AssemblyName>BlogRunner.Core</AssemblyName>
     <CoverageDisabled>true</CoverageDisabled>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
   </PropertyGroup>
@@ -37,25 +38,6 @@
     <Reference Include="System.Net.Http.WebRequest" />
     <Reference Include="System.Xml" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="BlogUtil.cs" />
-    <Compile Include="Config\Blog.cs" />
-    <Compile Include="Config\Config.cs" />
-    <Compile Include="Config\CoreCommandLineOptions.cs" />
-    <Compile Include="Config\Provider.cs" />
-    <Compile Include="Log.cs" />
-    <Compile Include="Test.cs" />
-    <Compile Include="ITestResult.cs" />
-    <Compile Include="TestRunner.cs" />
-    <Compile Include="Tests\CompositePostTest.cs" />
-    <Compile Include="Tests\SupportsEmbedsTest.cs" />
-    <Compile Include="Tests\SupportsEmptyTitlesTest.cs" />
-    <Compile Include="Tests\SupportsFuturePostTest.cs" />
-    <Compile Include="Tests\SupportsMultipleCategoriesTest.cs" />
-    <Compile Include="Tests\SupportsPostAsDraftTest.cs" />
-    <Compile Include="Tests\SupportsScriptsTest.cs" />
-    <Compile Include="Tests\TitleEncodingTest.cs" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenLiveWriter.Api\OpenLiveWriter.Api.csproj">
       <Project>{B6D10B42-F173-4086-BB81-96B724BA5594}</Project>
diff --git a/src/managed/BlogRunner/BlogRunner.csproj b/src/managed/BlogRunner/BlogRunner.csproj
index 3808ae4c..e1c063bf 100644
--- a/src/managed/BlogRunner/BlogRunner.csproj
+++ b/src/managed/BlogRunner/BlogRunner.csproj
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\writer.build.settings" />
   <PropertyGroup>
     <AssemblyName>BlogRunner</AssemblyName>
     <RootNamespace>BlogRunner</RootNamespace>
     <ProjectGuid>{BA726BEA-9A29-4E53-95DF-E478D86D0926}</ProjectGuid>
     <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <CoverageDisabled>true</CoverageDisabled>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
@@ -38,9 +39,6 @@
     <Reference Include="System.Net.Http.WebRequest" />
     <Reference Include="System.Xml" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\BlogRunner.Core\BlogRunner.Core.csproj">
       <Project>{1F76020F-DBB5-4F43-B530-C85EF9461A61}</Project>
diff --git a/src/managed/BlogRunnerGui/BlogRunnerGui.csproj b/src/managed/BlogRunnerGui/BlogRunnerGui.csproj
index 725edda4..39a76a50 100644
--- a/src/managed/BlogRunnerGui/BlogRunnerGui.csproj
+++ b/src/managed/BlogRunnerGui/BlogRunnerGui.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop" ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\writer.build.settings" />
   <PropertyGroup>
     <ProjectGuid>{2CDA86AA-4264-4175-8A6C-E6AB436255C8}</ProjectGuid>
@@ -7,6 +7,8 @@
     <RootNamespace>BlogRunnerGui</RootNamespace>
     <AssemblyName>BlogRunnerGui</AssemblyName>
     <CoverageDisabled>true</CoverageDisabled>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
   </PropertyGroup>
@@ -42,29 +44,6 @@
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="FileInput.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="FileInput.Designer.cs">
-      <DependentUpon>FileInput.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Form1.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Form1.Designer.cs">
-      <DependentUpon>Form1.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Program.cs" />
-    <EmbeddedResource Include="FileInput.resx">
-      <SubType>Designer</SubType>
-      <DependentUpon>FileInput.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Form1.resx">
-      <SubType>Designer</SubType>
-      <DependentUpon>Form1.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenLiveWriter.CoreServices\OpenLiveWriter.CoreServices.csproj">
       <Project>{9154B6B4-F2C3-4FB4-BE38-A26A6C9409EE}</Project>
diff --git a/src/managed/BlogRunnerReporter/BlogRunnerReporter.csproj b/src/managed/BlogRunnerReporter/BlogRunnerReporter.csproj
index e86eb0ac..bc346190 100644
--- a/src/managed/BlogRunnerReporter/BlogRunnerReporter.csproj
+++ b/src/managed/BlogRunnerReporter/BlogRunnerReporter.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\writer.build.settings" />
   <PropertyGroup>
     <ProjectGuid>{8A81012A-1661-46D5-8712-52BB48C2C27C}</ProjectGuid>
@@ -7,6 +7,7 @@
     <RootNamespace>BlogRunnerReporter</RootNamespace>
     <AssemblyName>BlogRunnerReporter</AssemblyName>
     <CoverageDisabled>true</CoverageDisabled>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -16,9 +17,6 @@
     <Reference Include="System.Web" />
     <Reference Include="System.Xml" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(RepoRoot)\writer.build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/managed/LocUtil/LocUtil.csproj b/src/managed/LocUtil/LocUtil.csproj
index 36515909..dd634c8b 100644
--- a/src/managed/LocUtil/LocUtil.csproj
+++ b/src/managed/LocUtil/LocUtil.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop" ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\writer.build.settings" />
   <PropertyGroup>
     <AssemblyName>locutil</AssemblyName>
@@ -8,6 +8,9 @@
     <OutputType>Exe</OutputType>
     <SignAssembly>false</SignAssembly>
     <CoverageDisabled>true</CoverageDisabled>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -42,13 +45,6 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="App.ico" />
-    <Compile Include="AppMain.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="CsvParser.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="RibbonMarkup.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(RepoRoot)\writer.build.targets" />
diff --git a/src/managed/MarketXmlGenerator/MarketXmlGenerator.csproj b/src/managed/MarketXmlGenerator/MarketXmlGenerator.csproj
index 7d9347ea..7003980b 100644
--- a/src/managed/MarketXmlGenerator/MarketXmlGenerator.csproj
+++ b/src/managed/MarketXmlGenerator/MarketXmlGenerator.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
   <Import Project="..\..\..\writer.build.settings" />
   <PropertyGroup>
     <ProjectGuid>{D286C651-2AE7-447E-BBD8-B82F1C542667}</ProjectGuid>
@@ -9,6 +9,9 @@
     <AssemblyName>MarketXmlGenerator</AssemblyName>
     <OutputType>Exe</OutputType>
     <RootNamespace>MarketXmlGenerator</RootNamespace>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -19,13 +22,8 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="App.ico" />
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="MarketXmlGenerator.cs" />
-    <Compile Include="..\GlobalAssemblyInfo.cs" />
-    <Compile Include="..\GlobalAssemblyVersionInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/managed/OpenLiveWriter.Api/OpenLiveWriter.Api.csproj b/src/managed/OpenLiveWriter.Api/OpenLiveWriter.Api.csproj
index f82142b7..33ef8873 100644
--- a/src/managed/OpenLiveWriter.Api/OpenLiveWriter.Api.csproj
+++ b/src/managed/OpenLiveWriter.Api/OpenLiveWriter.Api.csproj
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop" ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\writer.build.settings" />
   <PropertyGroup>
     <AssemblyName>OpenLiveWriter.Api</AssemblyName>
     <RootNamespace>OpenLiveWriter.Api</RootNamespace>
     <ProjectGuid>{B6D10B42-F173-4086-BB81-96B724BA5594}</ProjectGuid>
     <AssemblyVersion>1.1.0.0</AssemblyVersion>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -42,35 +44,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\GlobalAssemblyInfo.cs" />
-    <Compile Include="AdaptiveHtmlObject.cs" />
-    <Compile Include="ContentCreationException.cs" />
-    <Compile Include="ContentSource.cs" />
-    <Compile Include="HeaderFooterSource.cs" />
-    <Compile Include="HtmlScreenCapture.cs" />
-    <Compile Include="HtmlServices.cs" />
-    <Compile Include="IPostInfo.cs" />
-    <Compile Include="InsertableContentSourceAttribute.cs" />
-    <Compile Include="IProperties.cs" />
-    <Compile Include="IPublishingContext.cs" />
-    <Compile Include="ISmartContent.cs" />
-    <Compile Include="ISmartContentEditorSite.cs" />
-    <Compile Include="LiveClipboardContentSourceAttribute.cs" />
-    <Compile Include="PluginDiagnostics.cs" />
-    <Compile Include="PluginHttpRequest.cs" />
-    <Compile Include="PublishNotificationHook.cs" />
-    <Compile Include="SmartContentEditor.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="SmartContentSource.cs" />
-    <Compile Include="TaskServices.cs" />
-    <Compile Include="UrlContentSourceAttribute.cs" />
-    <Compile Include="WriterApplication.cs" />
-    <Compile Include="WriterPlugin.cs" />
-    <Compile Include="WriterPluginAttribute.cs" />
-    <EmbeddedResource Include="SmartContentEditor.resx">
-      <DependentUpon>SmartContentEditor.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(RepoRoot)\writer.build.targets" />
diff --git a/src/managed/OpenLiveWriter.ApplicationFramework/OpenLiveWriter.ApplicationFramework.csproj b/src/managed/OpenLiveWriter.ApplicationFramework/OpenLiveWriter.ApplicationFramework.csproj
index bb8629ff..e5e89a16 100644
--- a/src/managed/OpenLiveWriter.ApplicationFramework/OpenLiveWriter.ApplicationFramework.csproj
+++ b/src/managed/OpenLiveWriter.ApplicationFramework/OpenLiveWriter.ApplicationFramework.csproj
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop" ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\writer.build.settings" />
   <PropertyGroup>
     <AssemblyName>OpenLiveWriter.ApplicationFramework</AssemblyName>
     <RootNamespace>OpenLiveWriter.ApplicationFramework</RootNamespace>
     <ProjectGuid>{EEEE653A-90CE-44E2-B40E-22F747880CC0}</ProjectGuid>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Accessibility" />
@@ -38,356 +40,12 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\GlobalAssemblyInfo.cs" />
-    <Compile Include="ApplicationCommandBarLightweightControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="ApplicationForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="ApplicationManager.cs" />
-    <Compile Include="ApplicationStyle.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="ApplicationStyles\ApplicationStyleSkyBlue.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="BorderControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="ColorDefaultColorControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="ColorDialogLauncherControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="ColorPickerForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="ColorPopup.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="ColorPresetControl.cs" />
-    <Compile Include="Command.cs" />
-    <Compile Include="CommandBarButtonEntry.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="CommandBarButtonLightweightControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="CommandBarContainerLightweightControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="CommandBarControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="CommandBarControlEntry.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="CommandBarControlLightweightControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="CommandBarDefinition.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="CommandBarEntry.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="CommandBarEntryCollection.cs" />
-    <Compile Include="CommandBarEntryCollectionEditor.cs" />
-    <Compile Include="CommandBarLabelEntry.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="CommandBarLabelLightweightControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="CommandBarLightweightControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="CommandBarLightweightControlEntry.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="CommandBarSeparatorEntry.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="CommandBarSeparatorLightweightControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="CommandBarSpacerEntry.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="CommandBarSpacerLightweightControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="CommandCollection.cs" />
-    <Compile Include="CommandCollectionEditor.cs" />
-    <Compile Include="CommandContextManager.cs" />
-    <Compile Include="CommandContextMenu.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="CommandContextMenuDefinition.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="CommandContextMenuMiniForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="CommandLoader.cs" />
-    <Compile Include="CommandManager.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="CommandMenuBuilder.cs" />
-    <Compile Include="CommandMenuBuilderEntry.cs" />
-    <Compile Include="CommandOwnerDrawMenuItem.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="CommandResourceLoader.cs" />
-    <Compile Include="ContainedTextBoxCommandSource.cs" />
-    <Compile Include="DispatchingCommand.cs" />
-    <Compile Include="DynamicCommandMenu.cs" />
-    <Compile Include="DynamicCommandMenuOverflowForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GenericCommandHandler.cs" />
-    <Compile Include="IColorPickerCommand.cs" />
-    <Compile Include="ICommandContextMenuControlHandler.cs" />
-    <Compile Include="IFontControlCommand.cs" />
-    <Compile Include="IMainFrameWindow.cs" />
-    <Compile Include="ISessionHandler.cs" />
-    <Compile Include="ISimpleTextEditorCommandSource.cs" />
-    <Compile Include="LightweightSplitterEventArgs.cs" />
-    <Compile Include="MenuBuilder.cs" />
-    <Compile Include="MenuDefinitionEntry.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="MenuDefinitionEntryCollection.cs" />
-    <Compile Include="MenuDefinitionEntryCollectionEditor.cs" />
-    <Compile Include="MenuDefinitionEntryCommand.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="MenuDefinitionEntryPlaceholder.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="MiniTab.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="MiniTabsControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="MinMaxClose.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="OverridableCommand.cs" />
-    <Compile Include="OwnerDrawMenuItem.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Preferences\Preferences.cs" />
-    <Compile Include="Preferences\PreferencesForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Preferences\PreferencesPanel.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Preferences\WebProxyPreferences.cs" />
-    <Compile Include="Preferences\WebProxyPreferencesPanel.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="PrimaryWorkspaceCommandBarLightweightControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="PrimaryWorkspaceControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="RibbonHelper.cs" />
-    <Compile Include="SatelliteApplicationForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="SatelliteApplicationFormWorkspace.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="SectionHeaderControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="SeparatorControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="SeparatorControl.Designer.cs">
-      <DependentUpon>SeparatorControl.cs</DependentUpon>
-    </Compile>
-    <Compile Include="SideBarControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="SidebarHeaderControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="SidebarHeaderControl.Designer.cs">
-      <DependentUpon>SidebarHeaderControl.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Skinning\ColorizedResources.cs" />
-    <Compile Include="SpinnerCommand.cs" />
-    <Compile Include="SplitterLightweightControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="SystemButtonHelper.cs" />
-    <Compile Include="TabEntry.cs" />
-    <Compile Include="TabLightweightControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="TabPageContainerControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="TabPageControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="TabScrollerButtonLightweightControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="TabSelectorLightweightControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="TransparentCommandBarControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="WorkspaceColumnLightweightControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="WorkspaceColumnPaneLightweightControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="WorkspaceCommandBarLightweightControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="WorkspaceControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <EmbeddedResource Include="ApplicationForm.resx">
-      <DependentUpon>ApplicationForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ApplicationManager.resx">
-      <DependentUpon>ApplicationManager.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ApplicationStyle.resx">
-      <DependentUpon>ApplicationStyle.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ApplicationStyles\ApplicationStyleSkyBlue.resx">
-      <DependentUpon>ApplicationStyleSkyBlue.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="ApplicationStyles\Images\ApplicationStyleSmall.png" />
     <EmbeddedResource Include="ApplicationStyles\Images\Lavender.png" />
     <EmbeddedResource Include="ApplicationStyles\Images\Sienna.png" />
     <EmbeddedResource Include="ApplicationStyles\Images\SkyBlue.png" />
     <EmbeddedResource Include="ApplicationStyles\Images\Sterling.png" />
     <EmbeddedResource Include="ApplicationStyles\Images\Wintergreen.png" />
-    <EmbeddedResource Include="BorderControl.resx">
-      <DependentUpon>BorderControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ColorDefaultColorControl.resx">
-      <DependentUpon>ColorDefaultColorControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ColorDialogLauncherControl.resx">
-      <DependentUpon>ColorDialogLauncherControl.cs</DependentUpon>  
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ColorPickerForm.resx">
-      <DependentUpon>ColorPickerForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ColorPopup.resx">
-      <DependentUpon>ColorPopup.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ColorPresetControl.resx">
-      <DependentUpon>ColorPresetControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Command.resx">
-      <DependentUpon>Command.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="CommandBarButtonEntry.resx">
-      <DependentUpon>CommandBarButtonEntry.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="CommandBarButtonLightweightControl.resx">
-      <DependentUpon>CommandBarButtonLightweightControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="CommandBarContainerLightweightControl.resx">
-      <DependentUpon>CommandBarContainerLightweightControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="CommandBarControl.resx">
-      <DependentUpon>CommandBarControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="CommandBarControlEntry.resx">
-      <DependentUpon>CommandBarControlEntry.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="CommandBarControlLightweightControl.resx">
-      <DependentUpon>CommandBarControlLightweightControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="CommandBarDefinition.resx">
-      <DependentUpon>CommandBarDefinition.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="CommandBarEntry.resx">
-      <DependentUpon>CommandBarEntry.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="CommandBarLabelEntry.resx">
-      <DependentUpon>CommandBarLabelEntry.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="CommandBarLabelLightweightControl.resx">
-      <DependentUpon>CommandBarLabelLightweightControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="CommandBarLightweightControl.resx">
-      <DependentUpon>CommandBarLightweightControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="CommandBarLightweightControlEntry.resx">
-      <DependentUpon>CommandBarLightweightControlEntry.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="CommandBarSeparatorEntry.resx">
-      <DependentUpon>CommandBarSeparatorEntry.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="CommandBarSeparatorLightweightControl.resx">
-      <DependentUpon>CommandBarSeparatorLightweightControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="CommandContextMenu.resx">
-      <DependentUpon>CommandContextMenu.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="CommandContextMenuDefinition.resx">
-      <DependentUpon>CommandContextMenuDefinition.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="CommandContextMenuMiniForm.resx">
-      <DependentUpon>CommandContextMenuMiniForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="CommandManager.resx">
-      <DependentUpon>CommandManager.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="CommandOwnerDrawMenuItem.resx">
-      <DependentUpon>CommandOwnerDrawMenuItem.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="DynamicCommandMenuOverflowForm.resx">
-      <DependentUpon>DynamicCommandMenuOverflowForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="Images\Application\CommandMenuBitmapLatchedEnabled.png" />
     <EmbeddedResource Include="Images\Application\CommandMenuBitmapLatchedSelected.png" />
     <EmbeddedResource Include="Images\Application\DialogBodyBackground.png" />
@@ -472,111 +130,7 @@
     <EmbeddedResource Include="Images\HIG\ToolbarButtonPressedLarge.png" />
     <EmbeddedResource Include="Images\HIG\WhiteDropArrow.png" />
     <EmbeddedResource Include="Images\HIG\XPActionBarBottom.png" />
-    <EmbeddedResource Include="MenuDefinitionEntry.resx">
-      <DependentUpon>MenuDefinitionEntry.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="MenuDefinitionEntryCommand.resx">
-      <DependentUpon>MenuDefinitionEntryCommand.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="MenuDefinitionEntryPlaceholder.resx">
-      <DependentUpon>MenuDefinitionEntryPlaceholder.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="MinMaxClose.resx">
-      <DependentUpon>MinMaxClose.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="OwnerDrawMenuItem.resx">
-      <DependentUpon>OwnerDrawMenuItem.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="Preferences\Images\WebProxyPanelBitmap.png" />
-    <EmbeddedResource Include="Preferences\PreferencesForm.resx">
-      <DependentUpon>PreferencesForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Preferences\PreferencesPanel.resx">
-      <DependentUpon>PreferencesPanel.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Preferences\WebProxyPreferencesPanel.resx">
-      <DependentUpon>WebProxyPreferencesPanel.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PrimaryWorkspaceCommandBarLightweightControl.resx">
-      <DependentUpon>PrimaryWorkspaceCommandBarLightweightControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PrimaryWorkspaceControl.resx">
-      <DependentUpon>PrimaryWorkspaceControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SatelliteApplicationForm.resx">
-      <DependentUpon>SatelliteApplicationForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SatelliteApplicationFormWorkspace.resx">
-      <DependentUpon>SatelliteApplicationFormWorkspace.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SectionHeaderControl.resx">
-      <DependentUpon>SectionHeaderControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SeparatorControl.resx">
-      <DependentUpon>SeparatorControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SideBarControl.resx">
-      <DependentUpon>SideBarControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SidebarHeaderControl.resx">
-      <DependentUpon>SidebarHeaderControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SplitterLightweightControl.resx">
-      <DependentUpon>SplitterLightweightControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="TabLightweightControl.resx">
-      <DependentUpon>TabLightweightControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="TabPageContainerControl.resx">
-      <DependentUpon>TabPageContainerControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="TabPageControl.resx">
-      <DependentUpon>TabPageControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="TabScrollerButtonLightweightControl.resx">
-      <DependentUpon>TabScrollerButtonLightweightControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="TabSelectorLightweightControl.resx">
-      <DependentUpon>TabSelectorLightweightControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="WorkspaceColumnLightweightControl.resx">
-      <DependentUpon>WorkspaceColumnLightweightControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="WorkspaceColumnPaneLightweightControl.resx">
-      <DependentUpon>WorkspaceColumnPaneLightweightControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="WorkspaceCommandBarLightweightControl.resx">
-      <DependentUpon>WorkspaceCommandBarLightweightControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="WorkspaceControl.resx">
-      <DependentUpon>WorkspaceControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <Content Include="Images\Application\ErrorLogoSmall.png" />
     <Content Include="Images\Application\FeedbackLogoSmall.png" />
     <Content Include="Images\Application\QuestionLogoSmall.png" />
diff --git a/src/managed/OpenLiveWriter.BlogClient/OpenLiveWriter.BlogClient.csproj b/src/managed/OpenLiveWriter.BlogClient/OpenLiveWriter.BlogClient.csproj
index 5ad18f40..ca504720 100644
--- a/src/managed/OpenLiveWriter.BlogClient/OpenLiveWriter.BlogClient.csproj
+++ b/src/managed/OpenLiveWriter.BlogClient/OpenLiveWriter.BlogClient.csproj
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop" ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\writer.build.settings" />
   <PropertyGroup>
     <AssemblyName>OpenLiveWriter.BlogClient</AssemblyName>
     <RootNamespace>OpenLiveWriter.BlogClient</RootNamespace>
-    <ProjectGuid>{B6D10B42-F173-4086-BB81-96B724BA5594}</ProjectGuid>
     <ProjectGuid>{FE2EA529-26E6-42C3-9F6A-E58966995FFE}</ProjectGuid>
+    <ProjectGuid>{FE2EA529-26E6-42C3-9F6A-E58966995FFE}</ProjectGuid>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
   </PropertyGroup>
@@ -129,75 +131,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\GlobalAssemblyInfo.cs" />
-    <Compile Include="Blog.cs" />
-    <Compile Include="BlogClientBase.cs" />
-    <Compile Include="BlogClientHelper.cs" />
-    <Compile Include="BlogClientUIContext.cs" />
-    <Compile Include="BlogDescriptor.cs" />
-    <Compile Include="BlogProviderButtonDescription.cs" />
-    <Compile Include="BlogSettings.cs" />
-    <Compile Include="Clients\AtomClient.cs" />
-    <Compile Include="Clients\AtomContentValue.cs" />
-    <Compile Include="Clients\AtomEntry.cs" />
-    <Compile Include="Clients\AtomMediaUploader.cs" />
-    <Compile Include="Clients\AtomProtocolVersion.cs" />
-    <Compile Include="Clients\BlogClientLoginControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Clients\BlogClientLoginDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Clients\BlogClientManager.cs" />
-    <Compile Include="Clients\GoogleBloggerv3Client.cs" />
-    <Compile Include="Clients\BloggerAtomClient.cs" />
-    <Compile Include="Clients\BloggerCompatibleClient.cs" />
-    <Compile Include="Clients\BlogPostContentFilters.cs" />
-    <Compile Include="Clients\CredentialsHelper.cs" />
-    <Compile Include="Clients\GDataCaptchaForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Clients\GenericAtomClient.cs" />
-    <Compile Include="Clients\LineBreakInputFormatters.cs" />
-    <Compile Include="Clients\LiveJournalClient.cs" />
-    <Compile Include="Clients\MetaweblogClient.cs" />
-    <Compile Include="Clients\MovableTypeClient.cs" />
-    <Compile Include="Clients\RedirectHelper.cs" />
-    <Compile Include="Clients\SharePointClient.cs" />
-    <Compile Include="Clients\WordPressClient.cs" />
-    <Compile Include="Clients\XmlRestRequestHelper.cs" />
-    <Compile Include="Clients\XmlRpcBlogClient.cs" />
-    <Compile Include="Detection\BackgroundColorDetector.cs" />
-    <Compile Include="Detection\BlogAccountDetector.cs" />
-    <Compile Include="Detection\BlogEditingTemplate.cs" />
-    <Compile Include="Detection\BlogEditingTemplateDetector.cs" />
-    <Compile Include="Detection\BlogEditingTemplateStrategy.cs" />
-    <Compile Include="Detection\BloggerDetectionHelper.cs" />
-    <Compile Include="Detection\BlogPostRegionLocatorStrategy.cs" />
-    <Compile Include="Detection\BlogServiceDetector.cs" />
-    <Compile Include="Detection\BlogSettingsDetector.cs" />
-    <Compile Include="Detection\LazyHomepageDownloader.cs" />
-    <Compile Include="Detection\RsdServiceDetector.cs" />
-    <Compile Include="Detection\WriterEditingManifest.cs" />
-    <Compile Include="IBlogCredentials.cs" />
-    <Compile Include="IBlogSettingsAccessor.cs" />
-    <Compile Include="ICredentialsDomain.cs" />
-    <Compile Include="ImageViewers\DhtmlImageViewers.cs" />
-    <Compile Include="Providers\BlogProvider.cs" />
-    <Compile Include="Providers\BlogProviderFromXml.cs" />
-    <Compile Include="Providers\BlogProviderManager.cs" />
-    <Compile Include="Providers\BlogProviderParameters.cs" />
-    <EmbeddedResource Include="Clients\BlogClientLoginControl.resx">
-      <DependentUpon>BlogClientLoginControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Clients\BlogClientLoginDialog.resx">
-      <DependentUpon>BlogClientLoginDialog.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Clients\GDataCaptchaForm.resx">
-      <DependentUpon>GDataCaptchaForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="Clients\PassportSettings.xml" />
     <EmbeddedResource Include="Clients\GoogleBloggerv3Secrets.json" />
     <EmbeddedResource Include="Images\WordPressFav.ico" />
diff --git a/src/managed/OpenLiveWriter.BrowserControl/OpenLiveWriter.BrowserControl.csproj b/src/managed/OpenLiveWriter.BrowserControl/OpenLiveWriter.BrowserControl.csproj
index e28f2fd6..db461e5c 100644
--- a/src/managed/OpenLiveWriter.BrowserControl/OpenLiveWriter.BrowserControl.csproj
+++ b/src/managed/OpenLiveWriter.BrowserControl/OpenLiveWriter.BrowserControl.csproj
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop" ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\writer.build.settings" />
   <PropertyGroup>
     <AssemblyName>OpenLiveWriter.BrowserControl</AssemblyName>
     <RootNamespace>OpenLiveWriter.BrowserControl</RootNamespace>
     <ProjectGuid>{A5C213F6-F0C6-4FD6-B496-61FE434621A6}</ProjectGuid>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -29,19 +31,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\GlobalAssemblyInfo.cs" />
-    <Compile Include="AxWebBrowser.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="ExplorerBrowserCommands.cs" />
-    <Compile Include="ExplorerBrowserControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="IBrowserCommand.cs" />
-    <Compile Include="IBrowserControl.cs" />
-    <EmbeddedResource Include="ExplorerBrowserControl.resx">
-      <DependentUpon>ExplorerBrowserControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(RepoRoot)\writer.build.targets" />
diff --git a/src/managed/OpenLiveWriter.Controls/OpenLiveWriter.Controls.csproj b/src/managed/OpenLiveWriter.Controls/OpenLiveWriter.Controls.csproj
index 5aba3d3b..32bcf414 100644
--- a/src/managed/OpenLiveWriter.Controls/OpenLiveWriter.Controls.csproj
+++ b/src/managed/OpenLiveWriter.Controls/OpenLiveWriter.Controls.csproj
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop" ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\writer.build.settings" />
   <PropertyGroup>
     <AssemblyName>OpenLiveWriter.Controls</AssemblyName>
     <RootNamespace>OpenLiveWriter.Controls</RootNamespace>
     <ProjectGuid>{D4A39612-3610-458F-83F8-5722D1F51063}</ProjectGuid>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Accessibility" />
@@ -52,184 +54,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\GlobalAssemblyInfo.cs" />
-    <Compile Include="AnimatedBitmapControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="ApplicationDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="AutoCompleteTextbox.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="AutoCompleteTextbox.Designer.cs">
-      <DependentUpon>AutoCompleteTextbox.cs</DependentUpon>
-    </Compile>
-    <Compile Include="BitmapButton.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="BrowserMiniForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="ButtonBaseLightweightControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="ChoiceDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="ChoiceDialog.Designer.cs">
-      <DependentUpon>ChoiceDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Include="ChoiceOption.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="ChoiceOption.Designer.cs">
-      <DependentUpon>ChoiceOption.cs</DependentUpon>
-    </Compile>
-    <Compile Include="ComboBoxRel.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="ComboBoxRel.Designer.cs">
-      <DependentUpon>ComboBoxRel.cs</DependentUpon>
-    </Compile>
-    <Compile Include="DelayedAnimatedProgressDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="DelayedFetchComboBox.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="DialogHelper.cs" />
-    <Compile Include="DisplayableExceptionDisplayForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="DisplayMessage.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="DisplayMessageTestForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FocusWatchingUserControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="GroupLabelControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="IChildFocusWatcher.cs" />
-    <Compile Include="IHelpProviderContext.cs" />
-    <Compile Include="ILightweightControlContainerControl.cs" />
-    <Compile Include="ImageComboBox.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="ImageCropControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="ImageCropControl.Designer.cs">
-      <DependentUpon>ImageCropControl.cs</DependentUpon>
-    </Compile>
-    <Compile Include="IToolTipDisplay.cs" />
-    <Compile Include="LabelControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="LCCCFocusAndAccessibilityController.cs" />
-    <Compile Include="LightweightControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="LightweightControlCollection.cs" />
-    <Compile Include="LightweightControlContainerControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="LightweightControlEventArgs.cs" />
-    <Compile Include="MarginUtil.cs" />
-    <Compile Include="MiniForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="NewFolderButton.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="NumericTextBox.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="PersistentWindowAttribute.cs" />
-    <Compile Include="ProgressDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="ProgressHelper.cs" />
-    <Compile Include="ShowContextMenuEventArgs.cs" />
-    <Compile Include="SidebarListBox.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="TextBoxWithPaste.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="ToolTip2.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="TrackingToolTip.cs" />
-    <Compile Include="Wizard\WizardController.cs" />
-    <Compile Include="Wizard\WizardForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Wizard\WizardHeaderBar.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="XPBitmapButton.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <EmbeddedResource Include="AnimatedBitmapControl.resx">
-      <DependentUpon>AnimatedBitmapControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ApplicationDialog.resx">
-      <DependentUpon>ApplicationDialog.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="BitmapButton.resx">
-      <DependentUpon>BitmapButton.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="BrowserMiniForm.resx">
-      <DependentUpon>BrowserMiniForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ButtonBaseLightweightControl.resx">
-      <DependentUpon>ButtonBaseLightweightControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ChoiceDialog.resx">
-      <SubType>Designer</SubType>
-      <DependentUpon>ChoiceDialog.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ChoiceOption.resx">
-      <SubType>Designer</SubType>
-      <DependentUpon>ChoiceOption.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="DelayedAnimatedProgressDialog.resx">
-      <DependentUpon>DelayedAnimatedProgressDialog.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="DelayedFetchComboBox.resx">
-      <DependentUpon>DelayedFetchComboBox.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="DisplayableExceptionDisplayForm.resx">
-      <DependentUpon>DisplayableExceptionDisplayForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="DisplayMessage.resx">
-      <DependentUpon>DisplayMessage.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="DisplayMessageTestForm.resx">
-      <DependentUpon>DisplayMessageTestForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FocusWatchingUserControl.resx">
-      <DependentUpon>FocusWatchingUserControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="GroupLabelControl.resx">
-      <DependentUpon>GroupLabelControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="Images\Application\BitmapButtonFace.png" />
     <EmbeddedResource Include="Images\Application\BitmapButtonFacePushed.png" />
     <EmbeddedResource Include="Images\Application\ButtonFace.png" />
@@ -283,42 +107,6 @@
     <EmbeddedResource Include="Images\WizardArrowBody.png" />
     <EmbeddedResource Include="Images\WizardArrowHead.png" />
     <EmbeddedResource Include="Images\WizardTopTile.png" />
-    <EmbeddedResource Include="LabelControl.resx">
-      <DependentUpon>LabelControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="LightweightControl.resx">
-      <DependentUpon>LightweightControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="LightweightControlContainerControl.resx">
-      <DependentUpon>LightweightControlContainerControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="MiniForm.resx">
-      <DependentUpon>MiniForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="NewFolderButton.resx">
-      <DependentUpon>NewFolderButton.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="NumericTextBox.resx">
-      <DependentUpon>NumericTextBox.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ProgressDialog.resx">
-      <DependentUpon>ProgressDialog.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Wizard\WizardForm.resx">
-      <DependentUpon>WizardForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Wizard\WizardHeaderBar.resx">
-      <DependentUpon>WizardHeaderBar.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <Content Include="Images\Application\NewFolderDisabled.png" />
     <Content Include="Images\Application\NewFolderEnabled.png" />
     <Content Include="Images\Application\NewFolderSelected.png" />
diff --git a/src/managed/OpenLiveWriter.CoreServices/OpenLiveWriter.CoreServices.csproj b/src/managed/OpenLiveWriter.CoreServices/OpenLiveWriter.CoreServices.csproj
index 99a5e7b7..d9a60cc0 100644
--- a/src/managed/OpenLiveWriter.CoreServices/OpenLiveWriter.CoreServices.csproj
+++ b/src/managed/OpenLiveWriter.CoreServices/OpenLiveWriter.CoreServices.csproj
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop" ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\writer.build.settings" />
   <PropertyGroup>
     <AssemblyName>OpenLiveWriter.CoreServices</AssemblyName>
     <RootNamespace>OpenLiveWriter.CoreServices</RootNamespace>
     <ProjectGuid>{9154B6B4-F2C3-4FB4-BE38-A26A6C9409EE}</ProjectGuid>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -52,288 +54,11 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\GlobalAssemblyInfo.cs" />
-    <Compile Include="ApplicationConstants.cs" />
-    <Compile Include="ApplicationEnvironment.cs" />
-    <Compile Include="ArrayHelper.cs" />
-    <Compile Include="AsyncOperation.cs" />
-    <Compile Include="BackgroundWorkerQueue.cs" />
-    <Compile Include="BaseForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="BrowserHelper.cs" />
-    <Compile Include="BrowserOperationInvoker.cs" />
-    <Compile Include="CabinetFileExtractor.cs" />
-    <Compile Include="CancelableStream.cs" />
-    <Compile Include="ConditionVariable.cs" />
-    <Compile Include="CryptHelper.cs" />
-    <Compile Include="DelayUpdateHelper.cs" />
-    <Compile Include="ColorHelper.cs" />
-    <Compile Include="CommandLineHelper.cs" />
-    <Compile Include="CommandLineOptions.cs" />
-    <Compile Include="ControlHelper.cs" />
-    <Compile Include="DataObject\BrowserData.cs" />
-    <Compile Include="DataObject\DataFormatsEx.cs" />
-    <Compile Include="DataObject\DataObjectBase.cs" />
-    <Compile Include="DataObject\DataObjectMeister.cs" />
-    <Compile Include="DataObject\DIBHelper.cs" />
-    <Compile Include="DataObject\FileContentsHelper.cs" />
-    <Compile Include="DataObject\FileData.cs" />
-    <Compile Include="DataObject\FileItemFromFileContents.cs" />
-    <Compile Include="DataObject\FileItemFromFileDrop.cs" />
-    <Compile Include="DataObject\FileItemFromFileItem.cs" />
-    <Compile Include="DataObject\HTMLData.cs" />
-    <Compile Include="DataObject\HTMLDataObject.cs" />
-    <Compile Include="DataObject\IFileItemFormat.cs" />
-    <Compile Include="DataObject\ImageData.cs" />
-    <Compile Include="DataObject\LightWeightHTMLDataObject.cs" />
-    <Compile Include="DataObject\LightWeightHTMLDocumentData.cs" />
-    <Compile Include="DataObject\LightWeightHTMLToPlainText.cs" />
-    <Compile Include="DataObject\LiveClipboardData.cs" />
-    <Compile Include="DataObject\OleDataObject.cs" />
-    <Compile Include="DataObject\OleDataObjectHelper.cs" />
-    <Compile Include="DataObject\OleDataObjectImpl.cs" />
-    <Compile Include="DataObject\OleStgMedium.cs" />
-    <Compile Include="DataObject\TextData.cs" />
-    <Compile Include="DataObject\URLData.cs" />
-    <Compile Include="DateTimeHelper.cs" />
-    <Compile Include="DefaultHashtable.cs" />
-    <Compile Include="DelayedCancellableSignal.cs" />
-    <Compile Include="DelegateDisposable.cs" />
-    <Compile Include="Diagnostics\ApplicationDiagnostics.cs" />
-    <Compile Include="Diagnostics\ApplicationPerformance.cs" />
-    <Compile Include="Diagnostics\BufferingTraceListener.cs" />
-    <Compile Include="Diagnostics\BufferingTraceListenerEntry.cs" />
-    <Compile Include="Diagnostics\FileLogger.cs" />
-    <Compile Include="Diagnostics\DiagnosticsConsole.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Diagnostics\DynamicExceptionMessageRegistry.cs" />
-    <Compile Include="Diagnostics\EmptyComponent.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Diagnostics\ExceptionMessage.cs" />
-    <Compile Include="Diagnostics\HockeyAppProxy.cs" />
-    <Compile Include="Diagnostics\IDynamicExceptionMessage.cs" />
-    <Compile Include="Diagnostics\LogFileTraceListener.cs" />
-    <Compile Include="Diagnostics\OpenForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Diagnostics\UnexpectedErrorDelegate.cs" />
-    <Compile Include="Diagnostics\UnexpectedErrorDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Diagnostics\UnexpectedErrorMessage.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Diagnostics\UnhandledExceptionErrorMessage.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="DirectoryHelper.cs" />
-    <Compile Include="DisplayableException.cs" />
-    <Compile Include="DisplayHelper.cs" />
-    <Compile Include="DisposableCursor.cs" />
-    <Compile Include="DragDropHelper.cs" />
-    <Compile Include="EventCounter.cs" />
-    <Compile Include="ExifMetadata.cs" />
-    <Compile Include="FileHelper.cs" />
-    <Compile Include="FileItem.cs" />
-    <Compile Include="FileItemFromFile.cs" />
-    <Compile Include="FontHelper.cs" />
-    <Compile Include="GLink.cs" />
-    <Compile Include="GraphicsHelper.cs" />
-    <Compile Include="GuidHelper.cs" />
-    <Compile Include="HashSet.cs" />
-    <Compile Include="HtmlScreenCaptureCore.cs" />
-    <Compile Include="HTML\DefaultBlockElement.cs" />
-    <Compile Include="HTML\ExternalHtmlReferenceFixer.cs" />
-    <Compile Include="HTML\IImageReferenceFixer.cs" />
-    <Compile Include="HTML\VersionHostServiceProvider.cs" />
-    <Compile Include="HTML\DisableVmlVersionHost.cs" />
-    <Compile Include="HTML\DivDefaultBlockElement.cs" />
-    <Compile Include="HTML\DocumentVisitor.cs" />
-    <Compile Include="HTML\HTMLBalancer.cs" />
-    <Compile Include="HTML\HTMLBalancerCostFilter.cs" />
-    <Compile Include="HTML\HtmlCleaner.cs" />
-    <Compile Include="HTML\HTMLColorHelper.cs" />
-    <Compile Include="HTML\HTMLCombiner.cs" />
-    <Compile Include="HTML\HTMLDocumentHelper.cs" />
-    <Compile Include="HTML\HTMLElementHelper.cs" />
-    <Compile Include="HTML\HTMLMetaData.cs" />
-    <Compile Include="HTML\HTMLMetaDataRequest.cs" />
-    <Compile Include="HTML\HtmlReferenceFixer.cs" />
-    <Compile Include="HTML\HTMLSelectionHelper.cs" />
-    <Compile Include="HTML\HTMLTokens.cs" />
-    <Compile Include="HTML\HTMLTrimmer.cs" />
-    <Compile Include="HTML\LightweightCSSIterator.cs" />
-    <Compile Include="HTML\LightWeightCSSReplacer.cs" />
-    <Compile Include="HTML\LightWeightHTMLDocument.cs" />
-    <Compile Include="HTML\LightWeightHTMLDocumentIterator.cs" />
-    <Compile Include="HTML\LightWeightHTMLMetaData.cs" />
-    <Compile Include="HTML\LightWeightHTMLReplacer.cs" />
-    <Compile Include="HTML\LightWeightHTMLThinner2.cs" />
-    <Compile Include="HTML\LightWeightHTMLUrlToAbsolute.cs" />
-    <Compile Include="HTML\ParagraphDefaultBlockElement.cs" />
-    <Compile Include="HTML\UnsafeHtmlFragmentHelper.cs" />
-    <Compile Include="ImageCache.cs" />
-    <Compile Include="ImageHelper.cs" />
-    <Compile Include="ImageHelper2.cs" />
-    <Compile Include="InvokeInUIThreadDelegate.cs" />
-    <Compile Include="IProgressProvider.cs" />
-    <Compile Include="ISet.cs" />
-    <Compile Include="KeyboardHelper.cs" />
-    <Compile Include="KeyboardHook.cs" />
-    <Compile Include="Layout\AlignHelper.cs" />
-    <Compile Include="Layout\AutoGrow.cs" />
-    <Compile Include="Layout\ControlAdapter.cs" />
-    <Compile Include="Layout\GdiTextHelper.cs" />
-    <Compile Include="Layout\LayoutHelper.cs" />
-    <Compile Include="LazyLoader.cs" />
-    <Compile Include="LineEndingHelper.cs" />
-    <Compile Include="LinkedList.cs" />
-    <Compile Include="Marketization\MarketizationOptions.cs" />
-    <Compile Include="MatchFinder.cs" />
-    <Compile Include="MathHelper.cs" />
-    <Compile Include="MetaLock.cs" />
-    <Compile Include="Mime\MimeHelper.cs" />
-    <Compile Include="Mime\MimeHelperException.cs" />
-    <Compile Include="NumberHelper.cs" />
-    <Compile Include="OctreeQuantizer.cs" />
-    <Compile Include="PaddedWaitCursor.cs" />
-    <Compile Include="PathHelper.cs" />
-    <Compile Include="PerformanceTimer.cs" />
-    <Compile Include="PlatformHelper.cs" />
-    <Compile Include="PluginLoader.cs" />
-    <Compile Include="ProcessHelper.cs" />
-    <Compile Include="ProcessKeepalive.cs" />
-    <Compile Include="Progress\CancelOnlyProgressHost.cs" />
-    <Compile Include="Progress\DebugWritingProgressHost.cs" />
-    <Compile Include="Progress\IProgressCategoryProvider.cs" />
-    <Compile Include="Progress\IProgressHost.cs" />
-    <Compile Include="Progress\JointProgressHosts.cs" />
-    <Compile Include="Progress\MultipartAsyncOperation.cs" />
-    <Compile Include="Progress\OperationCancelledException.cs" />
-    <Compile Include="Progress\ProgressHostFilter.cs" />
-    <Compile Include="Progress\ProgressTick.cs" />
-    <Compile Include="Progress\ProgressWorker.cs" />
-    <Compile Include="Progress\ProgressWorkerHostAsyncOperation.cs" />
-    <Compile Include="Progress\SilentProgressHost.cs" />
-    <Compile Include="Progress\TickableProgressTick.cs" />
-    <Compile Include="Quantizer.cs" />
-    <Compile Include="QuickTimer.cs" />
-    <Compile Include="QuickTimer_Release.cs" />
-    <Compile Include="RectangleHelper.cs" />
-    <Compile Include="RegistryHelper.cs" />
-    <Compile Include="RegistryMonitor.cs" />
-    <Compile Include="ResourceDownloading\CabbedXmlResourceFileDownloader.cs" />
-    <Compile Include="ResourceDownloading\XPPResourceFileProcessor.cs" />
-    <Compile Include="ResourcedPropertyLoader.cs" />
-    <Compile Include="ResourceFileDownloader.cs" />
-    <Compile Include="ResourceFileException.cs" />
-    <Compile Include="ResourceHelper.cs" />
-    <Compile Include="RestoreValue.cs" />
-    <Compile Include="RunningObjectTable.cs" />
-    <Compile Include="SameThreadSimpleInvokeTarget.cs" />
-    <Compile Include="Settings\ISettingsPersister.cs" />
-    <Compile Include="Settings\MemorySettingsPersister.cs" />
-    <Compile Include="Settings\RegistryCodec.cs" />
-    <Compile Include="Settings\RegistrySettingsPersister.cs" />
-    <Compile Include="Settings\SettingsPersisterHelper.cs" />
-    <Compile Include="Settings\XmlSettingsPersister.cs" />
-    <Compile Include="ShellHelper.cs" />
-    <Compile Include="SimpleHeap.cs" />
-    <Compile Include="SingleInstanceApplicationManager.cs" />
-    <Compile Include="SiteStorage\FileBasedSiteStorage.cs" />
-    <Compile Include="SiteStorage\ISiteStorage.cs" />
-    <Compile Include="SiteStorage\MemoryBasedSiteStorage.cs" />
-    <Compile Include="SiteStorage\SiteStorageBase.cs" />
-    <Compile Include="SiteStorage\SiteStorageException.cs" />
-    <Compile Include="SiteStorage\TempFileSiteStorage.cs" />
-    <Compile Include="SplashScreen.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="StreamHelper.cs" />
-    <Compile Include="StringHelper.cs" />
-    <Compile Include="SystemProperties.cs" />
-    <Compile Include="Trie.cs" />
-    <Compile Include="TempFileManager.cs" />
-    <Compile Include="TextHelper.cs" />
-    <Compile Include="Threading\ParallelExecution.cs" />
-    <Compile Include="Threading\ParkingWindow.cs" />
-    <Compile Include="Threading\ProcessingQueue.cs" />
-    <Compile Include="Threading\ThreadHelper.cs" />
-    <Compile Include="Threading\ThreadStartWithParams.cs" />
-    <Compile Include="ThreadSafeQueue.cs" />
-    <Compile Include="TimerHelper.cs" />
-    <Compile Include="TransientDirectory.cs" />
-    <Compile Include="TransientFile.cs" />
-    <Compile Include="TransientFileSystemItem.cs" />
-    <Compile Include="TreeSet.cs" />
-    <Compile Include="TypeHelper.cs" />
-    <Compile Include="UI\BorderPaint.cs" />
-    <Compile Include="UI\ControlUITheme.cs" />
-    <Compile Include="UI\RelativePoint.cs" />
-    <Compile Include="UI\SizeBorderHitTester.cs" />
-    <Compile Include="UI\UIPaint.cs" />
-    <Compile Include="UI\VirtualTransparency.cs" />
-    <Compile Include="UserPreferencesMonitor.cs" />
-    <Compile Include="Utility.cs" />
-    <Compile Include="WebRequest\BrowserBasedWebRequestLocator.cs" />
-    <Compile Include="WebRequest\CloseTrackingHttpWebRequest.cs" />
-    <Compile Include="WebRequest\ContentTypeHelper.cs" />
-    <Compile Include="WebRequest\HTMLDocumentDownloader.cs" />
-    <Compile Include="WebRequest\HttpRequestHelper.cs" />
-    <Compile Include="WebRequest\IBrowserBasedWebRequest.cs" />
-    <Compile Include="WebRequest\PageAndReferenceDownloader.cs" />
-    <Compile Include="WebRequest\PageDownloadContext.cs" />
-    <Compile Include="WebRequest\PageToDownload.cs" />
-    <Compile Include="WebRequest\PageToDownloadFactory.cs" />
-    <Compile Include="WebRequest\ReferenceToDownload.cs" />
-    <Compile Include="WebRequest\ResponseHeaderHelper.cs" />
-    <Compile Include="WebRequest\UrlDownloadToFile.cs" />
-    <Compile Include="WebRequest\UrlHelper.cs" />
-    <Compile Include="WebRequest\WebPageDownloader.cs" />
-    <Compile Include="WebRequest\WebProxySettings.cs" />
-    <Compile Include="WebRequest\WebRequestWithCache.cs" />
-    <Compile Include="WebRequest\WsseAuthenticationModule.cs" />
-    <Compile Include="Win32WindowImpl.cs" />
-    <Compile Include="WindowSubClasser.cs" />
-    <Compile Include="XmlCharacterHelper.cs" />
-    <Compile Include="XmlHelper.cs" />
-    <Compile Include="XmlPreprocessor.cs" />
-    <Compile Include="XmlRpcClient.cs" />
-    <Compile Include="XmpMetadata.cs" />
-    <EmbeddedResource Include="Diagnostics\DiagnosticsConsole.resx">
-      <DependentUpon>DiagnosticsConsole.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Diagnostics\EmptyComponent.resx">
-      <DependentUpon>EmptyComponent.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="Diagnostics\Images\ErrorLogoSmall.png" />
-    <EmbeddedResource Include="Diagnostics\OpenForm.resx">
-      <DependentUpon>OpenForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Diagnostics\UnexpectedErrorDialog.resx">
-      <DependentUpon>UnexpectedErrorDialog.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Diagnostics\UnexpectedErrorMessage.resx">
-      <DependentUpon>UnexpectedErrorMessage.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Exceptions.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="Images\ApplicationIcon.ico" />
     <EmbeddedResource Include="Images\SplashScreen.png" />
     <EmbeddedResource Include="Marketization\Markets.xml" />
     <EmbeddedResource Include="Marketization\Master.xml" />
-    <EmbeddedResource Include="SplashScreen.resx">
-      <DependentUpon>SplashScreen.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <BinplaceCompiled Include="$(OutputPath)$(TargetFileName)">
diff --git a/src/managed/OpenLiveWriter.Extensibility/OpenLiveWriter.Extensibility.csproj b/src/managed/OpenLiveWriter.Extensibility/OpenLiveWriter.Extensibility.csproj
index d44e0363..3401fca3 100644
--- a/src/managed/OpenLiveWriter.Extensibility/OpenLiveWriter.Extensibility.csproj
+++ b/src/managed/OpenLiveWriter.Extensibility/OpenLiveWriter.Extensibility.csproj
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop" ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\writer.build.settings" />
   <PropertyGroup>
     <AssemblyName>OpenLiveWriter.Extensibility</AssemblyName>
     <RootNamespace>OpenLiveWriter.Extensibility</RootNamespace>
     <ProjectGuid>{A803C16E-6619-4017-883C-EA73EB947F34}</ProjectGuid>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -49,31 +51,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\GlobalAssemblyInfo.cs" />
-    <Compile Include="BlogClient\BlogAccount.cs" />
-    <Compile Include="BlogClient\BlogClientException.cs" />
-    <Compile Include="BlogClient\BlogInfo.cs" />
-    <Compile Include="BlogClient\BlogPost.cs" />
-    <Compile Include="BlogClient\BlogPostCategory.cs" />
-    <Compile Include="BlogClient\BlogPostKeyword.cs" />
-    <Compile Include="BlogClient\IBlogClient.cs" />
-    <Compile Include="BlogClient\IBlogPostContentFilter.cs" />
-    <Compile Include="BlogClient\IBlogProvider.cs" />
-    <Compile Include="BlogClient\IBlogProviderButtonDescription.cs" />
-    <Compile Include="BlogClient\RsdServiceDescription.cs" />
-    <Compile Include="ImageEditing\IImageDecorator.cs" />
-    <Compile Include="ImageEditing\IImageDecoratorDefaultSettingsCustomizer.cs" />
-    <Compile Include="ImageEditing\IImageDecoratorIcons.cs" />
-    <Compile Include="ImageEditing\IImageDecoratorUndoUnit.cs" />
-    <Compile Include="ImageEditing\IImageTargetEditor.cs" />
-    <Compile Include="ImageEditing\ImageDecoratorContext.cs" />
-    <Compile Include="ImageEditing\ImageDecoratorEditor.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="ImageEditing\ImageDecoratorEditorContext.cs" />
-    <EmbeddedResource Include="ImageEditing\ImageDecoratorEditor.resx">
-      <DependentUpon>ImageDecoratorEditor.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(RepoRoot)\writer.build.targets" />
diff --git a/src/managed/OpenLiveWriter.FileDestinations/OpenLiveWriter.FileDestinations.csproj b/src/managed/OpenLiveWriter.FileDestinations/OpenLiveWriter.FileDestinations.csproj
index ea9ded3c..52daf30a 100644
--- a/src/managed/OpenLiveWriter.FileDestinations/OpenLiveWriter.FileDestinations.csproj
+++ b/src/managed/OpenLiveWriter.FileDestinations/OpenLiveWriter.FileDestinations.csproj
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop" ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\writer.build.settings" />
   <PropertyGroup>
     <AssemblyName>OpenLiveWriter.FileDestinations</AssemblyName>
     <RootNamespace>OpenLiveWriter.FileDestinations</RootNamespace>
     <ProjectGuid>{217B1333-654D-4901-807D-6E1A98FF3A4D}</ProjectGuid>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -44,41 +46,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\GlobalAssemblyInfo.cs" />
-    <Compile Include="DestinationProfile.cs" />
-    <Compile Include="DestinationProfileManager.cs" />
-    <Compile Include="DestinationValidator.cs" />
-    <Compile Include="Exceptions\LoginException.cs" />
-    <Compile Include="Exceptions\NoSuchDirectoryException.cs" />
-    <Compile Include="FileDestination.cs" />
-    <Compile Include="FileSystemDestination.cs" />
-    <Compile Include="LocalFileSystemDestination.cs" />
-    <Compile Include="NewFolder.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="PublishFolderPicker.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="SiteDestinationException.cs" />
-    <Compile Include="WebPublish\WebPublishDestination.cs" />
-    <Compile Include="WebPublish\WebPublishMessage.cs" />
-    <Compile Include="WebPublish\WebPublishSettings.cs" />
-    <Compile Include="WebPublish\WebPublishUtils.cs" />
-    <Compile Include="WinInetFTPFileDestination.cs" />
-    <EmbeddedResource Include="Exceptions.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="NewFolder.resx">
-      <DependentUpon>NewFolder.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PublishFolderPicker.resx">
-      <DependentUpon>PublishFolderPicker.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="WebPublish\WebPublishMessage.resx">
-      <DependentUpon>WebPublishMessage.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(RepoRoot)\writer.build.targets" />
diff --git a/src/managed/OpenLiveWriter.HtmlEditor/OpenLiveWriter.HtmlEditor.csproj b/src/managed/OpenLiveWriter.HtmlEditor/OpenLiveWriter.HtmlEditor.csproj
index 52df6af8..2a1ad537 100644
--- a/src/managed/OpenLiveWriter.HtmlEditor/OpenLiveWriter.HtmlEditor.csproj
+++ b/src/managed/OpenLiveWriter.HtmlEditor/OpenLiveWriter.HtmlEditor.csproj
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop" ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\writer.build.settings" />
   <PropertyGroup>
     <AssemblyName>OpenLiveWriter.HtmlEditor</AssemblyName>
     <RootNamespace>OpenLiveWriter.HtmlEditor</RootNamespace>
     <ProjectGuid>{6A6872BC-67EF-4A42-A21A-30ECED376923}</ProjectGuid>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenLiveWriter.SpellChecker\OpenLiveWriter.SpellChecker.csproj">
@@ -62,179 +64,12 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\GlobalAssemblyInfo.cs" />
-    <Compile Include="BasicHtmlGenerationService.cs" />
-    <Compile Include="BoldApplier.cs" />
-    <Compile Include="Controls\HtmlStylePicker.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Controls\TextBoxEditorControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Debugging\StyleDebugger.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="EditorLinkNavigator.cs">
-    </Compile>
-    <Compile Include="HtmlBlockFormatHelper.cs" />
-    <Compile Include="HtmlEditorControl.cs" />
-    <Compile Include="HtmlEditorControlDamageServices.cs" />
-    <Compile Include="HtmlEditorElementBehavior.cs" />
-    <Compile Include="HtmlEditorSelection.cs" />
-    <Compile Include="HtmlSourceEditorControl.cs" />
-    <Compile Include="HtmlSourceEditorFindTextForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="HtmlStyleHelper.cs" />
-    <Compile Include="IHtmlEditor.cs" />
-    <Compile Include="IHtmlEditorCommandSource.cs" />
-    <Compile Include="IHtmlEditorComponentContext.cs" />
-    <Compile Include="IHTMLEditorDamageServices.cs" />
-    <Compile Include="IHtmlEditorSelection.cs" />
-    <Compile Include="IHtmlGenerationService.cs" />
-    <Compile Include="Linking\AddLinkDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Linking\Commands\CommandGlossary.cs" />
-    <Compile Include="Linking\Commands\LinkingCommand.cs" />
-    <Compile Include="Linking\GlossaryListView.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Linking\GlossaryManagementControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Linking\GlossaryManager.cs" />
-    <Compile Include="Linking\GlossaryPreferences.cs" />
-    <Compile Include="Linking\GlossaryPreferencesPanel.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Linking\GlossarySettings.cs" />
-    <Compile Include="Linking\HyperlinkForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Linking\LinkOptionsButton.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Linking\LinkSettings.cs" />
-    <Compile Include="Linking\SelectGlossaryLinkForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Marshalling\BackgroundColorTextStyle.cs" />
-    <Compile Include="Marshalling\BodyTagFinder.cs" />
-    <Compile Include="Marshalling\BoldTextStyle.cs" />
-    <Compile Include="Marshalling\IncompleteListFinder.cs" />
-    <Compile Include="Marshalling\FixupSegment.cs" />
-    <Compile Include="Marshalling\FontColorTextStyle.cs" />
-    <Compile Include="Marshalling\FontFamilyTextStyle.cs" />
-    <Compile Include="Marshalling\FontSizeTextStyle.cs" />
-    <Compile Include="Marshalling\KeepSourceFormatting.cs" />
-    <Compile Include="Marshalling\DataFormatHandler.cs" />
-    <Compile Include="Marshalling\DataFormatHandlerRegistry.cs" />
-    <Compile Include="Marshalling\Data_Handlers\FileHandler.cs" />
-    <Compile Include="Marshalling\Data_Handlers\FreeTextHandler.cs" />
-    <Compile Include="Marshalling\Data_Handlers\HtmlHandler.cs" />
-    <Compile Include="Marshalling\Data_Handlers\ImageOnlyHtmlHandler.cs" />
-    <Compile Include="Marshalling\Data_Handlers\PlainTextHandler.cs" />
-    <Compile Include="Marshalling\Data_Handlers\UrlHandler.cs" />
-    <Compile Include="Marshalling\DelegateBasedDataFormatHandlerFactory.cs" />
-    <Compile Include="Marshalling\DragDropTarget.cs" />
-    <Compile Include="Marshalling\HtmlEditorDataFormatHandler.cs" />
-    <Compile Include="Marshalling\HtmlEditorMarshallingHandler.cs" />
-    <Compile Include="Marshalling\IDataFormatHandlerFactory.cs" />
-    <Compile Include="Marshalling\IHtmlMarshallingTarget.cs" />
-    <Compile Include="Marshalling\MshtmlEditorDragAndDropTarget.cs" />
-    <Compile Include="Marshalling\OverlineTextStyle.cs" />
-    <Compile Include="Marshalling\SmallCapsTextStyle.cs" />
-    <Compile Include="Marshalling\StrikeThroughTextStyle.cs" />
-    <Compile Include="Marshalling\SubScriptTextStyle.cs" />
-    <Compile Include="Marshalling\SuperScriptTextStyle.cs" />
-    <Compile Include="Marshalling\TextStyle.cs" />
-    <Compile Include="Marshalling\TextStyles.cs" />
-    <Compile Include="Marshalling\ItalicTextStyle.cs" />
-    <Compile Include="Marshalling\UnderlineTextStyle.cs" />
-    <Compile Include="PasteSpecialForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="PasteSpecialFormText.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="RtlAcceleratorTranslator.cs" />
-    <Compile Include="SelectionDebugDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="SelectionDebugDialog.Designer.cs">
-      <DependentUpon>SelectionDebugDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Undo\DamageTrackingOleUndoUnit.cs" />
-    <Compile Include="Undo\OleUndoUnit.cs" />
-    <Compile Include="Undo\SelectionOleUndoUnit.cs" />
-    <Compile Include="WordCountForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="WordCountForm.Designer.cs">
-      <DependentUpon>WordCountForm.cs</DependentUpon>
-    </Compile>
-    <EmbeddedResource Include="Controls\HtmlStylePicker.resx">
-      <DependentUpon>HtmlStylePicker.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Controls\TextBoxEditorControl.resx">
-      <DependentUpon>TextBoxEditorControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Debugging\StyleDebugger.resx">
-      <DependentUpon>StyleDebugger.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="HtmlEditorControl.resx">
-      <DependentUpon>HtmlEditorControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="HtmlSourceEditorFindTextForm.resx">
-      <DependentUpon>HtmlSourceEditorFindTextForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="Images\KeepFormattingSample.png" />
     <EmbeddedResource Include="Images\PlainTextSample.png" />
     <EmbeddedResource Include="Images\ThinnedHTMLSample.png" />
-    <EmbeddedResource Include="Linking\AddLinkDialog.resx">
-      <DependentUpon>AddLinkDialog.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Linking\GlossaryManagementControl.resx">
-      <DependentUpon>GlossaryManagementControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Linking\GlossaryPreferencesPanel.resx">
-      <DependentUpon>GlossaryPreferencesPanel.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Linking\HyperlinkForm.resx">
-      <DependentUpon>HyperlinkForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="Linking\Images\GlossarySmall.png" />
     <EmbeddedResource Include="Linking\Images\OptionsArrow.png" />
     <EmbeddedResource Include="Linking\Images\URLOptions.png" />
-    <EmbeddedResource Include="Linking\SelectGlossaryLinkForm.resx">
-      <DependentUpon>SelectGlossaryLinkForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PasteSpecialForm.resx">
-      <DependentUpon>PasteSpecialForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PasteSpecialFormText.resx">
-      <DependentUpon>PasteSpecialFormText.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SelectionDebugDialog.resx">
-      <DependentUpon>SelectionDebugDialog.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="WordCountForm.resx">
-      <SubType>Designer</SubType>
-      <DependentUpon>WordCountForm.cs</DependentUpon>
-    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(RepoRoot)\writer.build.targets" />
diff --git a/src/managed/OpenLiveWriter.HtmlParser/OpenLiveWriter.HtmlParser.csproj b/src/managed/OpenLiveWriter.HtmlParser/OpenLiveWriter.HtmlParser.csproj
index a40b00f2..2fe9f351 100644
--- a/src/managed/OpenLiveWriter.HtmlParser/OpenLiveWriter.HtmlParser.csproj
+++ b/src/managed/OpenLiveWriter.HtmlParser/OpenLiveWriter.HtmlParser.csproj
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\writer.build.settings" />
   <PropertyGroup>
     <AssemblyName>OpenLiveWriter.HtmlParser</AssemblyName>
     <RootNamespace>OpenLiveWriter.HtmlParser</RootNamespace>
     <ProjectGuid>{8B905D4B-EE76-4EEE-83CC-C9028B2F16AE}</ProjectGuid>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -13,34 +15,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\GlobalAssemblyInfo.cs" />
-    <Compile Include="FormAgent\Checkbox.cs" />
-    <Compile Include="FormAgent\FormData.cs" />
-    <Compile Include="FormAgent\FormElement.cs" />
-    <Compile Include="FormAgent\FormElementWithValue.cs" />
-    <Compile Include="FormAgent\FormFactory.cs" />
-    <Compile Include="FormAgent\Hidden.cs" />
-    <Compile Include="FormAgent\HtmlForm.cs" />
-    <Compile Include="FormAgent\ImageButton.cs" />
-    <Compile Include="FormAgent\Option.cs" />
-    <Compile Include="FormAgent\OptionInfo.cs" />
-    <Compile Include="FormAgent\Radio.cs" />
-    <Compile Include="FormAgent\Select.cs" />
-    <Compile Include="FormAgent\SubmitButton.cs" />
-    <Compile Include="FormAgent\Textarea.cs" />
-    <Compile Include="FormAgent\Textbox.cs" />
-    <Compile Include="Parser\CssParser.cs" />
-    <Compile Include="Parser\Element.cs" />
-    <Compile Include="Parser\HtmlExtractor.cs" />
-    <Compile Include="Parser\HtmlUtils.cs" />
-    <Compile Include="Parser\IElementSource.cs" />
-    <Compile Include="Parser\JavascriptParser.cs" />
-    <Compile Include="Parser\LiteralElementMethods.cs" />
-    <Compile Include="Parser\ParseMethods.cs" />
-    <Compile Include="Parser\ReplaceOperation.cs" />
-    <Compile Include="Parser\SimpleHtmlParser.cs" />
     <Content Include="FormAgent\test1.htm" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(RepoRoot)\writer.build.targets" />
 </Project>
diff --git a/src/managed/OpenLiveWriter.InternalWriterPlugin/OpenLiveWriter.InternalWriterPlugin.csproj b/src/managed/OpenLiveWriter.InternalWriterPlugin/OpenLiveWriter.InternalWriterPlugin.csproj
index 119f44b8..4a3c22e0 100644
--- a/src/managed/OpenLiveWriter.InternalWriterPlugin/OpenLiveWriter.InternalWriterPlugin.csproj
+++ b/src/managed/OpenLiveWriter.InternalWriterPlugin/OpenLiveWriter.InternalWriterPlugin.csproj
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop" ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\writer.build.settings" />
   <PropertyGroup>
     <AssemblyName>OpenLiveWriter.InternalWriterPlugin</AssemblyName>
     <RootNamespace>OpenLiveWriter.InternalWriterPlugin</RootNamespace>
     <ProjectGuid>{699FB638-CE02-48D7-8078-30A7939C5BCB}</ProjectGuid>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -61,91 +63,11 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\GlobalAssemblyInfo.cs" />
-    <Compile Include="Controls\MapBirdsEyeButton.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Controls\MapBirdsEyeDirectionControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Controls\MapBirdsEyeZoomControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Controls\MapBitmapButton.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Controls\MapContextMenu.cs" />
-    <Compile Include="Controls\MapLogoControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Controls\MapPushpinForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Controls\MapScrollControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Controls\MapSearchButton.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Controls\MapTipControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Controls\MapViewComboBox.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Controls\MapZoomButtons.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="JSMapController.cs" />
-    <Compile Include="MapActiveObject.cs" />
-    <Compile Include="MapContentSource.cs" />
-    <Compile Include="MapControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="MapForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="MapOptions.cs" />
-    <Compile Include="MapOptionsDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="MapSettings.cs" />
-    <Compile Include="MapSidebarControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="MapUrlHelper.cs" />
     <EmbeddedResource Include="Images\AlignmentCenter.png" />
     <EmbeddedResource Include="Images\BingLogo.png" />
     <EmbeddedResource Include="Images\BingSearchButton.gif" />
     <Content Include="map-preview.html" />
     <Content Include="map.html" />
-    <EmbeddedResource Include="Controls\MapBirdsEyeDirectionControl.resx">
-      <DependentUpon>MapBirdsEyeDirectionControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Controls\MapBirdsEyeZoomControl.resx">
-      <DependentUpon>MapBirdsEyeZoomControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Controls\MapLogoControl.resx">
-      <DependentUpon>MapLogoControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Controls\MapPushpinForm.resx">
-      <DependentUpon>MapPushpinForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Controls\MapScrollControl.resx">
-      <DependentUpon>MapScrollControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Controls\MapTipControl.resx">
-      <DependentUpon>MapTipControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Controls\MapViewComboBox.resx">
-      <DependentUpon>MapViewComboBox.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="Images\AerialIcon.png" />
     <EmbeddedResource Include="Images\AlignmentInline.png" />
     <EmbeddedResource Include="Images\AlignmentLeft.png" />
@@ -207,22 +129,6 @@
     <EmbeddedResource Include="Images\ZoomPlusEnabled.png" />
     <EmbeddedResource Include="Images\ZoomPlusPressed.png" />
     <EmbeddedResource Include="Images\ZoomPlusSelected.png" />
-    <EmbeddedResource Include="MapControl.resx">
-      <DependentUpon>MapControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="MapForm.resx">
-      <DependentUpon>MapForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="MapOptionsDialog.resx">
-      <DependentUpon>MapOptionsDialog.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="MapSidebarControl.resx">
-      <DependentUpon>MapSidebarControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(RepoRoot)\writer.build.targets" />
diff --git a/src/managed/OpenLiveWriter.Interop.Mshtml/OpenLiveWriter.Interop.Mshtml.csproj b/src/managed/OpenLiveWriter.Interop.Mshtml/OpenLiveWriter.Interop.Mshtml.csproj
index d3dd0873..392a9a48 100644
--- a/src/managed/OpenLiveWriter.Interop.Mshtml/OpenLiveWriter.Interop.Mshtml.csproj
+++ b/src/managed/OpenLiveWriter.Interop.Mshtml/OpenLiveWriter.Interop.Mshtml.csproj
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\writer.build.settings" />
   <PropertyGroup>
     <CoverageDisabled>true</CoverageDisabled>
     <AssemblyName>OpenLiveWriter.Interop.Mshtml</AssemblyName>
     <RootNamespace>OpenLiveWriter.Interop.Mshtml</RootNamespace>
     <ProjectGuid>{102B4586-3CDB-4DC2-A918-8377B6915BB4}</ProjectGuid>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="CustomMarshalers" />
@@ -13,149 +15,5 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\GlobalAssemblyInfo.cs" />
-    <Compile Include="mshtml\CMimeTypes.cs" />
-    <Compile Include="mshtml\COpsProfile.cs" />
-    <Compile Include="mshtml\CPlugins.cs" />
-    <Compile Include="mshtml\DispHTMLUnknownElement.cs" />
-    <Compile Include="mshtml\FramesCollection.cs" />
-    <Compile Include="mshtml\HTMLDocumentClass.cs" />
-    <Compile Include="mshtml\HTMLDocumentEvents2.cs" />
-    <Compile Include="mshtml\HTMLHistory.cs" />
-    <Compile Include="mshtml\HTMLImageElementFactory.cs" />
-    <Compile Include="mshtml\HTMLLocation.cs" />
-    <Compile Include="mshtml\HTMLNavigator.cs" />
-    <Compile Include="mshtml\HTMLOptionElementFactory.cs" />
-    <Compile Include="mshtml\HTMLStyleSheetRule.cs" />
-    <Compile Include="mshtml\HTMLStyleSheetRulesCollection.cs" />
-    <Compile Include="mshtml\HTMLStyleSheetsCollection.cs" />
-    <Compile Include="mshtml\HTMLUnknownElement.cs" />
-    <Compile Include="mshtml\IDisplayPointer.cs" />
-    <Compile Include="mshtml\IDisplayServices.cs" />
-    <Compile Include="mshtml\IElementBehaviorSite.cs" />
-    <Compile Include="mshtml\IElementSegment.cs" />
-    <Compile Include="mshtml\IHighlightRenderingServices.cs" />
-    <Compile Include="mshtml\IHighlightSegment.cs" />
-    <Compile Include="mshtml\IHTMLAnchorElement.cs" />
-    <Compile Include="mshtml\IHTMLAttributeCollection.cs" />
-    <Compile Include="mshtml\IHTMLBaseElement.cs" />
-    <Compile Include="mshtml\IHTMLBlockElement.cs" />
-    <Compile Include="mshtml\IHTMLBodyElement.cs" />
-    <Compile Include="mshtml\IHTMLBookmarkCollection.cs" />
-    <Compile Include="mshtml\IHTMLBRElement.cs" />
-    <Compile Include="mshtml\IHTMLCaret.cs" />
-    <Compile Include="mshtml\IHTMLChangeLog.cs" />
-    <Compile Include="mshtml\IHTMLChangeSink.cs" />
-    <Compile Include="mshtml\IHTMLCommentElement.cs" />
-    <Compile Include="mshtml\IHTMLComputedStyle.cs" />
-    <Compile Include="mshtml\IHTMLControlElement.cs" />
-    <Compile Include="mshtml\IHTMLControlRange.cs" />
-    <Compile Include="mshtml\IHTMLCurrentStyle.cs" />
-    <Compile Include="mshtml\IHTMLCurrentStyle2.cs" />
-    <Compile Include="mshtml\IHTMLCurrentStyle3.cs" />
-    <Compile Include="mshtml\IHTMLCurrentStyle4.cs" />
-    <Compile Include="mshtml\IHTMLCurrentStyle5.cs" />
-    <Compile Include="mshtml\IHTMLDataTransfer.cs" />
-    <Compile Include="mshtml\IHTMLDivElement.cs" />
-    <Compile Include="mshtml\IHTMLDocument.cs" />
-    <Compile Include="mshtml\IHTMLDocument2.cs" />
-    <Compile Include="mshtml\IHTMLDocument3.cs" />
-    <Compile Include="mshtml\IHTMLDocument4.cs" />
-    <Compile Include="mshtml\IHTMLDocument5.cs" />
-    <Compile Include="mshtml\IHTMLDOMAttribute.cs" />
-    <Compile Include="mshtml\IHTMLDOMChildrenCollection.cs" />
-    <Compile Include="mshtml\IHTMLDOMImplementation.cs" />
-    <Compile Include="mshtml\IHTMLDOMNode.cs" />
-    <Compile Include="mshtml\IHTMLElement.cs" />
-    <Compile Include="mshtml\IHTMLElement2.cs" />
-    <Compile Include="mshtml\IHTMLElement3.cs" />
-    <Compile Include="mshtml\IHTMLElement4.cs" />
-    <Compile Include="mshtml\IHTMLElementCollection.cs" />
-    <Compile Include="mshtml\IHTMLEmbedElement.cs" />
-    <Compile Include="mshtml\IHTMLEventObj.cs" />
-    <Compile Include="mshtml\IHTMLEventObj2.cs" />
-    <Compile Include="mshtml\IHTMLEventObj3.cs" />
-    <Compile Include="mshtml\IHTMLFiltersCollection.cs" />
-    <Compile Include="mshtml\IHTMLFormElement.cs" />
-    <Compile Include="mshtml\IHTMLFrameBase.cs" />
-    <Compile Include="mshtml\IHTMLFramesCollection2.cs" />
-    <Compile Include="mshtml\IHTMLHtmlElement.cs" />
-    <Compile Include="mshtml\IHTMLImageElementFactory.cs" />
-    <Compile Include="mshtml\IHTMLImgElement.cs" />
-    <Compile Include="mshtml\IHTMLInputElement.cs" />
-    <Compile Include="mshtml\IHTMLLinkElement.cs" />
-    <Compile Include="mshtml\IHTMLLocation.cs" />
-    <Compile Include="mshtml\IHTMLMetaElement.cs" />
-    <Compile Include="mshtml\IHTMLMimeTypesCollection.cs" />
-    <Compile Include="mshtml\IHTMLNoShowElement.cs" />
-    <Compile Include="mshtml\IHTMLOpsProfile.cs" />
-    <Compile Include="mshtml\IHTMLOptionElement.cs" />
-    <Compile Include="mshtml\IHTMLOptionElementFactory.cs" />
-    <Compile Include="mshtml\IHTMLParaElement.cs" />
-    <Compile Include="mshtml\IHTMLPluginsCollection.cs" />
-    <Compile Include="mshtml\IHTMLRect.cs" />
-    <Compile Include="mshtml\IHTMLRectCollection.cs" />
-    <Compile Include="mshtml\IHTMLRenderStyle.cs" />
-    <Compile Include="mshtml\IHTMLRuleStyle.cs" />
-    <Compile Include="mshtml\IHTMLScreen.cs" />
-    <Compile Include="mshtml\IHTMLScriptElement.cs" />
-    <Compile Include="mshtml\IHTMLSelectElement.cs" />
-    <Compile Include="mshtml\IHTMLSelectionObject.cs" />
-    <Compile Include="mshtml\IHTMLSpanElement.cs" />
-    <Compile Include="mshtml\IHTMLStyle.cs" />
-    <Compile Include="mshtml\IHTMLStyle2.cs" />
-    <Compile Include="mshtml\IHTMLStyle3.cs" />
-    <Compile Include="mshtml\IHTMLStyle4.cs" />
-    <Compile Include="mshtml\IHTMLStyle5.cs" />
-    <Compile Include="mshtml\IHTMLStyle6.cs" />
-    <Compile Include="mshtml\IHTMLStyleSheet.cs" />
-    <Compile Include="mshtml\IHTMLStyleSheetRule.cs" />
-    <Compile Include="mshtml\IHTMLStyleSheetRulesCollection.cs" />
-    <Compile Include="mshtml\IHTMLStyleSheetsCollection.cs" />
-    <Compile Include="mshtml\IHTMLTable.cs" />
-    <Compile Include="mshtml\IHTMLTable2.cs" />
-    <Compile Include="mshtml\IHTMLTableCaption.cs" />
-    <Compile Include="mshtml\IHTMLTableCell.cs" />
-    <Compile Include="mshtml\IHTMLTableRow.cs" />
-    <Compile Include="mshtml\IHTMLTableRow2.cs" />
-    <Compile Include="mshtml\IHTMLTableSection.cs" />
-    <Compile Include="mshtml\IHTMLTextContainer.cs" />
-    <Compile Include="mshtml\IHTMLTextElement.cs" />
-    <Compile Include="mshtml\IHTMLTxtRange.cs" />
-    <Compile Include="mshtml\IHTMLUnknownElement.cs" />
-    <Compile Include="mshtml\IHTMLWindow2.cs" />
-    <Compile Include="mshtml\ILineInfo.cs" />
-    <Compile Include="mshtml\IMarkupContainer.cs" />
-    <Compile Include="mshtml\IMarkupPointer.cs" />
-    <Compile Include="mshtml\IOmHistory.cs" />
-    <Compile Include="mshtml\IOmNavigator.cs" />
-    <Compile Include="mshtml\ISegment.cs" />
-    <Compile Include="mshtml\ISegmentList.cs" />
-    <Compile Include="mshtml\ISegmentListIterator.cs" />
-    <Compile Include="mshtml\ISelectionServicesListener.cs" />
-    <Compile Include="mshtml\IVersionHost.cs" />
-    <Compile Include="mshtml\IVersionVector.cs" />
-    <Compile Include="mshtml\tagPOINT.cs" />
-    <Compile Include="mshtml\tagRECT.cs" />
-    <Compile Include="mshtml\_BEHAVIOR_EVENT.cs" />
-    <Compile Include="mshtml\_CARET_DIRECTION.cs" />
-    <Compile Include="mshtml\_COORD_SYSTEM.cs" />
-    <Compile Include="mshtml\_DISPLAY_GRAVITY.cs" />
-    <Compile Include="mshtml\_DISPLAY_MOVEUNIT.cs" />
-    <Compile Include="mshtml\_ELEMENT_ADJACENCY.cs" />
-    <Compile Include="mshtml\_ELEMENT_CORNER.cs" />
-    <Compile Include="mshtml\_ELEMENT_TAG_ID.cs" />
-    <Compile Include="mshtml\_HTML_PAINTER.cs" />
-    <Compile Include="mshtml\_HTML_PAINTER_INFO.cs" />
-    <Compile Include="mshtml\_HTML_PAINT_DRAW_INFO.cs" />
-    <Compile Include="mshtml\_HTML_PAINT_XFORM.cs" />
-    <Compile Include="mshtml\_HTML_PAINT_ZORDER.cs" />
-    <Compile Include="mshtml\_MARKUP_CONTEXT_TYPE.cs" />
-    <Compile Include="mshtml\_MOVEUNIT_ACTION.cs" />
-    <Compile Include="mshtml\_POINTER_GRAVITY.cs" />
-    <Compile Include="mshtml\_SELECTION_TYPE.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(RepoRoot)\writer.build.targets" />
 </Project>
diff --git a/src/managed/OpenLiveWriter.Interop/OpenLiveWriter.Interop.csproj b/src/managed/OpenLiveWriter.Interop/OpenLiveWriter.Interop.csproj
index c1106c0f..a4c57ac4 100644
--- a/src/managed/OpenLiveWriter.Interop/OpenLiveWriter.Interop.csproj
+++ b/src/managed/OpenLiveWriter.Interop/OpenLiveWriter.Interop.csproj
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop" ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\writer.build.settings" />
   <PropertyGroup>
     <ProjectGuid>{0937EF37-EB01-48E2-885B-991044877712}</ProjectGuid>
     <AssemblyName>OpenLiveWriter.Interop</AssemblyName>
     <RootNamespace>OpenLiveWriter.Interop</RootNamespace>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -14,119 +17,10 @@
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\GlobalAssemblyInfo.cs" />
-    <Compile Include="Com\ActiveDocuments\IAdviseSink.cs" />
-    <Compile Include="Com\ActiveDocuments\IEnumOleDocumentViews.cs" />
-    <Compile Include="Com\ActiveDocuments\IEnumOLEVERB.cs" />
-    <Compile Include="Com\ActiveDocuments\IEnumSTATDATA.cs" />
-    <Compile Include="Com\ActiveDocuments\IOleClientSite.cs" />
-    <Compile Include="Com\ActiveDocuments\IOleContainer.cs" />
-    <Compile Include="Com\ActiveDocuments\IOleDocument.cs" />
-    <Compile Include="Com\ActiveDocuments\IOleDocumentSite.cs" />
-    <Compile Include="Com\ActiveDocuments\IOleDocumentView.cs" />
-    <Compile Include="Com\ActiveDocuments\IOleInPlaceActiveObject.cs" />
-    <Compile Include="Com\ActiveDocuments\IOleInPlaceFrame.cs" />
-    <Compile Include="Com\ActiveDocuments\IOleInPlaceObject.cs" />
-    <Compile Include="Com\ActiveDocuments\IOleInPlaceSite.cs" />
-    <Compile Include="Com\ActiveDocuments\IOleInPlaceUIWindow.cs" />
-    <Compile Include="Com\ActiveDocuments\IOleObject.cs" />
-    <Compile Include="Com\ComHelper.cs" />
-    <Compile Include="Com\ComStream.cs" />
-    <Compile Include="Com\ComTypes.cs" />
-    <Compile Include="Com\IAuthenticate.cs" />
-    <Compile Include="Com\IBindStatusCallback.cs" />
-    <Compile Include="Com\ICatRegister.cs" />
-    <Compile Include="Com\IClassFactory.cs" />
-    <Compile Include="Com\IconReference.cs" />
-    <Compile Include="Com\ICustomDestinationList.cs" />
-    <Compile Include="Com\IDeskBand.cs" />
-    <Compile Include="Com\IDispatchEx.cs" />
-    <Compile Include="Com\IDockingWindow.cs" />
-    <Compile Include="Com\IDropSource.cs" />
-    <Compile Include="Com\IDropTarget.cs" />
-    <Compile Include="Com\IEnumFORMATETC.cs" />
-    <Compile Include="Com\IEnumOleUndoUnits.cs" />
-    <Compile Include="Com\IEnumUnknown.cs" />
-    <Compile Include="Com\IExtractImage.cs" />
-    <Compile Include="Com\IHttpNegotiate.cs" />
-    <Compile Include="Com\IHttpSecurity.cs" />
-    <Compile Include="Com\IInputObject.cs" />
-    <Compile Include="Com\IInputObjectSite.cs" />
-    <Compile Include="Com\IInternetProtocol.cs" />
-    <Compile Include="Com\IMalloc.cs" />
-    <Compile Include="Com\IObjectArray.cs" />
-    <Compile Include="Com\IObjectCollection.cs" />
-    <Compile Include="Com\IObjectSafety.cs" />
-    <Compile Include="Com\IObjectWithSite.cs" />
-    <Compile Include="Com\IObjectWithSiteImpl.cs" />
-    <Compile Include="Com\IOleCommandTarget.cs" />
-    <Compile Include="Com\IOleControl.cs" />
-    <Compile Include="Com\IOleDataObject.cs" />
-    <Compile Include="Com\IOleUndoManager.cs" />
-    <Compile Include="Com\IOleUndoUnit.cs" />
-    <Compile Include="Com\IOleWindow.cs" />
-    <Compile Include="Com\IPersist.cs" />
-    <Compile Include="Com\IPersistFile.cs" />
-    <Compile Include="Com\IPersistMoniker.cs" />
-    <Compile Include="Com\IPersistStorage.cs" />
-    <Compile Include="Com\IPersistStream.cs" />
-    <Compile Include="Com\IPersistStreamInit.cs" />
-    <Compile Include="Com\IPropertyStore.cs" />
-    <Compile Include="Com\IServiceProvider.cs" />
-    <Compile Include="Com\IShellFolder.cs" />
-    <Compile Include="Com\IShellItem.cs" />
-    <Compile Include="Com\IShellItem2.cs" />
-    <Compile Include="Com\IShellLink.cs" />
-    <Compile Include="Com\IShellLinkW.cs" />
-    <Compile Include="Com\IWebBrowser2.cs" />
-    <Compile Include="Com\IWindowForBindingUI.cs" />
-    <Compile Include="Com\MshtmlAmbientProperties.cs" />
-    <Compile Include="Com\Ole32.cs" />
-    <Compile Include="Com\PropertyKey.cs" />
-    <Compile Include="Com\PropVariant.cs" />
-    <Compile Include="Com\Ribbon\BasicCollection.cs" />
-    <Compile Include="Com\Ribbon\EnumUnknown.cs" />
-    <Compile Include="Com\Ribbon\ImageLoader.cs" />
-    <Compile Include="Com\Ribbon\IUICommandHandlerOverride.cs" />
-    <Compile Include="Com\Ribbon\PropertyKeys.cs" />
-    <Compile Include="Com\Ribbon\SimplePropertySet.cs" />
-    <Compile Include="Com\Ribbon\UIRibbon.cs" />
-    <Compile Include="Com\StreamMarshaler.cs" />
-    <Compile Include="Com\StructuredStorage\ILockBytes.cs" />
-    <Compile Include="Com\StructuredStorage\IStorage.cs" />
-    <Compile Include="Com\StructuredStorage\IStorageOpener.cs" />
-    <Compile Include="Com\StructuredStorage\Ole32Storage.cs" />
-    <Compile Include="Com\StructuredStorage\Storage.cs" />
-    <Compile Include="Com\StructuredStorage\StorageErrors.cs" />
-    <Compile Include="Com\StructuredStorage\StorageException.cs" />
-    <Compile Include="Windows\Advapi32.cs" />
-    <Compile Include="Windows\ComCtl32.cs" />
-    <Compile Include="Windows\Crypt32.cs" />
-    <Compile Include="Windows\DbgHelp.cs" />
-    <Compile Include="Windows\Errors.cs" />
-    <Compile Include="Windows\Gdi32.cs" />
-    <Compile Include="Windows\GdiPlus.cs" />
-    <Compile Include="Windows\Kernel32.cs" />
-    <Compile Include="Windows\MessageHelper.cs" />
-    <Compile Include="Windows\OleAut32.cs" />
-    <Compile Include="Windows\Propsys.cs" />
-    <Compile Include="Windows\Psapi.cs" />
-    <Compile Include="Windows\Shell32.cs" />
-    <Compile Include="Windows\Shlwapi.cs" />
-    <Compile Include="Windows\TaskDialog\TaskDialog.cs" />
-    <Compile Include="Windows\TaskDialog\TaskDialogMarshallers.cs" />
-    <Compile Include="Windows\TaskDialog\TaskDialogNative.cs" />
-    <Compile Include="Windows\UrlMon.cs" />
-    <Compile Include="Windows\User32.cs" />
-    <Compile Include="Windows\Uxtheme.cs" />
-    <Compile Include="Windows\WinInet.cs" />
-  </ItemGroup>
   <ItemGroup>
     <RobocopyCompiled Include="$(ProjectDir)Com\OpenLiveWriter.Interop.SHDocVw.dll">
       <DestinationFolder>$(FullTargetProjectPath)</DestinationFolder>
     </RobocopyCompiled>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(RepoRoot)\writer.build.targets" />
 </Project>
diff --git a/src/managed/OpenLiveWriter.Localization/OpenLiveWriter.Localization.csproj b/src/managed/OpenLiveWriter.Localization/OpenLiveWriter.Localization.csproj
index 9db3b4c6..8a34c7ea 100644
--- a/src/managed/OpenLiveWriter.Localization/OpenLiveWriter.Localization.csproj
+++ b/src/managed/OpenLiveWriter.Localization/OpenLiveWriter.Localization.csproj
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop" ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\writer.build.settings" />
   <PropertyGroup>
     <AssemblyName>OpenLiveWriter.Localization</AssemblyName>
     <RootNamespace>OpenLiveWriter.Localization</RootNamespace>
     <ProjectGuid>{DF928A2F-38E3-4B1F-83CE-1FDFDE836D84}</ProjectGuid>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -15,20 +17,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\GlobalAssemblyInfo.cs" />
-    <Compile Include="Bidi\BidiGraphics.cs" />
-    <Compile Include="Bidi\BidiHelper.cs" />
-    <Compile Include="Bidi\BidiLayout.cs" />
-    <Compile Include="CommandId.cs" />
-    <Compile Include="CultureHelper.cs" />
-    <Compile Include="CustomLocalizedPluginAttribute.cs" />
-    <Compile Include="Images.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Images.resx</DependentUpon>
-    </Compile>
-    <Compile Include="MessageId.cs" />
-    <Compile Include="Res.cs" />
-    <Compile Include="StringId.cs" />
     <None Include="CommandBitmaps\Cut.LargeImage.png" />
     <None Include="CommandBitmaps\Paste.LargeImage.png" />
     <None Include="CommandBitmaps\InsertMap.LargeImage.png" />
@@ -299,20 +287,6 @@
     <Content Include="Emoticons\Emoticon_WiltedRose.png" />
     <Content Include="Emoticons\Emoticon_WinkingSmile.png" />
     <Content Include="Emoticons\Emoticon_Work.png" />
-    <EmbeddedResource Include="Images.resx">
-      <SubType>Designer</SubType>
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Images.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PropertiesNonLoc.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Strings.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <None Include="Strings.csv" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/src/managed/OpenLiveWriter.Mshtml/OpenLiveWriter.Mshtml.csproj b/src/managed/OpenLiveWriter.Mshtml/OpenLiveWriter.Mshtml.csproj
index 89b46613..79c5c0b7 100644
--- a/src/managed/OpenLiveWriter.Mshtml/OpenLiveWriter.Mshtml.csproj
+++ b/src/managed/OpenLiveWriter.Mshtml/OpenLiveWriter.Mshtml.csproj
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop" ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\writer.build.settings" />
   <PropertyGroup>
     <ProjectGuid>{906BA039-467B-41AE-B805-BA1B837AB763}</ProjectGuid>
     <AssemblyName>OpenLiveWriter.Mshtml</AssemblyName>
     <RootNamespace>OpenLiveWriter.Mshtml</RootNamespace>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -30,67 +32,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\GlobalAssemblyInfo.cs" />
-    <Compile Include="DisplayServices.cs" />
-    <Compile Include="ElementFilters.cs" />
-    <Compile Include="InternetSecurityManager.cs" />
-    <Compile Include="MarkupContainer.cs" />
-    <Compile Include="MarkupHelpers.cs" />
-    <Compile Include="MarkupPointer.cs" />
-    <Compile Include="MarkupPointerMoveHelper.cs" />
-    <Compile Include="MarkupRange.cs" />
-    <Compile Include="MshtmlCommands.cs" />
-    <Compile Include="MshtmlControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="MshtmlDocumentEvents.cs" />
-    <Compile Include="MshtmlEditor.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="MshtmlElementBehavior.cs" />
-    <Compile Include="MshtmlFontWrapper.cs" />
-    <Compile Include="MshtmlKeyboardHook.cs" />
-    <Compile Include="MshtmlMarkupServices.cs" />
-    <Compile Include="Mshtml_Interop\ElementBehaviorFactoryForExistingBehavior.cs" />
-    <Compile Include="Mshtml_Interop\HtmlElementEvents2DispIds.cs" />
-    <Compile Include="Mshtml_Interop\ICustomDoc.cs" />
-    <Compile Include="Mshtml_Interop\IDisplayPointerRaw.cs" />
-    <Compile Include="Mshtml_Interop\IDisplayServicesRaw.cs" />
-    <Compile Include="Mshtml_Interop\IDocHostShowUI.cs" />
-    <Compile Include="Mshtml_Interop\IDocHostShowUIBaseImpl.cs" />
-    <Compile Include="Mshtml_Interop\IDocHostUIHandler.cs" />
-    <Compile Include="Mshtml_Interop\IDocHostUIHandler2.cs" />
-    <Compile Include="Mshtml_Interop\IDocHostUIHandlerBaseImpl.cs" />
-    <Compile Include="Mshtml_Interop\IElementBehaviorFactoryRaw.cs" />
-    <Compile Include="Mshtml_Interop\IElementBehaviorRaw.cs" />
-    <Compile Include="Mshtml_Interop\IHighlightRenderingServicesRaw.cs" />
-    <Compile Include="Mshtml_Interop\IHighlightSegmentRaw.cs" />
-    <Compile Include="Mshtml_Interop\IHTMLCaretRaw.cs" />
-    <Compile Include="Mshtml_Interop\IHTMLEditDesignerRaw.cs" />
-    <Compile Include="Mshtml_Interop\IHTMLEditHostRaw.cs" />
-    <Compile Include="Mshtml_Interop\IHTMLEditServicesRaw.cs" />
-    <Compile Include="Mshtml_Interop\IHTMLPainterEventInfoRaw.cs" />
-    <Compile Include="Mshtml_Interop\IHTMLPainterRaw.cs" />
-    <Compile Include="Mshtml_Interop\IHTMLPaintSiteRaw.cs" />
-    <Compile Include="Mshtml_Interop\IInternetSecurityManager.cs" />
-    <Compile Include="Mshtml_Interop\IMarkupContainer2Raw.cs" />
-    <Compile Include="Mshtml_Interop\IMarkupContainerRaw.cs" />
-    <Compile Include="Mshtml_Interop\IMarkupPointer2Raw.cs" />
-    <Compile Include="Mshtml_Interop\IMarkupPointerRaw.cs" />
-    <Compile Include="Mshtml_Interop\IMarkupServices2Raw.cs" />
-    <Compile Include="Mshtml_Interop\IMarkupServicesRaw.cs" />
-    <Compile Include="Mshtml_Interop\IObjectSafety.cs" />
-    <Compile Include="Mshtml_Interop\IProtectFocus.cs" />
-    <Compile Include="Mshtml_Interop\ISegmentListIteratorRaw.cs" />
-    <Compile Include="Mshtml_Interop\ISegmentRaw.cs" />
-    <Compile Include="Mshtml_Interop\ISelectionServicesRaw.cs" />
-    <EmbeddedResource Include="MshtmlControl.resx">
-      <DependentUpon>MshtmlControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="MshtmlEditor.resx">
-      <DependentUpon>MshtmlEditor.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(RepoRoot)\writer.build.targets" />
diff --git a/src/managed/OpenLiveWriter.PostEditor/OpenLiveWriter.PostEditor.csproj b/src/managed/OpenLiveWriter.PostEditor/OpenLiveWriter.PostEditor.csproj
index 37f3b3e4..c3323d2a 100644
--- a/src/managed/OpenLiveWriter.PostEditor/OpenLiveWriter.PostEditor.csproj
+++ b/src/managed/OpenLiveWriter.PostEditor/OpenLiveWriter.PostEditor.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop" ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\writer.build.settings" />
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);CODE_ANALYSIS;WIN32</DefineConstants>
@@ -7,6 +7,8 @@
     <RootNamespace>OpenLiveWriter.PostEditor</RootNamespace>
     <ProjectGuid>{D6C9A393-E0B8-4548-B84B-F8B6FE2A5645}</ProjectGuid>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
   </PropertyGroup>
@@ -197,902 +199,14 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\GlobalAssemblyInfo.cs" />
-    <Compile Include="AboutForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="AfterPublishFileUploadFailedForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="AlignmentMarginContentEditor.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Alignment\HtmlAlignDecoratorSettings.cs" />
-    <Compile Include="Autoreplace\AutoreplaceEditForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Autoreplace\AutoreplaceEditForm.Designer.cs">
-      <DependentUpon>AutoreplaceEditForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Autoreplace\AutoreplaceManagementControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Autoreplace\AutoreplaceManagementControl.Designer.cs">
-      <DependentUpon>AutoreplaceManagementControl.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Autoreplace\AutoreplaceManager.cs" />
-    <Compile Include="Autoreplace\AutoreplacePreferences.cs" />
-    <Compile Include="Autoreplace\AutoreplacePreferencesPanel.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Autoreplace\AutoreplaceSettings.cs" />
-    <Compile Include="BlogFileUploader.cs" />
-    <Compile Include="BlogPostEditingManager.cs" />
-    <Compile Include="BlogPostExtensionDataList.cs" />
-    <Compile Include="BlogPostImageData.cs" />
-    <Compile Include="BlogPostSettingsBag.cs" />
-    <Compile Include="BlogPostSupportingFileStorage.cs" />
-    <Compile Include="BlogProviderButtons\BlogProviderButton.cs" />
-    <Compile Include="BlogProviderButtons\BlogProviderButtonManager.cs" />
-    <Compile Include="BlogProviderButtons\BlogProviderButtonNotificationSink.cs" />
-    <Compile Include="Commands\AboutCommand.cs" />
-    <Compile Include="Commands\AlignmentCommand.cs" />
-    <Compile Include="Commands\CommandWeblogPicker.cs" />
-    <Compile Include="Commands\ContextAvailabilityCommand.cs" />
-    <Compile Include="Commands\CustomTooltipWhenDisabledCommand.cs" />
-    <Compile Include="Commands\DynamicCommandGallery.cs" />
-    <Compile Include="Commands\GalleryCommand.cs" />
-    <Compile Include="Commands\GroupCommand.cs" />
-    <Compile Include="Commands\ImageCustomSizeDropdown.cs" />
-    <Compile Include="Commands\ImageLinkTargetDropdown.cs" />
-    <Compile Include="Commands\InsertablePluginsGalleryCommand.cs" />
-    <Compile Include="Commands\MarginCommand.cs" />
-    <Compile Include="Commands\MutuallyExclusiveDropdown.cs" />
-    <Compile Include="Commands\ProxyCommand.cs" />
-    <Compile Include="Commands\RecentItemsCommand.cs" />
-    <Compile Include="Commands\DraftPostItemsGalleryCommand.cs" />
-    <Compile Include="Commands\SelectGalleryCommand.cs" />
-    <Compile Include="Commands\SemanticHtmlGalleryCommand.cs" />
-    <Compile Include="Configuration\Accounts\WeblogAccountListView.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Configuration\Accounts\WeblogAccountManagementControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Configuration\Accounts\WeblogAccountPreferences.cs" />
-    <Compile Include="Configuration\Accounts\WeblogAccountPreferencesPanel.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Configuration\Settings\AccountPanel.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Configuration\Settings\AdvancedPanel.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Configuration\Settings\BlogPluginsPanel.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Configuration\Settings\BlogPluginsPanel.Designer.cs">
-      <DependentUpon>BlogPluginsPanel.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Configuration\Settings\EditingPanel.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Configuration\Settings\FTPSettingsForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Configuration\Settings\ImagesPanel.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Configuration\Settings\WeblogCapabilitiesForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Configuration\Settings\WeblogSettingsManager.cs" />
-    <Compile Include="Configuration\Settings\WeblogSettingsPanel.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Configuration\TemporaryBlogSettings.cs" />
-    <Compile Include="Configuration\Wizard\BlogProviderAccountWizard.cs" />
-    <Compile Include="Configuration\Wizard\WeblogConfigurationWizard.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Configuration\Wizard\WeblogConfigurationWizardController.cs" />
-    <Compile Include="Configuration\Wizard\WeblogConfigurationWizardHeader.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Configuration\Wizard\WeblogConfigurationWizardPanel.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Configuration\Wizard\WeblogConfigurationWizardPanelAutoDetection.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Configuration\Wizard\WeblogConfigurationWizardPanelBasicInfo.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Configuration\Wizard\WeblogConfigurationWizardPanelBlogType.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Configuration\Wizard\WeblogConfigurationWizardPanelConfirmation.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Configuration\Wizard\WeblogConfigurationWizardPanelProgress.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Configuration\Wizard\WeblogConfigurationWizardPanelSelectBlog.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Configuration\Wizard\WeblogConfigurationWizardPanelSelectProvider.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Configuration\Wizard\WeblogConfigurationWizardPanelGoogleBloggerAuthentication.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Configuration\Wizard\WeblogConfigurationWizardPanelSharePointAuthentication.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Configuration\Wizard\WeblogConfigurationWizardPanelSharePointBasicInfo.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Configuration\Wizard\WeblogConfigurationWizardPanelWelcome.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Configuration\Wizard\WeblogConfigurationWizardSettings.cs" />
-    <Compile Include="Configuration\Wizard\WeblogHomepageUrlControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Configuration\Wizard\WizardAutoDetectionOperations.cs" />
-    <Compile Include="Configuration\Wizard\WizardAutoDetectionStep.cs" />
-    <Compile Include="ContentEditor\ContentEditor.cs" />
-    <Compile Include="ContentEditor\ContentEditorAccountAdapter.cs" />
-    <Compile Include="ContentEditor\ContentEditorProxy.cs" />
-    <Compile Include="ContentEditor\ContentEditorSettingException.cs" />
-    <Compile Include="ContentEditor\GlobalEditorOptions.cs" />
-    <Compile Include="ContentEditor\IContentEditor.cs" />
-    <Compile Include="ContentEditor\IContentEditorFactory.cs" />
-    <Compile Include="ContentEditor\IContentEditorSite.cs" />
-    <Compile Include="ContentEditor\IContentTarget.cs" />
-    <Compile Include="ContentEditor\ISettingsProvider.cs" />
-    <Compile Include="ContentEditor\MainFrameWindowAdapter.cs" />
-    <Compile Include="ContentEditor\SharedCanvasImageReferenceFixer.cs" />
-    <Compile Include="ContentEditor\OpenLiveWriterSettingsProvider.cs" />
-    <Compile Include="ContentSources\Common\ContentSourceLayout.cs" />
-    <Compile Include="ContentSources\Common\IAuth.cs" />
-    <Compile Include="ContentSources\Common\IMediaSource.cs" />
-    <Compile Include="ContentSources\Common\MediaSmartContent.cs" />
-    <Compile Include="ContentSources\Common\MediaTab.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="ContentSources\Common\MediaTab.Designer.cs">
-      <DependentUpon>MediaTab.cs</DependentUpon>
-    </Compile>
-    <Compile Include="ContentSources\Common\PanelLoginControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="ContentSources\Common\LoginStatusControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="ContentSources\Common\MediaInsertForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="ContentSources\ContentSourceManager.cs" />
-    <Compile Include="ContentSources\IContentUpdateFilter.cs" />
-    <Compile Include="ContentSources\IHandlesMultipleUrls.cs" />
-    <Compile Include="ContentSources\IInternalContent.cs" />
-    <Compile Include="ContentSources\IInternalSmartContentContextSource.cs" />
-    <Compile Include="ContentSources\IInternalSmartContentSource.cs" />
-    <Compile Include="ContentSources\InternalSmartContent.cs" />
-    <Compile Include="ContentSources\InternalSmartContentContext.cs" />
-    <Compile Include="ContentSources\ISupportsDeleteHook.cs" />
-    <Compile Include="ContentSources\ISupportsDragDropFile.cs" />
-    <Compile Include="ContentSources\RefreshableContentManager.cs" />
-    <Compile Include="ContentSources\SmartContent.cs" />
-    <Compile Include="ContentSources\SmartContentInsertionHelper.cs" />
-    <Compile Include="ContentSources\UrlContentRetreivalWithProgress.cs" />
-    <Compile Include="ContentSources\UrlContentRetreivalWithProgressDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="EditingPreferencesPanel.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Emoticons\Emoticon.cs" />
-    <Compile Include="Emoticons\EmoticonsGalleryCommand.cs" />
-    <Compile Include="ExpirationForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FileUploadFailedForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FocusControlManager.cs" />
-    <Compile Include="HtmlDocument2Wrapper.cs" />
-    <Compile Include="IActiveSmartContentEditor.cs" />
-    <Compile Include="IBlogContext.cs" />
-    <Compile Include="IBlogPostContentEditor.cs" />
-    <Compile Include="IBlogPostEditingContext.cs" />
-    <Compile Include="IBlogPostEditingSite.cs" />
-    <Compile Include="IBlogPostEditor.cs" />
-    <Compile Include="IBlogPostPublishingContext.cs" />
-    <Compile Include="IBlogSettingsEditor.cs" />
-    <Compile Include="ImageInsertion\InsertImageDialog.cs" />
-    <Compile Include="ImageInsertion\InsertImageSource.cs" />
-    <Compile Include="ImageInsertion\InsertImageTabControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="ImageInsertion\TabbingHookProc.cs" />
-    <Compile Include="ImageInsertion\WebImageSource.cs" />
-    <Compile Include="ImageInsertion\WebImages\WebImageContentSource.cs" />
-    <Compile Include="ImageInsertion\WebImages\WebImageForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="ImageInsertion\WebImages\WebImageForm.Designer.cs">
-      <DependentUpon>WebImageForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="InlineEditField.cs" />
-    <Compile Include="ISupportingFile.cs" />
-    <Compile Include="ISupportingFileService.cs" />
-    <Compile Include="JumpList\IJumpListItem.cs" />
-    <Compile Include="JumpList\JumpList.cs" />
-    <Compile Include="JumpList\JumpListCustomCategory.cs" />
-    <Compile Include="JumpList\JumpListCustomCategoryCollection.cs" />
-    <Compile Include="JumpList\JumpListItem.cs" />
-    <Compile Include="JumpList\JumpListItemCollection.cs" />
-    <Compile Include="JumpList\TaskbarEnums.cs" />
-    <Compile Include="JumpList\TaskbarManager.cs" />
-    <Compile Include="JumpList\WriterJumplist.cs" />
-    <Compile Include="LiveClipboard\LiveClipboardChangeHandlerForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="LiveClipboard\LiveClipboardManager.cs" />
-    <Compile Include="LiveClipboard\LiveClipboardPreferences.cs" />
-    <Compile Include="LiveClipboard\LiveClipboardPreferencesPanel.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Mail\WindowsLiveMailContentTarget.cs" />
-    <Compile Include="Mail\WindowsLiveMailShim.cs" />
-    <Compile Include="OpenPost\BlogPostListBox.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="OpenPost\BlogPostSourceListBox.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="OpenPost\CommandRecentPost.cs" />
-    <Compile Include="OpenPost\GetRecentPostsProgressControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="OpenPost\OpenPostForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="OpenPost\SelectPostLinkForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="ContentSources\IPublishTimeWorker.cs" />
-    <Compile Include="ContentSources\SmartContentWorker.cs" />
-    <Compile Include="SmartContentPersistedFileList.cs" />
-    <Compile Include="PingPreferencesPanel.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="PluginSettingsAdaptor.cs" />
-    <Compile Include="PluginsPreferences.cs" />
-    <Compile Include="PluginsPreferencesPanel.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="PostDeleteHelper.cs" />
-    <Compile Include="PostEditorException.cs" />
-    <Compile Include="PostEditorFile.cs" />
-    <Compile Include="PostEditorFileLookupCache.cs" />
-    <Compile Include="PostEditorFooter.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="PostEditorFooter.Designer.cs">
-      <DependentUpon>PostEditorFooter.cs</DependentUpon>
-    </Compile>
-    <Compile Include="PostEditorForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="PostEditorKeyboardHandler.cs" />
-    <Compile Include="PostEditorLifetimeManager.cs" />
-    <Compile Include="PostEditorMainControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="PostEditorPluginManager.cs" />
-    <Compile Include="PostEditorPostSource.cs" />
-    <Compile Include="PostEditorPreferences.cs" />
-    <Compile Include="PostEditorPreferencesEditor.cs" />
-    <Compile Include="PostEditorPreferencesPanel.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="PostEditorSettings.cs" />
-    <Compile Include="PostEditorSettingsM1.cs" />
-    <Compile Include="PostHelper.cs" />
-    <Compile Include="PostHtmlEditing\AnchorContextMenuDefinition.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="PostHtmlEditing\Behaviors\BehaviorControl.cs" />
-    <Compile Include="PostHtmlEditing\Behaviors\BehaviorControlCollection.cs" />
-    <Compile Include="PostHtmlEditing\Behaviors\BehaviorDragDropSource.cs" />
-    <Compile Include="PostHtmlEditing\Behaviors\BlockquoteEditingElementBehavior.cs" />
-    <Compile Include="PostHtmlEditing\Behaviors\DebugBorderControl.cs" />
-    <Compile Include="PostHtmlEditing\Behaviors\ElementControlBehavior.cs" />
-    <Compile Include="PostHtmlEditing\Behaviors\ElementFocusPainter.cs" />
-    <Compile Include="PostHtmlEditing\Behaviors\ExtendedEntrySplitterElementBehavior.cs" />
-    <Compile Include="PostHtmlEditing\Behaviors\FocusControl.cs" />
-    <Compile Include="PostHtmlEditing\Behaviors\IBehaviorControlContainerControl.cs" />
-    <Compile Include="PostHtmlEditing\Behaviors\PropertiesDongleControl.cs" />
-    <Compile Include="PostHtmlEditing\Behaviors\ResizableElementBehavior.cs" />
-    <Compile Include="PostHtmlEditing\Behaviors\ResizerControl.cs" />
-    <Compile Include="PostHtmlEditing\Behaviors\SidebarDongleController.cs" />
-    <Compile Include="PostHtmlEditing\BlogPostHtmlEditor.cs" />
-    <Compile Include="PostHtmlEditing\BlogPostHtmlEditorControl.cs" />
-    <Compile Include="PostHtmlEditing\BlogPostHtmlSourceEditorControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="PostHtmlEditing\DebugElementBehavior.cs" />
-    <Compile Include="PostHtmlEditing\DisabledImageElementBehavior.cs" />
-    <Compile Include="PostHtmlEditing\DisabledSmartContentElementBehavior.cs" />
-    <Compile Include="PostHtmlEditing\EditableRegionElementBehavior.cs" />
-    <Compile Include="PostHtmlEditing\EditableSmartContent.cs" />
-    <Compile Include="PostHtmlEditing\EditingTemplateLoader.cs" />
-    <Compile Include="PostHtmlEditing\EditorCommandBarLightweightControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="PostHtmlEditing\ElementBehaviorManager.cs" />
-    <Compile Include="PostHtmlEditing\ExtendedHtmlEditorMashallingHandler.cs" />
-    <Compile Include="PostHtmlEditing\FormattedHtmlPrinter.cs" />
-    <Compile Include="PostHtmlEditing\HtmlEditorSettings.cs" />
-    <Compile Include="PostHtmlEditing\HtmlGenerator.cs" />
-    <Compile Include="PostHtmlEditing\HtmlLinebreakStripper.cs" />
-    <Compile Include="PostHtmlEditing\HtmlPreserver.cs" />
-    <Compile Include="PostHtmlEditing\HtmlSourceEditorSettings.cs" />
-    <Compile Include="PostHtmlEditing\IBlogPostHtmlEditor.cs" />
-    <Compile Include="PostHtmlEditing\IBlogPostImageEditingContext.cs" />
-    <Compile Include="PostHtmlEditing\IBlogPostSidebarContext.cs" />
-    <Compile Include="PostHtmlEditing\ImageContextMenuDefinition.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="PostHtmlEditing\ImageEditingElementBehavior.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\BlackandWhiteDecorator.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\BlurDecorator.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\BrightnessDecorator.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\BrightnessEditor.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\CropDecorator.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\CropEditor.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\CropEditor.Designer.cs">
-      <DependentUpon>CropEditor.cs</DependentUpon>
-    </Compile>
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\DropShadowBorderDecorator.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\EmbossDecorator.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\HtmlAlignDecorator.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\HtmlAlignEditor.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\HtmlAltTextDecorator.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\HtmlAltTextEditor.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\HtmlBorderDecorator.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\HtmlImageResizeDecorator.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\HtmlImageResizeEditor.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\HtmlImageTargetDecorator.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\HtmlImageTargetEditor.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\HtmlMarginDecorator.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\HtmlMarginEditor.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\ImageBorderDecorator.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\ImageDecoratorUtils.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\ImageSliceBorderDecorator.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\LinkToOptionsForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\NoBlurDecorator.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\NoBorderDecorator.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\NoEmbossDecorator.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\NoRecolorDecorator.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\NoSharpenDecorator.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\PhotoBorderDecorator.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\PolaroidBorderDecorator.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\ReflectionBorderDecorator.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\RotationEditor.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\RoundedCornersBorderDecorator.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\SaturationDecorator.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\SepiaToneDecorator.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\SharpenDecorator.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\SoftShadowBorderDecorator.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\SolidBorderDecorator.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\TiltDecorator.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\TiltDecoratorEditor.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\TiltDecoratorEditor.Designer.cs">
-      <DependentUpon>TiltDecoratorEditor.cs</DependentUpon>
-    </Compile>
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\TiltDecoratorSettings.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\TransformMatrix.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\WarmDecorator.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\WatermarkDecorator.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\Decorators\WatermarkEditor.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="PostHtmlEditing\ImageEditing\DefaultImageSettings.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\EditImageSizesDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Emoticons\EmoticonsManager.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\ILinkOptions.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\ILinkOptionsEditor.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\ImageEffectsBorderGalleryCommand.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\ImageBorderPickerControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="PostHtmlEditing\ImageEditing\ImageDecoratorEditorContextImpl.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\ImageDecoratorEditorForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="PostHtmlEditing\ImageEditing\ImageDecoratorHelper.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\ImageDecoratorsCommandBarLightweightControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="PostHtmlEditing\ImageEditing\ImageDecoratorsControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="PostHtmlEditing\ImageEditing\ImageDecoratorsList.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\ImageDecoratorsManager.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\ImageEditingPropertyHandler.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\ImageEditingSettings.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\ImageEffectsEmbossGalleryCommand.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\ImageEffectsGalleryCommand.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\ImageEffectsBlurGalleryCommand.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\ImageEffectsRecolorGalleryCommand.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\ImageEffectsSharpenGalleryCommand.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\ImageFilterDecoratorAdapter.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\ImageInsertHandler.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\ImagePropertiesInfo.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\ImagePropertiesSidebar.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\ImagePropertiesSidebarControl.cs">
-    </Compile>
-    <Compile Include="PostHtmlEditing\ImageEditing\ImagePropertiesSidebarHostControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="PostHtmlEditing\ImageEditing\ImageSizeControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="PostHtmlEditing\ImageEditing\ImageSizeHelper.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\ImageSizePickerControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="PostHtmlEditing\ImageEditing\ImageSizeSpinnerCommand.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\ImageTargetEditorControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="PostHtmlEditing\ImageEditing\ImageTargetGalleryCommand.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\ImageUrlTargetEditorControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="PostHtmlEditing\ImageEditing\ImageUtils.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\LinkOptions.cs" />
-    <Compile Include="PostHtmlEditing\ImageEditing\LinkOptionsEditorControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="PostHtmlEditing\ImageInitializationAsyncOperation.cs" />
-    <Compile Include="PostHtmlEditing\ImageInsertionManager.cs" />
-    <Compile Include="PostHtmlEditing\ImageUrlForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="PostHtmlEditing\NewImageInfo.cs" />
-    <Compile Include="PostHtmlEditing\PostBodyEditingElementBehavior.cs" />
-    <Compile Include="PostHtmlEditing\PostHtmlEditingSettings.cs" />
-    <Compile Include="PostHtmlEditing\PostTitleEditingElementBehavior.cs" />
-    <Compile Include="PostHtmlEditing\Sidebar\ContentSourceSidebarControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="PostHtmlEditing\Sidebar\HtmlEditorSidebarHost.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="PostHtmlEditing\Sidebar\HtmlEditorSidebarSettings.cs" />
-    <Compile Include="PostHtmlEditing\Sidebar\HtmlEditorSidebarStatus.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="PostHtmlEditing\Sidebar\ISidebar.cs" />
-    <Compile Include="PostHtmlEditing\Sidebar\ISidebarContext.cs" />
-    <Compile Include="PostHtmlEditing\Sidebar\ISmartContentEditorCache.cs" />
-    <Compile Include="PostHtmlEditing\Sidebar\MessageSidebarControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="PostHtmlEditing\Sidebar\SidebarControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="PostHtmlEditing\SmartContentContextMenuDefinition.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="PostHtmlEditing\SmartContentElementBehavior.cs" />
-    <Compile Include="PostHtmlEditing\SmartContentSelection.cs" />
-    <Compile Include="PostHtmlEditing\TextContextMenuDefinition.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="PostHtmlEditing\TitledRegionElementBehavior.cs" />
-    <Compile Include="PostListCache.cs" />
-    <Compile Include="PostPropertyEditing\CategoryControl\CategoryContext.cs" />
-    <Compile Include="PostPropertyEditing\CategoryControl\CategoryDisplayFormW3M1.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="PostPropertyEditing\CategoryControl\CategoryDisplayFormW3M1.Designer.cs">
-      <DependentUpon>CategoryDisplayFormW3M1.cs</DependentUpon>
-    </Compile>
-    <Compile Include="PostPropertyEditing\CategoryControl\CategoryDropDownControlM1.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="PostPropertyEditing\CategoryControl\RadioCategorySelector.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="PostPropertyEditing\CategoryControl\RadioCategorySelector.Designer.cs">
-      <DependentUpon>RadioCategorySelector.cs</DependentUpon>
-    </Compile>
-    <Compile Include="PostPropertyEditing\CategoryControl\TreeCategorySelector.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="PostPropertyEditing\CategoryControl\TreeCategorySelector.Designer.cs">
-      <DependentUpon>TreeCategorySelector.cs</DependentUpon>
-    </Compile>
-    <Compile Include="PostPropertyEditing\FutureDateWarningForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="PostPropertyEditing\PageParentComboBox.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="PostPropertyEditing\PostPropertiesBandControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="PostPropertyEditing\PostPropertiesBandControl.Designer.cs">
-      <DependentUpon>PostPropertiesBandControl.cs</DependentUpon>
-    </Compile>
-    <Compile Include="PostPropertyEditing\PostPropertiesForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="PostPropertyEditing\PostPropertiesForm.Designer.cs">
-      <DependentUpon>PostPropertiesForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="PostPropertyEditing\PublishDateTimePicker.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="PostPropertyEditing\SharedPropertiesController.cs" />
-    <Compile Include="PreferencesHandler.cs" />
-    <Compile Include="PrivacyPreferencesPanel.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="RecentPostNotSynchronizedWarningForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="RecentPostProgressForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="RecentPostSynchronizer.cs" />
-    <Compile Include="RibbonControl.cs" />
-    <Compile Include="ServiceUpdateChecker.cs" />
-    <Compile Include="SupportingFiles\SupportingFileFactory.cs" />
-    <Compile Include="SupportingFiles\SupportingFileReferenceList.cs" />
-    <Compile Include="SupportingFiles\SupportingFileService.cs" />
-    <Compile Include="SupportingFiles\SupportingFilesForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Tables\CellPropertiesControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Tables\CellPropertiesControl.Designer.cs">
-      <DependentUpon>CellPropertiesControl.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Tables\CellPropertiesForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Tables\CellPropertiesForm.Designer.cs">
-      <DependentUpon>CellPropertiesForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Tables\ColumnPropertiesForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Tables\ColumnPropertiesForm.Designer.cs">
-      <DependentUpon>ColumnPropertiesForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Tables\ColumnWidthControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Tables\ColumnWidthControl.Designer.cs">
-      <DependentUpon>ColumnWidthControl.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Tables\HTMLTableColumn.cs" />
-    <Compile Include="Tables\PixelPercent.cs" />
-    <Compile Include="Tables\RowPropertiesForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Tables\TableAlignmentControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Tables\TableCellEditingElementBehavior.cs" />
-    <Compile Include="Tables\TableCellSelectionTracker.cs" />
-    <Compile Include="Tables\TableColumnSizeEditor.cs" />
-    <Compile Include="Tables\TableContextMenuDefinition.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Tables\TableDataFormatHandler.cs" />
-    <Compile Include="Tables\TableEditingContext.cs" />
-    <Compile Include="Tables\TableEditingElementBehavior.cs" />
-    <Compile Include="Tables\TableEditingManager.cs" />
-    <Compile Include="Tables\TableEditingSettings.cs" />
-    <Compile Include="Tables\TableEditor.cs" />
-    <Compile Include="Tables\TableHelper.cs" />
-    <Compile Include="Tables\TableIndentControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Tables\TablePropertiesForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Tables\TablePropertiesForm.Designer.cs">
-      <DependentUpon>TablePropertiesForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Tables\TableSelection.cs" />
-    <Compile Include="Tagging\EditTagForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Tagging\ListHelper.cs" />
-    <Compile Include="Tagging\TagContentSource.cs" />
-    <Compile Include="Tagging\TagContext.cs" />
-    <Compile Include="Tagging\TagEditor.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Tagging\TagForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Tagging\TagOptions.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Tagging\TagProvider.cs" />
-    <Compile Include="Tagging\TagProviderComboBox.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Tagging\TagProviderManager.cs" />
-    <Compile Include="Tagging\TagSmartContentEditor.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Tagging\TextBoxWithAutoComplete.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Tagging\TransparentLabel.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Tagging\Utility.cs" />
-    <Compile Include="TextEditingCommandDispatcher.cs" />
-    <Compile Include="TitleReminderForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="TypographicCharacterHandler.cs" />
-    <Compile Include="Updates\UpdateManager.cs" />
-    <Compile Include="Updates\UpdateSettings.cs" />
-    <Compile Include="UpdateWeblogAsyncOperation.cs" />
-    <Compile Include="UpdateWeblogProgressForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Video\CategoryItem.cs" />
-    <Compile Include="Video\IVideoPublisher.cs" />
-    <Compile Include="Video\Video.cs" />
-    <Compile Include="Video\VideoAspectRatioHelper.cs" />
-    <Compile Include="Video\VideoContentSource.cs" />
-    <Compile Include="Video\VideoContext.cs" />
-    <Compile Include="Video\VideoEditorControl.cs" />
-    <Compile Include="Video\VideoListBox\VideoListBoxControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Video\VideoPluginException.cs" />
-    <Compile Include="Video\VideoProvider.cs" />
-    <Compile Include="Video\VideoProviderHelper.cs" />
-    <Compile Include="Video\VideoProviderManager.cs" />
-    <Compile Include="Video\VideoPublishProgressForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Video\VideoPublishProgressForm.Designer.cs">
-      <DependentUpon>VideoPublishProgressForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Video\VideoPublishSource.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Video\VideoPublishSource.Designer.cs">
-      <DependentUpon>VideoPublishSource.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Video\VideoServiceException.cs" />
-    <Compile Include="Video\VideoService\IVideo.cs" />
-    <Compile Include="Video\VideoService\VideoRequestType.cs" />
-    <Compile Include="Video\VideoService\VideoRequestTypeComboBox.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Video\VideoService\VideoRequestTypeComboBox.Designer.cs">
-      <DependentUpon>VideoRequestTypeComboBox.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Video\VideoService\VideoPagingControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Video\VideoService\VideoServiceVideoSource.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Video\VideoSettings.cs" />
-    <Compile Include="Video\VideoSmartContent.cs" />
-    <Compile Include="Video\VideoSource.cs">
-    </Compile>
-    <Compile Include="Video\VideoListBox\VideoThumbnail.cs" />
-    <Compile Include="Video\VideoListBox\VideoThumbnailManager.cs" />
-    <Compile Include="Video\WebVideoSource.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Video\YouTube\YouTubeVideoService.cs" />
-    <Compile Include="Video\YouTube\YouTubeException.cs" />
-    <Compile Include="Video\YouTube\YoutubeVideoPublisher.cs" />
-    <Compile Include="ViewSwitchTabControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="ViewSwitchTabControl.Designer.cs">
-      <DependentUpon>ViewSwitchTabControl.cs</DependentUpon>
-    </Compile>
-    <Compile Include="WebLayoutViewWarningForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="WeblogCommandManager.cs" />
-    <Compile Include="WindowCascadeHelper.cs" />
-    <Compile Include="OpenLiveWriterContentTarget.cs" />
-    <Compile Include="WordCount\WordCountPreferences.cs" />
-    <Compile Include="WordCount\WordCountSettings.cs" />
-    <EmbeddedResource Include="AboutForm.resx">
-      <DependentUpon>AboutForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="AfterPublishFileUploadFailedForm.resx">
-      <DependentUpon>AfterPublishFileUploadFailedForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Autoreplace\AutoreplaceEditForm.resx">
-      <DependentUpon>AutoreplaceEditForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Autoreplace\AutoreplaceManagementControl.resx">
-      <DependentUpon>AutoreplaceManagementControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Autoreplace\AutoreplacePreferencesPanel.resx">
-      <DependentUpon>AutoreplacePreferencesPanel.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Commands\CommandWeblogPicker.resx">
-      <DependentUpon>CommandWeblogPicker.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="Configuration\Accounts\Images\AccountPanelBitmap.png" />
     <EmbeddedResource Include="Configuration\Accounts\Images\Blog.png" />
-    <EmbeddedResource Include="Configuration\Accounts\WeblogAccountListView.resx">
-      <DependentUpon>WeblogAccountListView.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Configuration\Accounts\WeblogAccountManagementControl.resx">
-      <DependentUpon>WeblogAccountManagementControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Configuration\Accounts\WeblogAccountPreferencesPanel.resx">
-      <DependentUpon>WeblogAccountPreferencesPanel.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Configuration\Settings\AccountPanel.resx">
-      <DependentUpon>AccountPanel.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Configuration\Settings\AdvancedPanel.resx">
-      <DependentUpon>AdvancedPanel.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Configuration\Settings\BlogPluginsPanel.resx">
-      <SubType>Designer</SubType>
-      <DependentUpon>BlogPluginsPanel.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Configuration\Settings\EditingPanel.resx">
-      <DependentUpon>EditingPanel.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Configuration\Settings\FTPSettingsForm.resx">
-      <DependentUpon>FTPSettingsForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Configuration\Settings\ImagesPanel.resx">
-      <DependentUpon>ImagesPanel.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="Configuration\Settings\Images\AccountPanelBitmap.png" />
     <EmbeddedResource Include="Configuration\Settings\Images\AdvancedPanelBitmap.png" />
     <EmbeddedResource Include="Configuration\Settings\Images\EditingPanelBitmap.png" />
     <EmbeddedResource Include="Configuration\Settings\Images\ImagesPanelBitmap.png" />
-    <EmbeddedResource Include="Configuration\Settings\WeblogCapabilitiesForm.resx">
-      <DependentUpon>WeblogCapabilitiesForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Configuration\Settings\WeblogSettingsPanel.resx">
-      <DependentUpon>WeblogSettingsPanel.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="Configuration\Wizard\Images\LiveID16.gif" />
     <EmbeddedResource Include="Configuration\Wizard\Images\WeblogWizardHeader.png" />
-    <EmbeddedResource Include="Configuration\Wizard\WeblogConfigurationWizard.resx">
-      <DependentUpon>WeblogConfigurationWizard.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Configuration\Wizard\WeblogConfigurationWizardHeader.resx">
-      <DependentUpon>WeblogConfigurationWizardHeader.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Configuration\Wizard\WeblogConfigurationWizardPanel.resx">
-      <DependentUpon>WeblogConfigurationWizardPanel.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Configuration\Wizard\WeblogConfigurationWizardPanelAutoDetection.resx">
-      <DependentUpon>WeblogConfigurationWizardPanelAutoDetection.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Configuration\Wizard\WeblogConfigurationWizardPanelBasicInfo.resx">
-      <DependentUpon>WeblogConfigurationWizardPanelBasicInfo.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Configuration\Wizard\WeblogConfigurationWizardPanelBlogType.resx">
-      <DependentUpon>WeblogConfigurationWizardPanelBlogType.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Configuration\Wizard\WeblogConfigurationWizardPanelConfirmation.resx">
-      <DependentUpon>WeblogConfigurationWizardPanelConfirmation.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Configuration\Wizard\WeblogConfigurationWizardPanelProgress.resx">
-      <DependentUpon>WeblogConfigurationWizardPanelProgress.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Configuration\Wizard\WeblogConfigurationWizardPanelSelectBlog.resx">
-      <DependentUpon>WeblogConfigurationWizardPanelSelectBlog.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Configuration\Wizard\WeblogConfigurationWizardPanelSelectProvider.resx">
-      <DependentUpon>WeblogConfigurationWizardPanelSelectProvider.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Configuration\Wizard\WeblogConfigurationWizardPanelGoogleBloggerAuthentication.resx">
-      <DependentUpon>WeblogConfigurationWizardPanelGoogleBloggerAuthentication.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Configuration\Wizard\WeblogConfigurationWizardPanelSharePointAuthentication.resx">
-      <DependentUpon>WeblogConfigurationWizardPanelSharePointAuthentication.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Configuration\Wizard\WeblogConfigurationWizardPanelSharePointBasicInfo.resx">
-      <DependentUpon>WeblogConfigurationWizardPanelSharePointBasicInfo.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Configuration\Wizard\WeblogHomepageUrlControl.resx">
-      <DependentUpon>WeblogHomepageUrlControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ContentSources\Common\MediaTab.resx">
-      <SubType>Designer</SubType>
-      <DependentUpon>MediaTab.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ContentSources\Common\PanelLoginControl.resx">
-      <DependentUpon>PanelLoginControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ContentSources\Common\LoginStatusControl.resx">
-      <DependentUpon>LoginStatusControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ContentSources\Common\MediaInsertForm.resx">
-      <DependentUpon>MediaInsertForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="ContentSources\Images\DefaultPluginImage.png" />
     <EmbeddedResource Include="ContentSources\Images\NetworkProgress\Progress01.png" />
     <EmbeddedResource Include="ContentSources\Images\NetworkProgress\Progress02.png" />
@@ -1116,22 +230,6 @@
     <EmbeddedResource Include="ContentSources\Images\NetworkProgress\Progress20.png" />
     <EmbeddedResource Include="ContentSources\Images\NetworkProgress\Progress21.png" />
     <EmbeddedResource Include="ContentSources\Images\NetworkProgress\Progress22.png" />
-    <EmbeddedResource Include="ContentSources\UrlContentRetreivalWithProgressDialog.resx">
-      <DependentUpon>UrlContentRetreivalWithProgressDialog.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="EditingPreferencesPanel.resx">
-      <DependentUpon>EditingPreferencesPanel.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ExpirationForm.resx">
-      <DependentUpon>ExpirationForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FileUploadFailedForm.resx">
-      <DependentUpon>FileUploadFailedForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="ImageInsertion\Images\InsertFromWebWatermark.png" />
     <EmbeddedResource Include="ImageInsertion\Images\TabInsertFromFile.png" />
     <EmbeddedResource Include="ImageInsertion\Images\TabInsertFromWeb.png" />
@@ -1187,22 +285,6 @@
     <EmbeddedResource Include="LiveClipboard\Images\HandledByOpenLiveWriter.png" />
     <EmbeddedResource Include="LiveClipboard\Images\LiveClipboardIcon.png" />
     <EmbeddedResource Include="LiveClipboard\Images\LiveClipboardSmall.png" />
-    <EmbeddedResource Include="LiveClipboard\LiveClipboardChangeHandlerForm.resx">
-      <DependentUpon>LiveClipboardChangeHandlerForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="LiveClipboard\LiveClipboardPreferencesPanel.resx">
-      <DependentUpon>LiveClipboardPreferencesPanel.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="OpenPost\CommandRecentPost.resx">
-      <DependentUpon>CommandRecentPost.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="OpenPost\GetRecentPostsProgressControl.resx">
-      <DependentUpon>GetRecentPostsProgressControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="OpenPost\Images\BlogPost.png" />
     <EmbeddedResource Include="OpenPost\Images\DeleteDraftPostDisabled.png" />
     <EmbeddedResource Include="OpenPost\Images\DeleteDraftPostEnabled.png" />
@@ -1227,162 +309,14 @@
     <EmbeddedResource Include="OpenPost\Images\SelectWebLogPostings.png" />
     <EmbeddedResource Include="OpenPost\Images\SelectWebLogPostingsLarge.png" />
     <EmbeddedResource Include="OpenPost\Images\Separator.png" />
-    <EmbeddedResource Include="OpenPost\OpenPostForm.resx">
-      <DependentUpon>OpenPostForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="OpenPost\SelectPostLinkForm.resx">
-      <DependentUpon>SelectPostLinkForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PingPreferencesPanel.resx">
-      <DependentUpon>PingPreferencesPanel.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PluginsPreferencesPanel.resx">
-      <DependentUpon>PluginsPreferencesPanel.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostEditorForm.resx">
-      <DependentUpon>PostEditorForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostEditorMainControl.resx">
-      <DependentUpon>PostEditorMainControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostEditorPreferencesPanel.resx">
-      <DependentUpon>PostEditorPreferencesPanel.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="PostHtmlEditing\Behaviors\Images\ActiveHatch.png" />
     <EmbeddedResource Include="PostHtmlEditing\Behaviors\Images\ExtendedEntrySeparatorTile.png" />
-    <EmbeddedResource Include="PostHtmlEditing\BlogPostHtmlEditorControl.resx">
-      <DependentUpon>BlogPostHtmlEditorControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostHtmlEditing\BlogPostHtmlSourceEditorControl.resx">
-      <DependentUpon>BlogPostHtmlSourceEditorControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostHtmlEditing\ImageContextMenuDefinition.resx">
-      <DependentUpon>ImageContextMenuDefinition.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostHtmlEditing\ImageEditing\Decorators\BrightnessEditor.resx">
-      <DependentUpon>BrightnessEditor.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostHtmlEditing\ImageEditing\Decorators\CropEditor.resx">
-      <DependentUpon>CropEditor.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostHtmlEditing\ImageEditing\Decorators\HtmlAlignEditor.resx">
-      <DependentUpon>HtmlAlignEditor.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostHtmlEditing\ImageEditing\Decorators\HtmlAltTextEditor.resx">
-      <DependentUpon>HtmlAltTextEditor.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostHtmlEditing\ImageEditing\Decorators\HtmlImageResizeEditor.resx">
-      <DependentUpon>HtmlImageResizeEditor.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostHtmlEditing\ImageEditing\Decorators\HtmlImageTargetEditor.resx">
-      <DependentUpon>HtmlImageTargetEditor.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostHtmlEditing\ImageEditing\Decorators\HtmlMarginEditor.resx">
-      <DependentUpon>HtmlMarginEditor.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostHtmlEditing\ImageEditing\Decorators\LinkToOptionsForm.resx">
-      <DependentUpon>LinkToOptionsForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostHtmlEditing\ImageEditing\Decorators\RotationEditor.resx">
-      <DependentUpon>RotationEditor.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostHtmlEditing\ImageEditing\Decorators\TiltDecoratorEditor.resx">
-      <SubType>Designer</SubType>
-      <DependentUpon>TiltDecoratorEditor.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostHtmlEditing\ImageEditing\Decorators\WatermarkEditor.resx">
-      <DependentUpon>WatermarkEditor.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostHtmlEditing\ImageEditing\EditImageSizesDialog.resx">
-      <DependentUpon>EditImageSizesDialog.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostHtmlEditing\ImageEditing\ImageBorderPickerControl.resx">
-      <DependentUpon>ImageBorderPickerControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostHtmlEditing\ImageEditing\ImageDecoratorEditorForm.resx">
-      <DependentUpon>ImageDecoratorEditorForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostHtmlEditing\ImageEditing\ImageDecoratorsCommandBarLightweightControl.resx">
-      <DependentUpon>ImageDecoratorsCommandBarLightweightControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostHtmlEditing\ImageEditing\ImageDecoratorsControl.resx">
-      <DependentUpon>ImageDecoratorsControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostHtmlEditing\ImageEditing\ImagePropertiesSidebarControl.resx">
-      <DependentUpon>ImagePropertiesSidebarControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostHtmlEditing\ImageEditing\ImagePropertiesSidebarHostControl.resx">
-      <DependentUpon>ImagePropertiesSidebarHostControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostHtmlEditing\ImageEditing\ImageSizeControl.resx">
-      <DependentUpon>ImageSizeControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostHtmlEditing\ImageEditing\ImageSizePickerControl.resx">
-      <DependentUpon>ImageSizePickerControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="PostHtmlEditing\ImageEditing\Images\CustomizeImageSizeButton.png" />
     <EmbeddedResource Include="PostHtmlEditing\ImageEditing\Images\WrapTextInlineEnabled.png" />
     <EmbeddedResource Include="PostHtmlEditing\ImageEditing\Images\WrapTextLeftEnabled.png" />
     <EmbeddedResource Include="PostHtmlEditing\ImageEditing\Images\WrapTextRightEnabled.png" />
-    <EmbeddedResource Include="PostHtmlEditing\ImageEditing\ImageTargetEditorControl.resx">
-      <DependentUpon>ImageTargetEditorControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostHtmlEditing\ImageEditing\ImageUrlTargetEditorControl.resx">
-      <DependentUpon>ImageUrlTargetEditorControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostHtmlEditing\ImageEditing\LinkOptionsEditorControl.resx">
-      <DependentUpon>LinkOptionsEditorControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="PostHtmlEditing\Images\PropertiesHandleEnabled.png" />
     <EmbeddedResource Include="PostHtmlEditing\Images\PropertiesHandleSelected.png" />
-    <EmbeddedResource Include="PostHtmlEditing\ImageUrlForm.resx">
-      <DependentUpon>ImageUrlForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostHtmlEditing\Sidebar\ContentSourceSidebarControl.resx">
-      <DependentUpon>ContentSourceSidebarControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostHtmlEditing\Sidebar\HtmlEditorSidebarHost.resx">
-      <DependentUpon>HtmlEditorSidebarHost.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostHtmlEditing\Sidebar\HtmlEditorSidebarStatus.resx">
-      <DependentUpon>HtmlEditorSidebarStatus.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="PostHtmlEditing\Sidebar\Images\ChevronLeft.png" />
     <EmbeddedResource Include="PostHtmlEditing\Sidebar\Images\ChevronLeftHover.png" />
     <EmbeddedResource Include="PostHtmlEditing\Sidebar\Images\ChevronRight.png" />
@@ -1395,39 +329,7 @@
     <EmbeddedResource Include="PostHtmlEditing\Sidebar\Images\NewPost.png" />
     <EmbeddedResource Include="PostHtmlEditing\Sidebar\Images\OpenPost.png" />
     <EmbeddedResource Include="PostHtmlEditing\Sidebar\Images\SectionCorner.png" />
-    <EmbeddedResource Include="PostHtmlEditing\Sidebar\SidebarControl.resx">
-      <DependentUpon>SidebarControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostHtmlEditing\SmartContentContextMenuDefinition.resx">
-      <DependentUpon>SmartContentContextMenuDefinition.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostHtmlEditing\TextContextMenuDefinition.resx">
-      <DependentUpon>TextContextMenuDefinition.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostPropertyEditing\CategoryControl\CategoryDisplayFormW3M1.resx">
-      <SubType>Designer</SubType>
-      <DependentUpon>CategoryDisplayFormW3M1.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostPropertyEditing\CategoryControl\CategoryDropDownControlM1.resx">
-      <DependentUpon>CategoryDropDownControlM1.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="PostPropertyEditing\CategoryControl\Images\CategoryIcon.png" />
-    <EmbeddedResource Include="PostPropertyEditing\CategoryControl\RadioCategorySelector.resx">
-      <SubType>Designer</SubType>
-      <DependentUpon>RadioCategorySelector.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostPropertyEditing\CategoryControl\TreeCategorySelector.resx">
-      <SubType>Designer</SubType>
-      <DependentUpon>TreeCategorySelector.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PostPropertyEditing\FutureDateWarningForm.resx">
-      <DependentUpon>FutureDateWarningForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="PostPropertyEditing\Images\Information.png" />
     <EmbeddedResource Include="PostPropertyEditing\Images\PostOptionsEnabled.png" />
     <EmbeddedResource Include="PostPropertyEditing\Images\PostOptionsSelected.png" />
@@ -1440,102 +342,10 @@
     <EmbeddedResource Include="PostPropertyEditing\Images\UpButtonEnabled.png" />
     <EmbeddedResource Include="PostPropertyEditing\Images\UpButtonPushed.png" />
     <EmbeddedResource Include="PostPropertyEditing\Images\UpButtonSelected.png" />
-    <EmbeddedResource Include="PostPropertyEditing\PageParentComboBox.resx">
-      <DependentUpon>PageParentComboBox.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PrivacyPreferencesPanel.resx">
-      <SubType>Designer</SubType>
-      <DependentUpon>PrivacyPreferencesPanel.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="RecentPostNotSynchronizedWarningForm.resx">
-      <DependentUpon>RecentPostNotSynchronizedWarningForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="RecentPostProgressForm.resx">
-      <DependentUpon>RecentPostProgressForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SupportingFiles\SupportingFilesForm.resx">
-      <DependentUpon>SupportingFilesForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Tables\CellPropertiesControl.resx">
-      <DependentUpon>CellPropertiesControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Tables\CellPropertiesForm.resx">
-      <DependentUpon>CellPropertiesForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Tables\ColumnPropertiesForm.resx">
-      <DependentUpon>ColumnPropertiesForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Tables\ColumnWidthControl.resx">
-      <DependentUpon>ColumnWidthControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Tables\RowPropertiesForm.resx">
-      <DependentUpon>RowPropertiesForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Tables\TableAlignmentControl.resx">
-      <DependentUpon>TableAlignmentControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Tables\TableContextMenuDefinition.resx">
-      <DependentUpon>TableContextMenuDefinition.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Tables\TableIndentControl.resx">
-      <DependentUpon>TableIndentControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Tables\TablePropertiesForm.resx">
-      <DependentUpon>TablePropertiesForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Tagging\EditTagForm.resx">
-      <DependentUpon>EditTagForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="Tagging\Images\HeaderCorner.png" />
     <EmbeddedResource Include="Tagging\Images\InsertTag.png" />
     <EmbeddedResource Include="Tagging\Images\TagWatermark.png" />
-    <EmbeddedResource Include="Tagging\TagEditor.resx">
-      <DependentUpon>TagEditor.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Tagging\TagForm.resx">
-      <DependentUpon>TagForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Tagging\TagOptions.resx">
-      <DependentUpon>TagOptions.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Tagging\TagProviderComboBox.resx">
-      <DependentUpon>TagProviderComboBox.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="Tagging\TagProviders.xml" />
-    <EmbeddedResource Include="Tagging\TagSmartContentEditor.resx">
-      <DependentUpon>TagSmartContentEditor.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Tagging\TextBoxWithAutoComplete.resx">
-      <DependentUpon>TextBoxWithAutoComplete.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="TitleReminderForm.resx">
-      <DependentUpon>TitleReminderForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UpdateWeblogProgressForm.resx">
-      <DependentUpon>UpdateWeblogProgressForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="Video\Images\AlignmentInline.png" />
     <EmbeddedResource Include="Video\Images\AlignmentLeft.png" />
     <EmbeddedResource Include="Video\Images\AlignmentRight.png" />
@@ -1554,36 +364,8 @@
     <EmbeddedResource Include="Video\Images\VideoWatermark.png" />
     <EmbeddedResource Include="Video\VideoListBox\Images\DownloadingThumbnail.png" />
     <EmbeddedResource Include="Video\VideoListBox\Images\NoAvailableThumbnail.png" />
-    <EmbeddedResource Include="Video\VideoEditorControl.resx">
-      <DependentUpon>VideoEditorControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="Video\VideoProvidersB2.xml" />
-    <EmbeddedResource Include="Video\VideoPublishSource.resx">
-      <DependentUpon>VideoPublishSource.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Video\VideoService\VideoPagingControl.resx">
-      <SubType>Designer</SubType>
-      <DependentUpon>VideoPagingControl.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Video\VideoService\VideoRequestTypeComboBox.resx">
-      <SubType>Designer</SubType>
-      <DependentUpon>VideoRequestTypeComboBox.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Video\VideoService\VideoServiceVideoSource.resx">
-      <SubType>Designer</SubType>
-      <DependentUpon>VideoServiceVideoSource.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Video\WebVideoSource.resx">
-      <DependentUpon>WebVideoSource.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="Video\YouTube\Images\Sidebar.png" />
-    <EmbeddedResource Include="WebLayoutViewWarningForm.resx">
-      <DependentUpon>WebLayoutViewWarningForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="Images\PreferencesAutoreplace.png" />
     <EmbeddedResource Include="PostPropertyEditing\CategoryControl\Images\Search.png" />
     <EmbeddedResource Include="PostHtmlEditing\ImageEditing\Images\WrapTextCenterEnabled.png" />
diff --git a/src/managed/OpenLiveWriter.SpellChecker/OpenLiveWriter.SpellChecker.csproj b/src/managed/OpenLiveWriter.SpellChecker/OpenLiveWriter.SpellChecker.csproj
index df7e3339..4483bb3e 100644
--- a/src/managed/OpenLiveWriter.SpellChecker/OpenLiveWriter.SpellChecker.csproj
+++ b/src/managed/OpenLiveWriter.SpellChecker/OpenLiveWriter.SpellChecker.csproj
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop" ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\writer.build.settings" />
   <PropertyGroup>
     <AssemblyName>OpenLiveWriter.SpellChecker</AssemblyName>
     <RootNamespace>OpenLiveWriter.SpellChecker</RootNamespace>
     <ProjectGuid>{2DB3A424-0F1E-44AC-AE01-5454586CE769}</ProjectGuid>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="PlatformSpellCheck, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -61,46 +63,10 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\GlobalAssemblyInfo.cs" />
-    <Compile Include="HighlightSegmentTracker.cs" />
-    <Compile Include="HtmlTextBoxWordRange.cs" />
-    <Compile Include="IBlogPostSpellCheckingContext.cs" />
-    <Compile Include="SortedMarkupRangeList.cs" />
-    <Compile Include="ISpellingChecker.cs" />
-    <Compile Include="IWordRange.cs" />
-    <Compile Include="IWordRangeProvider.cs" />
-    <Compile Include="MisspelledWordInfo.cs" />
-    <Compile Include="MshtmlWordRange.cs" />
-    <Compile Include="SpellCheckerForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="SpellCheckingContextMenuDefinition.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="SpellingHighlighter.cs" />
-    <Compile Include="SpellingLanguageEntry.cs" />
-    <Compile Include="SpellingManager.cs" />
-    <Compile Include="SpellingPreferences.cs" />
-    <Compile Include="SpellingPreferencesPanel.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="SpellingSettings.cs" />
-    <Compile Include="SpellingTimer.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="TextBoxWordRange.cs" />
-    <Compile Include="WinSpellingChecker.cs" />
     <EmbeddedResource Include="Images\SpellingDictionaries.png" />
     <EmbeddedResource Include="Images\SpellingGeneral.png" />
     <EmbeddedResource Include="Images\SpellingPanelBitmap.png" />
     <EmbeddedResource Include="Images\SpellingPanelBitmapSmall.png" />
-    <EmbeddedResource Include="SpellCheckerForm.resx">
-      <DependentUpon>SpellCheckerForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SpellingPreferencesPanel.resx">
-      <DependentUpon>SpellingPreferencesPanel.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/src/managed/OpenLiveWriter.UnitTest/OpenLiveWriter.UnitTest.csproj b/src/managed/OpenLiveWriter.UnitTest/OpenLiveWriter.UnitTest.csproj
index a9ed16d5..6ff3a5a4 100644
--- a/src/managed/OpenLiveWriter.UnitTest/OpenLiveWriter.UnitTest.csproj
+++ b/src/managed/OpenLiveWriter.UnitTest/OpenLiveWriter.UnitTest.csproj
@@ -72,10 +72,6 @@
       <Project>{B6D10B42-F173-4086-BB81-96B724BA5594}</Project>
       <Name>OpenLiveWriter.Api</Name>
     </ProjectReference>
-    <ProjectReference Include="..\OpenLiveWriter.CoreServices\OpenLiveWriter.CoreServices.csproj">
-      <Project>{9154B6B4-F2C3-4FB4-BE38-A26A6C9409EE}</Project>
-      <Name>OpenLiveWriter.CoreServices</Name>
-    </ProjectReference>
     <ProjectReference Include="..\OpenLiveWriter.Extensibility\OpenLiveWriter.Extensibility.csproj">
       <Project>{A803C16E-6619-4017-883C-EA73EB947F34}</Project>
       <Name>OpenLiveWriter.Extensibility</Name>
diff --git a/src/managed/OpenLiveWriter/OpenLiveWriter.csproj b/src/managed/OpenLiveWriter/OpenLiveWriter.csproj
index e655a51b..2927708d 100644
--- a/src/managed/OpenLiveWriter/OpenLiveWriter.csproj
+++ b/src/managed/OpenLiveWriter/OpenLiveWriter.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop" ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\writer.build.settings" />
   <PropertyGroup>
     <AssemblyName>OpenLiveWriter</AssemblyName>
@@ -13,6 +13,8 @@
     <StartupObject>OpenLiveWriter.ApplicationMain</StartupObject>
     <ApplicationManifest>OpenLiveWriter.exe.manifest</ApplicationManifest>
     <UseVSHostingProcess>false</UseVSHostingProcess>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
   </PropertyGroup>
@@ -133,16 +135,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\GlobalAssemblyInfo.cs" />
-    <Compile Include="ApplicationLauncher.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ApplicationMain.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="WriterCommandLineOptions.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <EmbeddedResource Include="OpenLiveWriter.exe.manifest">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </EmbeddedResource>
diff --git a/writer.build.settings b/writer.build.settings
index d9df49ac..22080118 100644
--- a/writer.build.settings
+++ b/writer.build.settings
@@ -2,7 +2,8 @@
 
     <PropertyGroup>
       <Project>Writer</Project>
-      <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+      <!--<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>-->
+      <TargetFramework>netcoreapp3.0</TargetFramework>
       <RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
       <SrcManagedRoot>$(RepoRoot)\src\managed</SrcManagedRoot>
       <SolutionDir Condition="'$(SolutionDir)'==''">$(SrcManagedRoot)</SolutionDir>