From 2a2cd06f8a307f43022b2ee8dc0ff46acf35b1f6 Mon Sep 17 00:00:00 2001
From: Sam Harwell <sam@tunnelvisionlabs.com>
Date: Thu, 29 Nov 2018 08:53:42 -0600
Subject: [PATCH] Convert solution to CPS

---
 .../NBug.Destinations.AzureBlobStorage.csproj |  64 +---
 Documentation/Documentation.csproj            |  49 +--
 .../NBug.Examples.Console.csproj              |  65 +---
 .../NBug.Examples.WPF.csproj                  | 128 ++-----
 .../NBug.Examples.WinForms.csproj             | 110 ++----
 NBug.Configurator/NBug.Configurator.csproj    | 192 ++---------
 NBug.Tests/NBug.Tests.csproj                  |  82 +----
 NBug.sln                                      |  23 +-
 NBug/NBug.csproj                              | 322 ++----------------
 NBug/Properties/Localization.de.Designer.cs   |   0
 .../Properties/Localization.es-MX.Designer.cs |   0
 .../Properties/Localization.fi-FI.Designer.cs |   0
 NBug/Properties/Localization.hr.Designer.cs   |   0
 NBug/Properties/Localization.ja.Designer.cs   |   0
 .../Properties/Localization.ko-KR.Designer.cs |   0
 .../Properties/Localization.pt-BR.Designer.cs |   0
 .../Properties/Localization.ru-RU.Designer.cs |   0
 global.json                                   |   5 +
 18 files changed, 176 insertions(+), 864 deletions(-)
 delete mode 100644 NBug/Properties/Localization.de.Designer.cs
 delete mode 100644 NBug/Properties/Localization.es-MX.Designer.cs
 delete mode 100644 NBug/Properties/Localization.fi-FI.Designer.cs
 delete mode 100644 NBug/Properties/Localization.hr.Designer.cs
 delete mode 100644 NBug/Properties/Localization.ja.Designer.cs
 delete mode 100644 NBug/Properties/Localization.ko-KR.Designer.cs
 delete mode 100644 NBug/Properties/Localization.pt-BR.Designer.cs
 delete mode 100644 NBug/Properties/Localization.ru-RU.Designer.cs
 create mode 100644 global.json

diff --git a/Destinations/NBug.Destinations.AzureBlobStorage/NBug.Destinations.AzureBlobStorage.csproj b/Destinations/NBug.Destinations.AzureBlobStorage/NBug.Destinations.AzureBlobStorage.csproj
index ad2b6b1..e958aa1 100644
--- a/Destinations/NBug.Destinations.AzureBlobStorage/NBug.Destinations.AzureBlobStorage.csproj
+++ b/Destinations/NBug.Destinations.AzureBlobStorage/NBug.Destinations.AzureBlobStorage.csproj
@@ -1,54 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{B5F98A29-817D-4186-A812-1B6A7B08108D}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>NBug.Destinations.AzureBlobStorage</RootNamespace>
-    <AssemblyName>NBug.Destinations.AzureBlobStorage</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <TargetFrameworks>net45</TargetFrameworks>
+
+    <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
+
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
     <AssemblyOriginatorKeyFile>Signing.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data.Services.Client" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Data.Edm" Version="5.2.0" />
     <PackageReference Include="Microsoft.Data.OData" Version="5.2.0" />
@@ -56,19 +20,13 @@
     <PackageReference Include="System.Spatial" Version="5.2.0" />
     <PackageReference Include="WindowsAzure.Storage" Version="2.0.5.1" />
   </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="AzureBlobStorage.cs" />
-    <Compile Include="AzureBlobStorageFactory.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\NBug\NBug.csproj">
-      <Project>{62ced1d5-f603-40de-8bf5-3e49d3a392f4}</Project>
-      <Name>NBug</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\NBug\NBug.csproj" />
   </ItemGroup>
+
   <ItemGroup>
     <None Include="Signing.snk" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+
 </Project>
\ No newline at end of file
diff --git a/Documentation/Documentation.csproj b/Documentation/Documentation.csproj
index 8eebb4f..cde8b49 100644
--- a/Documentation/Documentation.csproj
+++ b/Documentation/Documentation.csproj
@@ -1,47 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{975E1EA6-EDA8-4E5D-AC56-7A741022C89A}</ProjectGuid>
+    <TargetFrameworks>net45</TargetFrameworks>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Documentation</RootNamespace>
-    <AssemblyName>Documentation</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <TargetFrameworkProfile />
-    <FileAlignment>512</FileAlignment>
-    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+
+    <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
+    <NoWarn>$(NoWarn),1591,1574</NoWarn>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Content Include="html\content\blank.html" />
-    <Content Include="html\content\getting_started.html" />
-    <Content Include="html\index.html" />
-    <Content Include="html\toc.html" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="html\content\images\" />
-  </ItemGroup>
+
   <ItemGroup>
-    <None Include="chm\NBug 1.1.1 Docs.chm" />
+    <Content Include="html\**\*" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+
 </Project>
\ No newline at end of file
diff --git a/Examples/NBug.Examples.Console/NBug.Examples.Console.csproj b/Examples/NBug.Examples.Console/NBug.Examples.Console.csproj
index 9df1d83..82a5af3 100644
--- a/Examples/NBug.Examples.Console/NBug.Examples.Console.csproj
+++ b/Examples/NBug.Examples.Console/NBug.Examples.Console.csproj
@@ -1,71 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{37281C42-C5CC-456D-B817-D81E6D866121}</ProjectGuid>
+    <TargetFrameworks>net45</TargetFrameworks>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>NBug.Examples.Console</RootNamespace>
-    <AssemblyName>NBug.Examples.Console</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <TargetFrameworkProfile />
-    <FileAlignment>512</FileAlignment>
-    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+
+    <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <NoWarn>$(NoWarn),1591,1574</NoWarn>
   </PropertyGroup>
+
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
     <AssemblyOriginatorKeyFile>..\..\Signing.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
+
   <PropertyGroup>
     <ApplicationIcon>..\..\NBug\resources\icon.ico</ApplicationIcon>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>bin\Release\NBug.Examples.Console.XML</DocumentationFile>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
+
   <ItemGroup>
     <Compile Include="..\..\GlobalAssemblyInfo.cs">
       <Link>Properties\GlobalAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
   </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\..\NBug\NBug.csproj">
-      <Project>{62CED1D5-F603-40DE-8BF5-3E49D3A392F4}</Project>
-      <Name>NBug</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\NBug\NBug.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+
 </Project>
\ No newline at end of file
diff --git a/Examples/NBug.Examples.WPF/NBug.Examples.WPF.csproj b/Examples/NBug.Examples.WPF/NBug.Examples.WPF.csproj
index ad44081..35ae367 100644
--- a/Examples/NBug.Examples.WPF/NBug.Examples.WPF.csproj
+++ b/Examples/NBug.Examples.WPF/NBug.Examples.WPF.csproj
@@ -1,117 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="MSBuild.Sdk.Extras">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{33B22A3A-8188-42BE-BAD6-40046019EA73}</ProjectGuid>
+    <TargetFrameworks>net45</TargetFrameworks>
     <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>NBug.Examples.WPF</RootNamespace>
-    <AssemblyName>NBug.Examples.WPF</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <TargetFrameworkProfile />
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationIcon>..\..\NBug\resources\icon.ico</ApplicationIcon>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+
+    <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
   </PropertyGroup>
+
   <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
+    <ApplicationIcon>..\..\NBug\resources\icon.ico</ApplicationIcon>
   </PropertyGroup>
+
   <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\Signing.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
+    <Reference Include="System.Xaml" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\..\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml" Generator="MSBuild:Compile" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Page Include="MainWindow.xaml" Generator="MSBuild:Compile" />
   </ItemGroup>
+
   <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-    <Page Include="MainWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Compile Include="..\..\GlobalAssemblyInfo.cs">
-      <Link>Properties\GlobalAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MainWindow.xaml.cs">
-      <DependentUpon>MainWindow.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
+    <EmbeddedResource Update="Properties\Resources.resx" Generator="ResXFileCodeGenerator" />
   </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <None Include="app.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <AppDesigner Include="Properties\" />
+    <None Update="Properties\Settings.settings" Generator="SettingsSingleFileGenerator" />
   </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\..\NBug\NBug.csproj">
-      <Project>{62CED1D5-F603-40DE-8BF5-3E49D3A392F4}</Project>
-      <Name>NBug</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\NBug\NBug.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+
 </Project>
\ No newline at end of file
diff --git a/Examples/NBug.Examples.WinForms/NBug.Examples.WinForms.csproj b/Examples/NBug.Examples.WinForms/NBug.Examples.WinForms.csproj
index eb35f31..29524ba 100644
--- a/Examples/NBug.Examples.WinForms/NBug.Examples.WinForms.csproj
+++ b/Examples/NBug.Examples.WinForms/NBug.Examples.WinForms.csproj
@@ -1,109 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{1A387F18-8DEA-4EF8-8399-B808F1B1F3AD}</ProjectGuid>
+    <TargetFrameworks>net45</TargetFrameworks>
     <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>NBug.Examples.WinForms</RootNamespace>
-    <AssemblyName>NBug.Examples.WinForms</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <TargetFrameworkProfile />
-    <FileAlignment>512</FileAlignment>
-    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+
+    <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
   </PropertyGroup>
+
   <PropertyGroup>
     <ApplicationIcon>..\..\NBug\resources\icon.ico</ApplicationIcon>
   </PropertyGroup>
+
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
     <AssemblyOriginatorKeyFile>..\..\Signing.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
+
   <ItemGroup>
     <Compile Include="..\..\GlobalAssemblyInfo.cs">
       <Link>Properties\GlobalAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="MainForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="MainForm.Designer.cs">
-      <DependentUpon>MainForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Normal.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Normal.Designer.cs">
-      <DependentUpon>Normal.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="MainForm.resx">
-      <DependentUpon>MainForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Normal.resx">
-      <DependentUpon>Normal.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <None Include="app.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
   </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="MainForm.resx" DependentUpon="MainForm.cs" />
+    <EmbeddedResource Update="Normal.resx" DependentUpon="Normal.cs" />
+    <EmbeddedResource Update="Properties\Resources.resx" Generator="ResXFileCodeGenerator" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="Properties\Settings.settings" Generator="SettingsSingleFileGenerator" />
+  </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\..\NBug\NBug.csproj">
-      <Project>{62CED1D5-F603-40DE-8BF5-3E49D3A392F4}</Project>
-      <Name>NBug</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\NBug\NBug.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+
 </Project>
\ No newline at end of file
diff --git a/NBug.Configurator/NBug.Configurator.csproj b/NBug.Configurator/NBug.Configurator.csproj
index 1c9ac6e..0c5d580 100644
--- a/NBug.Configurator/NBug.Configurator.csproj
+++ b/NBug.Configurator/NBug.Configurator.csproj
@@ -1,194 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{84D5B54B-7546-44C5-95F7-CDDBFB3F31B3}</ProjectGuid>
+    <TargetFrameworks>net45</TargetFrameworks>
     <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>NBug.Configurator</RootNamespace>
-    <AssemblyName>NBug.Configurator</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <TargetFrameworkProfile />
-    <FileAlignment>512</FileAlignment>
-    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+
+    <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
   </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
+
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
   </PropertyGroup>
+
   <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\Signing.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
+
   <PropertyGroup>
     <ApplicationIcon>..\NBug\resources\icon.ico</ApplicationIcon>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
+
   <ItemGroup>
     <Compile Include="..\GlobalAssemblyInfo.cs">
       <Link>Properties\GlobalAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="AboutBox.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="AboutBox.Designer.cs">
-      <DependentUpon>AboutBox.cs</DependentUpon>
-    </Compile>
-    <Compile Include="MainForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="MainForm.Designer.cs">
-      <DependentUpon>MainForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="CustomPreviewForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="CustomPreviewForm.Designer.cs">
-      <DependentUpon>CustomPreviewForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="PreviewForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="PreviewForm.Designer.cs">
-      <DependentUpon>PreviewForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SubmitPanels\Custom\Custom.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="SubmitPanels\Custom\Custom.Designer.cs">
-      <DependentUpon>Custom.cs</DependentUpon>
-    </Compile>
-    <Compile Include="SubmitPanels\ISubmitPanel.cs" />
-    <Compile Include="SubmitPanels\Tracker\Mantis.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="SubmitPanels\Tracker\Mantis.Designer.cs">
-      <DependentUpon>Mantis.cs</DependentUpon>
-    </Compile>
-    <Compile Include="SubmitPanels\Web\Ftp.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="SubmitPanels\Web\Ftp.Designer.cs">
-      <DependentUpon>Ftp.cs</DependentUpon>
-    </Compile>
-    <Compile Include="SubmitPanels\Web\Http.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="SubmitPanels\Web\Http.Designer.cs">
-      <DependentUpon>Http.cs</DependentUpon>
-    </Compile>
-    <Compile Include="SubmitPanels\Web\Mail.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="SubmitPanels\Web\Mail.Designer.cs">
-      <DependentUpon>Mail.cs</DependentUpon>
-    </Compile>
-    <Compile Include="SubmitPanels\PanelLoader.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="SubmitPanels\PanelLoader.Designer.cs">
-      <DependentUpon>PanelLoader.cs</DependentUpon>
-    </Compile>
-    <Compile Include="SubmitPanels\Tracker\Redmine.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="SubmitPanels\Tracker\Redmine.Designer.cs">
-      <DependentUpon>Redmine.cs</DependentUpon>
-    </Compile>
-    <EmbeddedResource Include="AboutBox.resx">
-      <DependentUpon>AboutBox.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="MainForm.resx">
-      <DependentUpon>MainForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="CustomPreviewForm.resx">
-      <DependentUpon>CustomPreviewForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PreviewForm.resx">
-      <DependentUpon>PreviewForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <EmbeddedResource Include="SubmitPanels\Custom\Custom.resx">
-      <DependentUpon>Custom.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SubmitPanels\Tracker\Mantis.resx">
-      <DependentUpon>Mantis.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SubmitPanels\Web\Ftp.resx">
-      <DependentUpon>Ftp.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SubmitPanels\Web\Http.resx">
-      <DependentUpon>Http.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SubmitPanels\Web\Mail.resx">
-      <DependentUpon>Mail.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SubmitPanels\PanelLoader.resx">
-      <DependentUpon>PanelLoader.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SubmitPanels\Tracker\Redmine.resx">
-      <DependentUpon>Redmine.cs</DependentUpon>
-    </EmbeddedResource>
-    <None Include="app.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
   </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx" Generator="ResXFileCodeGenerator" />
+  </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\NBug\NBug.csproj">
-      <Project>{62CED1D5-F603-40DE-8BF5-3E49D3A392F4}</Project>
-      <Name>NBug</Name>
-    </ProjectReference>
+    <None Update="Properties\Settings.settings" Generator="SettingsSingleFileGenerator" />
   </ItemGroup>
+
   <ItemGroup>
-    <Folder Include="SubmitPanels\Database\" />
+    <ProjectReference Include="..\NBug\NBug.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+
 </Project>
\ No newline at end of file
diff --git a/NBug.Tests/NBug.Tests.csproj b/NBug.Tests/NBug.Tests.csproj
index 5d13b25..9c1e9d7 100644
--- a/NBug.Tests/NBug.Tests.csproj
+++ b/NBug.Tests/NBug.Tests.csproj
@@ -1,92 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{3CE73395-EECA-465B-B77F-227F164E92EB}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>NBug.Tests</RootNamespace>
-    <AssemblyName>NBug.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <TargetFrameworkProfile />
-    <FileAlignment>512</FileAlignment>
-    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <TargetFrameworks>net45</TargetFrameworks>
+
+    <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <DocumentationFile>
-    </DocumentationFile>
+
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
   </PropertyGroup>
+
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
     <AssemblyOriginatorKeyFile>..\Signing.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Moq" Version="4.0.10827" />
     <PackageReference Include="xunit" Version="1.9.0.1566" />
     <PackageReference Include="xunit.extensions" Version="1.9.0.1566" />
   </ItemGroup>
+
   <ItemGroup>
     <Compile Include="..\GlobalAssemblyInfo.cs">
       <Link>Properties\GlobalAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="Functional\SettingsUITests.cs" />
-    <Compile Include="Integration\DispatcherTests.cs" />
-    <Compile Include="Integration\SettingsTests.cs" />
-    <Compile Include="Tools\Fixtures\ReportFixture.cs" />
-    <Compile Include="Tools\Fixtures\SettingsFixture.cs" />
-    <Compile Include="Functional\DeveloperUITests.cs" />
-    <Compile Include="Tools\Extensions\UIAttribute.cs" />
-    <Compile Include="Tools\Fixtures\UIFixture.cs" />
-    <Compile Include="Tools\Stubs\DummyArgumentException.cs" />
-    <Compile Include="Tools\Stubs\DummySerializableException.cs" />
-    <Compile Include="Functional\WinFormsUITests.cs" />
-    <Compile Include="Integration\BugReportTests.cs" />
-    <Compile Include="Integration\HandlerTests.cs" />
-    <Compile Include="Unit\BugReportTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Unit\Helpers\EmailDestinationBuilderTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\NBug\NBug.csproj">
-      <Project>{62CED1D5-F603-40DE-8BF5-3E49D3A392F4}</Project>
-      <Name>NBug</Name>
-    </ProjectReference>
   </ItemGroup>
+
   <ItemGroup>
-    <Folder Include="Tools\Helpers\" />
+    <ProjectReference Include="..\NBug\NBug.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+
 </Project>
\ No newline at end of file
diff --git a/NBug.sln b/NBug.sln
index 02bab00..43ddf2c 100644
--- a/NBug.sln
+++ b/NBug.sln
@@ -1,19 +1,21 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NBug", "NBug\NBug.csproj", "{62CED1D5-F603-40DE-8BF5-3E49D3A392F4}"
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.106
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NBug", "NBug\NBug.csproj", "{62CED1D5-F603-40DE-8BF5-3E49D3A392F4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NBug.Configurator", "NBug.Configurator\NBug.Configurator.csproj", "{84D5B54B-7546-44C5-95F7-CDDBFB3F31B3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NBug.Configurator", "NBug.Configurator\NBug.Configurator.csproj", "{84D5B54B-7546-44C5-95F7-CDDBFB3F31B3}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{06E05029-1FB3-4122-9524-E81DC884A94E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NBug.Examples.WPF", "Examples\NBug.Examples.WPF\NBug.Examples.WPF.csproj", "{33B22A3A-8188-42BE-BAD6-40046019EA73}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NBug.Examples.WPF", "Examples\NBug.Examples.WPF\NBug.Examples.WPF.csproj", "{33B22A3A-8188-42BE-BAD6-40046019EA73}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NBug.Examples.Console", "Examples\NBug.Examples.Console\NBug.Examples.Console.csproj", "{37281C42-C5CC-456D-B817-D81E6D866121}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NBug.Examples.Console", "Examples\NBug.Examples.Console\NBug.Examples.Console.csproj", "{37281C42-C5CC-456D-B817-D81E6D866121}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NBug.Examples.WinForms", "Examples\NBug.Examples.WinForms\NBug.Examples.WinForms.csproj", "{1A387F18-8DEA-4EF8-8399-B808F1B1F3AD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NBug.Examples.WinForms", "Examples\NBug.Examples.WinForms\NBug.Examples.WinForms.csproj", "{1A387F18-8DEA-4EF8-8399-B808F1B1F3AD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NBug.Tests", "NBug.Tests\NBug.Tests.csproj", "{3CE73395-EECA-465B-B77F-227F164E92EB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NBug.Tests", "NBug.Tests\NBug.Tests.csproj", "{3CE73395-EECA-465B-B77F-227F164E92EB}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{26B9F5D5-286F-4C6E-AB2C-5B817053D8DC}"
 	ProjectSection(SolutionItems) = preProject
@@ -23,7 +25,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		ToDo.txt = ToDo.txt
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Documentation", "Documentation\Documentation.csproj", "{975E1EA6-EDA8-4E5D-AC56-7A741022C89A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Documentation", "Documentation\Documentation.csproj", "{975E1EA6-EDA8-4E5D-AC56-7A741022C89A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{27B24A78-ADE1-4109-A077-F712912B1A78}"
 	ProjectSection(SolutionItems) = preProject
@@ -32,7 +34,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{27B24A
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Destinations", "Destinations", "{643C26DA-0C14-4F95-9F95-4A3A946D03D4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NBug.Destinations.AzureBlobStorage", "Destinations\NBug.Destinations.AzureBlobStorage\NBug.Destinations.AzureBlobStorage.csproj", "{B5F98A29-817D-4186-A812-1B6A7B08108D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NBug.Destinations.AzureBlobStorage", "Destinations\NBug.Destinations.AzureBlobStorage\NBug.Destinations.AzureBlobStorage.csproj", "{B5F98A29-817D-4186-A812-1B6A7B08108D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -80,4 +82,7 @@ Global
 		{1A387F18-8DEA-4EF8-8399-B808F1B1F3AD} = {06E05029-1FB3-4122-9524-E81DC884A94E}
 		{B5F98A29-817D-4186-A812-1B6A7B08108D} = {643C26DA-0C14-4F95-9F95-4A3A946D03D4}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {3077AB15-2963-44FC-B860-965ED4865709}
+	EndGlobalSection
 EndGlobal
diff --git a/NBug/NBug.csproj b/NBug/NBug.csproj
index 7befb8c..a87c98d 100644
--- a/NBug/NBug.csproj
+++ b/NBug/NBug.csproj
@@ -1,317 +1,53 @@
 <?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">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{62CED1D5-F603-40DE-8BF5-3E49D3A392F4}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>NBug</RootNamespace>
-    <AssemblyName>NBug</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <TargetFrameworks>net45</TargetFrameworks>
+
+    <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-    <DocumentationFile>
-    </DocumentationFile>
+    <NoWarn>$(NoWarn),1591,1574</NoWarn>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <DocumentationFile>bin\Release\NBug.XML</DocumentationFile>
-    <NoWarn>1591;1574</NoWarn>
+
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
   </PropertyGroup>
+
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
     <AssemblyOriginatorKeyFile>..\Signing.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Drawing" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
   </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="2018.2.1" />
     <PackageReference Include="Microsoft.VisualStudio.Threading" Version="15.8.132" />
   </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\..\..\GitExtUtils\GitUI\DpiUtil.cs" Link="Core\Util\DpiUtil.cs" />
+    <Compile Include="..\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs" />
+  </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="..\..\..\GitExtUtils\GitUI\DpiUtil.cs">
-      <Link>Core\Util\DpiUtil.cs</Link>
-    </Compile>
-    <Compile Include="..\GlobalAssemblyInfo.cs">
-      <Link>Properties\GlobalAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="Core\Submission\Custom\Custom.cs" />
-    <Compile Include="Core\Submission\IProtocol.cs" />
-    <Compile Include="Core\Submission\IProtocolFactory.cs" />
-    <Compile Include="Core\Submission\Tracker\BugNet.cs" />
-    <Compile Include="Core\Submission\Tracker\Mantis\AccountData.cs" />
-    <Compile Include="Core\Submission\Tracker\Mantis\AttachmentData.cs" />
-    <Compile Include="Core\Submission\Tracker\Mantis\CustomFieldValueForIssueData.cs" />
-    <Compile Include="Core\Submission\Tracker\Mantis\IMantisConnectService.cs" />
-    <Compile Include="Core\Submission\Tracker\Mantis\IssueData.cs" />
-    <Compile Include="Core\Submission\Tracker\Mantis\IssueNoteData.cs" />
-    <Compile Include="Core\Submission\Tracker\Mantis\Mantis.cs" />
-    <Compile Include="Core\Submission\Tracker\Mantis\MantisConnectService.cs" />
-    <Compile Include="Core\Submission\Tracker\Mantis\ObjectRef.cs" />
-    <Compile Include="Core\Submission\Tracker\Mantis\ProjectVersionData.cs" />
-    <Compile Include="Core\Submission\Tracker\Mantis\RelationshipData.cs" />
-    <Compile Include="Core\Submission\Tracker\Mantis\UserData.cs" />
-    <Compile Include="Core\UI\Custom\CustomUI.cs" />
-    <Compile Include="Core\UI\Developer\InternalExceptionViewer.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Core\UI\Developer\InternalExceptionViewer.Designer.cs">
-      <DependentUpon>InternalExceptionViewer.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Core\UI\Developer\InternalLogViewer.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Core\UI\Developer\InternalLogViewer.Designer.cs">
-      <DependentUpon>InternalLogViewer.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Core\UI\WinForms\Panels\ExceptionDetails.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Core\UI\WinForms\Panels\ExceptionDetails.Designer.cs">
-      <DependentUpon>ExceptionDetails.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Core\Util\Web\StreamUpload.cs" />
-    <Compile Include="Core\Util\ConnectionStringParser.cs" />
-    <Compile Include="Core\Util\PublicResources.cs" />
-    <Compile Include="Events\CustomSubmissionEventArgs.cs" />
-    <Compile Include="Events\CustomUIEventArgs.cs" />
-    <Compile Include="Enums\MiniDumpType.cs" />
-    <Compile Include="Enums\StoragePath.cs" />
-    <Compile Include="Enums\UIMode.cs" />
-    <Compile Include="Enums\UIProvider.cs" />
-    <Compile Include="Exceptions.cs" />
-    <Compile Include="Handler.cs" />
-    <Compile Include="Helpers\EmailDestinationBuilder.cs" />
-    <Compile Include="Properties\Localization.de.Designer.cs">
-      <DependentUpon>Localization.de.resx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Properties\Localization.es-MX.Designer.cs">
-      <DependentUpon>Localization.es-MX.resx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Properties\Localization.fi-FI.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Localization.fi-FI.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Localization.hr.Designer.cs">
-      <DependentUpon>Localization.hr.resx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Properties\Localization.ja.Designer.cs">
-      <DependentUpon>Localization.ja.resx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Properties\Localization.ko-KR.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Localization.ko-KR.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Localization.pt-BR.Designer.cs">
-      <DependentUpon>Localization.pt-BR.resx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Properties\Localization.ru-RU.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Localization.ru-RU.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Localization.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Localization.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>Settings.settings</DependentUpon>
-    </Compile>
-    <Compile Include="Core\Reporting\BugReport.cs" />
-    <Compile Include="Core\Reporting\Feedback.cs" />
-    <Compile Include="Core\Reporting\Info\AssemblyInfo.cs" />
-    <Compile Include="Core\Reporting\Info\ConfigurationInfo.cs" />
-    <Compile Include="Core\Reporting\Info\GeneralInfo.cs" />
-    <Compile Include="Core\Reporting\MiniDump\DumpWriter.cs" />
-    <Compile Include="Core\Reporting\Info\Report.cs" />
-    <Compile Include="Core\Reporting\Info\SystemInfo.cs" />
-    <Compile Include="Core\Reporting\MiniDump\DumpTypeFlag.cs" />
-    <Compile Include="Core\Submission\Database\Ado.cs" />
-    <Compile Include="Core\Submission\Database\MsSql.cs" />
-    <Compile Include="Core\Submission\Database\MySql.cs" />
-    <Compile Include="Core\Submission\Dispatcher.cs" />
-    <Compile Include="Core\Submission\ProtocolBase.cs" />
-    <Compile Include="Core\Submission\Tracker\Bugzilla.cs" />
-    <Compile Include="Core\Submission\Tracker\GitHub.cs" />
-    <Compile Include="Core\Submission\Tracker\GoogleCode.cs" />
-    <Compile Include="Core\Submission\Tracker\Redmine.cs" />
-    <Compile Include="Core\Submission\Tracker\Trac.cs" />
-    <Compile Include="Core\Submission\Web\Ftp.cs" />
-    <Compile Include="Core\Submission\Web\Http.cs" />
-    <Compile Include="Core\Submission\Web\Mail.cs" />
-    <Compile Include="Settings.cs" />
-    <Compile Include="Core\UI\Console\ConsoleUI.cs" />
-    <Compile Include="Core\UI\UISelector.cs" />
-    <Compile Include="Core\UI\UIDialogResult.cs" />
-    <Compile Include="Core\UI\WinForms\Feedback.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Core\UI\WinForms\Feedback.Designer.cs">
-      <DependentUpon>Feedback.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Core\UI\WinForms\Full.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Core\UI\WinForms\Full.Designer.cs">
-      <DependentUpon>Full.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Core\UI\WinForms\Panels\ExceptionDetailView.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Core\UI\WinForms\Panels\ExceptionDetailView.Designer.cs">
-      <DependentUpon>ExceptionDetailView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Core\UI\WinForms\Minimal.cs" />
-    <Compile Include="Core\UI\WinForms\Normal.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Core\UI\WinForms\Normal.Designer.cs">
-      <DependentUpon>Normal.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Core\Reporting\MiniDump\ExceptionFilters.cs" />
-    <Compile Include="Properties\SettingsOverride.cs" />
-    <Compile Include="Core\UI\WinForms\WinFormsUI.cs" />
-    <Compile Include="Core\UI\WPF\WPFUI.cs" />
-    <Compile Include="Core\Util\Exceptions\NBugConfigurationException.cs" />
-    <Compile Include="Core\Util\Exceptions\NBugException.cs" />
-    <Compile Include="Core\Util\Exceptions\NBugRuntimeException.cs" />
-    <Compile Include="Core\Util\ExceptionThread.cs" />
-    <Compile Include="Core\Util\Logging\Logger.cs" />
-    <Compile Include="Enums\LoggerCategory.cs" />
-    <Compile Include="Core\Util\ProtectedConfiguration.cs" />
-    <Compile Include="Core\Util\Serialization\SerializableDictionary.cs" />
-    <Compile Include="Core\Util\Serialization\SerializableException.cs" />
-    <Compile Include="Core\Util\Storage\StoragePath.cs" />
-    <Compile Include="Core\Util\Storage\StoredItemFile.cs" />
-    <Compile Include="Core\Util\Storage\Storer.cs" />
-    <Compile Include="Core\Util\Storage\ZipStorer.cs" />
+    <None Update="Properties\Settings.settings" Generator="SettingsSingleFileGenerator" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Include="app.config">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </None>
+    <EmbeddedResource Update="Properties\Localization.resx" Generator="ResXFileCodeGenerator" />
+    <EmbeddedResource Update="Properties\Resources.resx" Generator="ResXFileCodeGenerator" />
   </ItemGroup>
+
+  <!-- Special handling for embedded resources and generated files to show as nested in Solution Explorer -->
   <ItemGroup>
-    <EmbeddedResource Include="Core\UI\Developer\InternalExceptionViewer.resx">
-      <DependentUpon>InternalExceptionViewer.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Core\UI\Developer\InternalLogViewer.resx">
-      <DependentUpon>InternalLogViewer.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Core\UI\WinForms\Panels\ExceptionDetails.resx">
-      <DependentUpon>ExceptionDetails.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Localization.es-MX.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Localization.es-MX.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Localization.de.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Localization.de.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Localization.fi-FI.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Localization.fi-FI.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Localization.hr.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Localization.hr.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Localization.ko-KR.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Localization.ko-KR.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Localization.ja.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Localization.ja.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Localization.pt-BR.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Localization.pt-BR.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Localization.ru-RU.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Localization.ru-RU.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Localization.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Localization.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <SubType>Designer</SubType>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Core\UI\WinForms\Feedback.resx">
-      <DependentUpon>Feedback.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Core\UI\WinForms\Full.resx">
-      <DependentUpon>Full.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Core\UI\WinForms\Panels\ExceptionDetailView.resx">
-      <DependentUpon>ExceptionDetailView.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Core\UI\WinForms\Normal.resx">
-      <DependentUpon>Normal.cs</DependentUpon>
-    </EmbeddedResource>
+    <!-- Localized embedded resources are just dependent on the parent RESX -->
+    <EmbeddedResource Update="**\*.??.resx" DependentUpon="$([System.IO.Path]::ChangeExtension($([System.IO.Path]::GetFileNameWithoutExtension(%(Identity))), '.resx'))" />
+    <EmbeddedResource Update="**\*.??-??.resx" DependentUpon="$([System.IO.Path]::ChangeExtension($([System.IO.Path]::GetFileNameWithoutExtension(%(Identity))), '.resx'))" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+
 </Project>
\ No newline at end of file
diff --git a/NBug/Properties/Localization.de.Designer.cs b/NBug/Properties/Localization.de.Designer.cs
deleted file mode 100644
index e69de29..0000000
diff --git a/NBug/Properties/Localization.es-MX.Designer.cs b/NBug/Properties/Localization.es-MX.Designer.cs
deleted file mode 100644
index e69de29..0000000
diff --git a/NBug/Properties/Localization.fi-FI.Designer.cs b/NBug/Properties/Localization.fi-FI.Designer.cs
deleted file mode 100644
index e69de29..0000000
diff --git a/NBug/Properties/Localization.hr.Designer.cs b/NBug/Properties/Localization.hr.Designer.cs
deleted file mode 100644
index e69de29..0000000
diff --git a/NBug/Properties/Localization.ja.Designer.cs b/NBug/Properties/Localization.ja.Designer.cs
deleted file mode 100644
index e69de29..0000000
diff --git a/NBug/Properties/Localization.ko-KR.Designer.cs b/NBug/Properties/Localization.ko-KR.Designer.cs
deleted file mode 100644
index e69de29..0000000
diff --git a/NBug/Properties/Localization.pt-BR.Designer.cs b/NBug/Properties/Localization.pt-BR.Designer.cs
deleted file mode 100644
index e69de29..0000000
diff --git a/NBug/Properties/Localization.ru-RU.Designer.cs b/NBug/Properties/Localization.ru-RU.Designer.cs
deleted file mode 100644
index e69de29..0000000
diff --git a/global.json b/global.json
new file mode 100644
index 0000000..2120c2f
--- /dev/null
+++ b/global.json
@@ -0,0 +1,5 @@
+{
+  "msbuild-sdks": {
+    "MSBuild.Sdk.Extras": "1.6.65"
+  }
+}