Update to new MSBuild format in project files. Changed Mono.Addins to .NETStandard2.0

27 files changed, 71 insertions, 408 deletions

diff --git a/Mono.Addins.CecilReflector/Mono.Addins.CecilReflector.csproj b/Mono.Addins.CecilReflector/Mono.Addins.CecilReflector.csproj
index f72813d..e21e174 100644
--- a/Mono.Addins.CecilReflector/Mono.Addins.CecilReflector.csproj
+++ b/Mono.Addins.CecilReflector/Mono.Addins.CecilReflector.csproj
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\TargetFrameworks.props" />
   <Import Project="..\Version.props" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{42D1CE65-A14B-4218-B787-58AD7AA68513}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AssemblyName>Mono.Addins.CecilReflector</AssemblyName>
     <RootNamespace>Mono.Addins.CecilReflector</RootNamespace>
-    <SignAssembly>True</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\mono-addins.snk</AssemblyOriginatorKeyFile>
     <PackageId>Mono.Addins.CecilReflector</PackageId>
     <Description>Mono.Addins is a framework for creating extensible applications, and for creating add-ins which extend applications. Mono.Addins.Setup provides an API for managing add-ins, creating add-in packages and publishing add-ins in on-line repositories.</Description>
     <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -50,8 +45,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Mono.Addins.CecilReflector\Reflector.cs" />
-    <Compile Include="AssemblyInfo.cs" />
+    <Compile Remove="AssemblyInfo.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/Mono.Addins.Gui/Mono.Addins.Gui.csproj b/Mono.Addins.Gui/Mono.Addins.Gui.csproj
index d5681ea..0455387 100644
--- a/Mono.Addins.Gui/Mono.Addins.Gui.csproj
+++ b/Mono.Addins.Gui/Mono.Addins.Gui.csproj
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\TargetFrameworks.props" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.30703</ProductVersion>
     <ProjectGuid>{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AssemblyName>Mono.Addins.Gui</AssemblyName>
     <SchemaVersion>2.0</SchemaVersion>
     <RootNamespace>Mono.Addins.Gui</RootNamespace>
-    <SignAssembly>True</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\mono-addins.snk</AssemblyOriginatorKeyFile>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,15 +35,11 @@
     <NoWarn>1574;1591</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f, processorArchitecture=MSIL"/>
-    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f, processorArchitecture=MSIL"/>
-    <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f, processorArchitecture=MSIL"/>
-    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f, processorArchitecture=MSIL"/>
-    <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f, processorArchitecture=MSIL"/>
     <Reference Include="System" />
     <Reference Include="Mono.Posix" />
     <Reference Include="Mono.Cairo" />
     <Reference Include="System.Core" />
+    <PackageReference Include="GtkSharp" Version="3.22.25.128" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Mono.Addins\Mono.Addins.csproj">
@@ -62,35 +54,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Mono.Addins.Gui\AddinManagerDialog.cs" />
-    <Compile Include="Mono.Addins.Gui\AddinTreeWidget.cs" />
-    <Compile Include="Mono.Addins.Gui\ManageSitesDialog.cs" />
-    <Compile Include="Mono.Addins.Gui\NewSiteDialog.cs" />
-    <Compile Include="Mono.Addins.Gui\Services.cs" />
-    <Compile Include="Mono.Addins.Gui\ErrorDialog.cs" />
-    <Compile Include="Mono.Addins.Gui\AddinManagerWindow.cs" />
-    <Compile Include="Mono.Addins.Gui\AddinInstaller.cs" />
-    <Compile Include="Mono.Addins.Gui\AddinInstallerDialog.cs" />
-    <Compile Include="Mono.Addins.Gui\ProgressDialog.cs" />
-    <Compile Include="Mono.Addins.Gui\InstallDialog.cs" />
-    <Compile Include="Mono.Addins.Gui\AddinInfoView.cs" />
-    <Compile Include="Mono.Addins.Gui\HeaderBox.cs" />
-    <Compile Include="Mono.Addins.Gui\HslColor.cs" />
-    <Compile Include="Mono.Addins.Gui\SearchEntry.cs" />
-    <Compile Include="Mono.Addins.Gui\HoverImageButton.cs" />
-    <Compile Include="Mono.Addins.Gui\InstallMonitor.cs" />
-    <Compile Include="Gui\generated.cs" />
-    <Compile Include="Gui\Mono.Addins.Gui.AddinInfoView.cs" />
-    <Compile Include="Gui\Mono.Addins.Gui.AddinInstallerDialog.cs" />
-    <Compile Include="Gui\Mono.Addins.Gui.AddinManagerDialog.cs" />
-    <Compile Include="Gui\Mono.Addins.Gui.ErrorDialog.cs" />
-    <Compile Include="Gui\Mono.Addins.Gui.InstallDialog.cs" />
-    <Compile Include="Gui\Mono.Addins.Gui.ManageSitesDialog.cs" />
-    <Compile Include="Gui\Mono.Addins.Gui.NewSiteDialog.cs" />
-    <Compile Include="Gui\Mono.Addins.Gui.ProgressDialog.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <EmbeddedResource Include="icons\package-x-generic.png">
       <LogicalName>package-x-generic.png</LogicalName>
     </EmbeddedResource>
@@ -381,7 +344,6 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Gui\" />
+    <Compile Remove="AssemblyInfo.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/Mono.Addins.GuiGtk3/Mono.Addins.GuiGtk3.csproj b/Mono.Addins.GuiGtk3/Mono.Addins.GuiGtk3.csproj
index fc688f3..64ce514 100644
--- a/Mono.Addins.GuiGtk3/Mono.Addins.GuiGtk3.csproj
+++ b/Mono.Addins.GuiGtk3/Mono.Addins.GuiGtk3.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\TargetFrameworks.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -10,8 +10,6 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Mono.Addins.GuiGtk3</RootNamespace>
     <AssemblyName>Mono.Addins.GuiGtk3</AssemblyName>
-    <SignAssembly>True</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\mono-addins.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -37,35 +35,9 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="gtk-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <Reference Include="gdk-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <Reference Include="glib-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <Reference Include="pango-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <Reference Include="atk-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="System.Core" />
-    <Reference Include="cairo-sharp, Version=1.10.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
     <Reference Include="Mono.Posix" />
-    <Reference Include="gio-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Mono.Addins.Gui\AddinInfoView.cs" />
-    <Compile Include="Mono.Addins.Gui\AddinInstaller.cs" />
-    <Compile Include="Mono.Addins.Gui\AddinInstallerDialog.cs" />
-    <Compile Include="Mono.Addins.Gui\AddinManagerDialog.cs" />
-    <Compile Include="Mono.Addins.Gui\AddinManagerWindow.cs" />
-    <Compile Include="Mono.Addins.Gui\AddinTreeWidget.cs" />
-    <Compile Include="Mono.Addins.Gui\ErrorDialog.cs" />
-    <Compile Include="Mono.Addins.Gui\HeaderBox.cs" />
-    <Compile Include="Mono.Addins.Gui\HoverImageButton.cs" />
-    <Compile Include="Mono.Addins.Gui\HslColor.cs" />
-    <Compile Include="Mono.Addins.Gui\InstallDialog.cs" />
-    <Compile Include="Mono.Addins.Gui\InstallMonitor.cs" />
-    <Compile Include="Mono.Addins.Gui\ManageSitesDialog.cs" />
-    <Compile Include="Mono.Addins.Gui\NewSiteDialog.cs" />
-    <Compile Include="Mono.Addins.Gui\ProgressDialog.cs" />
-    <Compile Include="Mono.Addins.Gui\SearchEntry.cs" />
-    <Compile Include="Mono.Addins.Gui\Services.cs" />
+    <PackageReference Include="GtkSharp" Version="3.22.25.128" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="icons\download-16.png">
@@ -381,7 +353,6 @@
       <LogicalName>Mono.Addins.GuiGtk3.interfaces.ErrorDialog.ui</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <ProjectReference Include="..\Mono.Addins.Setup\Mono.Addins.Setup.csproj">
       <Project>{A85C9721-C054-4BD8-A1F3-0227615F0A36}</Project>
@@ -392,4 +363,7 @@
       <Name>Mono.Addins</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Remove="AssemblyInfo.cs" />
+  </ItemGroup>
 </Project>
diff --git a/Mono.Addins.MSBuild/Mono.Addins.MSBuild.csproj b/Mono.Addins.MSBuild/Mono.Addins.MSBuild.csproj
index c0836b1..3767f32 100644
--- a/Mono.Addins.MSBuild/Mono.Addins.MSBuild.csproj
+++ b/Mono.Addins.MSBuild/Mono.Addins.MSBuild.csproj
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <Import Project="..\TargetFrameworks.props" />
+<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>{B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AssemblyName>Mono.Addins.MSBuild</AssemblyName>
     <RootNamespace>Mono.Addins.MSBuild</RootNamespace>
-    <SignAssembly>True</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\mono-addins.snk</AssemblyOriginatorKeyFile>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -34,21 +30,8 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="Microsoft.Build.Utilities.v4.0" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="ResolveAddinReferences.cs" />
-    <Compile Include="Util.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\Mono.Addins.Setup\Mono.Addins.Setup.csproj">
-      <Project>{A85C9721-C054-4BD8-A1F3-0227615F0A36}</Project>
-      <Name>Mono.Addins.Setup</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\Mono.Addins\Mono.Addins.csproj">
       <Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project>
       <Name>Mono.Addins</Name>
@@ -56,6 +39,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="Mono.Addins.targets" />
+    <Compile Remove="ResolveAddinReferences.cs" />
+    <Compile Remove="AssemblyInfo.cs" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Mono.Addins.MSBuild/Util.cs b/Mono.Addins.MSBuild/Util.cs
index 98ed52f..d8a3cd6 100644
--- a/Mono.Addins.MSBuild/Util.cs
+++ b/Mono.Addins.MSBuild/Util.cs
@@ -32,7 +32,7 @@ using System.IO;
 
 namespace Mono.Addins.MSBuild
 {
-	internal class Util
+	public class Util
 	{
 		public static bool IsWindows {
 			get { return Path.DirectorySeparatorChar == '\\'; }
diff --git a/Mono.Addins.Setup/Mono.Addins.Setup.csproj b/Mono.Addins.Setup/Mono.Addins.Setup.csproj
index c63b747..2996d6c 100644
--- a/Mono.Addins.Setup/Mono.Addins.Setup.csproj
+++ b/Mono.Addins.Setup/Mono.Addins.Setup.csproj
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\TargetFrameworks.props" />
   <Import Project="..\Version.props" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{A85C9721-C054-4BD8-A1F3-0227615F0A36}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AssemblyName>Mono.Addins.Setup</AssemblyName>
     <RootNamespace>Mono.Addins.Setup</RootNamespace>
-    <SignAssembly>True</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\mono-addins.snk</AssemblyOriginatorKeyFile>
     <PackageId>Mono.Addins.Setup</PackageId>
     <Description>Mono.Addins is a framework for creating extensible applications, and for creating add-ins which extend applications. Mono.Addins.Setup provides an API for managing add-ins, creating add-in packages and publishing add-ins in on-line repositories.</Description>
     <ProductVersion>8.0.30703</ProductVersion>
@@ -48,6 +44,7 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Net.Http" />
     <PackageReference Include="SharpZipLib" Version="1.1.0" />
+    <ProjectReference Include="..\Mono.Addins.MSBuild\Mono.Addins.MSBuild.csproj" />
     <ProjectReference Include="..\Mono.Addins\Mono.Addins.csproj">
       <Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project>
       <Name>Mono.Addins</Name>
@@ -56,42 +53,6 @@
     <PackageReference Include="NuGet.Build.Packaging" Version="0.2.0" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Mono.Addins.Setup\AddinInfo.cs" />
-    <Compile Include="Mono.Addins.Setup\AddinInfoCollection.cs" />
-    <Compile Include="Mono.Addins.Setup\AddinPackage.cs" />
-    <Compile Include="Mono.Addins.Setup\AddinRepositoryEntry.cs" />
-    <Compile Include="Mono.Addins.Setup\AddinStore.cs" />
-    <Compile Include="Mono.Addins.Setup\AddinSystemConfiguration.cs" />
-    <Compile Include="Mono.Addins.Setup\AddinSystemConfigurationReaderWriter.cs" />
-    <Compile Include="Mono.Addins.Setup\AddinSystemConfigurationSerializer.cs" />
-    <Compile Include="Mono.Addins.Setup\InstallException.cs" />
-    <Compile Include="Mono.Addins.Setup\Package.cs" />
-    <Compile Include="Mono.Addins.Setup\PackageCollection.cs" />
-    <Compile Include="Mono.Addins.Setup\ReferenceRepositoryEntry.cs" />
-    <Compile Include="Mono.Addins.Setup\Repository.cs" />
-    <Compile Include="Mono.Addins.Setup\RepositoryEntry.cs" />
-    <Compile Include="Mono.Addins.Setup\RepositoryEntryCollection.cs" />
-    <Compile Include="Mono.Addins.Setup\RepositoryReaderWriter.cs" />
-    <Compile Include="Mono.Addins.Setup\RepositoryRecord.cs" />
-    <Compile Include="Mono.Addins.Setup\RepositorySerializer.cs" />
-    <Compile Include="Mono.Addins.Setup\SetupTool.cs" />
-    <Compile Include="Mono.Addins.Setup.ProgressMonitoring\ConsoleProgressMonitor.cs" />
-    <Compile Include="Mono.Addins.Setup.ProgressMonitoring\LogTextWriter.cs" />
-    <Compile Include="Mono.Addins.Setup.ProgressMonitoring\NullProgressMonitor.cs" />
-    <Compile Include="Mono.Addins.Setup.ProgressMonitoring\ProgressStatusMonitor.cs" />
-    <Compile Include="Mono.Addins.Setup.ProgressMonitoring\ProgressTracker.cs" />
-    <Compile Include="Mono.Addins.Setup\IProgressMonitor.cs" />
-    <Compile Include="Mono.Addins.Setup\RepositoryRegistry.cs" />
-    <Compile Include="Mono.Addins.Setup\SetupService.cs" />
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Mono.Addins.Setup\ConsoleAddinInstaller.cs" />
-    <Compile Include="Mono.Addins.Setup\PcFileCache.cs" />
-    <Compile Include="Mono.Addins.Setup\TextFormatter.cs" />
-    <Compile Include="Mono.Addins.Setup\WebRequestHelper.cs" />
-    <Compile Include="Mono.Addins.Setup\AddinRepositoryProvider.cs" />
-    <Compile Include="Mono.Addins.Setup\MonoAddinsRepositoryProvider.cs" />
-    <Compile Include="Mono.Addins.Setup\HttpClientProvider.cs" />
-    <Compile Include="Mono.Addins.Setup\DownloadFileRequest.cs" />
+    <Compile Remove="AssemblyInfo.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/Mono.Addins.Setup/Mono.Addins.Setup/AddinPackage.cs b/Mono.Addins.Setup/Mono.Addins.Setup/AddinPackage.cs
index 6929928..c7a3ec7 100644
--- a/Mono.Addins.Setup/Mono.Addins.Setup/AddinPackage.cs
+++ b/Mono.Addins.Setup/Mono.Addins.Setup/AddinPackage.cs
@@ -42,6 +42,7 @@ using Mono.Addins.Description;
 using System.Collections.Generic;
 using System.Linq;
 using Mono.Addins.Database;
+using Mono.Addins.MSBuild;
 
 namespace Mono.Addins.Setup
 {
diff --git a/Mono.Addins.Setup/Mono.Addins.Setup/SetupService.cs b/Mono.Addins.Setup/Mono.Addins.Setup/SetupService.cs
index e9ee1d4..feffcf3 100644
--- a/Mono.Addins.Setup/Mono.Addins.Setup/SetupService.cs
+++ b/Mono.Addins.Setup/Mono.Addins.Setup/SetupService.cs
@@ -37,6 +37,7 @@ using System.Xml;
 using ICSharpCode.SharpZipLib.Zip;
 using Mono.Addins.Database;
 using Mono.Addins.Description;
+using Mono.Addins.MSBuild;
 using Mono.Addins.Setup.ProgressMonitoring;
 using Mono.PkgConfig;
 
diff --git a/Mono.Addins.sln b/Mono.Addins.sln
index e33045b..2b19c97 100644
--- a/Mono.Addins.sln
+++ b/Mono.Addins.sln
@@ -163,7 +163,6 @@ Global
 		{B051C84E-48CC-448D-B00C-1525EB64E4BE}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{B051C84E-48CC-448D-B00C-1525EB64E4BE}.Release|Any CPU.Build.0 = Release|Any CPU

 		{B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}.DebugGtk3|Any CPU.ActiveCfg = Debug|Any CPU

 		{B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}.DebugGtk3|Any CPU.Build.0 = Debug|Any CPU

 		{B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}.DebugNoGui|Any CPU.ActiveCfg = Debug|Any CPU

@@ -172,6 +171,7 @@ Global
 		{B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

 		{B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}.Release|Any CPU.Build.0 = Release|Any CPU

+		{B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{EA2F08DC-8289-4A89-A405-1A70D8B4C569}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{EA2F08DC-8289-4A89-A405-1A70D8B4C569}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{EA2F08DC-8289-4A89-A405-1A70D8B4C569}.DebugGtk3|Any CPU.ActiveCfg = Debug|Any CPU

@@ -201,7 +201,6 @@ Global
 		{F109148D-849E-4044-8700-5E8EA0AB2476}.Release|Any CPU.ActiveCfg = Debug|Any CPU

 		{F109148D-849E-4044-8700-5E8EA0AB2476}.Release|Any CPU.Build.0 = Debug|Any CPU

 		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugGtk3|Any CPU.ActiveCfg = Debug|Any CPU

 		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugGtk3|Any CPU.Build.0 = Debug|Any CPU

 		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugNoGui|Any CPU.ActiveCfg = Debug|Any CPU

diff --git a/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs b/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs
index 714f243..2bb9779 100644
--- a/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs
+++ b/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs
@@ -1826,9 +1826,9 @@ namespace Mono.Addins.Database
 //			if (Util.IsMono)
 //				return new SetupProcess ();
 //			else
-			if (fs.RequiresIsolation)
-				return new SetupDomain ();
-			else
+			//if (fs.RequiresIsolation)
+			//	return new SetupDomain ();
+			//else
 				return new SetupLocal ();
 		}
 		
diff --git a/Mono.Addins/Mono.Addins.Database/SetupProcess.cs b/Mono.Addins/Mono.Addins.Database/SetupProcess.cs
index 0ae3a33..1b26252 100644
--- a/Mono.Addins/Mono.Addins.Database/SetupProcess.cs
+++ b/Mono.Addins/Mono.Addins.Database/SetupProcess.cs
@@ -160,19 +160,10 @@ namespace Mono.Addins.Database
 		
 		static string CreateHostExe ()
 		{
-			string file;
-			string id;
-			string fullFile;
-			do {
-				id = Guid.NewGuid ().ToString ().Replace ('-','_');
-				file = id + ".exe";
-				fullFile = Path.Combine (Path.GetTempPath (), file);
-			} while (File.Exists (fullFile));
-
 			AssemblyName aname = new AssemblyName ();
-			aname.Name = id;
-			AssemblyBuilder ab = AppDomain.CurrentDomain.DefineDynamicAssembly (aname, AssemblyBuilderAccess.Save, Path.GetTempPath ());
-			ModuleBuilder mb = ab.DefineDynamicModule (aname.Name, file);
+			aname.Name = Guid.NewGuid ().ToString ().Replace ('-','_');
+			AssemblyBuilder ab = AssemblyBuilder.DefineDynamicAssembly (aname, AssemblyBuilderAccess.Run);
+			ModuleBuilder mb = ab.DefineDynamicModule (aname.Name);
 			TypeBuilder tb = mb.DefineType ("App", TypeAttributes.Public|TypeAttributes.Class);
 			
 			MethodBuilder fb = tb.DefineMethod("Main",
@@ -187,10 +178,8 @@ namespace Mono.Addins.Database
 			ilg.EmitCall (OpCodes.Call, mi, null);
 			ilg.Emit (OpCodes.Ret);
 			
-			tb.CreateType();
-			ab.SetEntryPoint (fb, PEFileKinds.WindowApplication);
-			ab.Save (file);
-			return fullFile;
+			tb.CreateTypeInfo();
+			return tb.FullName;
 		}
 	}
 	
diff --git a/Mono.Addins/Mono.Addins.Description/ModuleDescription.cs b/Mono.Addins/Mono.Addins.Description/ModuleDescription.cs
index 233167d..dfbd169 100644
--- a/Mono.Addins/Mono.Addins.Description/ModuleDescription.cs
+++ b/Mono.Addins/Mono.Addins.Description/ModuleDescription.cs
@@ -147,7 +147,7 @@ namespace Mono.Addins.Description
 			}
 		}
 
-		internal StringCollection AssemblyNames {
+		public StringCollection AssemblyNames {
 			get { 
 				if (assemblyNames == null) {
 					assemblyNames = new StringCollection ();
diff --git a/Mono.Addins/Mono.Addins.csproj b/Mono.Addins/Mono.Addins.csproj
index 025be72..28b87bc 100644
--- a/Mono.Addins/Mono.Addins.csproj
+++ b/Mono.Addins/Mono.Addins.csproj
@@ -1,21 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <Import Project="..\TargetFrameworks.props" />
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\Version.props" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AssemblyName>Mono.Addins</AssemblyName>
     <RootNamespace>Mono.Addins</RootNamespace>
-    <SignAssembly>True</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\mono-addins.snk</AssemblyOriginatorKeyFile>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <PackageId>Mono.Addins</PackageId>
     <Description>Mono.Addins is a framework for creating extensible applications, and for creating add-ins which extend applications.</Description>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -47,121 +41,11 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <PackageReference Include="NuGet.Build.Packaging" Version="0.2.0" />
+    <PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Mono.Addins\ExtensionNode.cs" />
-    <Compile Include="Mono.Addins\ExtensionTree.cs" />
-    <Compile Include="Mono.Addins\TreeNode.cs" />
-    <Compile Include="Mono.Addins\RuntimeAddin.cs" />
-    <Compile Include="Mono.Addins\TreeNodeCollection.cs" />
-    <Compile Include="Mono.Addins\TypeExtensionNode.cs" />
-    <Compile Include="Mono.Addins\MissingDependencyException.cs" />
-    <Compile Include="Mono.Addins\ExtensionNodeList.cs" />
-    <Compile Include="Mono.Addins\NodeAttributeAttribute.cs" />
-    <Compile Include="Mono.Addins\ExtensionContext.cs" />
-    <Compile Include="Mono.Addins\ConditionType.cs" />
-    <Compile Include="Mono.Addins\AddinAttribute.cs" />
-    <Compile Include="Mono.Addins\ExtensionAttribute.cs" />
-    <Compile Include="Mono.Addins\AddinDependencyAttribute.cs" />
-    <Compile Include="Mono.Addins\ExtensionPointAttribute.cs" />
-    <Compile Include="Mono.Addins.Description\AddinDescription.cs" />
-    <Compile Include="Mono.Addins.Description\ExtensionPoint.cs" />
-    <Compile Include="Mono.Addins.Description\ModuleDescription.cs" />
-    <Compile Include="Mono.Addins.Description\ModuleDescriptionCollection.cs" />
-    <Compile Include="Mono.Addins.Description\ExtensionPointCollection.cs" />
-    <Compile Include="Mono.Addins.Description\ExtensionNodeType.cs" />
-    <Compile Include="Mono.Addins.Serialization\BinaryXmlReader.cs" />
-    <Compile Include="Mono.Addins.Serialization\BinaryXmlWriter.cs" />
-    <Compile Include="Mono.Addins.Serialization\IBinaryXmlElement.cs" />
-    <Compile Include="Mono.Addins.Serialization\BinaryXmlTypeMap.cs" />
-    <Compile Include="Mono.Addins.Description\ExtensionNodeSet.cs" />
-    <Compile Include="Mono.Addins.Description\ExtensionNodeSetCollection.cs" />
-    <Compile Include="Mono.Addins.Description\Extension.cs" />
-    <Compile Include="Mono.Addins.Description\ExtensionNodeDescription.cs" />
-    <Compile Include="Mono.Addins.Description\ExtensionNodeDescriptionCollection.cs" />
-    <Compile Include="Mono.Addins.Description\ExtensionCollection.cs" />
-    <Compile Include="Mono.Addins.Description\ConditionTypeDescription.cs" />
-    <Compile Include="Mono.Addins.Description\ConditionTypeDescriptionCollection.cs" />
-    <Compile Include="Mono.Addins.Description\ObjectDescription.cs" />
-    <Compile Include="Mono.Addins.Description\ObjectDescriptionCollection.cs" />
-    <Compile Include="Mono.Addins.Description\AddinDependency.cs" />
-    <Compile Include="Mono.Addins.Description\Dependency.cs" />
-    <Compile Include="Mono.Addins.Description\AssemblyDependency.cs" />
-    <Compile Include="Mono.Addins.Description\DependencyCollection.cs" />
-    <Compile Include="Mono.Addins\GettextCatalog.cs" />
-    <Compile Include="Mono.Addins\IProgressStatus.cs" />
-    <Compile Include="Mono.Addins\AddinManager.cs" />
-    <Compile Include="Mono.Addins\TypeExtensionPointAttribute.cs" />
-    <Compile Include="Mono.Addins.Database\AddinDatabase.cs" />
-    <Compile Include="Mono.Addins.Database\AddinHostIndex.cs" />
-    <Compile Include="Mono.Addins.Database\AddinScanFolderInfo.cs" />
-    <Compile Include="Mono.Addins.Database\AddinScanner.cs" />
-    <Compile Include="Mono.Addins.Database\AddinScanResult.cs" />
-    <Compile Include="Mono.Addins.Database\FileDatabase.cs" />
-    <Compile Include="Mono.Addins.Database\AddinUpdateData.cs" />
-    <Compile Include="Mono.Addins.Database\SetupProcess.cs" />
-    <Compile Include="Mono.Addins.Database\Util.cs" />
-    <Compile Include="Mono.Addins.Database\DatabaseConfiguration.cs" />
-    <Compile Include="Mono.Addins\Addin.cs" />
-    <Compile Include="Mono.Addins\AddinInfo.cs" />
-    <Compile Include="Mono.Addins.Description\NativeDependency.cs" />
-    <Compile Include="Mono.Addins\NodeElement.cs" />
-    <Compile Include="Mono.Addins\ConsoleProgressStatus.cs" />
-    <Compile Include="Mono.Addins.Database\ProcessProgressStatus.cs" />
-    <Compile Include="Mono.Addins\AddinErrorEventArgs.cs" />
-    <Compile Include="Mono.Addins\AddinEventArgs.cs" />
-    <Compile Include="Mono.Addins\AddinRegistry.cs" />
-    <Compile Include="Mono.Addins\ExtensionNodeChildAttribute.cs" />
-    <Compile Include="Mono.Addins\ExtensionNodeAttribute.cs" />
-    <Compile Include="Mono.Addins.Description\NodeTypeAttribute.cs" />
-    <Compile Include="Mono.Addins.Description\NodeTypeAttributeCollection.cs" />
-    <Compile Include="Mono.Addins\AddinRootAttribute.cs" />
-    <Compile Include="Mono.Addins.Description\ExtensionNodeTypeCollection.cs" />
-    <Compile Include="Mono.Addins\InstanceExtensionNode.cs" />
-    <Compile Include="Mono.Addins\IAddinInstaller.cs" />
-    <Compile Include="Mono.Addins.Localization\IAddinLocalizer.cs" />
-    <Compile Include="Mono.Addins\AddinLocalizer.cs" />
-    <Compile Include="Mono.Addins.Localization\IAddinLocalizerFactory.cs" />
-    <Compile Include="Mono.Addins.Localization\NullLocalizer.cs" />
-    <Compile Include="Mono.Addins.Localization\StringTableLocalizer.cs" />
-    <Compile Include="Mono.Addins.Localization\StringResourceLocalizer.cs" />
-    <Compile Include="Mono.Addins.Localization\GettextLocalizer.cs" />
-    <Compile Include="Mono.Addins.Localization\GettextDomain.cs" />
-    <Compile Include="Mono.Addins.Localization\IPluralAddinLocalizer.cs" />
-    <Compile Include="Mono.Addins.Database\IAssemblyReflector.cs" />
-    <Compile Include="Mono.Addins.Database\DefaultAssemblyReflector.cs" />
-    <Compile Include="Mono.Addins.Description\AddinFlags.cs" />
-    <Compile Include="Mono.Addins.Database\SetupDomain.cs" />
-    <Compile Include="Mono.Addins.Database\ISetupHandler.cs" />
-    <Compile Include="Mono.Addins\ExtensionAttributeAttribute.cs" />
-    <Compile Include="Mono.Addins\CustomConditionAttribute.cs" />
-    <Compile Include="Mono.Addins\CustomExtensionAttribute.cs" />
-    <Compile Include="Mono.Addins\AddinAuthorAttribute.cs" />
-    <Compile Include="Mono.Addins\AddinLocalizerGettextAttribute.cs" />
-    <Compile Include="Mono.Addins\ImportAddinFileAttribute.cs" />
-    <Compile Include="Mono.Addins\ImportAddinAssemblyAttribute.cs" />
-    <Compile Include="Mono.Addins\AddinModuleAttribute.cs" />
-    <Compile Include="Mono.Addins\AddinEngine.cs" />
-    <Compile Include="Mono.Addins.Database\AddinFileSystemExtension.cs" />
-    <Compile Include="Mono.Addins.Database\SetupLocal.cs" />
-    <Compile Include="Mono.Addins\ContentType.cs" />
-    <Compile Include="Mono.Addins.Description\AddinProperty.cs" />
-    <Compile Include="Mono.Addins.Description\AddinPropertyCollection.cs" />
-    <Compile Include="Mono.Addins\AddinPropertyAttribute.cs" />
-    <Compile Include="Mono.Addins\AddinNameAttribute.cs" />
-    <Compile Include="Mono.Addins\AddinDescriptionAttribute.cs" />
-    <Compile Include="Mono.Addins\AddinUrlAttribute.cs" />
-    <Compile Include="Mono.Addins\AddinCategoryAttribute.cs" />
-    <Compile Include="Mono.Addins\AddinFlagsAttribute.cs" />
-    <Compile Include="Mono.Addins\AddinLocalizerAttribute.cs" />
-    <Compile Include="Mono.Addins.Description\PackageFormat.cs" />
-    <Compile Include="Mono.Addins.Database\ScanOptions.cs" />
-    <Compile Include="Mono.Addins.Database\AddinScanData.cs" />
-    <Compile Include="Mono.Addins.Database\AddinFolderVisitor.cs" />
-    <Compile Include="Mono.Addins.Database\AddinScanDataFileGenerator.cs" />
-    <Compile Include="Mono.Addins.Database\AddinRegistryUpdater.cs" />
-    <Compile Include="Mono.Addins.Database\AssemblyLocatorVisitor.cs" />
+    <Compile Remove="CustomConditionAttribute.cs" />
+    <Compile Remove="Mono.Addins.Database\SetupDomain.cs" />
+    <Compile Remove="AssemblyInfo.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/Mono.Addins/Mono.Addins/AddinEngine.cs b/Mono.Addins/Mono.Addins/AddinEngine.cs
index d73a464..dc45d6a 100755
--- a/Mono.Addins/Mono.Addins/AddinEngine.cs
+++ b/Mono.Addins/Mono.Addins/AddinEngine.cs
@@ -223,7 +223,7 @@ namespace Mono.Addins
 			Initialize (null, startupDirectory, configDir, addinsDir, databaseDir);
 		}
 		
-		internal void Initialize (Assembly startupAsm, string customStartupDirectory, string configDir, string addinsDir, string databaseDir)
+		public void Initialize (Assembly startupAsm, string customStartupDirectory, string configDir, string addinsDir, string databaseDir)
 		{
 			lock (LocalLock) {
 				if (initialized)
diff --git a/Mono.Addins/Mono.Addins/AddinManager.cs b/Mono.Addins/Mono.Addins/AddinManager.cs
index b5bef3f..4dc5d5a 100644
--- a/Mono.Addins/Mono.Addins/AddinManager.cs
+++ b/Mono.Addins/Mono.Addins/AddinManager.cs
@@ -828,7 +828,7 @@ namespace Mono.Addins
 			remove { AddinEngine.AddinAssembliesLoaded -= value; }
 		}
 		
-		internal static bool CheckAssembliesLoaded (HashSet<string> files)
+		public static bool CheckAssembliesLoaded (HashSet<string> files)
 		{
 			foreach (Assembly asm in AppDomain.CurrentDomain.GetAssemblies ()) {
 				if (asm is System.Reflection.Emit.AssemblyBuilder)
diff --git a/TargetFrameworks.props b/TargetFrameworks.props
index 4eda1b7..60fb3a7 100644
--- a/TargetFrameworks.props
+++ b/TargetFrameworks.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <InMonoDevelopTree Condition="Exists('$(MSBuildThisFileDirectory)..\..\msbuild\MonoDevelop.AfterCommon.props')">true</InMonoDevelopTree>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <TargetFrameworkVersion Condition=" '$(InMonoDevelopTree)' == 'true' ">v4.6.1</TargetFrameworkVersion>
+    <TargetFramework>net461</TargetFramework>
+    <TargetFramework Condition=" '$(InMonoDevelopTree)' == 'true' ">net461</TargetFramework>
   </PropertyGroup>
 </Project>
diff --git a/Test/CommandExtension/CommandExtension.csproj b/Test/CommandExtension/CommandExtension.csproj
index c040727..20006d2 100644
--- a/Test/CommandExtension/CommandExtension.csproj
+++ b/Test/CommandExtension/CommandExtension.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\TargetFrameworks.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -36,13 +36,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="CommandExtension.addin.xml">
+    <None Include="CommandExtension.addin.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
+    </None>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="CommandExtensionNode.cs" />
-    <Compile Include="CustomLocalizerFactory.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Test/FileContentExtension/FileContentExtension.csproj b/Test/FileContentExtension/FileContentExtension.csproj
index e800944..dedcf1b 100644
--- a/Test/FileContentExtension/FileContentExtension.csproj
+++ b/Test/FileContentExtension/FileContentExtension.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\TargetFrameworks.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -40,10 +40,4 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="FileContentExtensionNode.cs" />
-    <Compile Include="FileSampleExtender.cs" />
-    <Compile Include="IExtraFileContent.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Test/FileExtender/FileExtender.csproj b/Test/FileExtender/FileExtender.csproj
index c63d17a..ea667b1 100644
--- a/Test/FileExtender/FileExtender.csproj
+++ b/Test/FileExtender/FileExtender.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\TargetFrameworks.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -48,9 +48,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="FileExtender.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <EmbeddedResource Include="FileExtender.addin.xml">
       <LogicalName>FileExtender.addin.xml</LogicalName>
     </EmbeddedResource>
@@ -63,5 +60,4 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/Test/GuiTester/GuiTester.csproj b/Test/GuiTester/GuiTester.csproj
index b7d3f35..019f360 100644
--- a/Test/GuiTester/GuiTester.csproj
+++ b/Test/GuiTester/GuiTester.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\TargetFrameworks.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -33,11 +33,7 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="Mono.Posix" />
-    <Reference Include="gtk-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <Reference Include="gdk-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <Reference Include="glib-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <Reference Include="pango-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <Reference Include="atk-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <PackageReference Include="GtkSharp" Version="3.22.25.128" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="gtk-gui\gui.stetic">
@@ -45,12 +41,6 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="gtk-gui\generated.cs" />
-    <Compile Include="Main.cs" />
-    <Compile Include="AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
     <ProjectReference Include="..\..\Mono.Addins\Mono.Addins.csproj">
       <Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project>
       <Name>Mono.Addins</Name>
diff --git a/Test/HelloWorldExtension/HelloWorldExtension.csproj b/Test/HelloWorldExtension/HelloWorldExtension.csproj
index 89f178d..896810d 100644
--- a/Test/HelloWorldExtension/HelloWorldExtension.csproj
+++ b/Test/HelloWorldExtension/HelloWorldExtension.csproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <Import Project="..\..\TargetFrameworks.props" />
+<Project Sdk="Microsoft.NET.Sdk">  <Import Project="..\..\TargetFrameworks.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -40,12 +39,4 @@
       <Name>Mono.Addins</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="HelloWorldWriter.cs" />
-    <Compile Include="HelloSampleExtender.cs" />
-    <Compile Include="AttributeExtensions.cs" />
-    <Compile Include="HelloWriterWithMetadata.cs" />
-    <Compile Include="HelloWriterWithCondition.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Test/MultiAssemblyAddin/MultiAssemblyAddin.csproj b/Test/MultiAssemblyAddin/MultiAssemblyAddin.csproj
index a4767c0..9e00894 100644
--- a/Test/MultiAssemblyAddin/MultiAssemblyAddin.csproj
+++ b/Test/MultiAssemblyAddin/MultiAssemblyAddin.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\TargetFrameworks.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -34,9 +34,6 @@
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Extensions.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <ProjectReference Include="..\..\Mono.Addins\Mono.Addins.csproj">
       <Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project>
       <Name>Mono.Addins</Name>
@@ -52,5 +49,4 @@
       <Name>SecondAssembly</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Test/MultiAssemblyAddin/OptionalModule/OptionalModule.csproj b/Test/MultiAssemblyAddin/OptionalModule/OptionalModule.csproj
index 99cf86f..dd39726 100644
--- a/Test/MultiAssemblyAddin/OptionalModule/OptionalModule.csproj
+++ b/Test/MultiAssemblyAddin/OptionalModule/OptionalModule.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\..\TargetFrameworks.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -45,8 +45,4 @@
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Extensions.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Test/MultiAssemblyAddin/SecondAssembly/SecondAssembly.csproj b/Test/MultiAssemblyAddin/SecondAssembly/SecondAssembly.csproj
index d99d3cf..0948e7b 100644
--- a/Test/MultiAssemblyAddin/SecondAssembly/SecondAssembly.csproj
+++ b/Test/MultiAssemblyAddin/SecondAssembly/SecondAssembly.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\..\TargetFrameworks.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -45,9 +45,4 @@
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="CustomLocalizerFactory.cs" />
-    <Compile Include="Extensions.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Test/SystemInfoExtension/SystemInfoExtension.csproj b/Test/SystemInfoExtension/SystemInfoExtension.csproj
index 9b1b764..5da5888 100644
--- a/Test/SystemInfoExtension/SystemInfoExtension.csproj
+++ b/Test/SystemInfoExtension/SystemInfoExtension.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\TargetFrameworks.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -40,22 +40,16 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="MyClass.cs" />
-    <Compile Include="SystemInfoWriter.cs" />
-    <Compile Include="ModuleExtensionNode.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="SystemInfoExtension.addin.xml">
+    <None Include="SystemInfoExtension.addin.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
+    </None>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <EmbeddedResource Include="Resources.resx">
+    <None Include="Resources.resx">
       <LogicalName>Resources.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Resources.ca.resx">
+    </None>
+    <None Include="Resources.ca.resx">
       <LogicalName>Resources.ca.resources</LogicalName>
-    </EmbeddedResource>
+    </None>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Test/UnitTests/UnitTests.csproj b/Test/UnitTests/UnitTests.csproj
index c0329a3..12aa989 100644
--- a/Test/UnitTests/UnitTests.csproj
+++ b/Test/UnitTests/UnitTests.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\TargetFrameworks.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -10,8 +10,6 @@
     <AssemblyName>UnitTests</AssemblyName>
     <SchemaVersion>2.0</SchemaVersion>
     <RootNamespace>UnitTests</RootNamespace>
-    <SignAssembly>True</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\..\mono-addins.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -28,9 +26,6 @@
     <Reference Include="System.Core" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-    <PackageReference Include="NUnit.ConsoleRunner" GeneratePathProperty="true">
-      <Version>3.11.1</Version>
-    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Mono.Addins\Mono.Addins.csproj">
@@ -47,36 +42,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="TestExtensions.cs" />
-    <Compile Include="TestBase.cs" />
-    <Compile Include="TestEvents.cs" />
-    <Compile Include="TestFileDatabase.cs" />
-    <Compile Include="TestLoadUnload.cs" />
-    <Compile Include="TestConditions.cs" />
-    <Compile Include="TestSetup.cs" />
-    <Compile Include="TestLocalization.cs" />
-    <Compile Include="AddinInformationTests.cs" />
-    <Compile Include="ExtensionModel\ComplexNode.cs" />
-    <Compile Include="ExtensionModel\GlobalInfoCondition.cs" />
-    <Compile Include="ExtensionModel\ISampleExtender.cs" />
-    <Compile Include="ExtensionModel\IWriter.cs" />
-    <Compile Include="ExtensionModel\IWriterWithMetadata.cs" />
-    <Compile Include="ExtensionModel\NodeWithAttribute.cs" />
-    <Compile Include="ExtensionModel\ParameterInfoCondition.cs" />
-    <Compile Include="ExtensionModel\SimpleExtensionAttribute.cs" />
-    <Compile Include="ExtensionModel\AttrExtensionWithManyNodes.cs" />
-    <Compile Include="ExtensionModel\MultiAssemblyTestExtensionPoint.cs" />
-    <Compile Include="TestLoadXmlAddinDescription.cs" />
-    <Compile Include="TestVerifyAddinDescription.cs" />
-    <Compile Include="TestAddinDescription.cs" />
-    <Compile Include="ExtensionModel\Properties.cs" />
-    <Compile Include="Util.cs" />
-    <Compile Include="TestSetupService.cs" />
-    <Compile Include="ExtensionModel\GlobalInfoConditionAttribute.cs" />
-    <Compile Include="TestScan.cs" />
-    <Compile Include="TestScanDataFileGeneration.cs" />
-  </ItemGroup>
-  <ItemGroup>
     <Content Include="SimpleApp.addin.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -98,7 +63,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <EmbeddedResource Include="TestManifest2.xml">
       <LogicalName>TestManifest2.xml</LogicalName>
@@ -110,7 +74,8 @@
       <LogicalName>TestManifest2-bis.xml</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
-    <Target Name="Test">
-        <Exec Command="$(PkgNUnit_ConsoleRunner)\tools\nunit3-console.exe $(ProjectDir)\bin\Debug\UnitTests.dll" />
-    </Target>
+  <ItemGroup>
+    <Compile Remove="TestFileDatabase.cs" />
+    <Compile Remove="TestLocalization.cs" />
+  </ItemGroup>
 </Project>
diff --git a/mautil/mautil.csproj b/mautil/mautil.csproj
index 49d2ee0..d50c997 100644
--- a/mautil/mautil.csproj
+++ b/mautil/mautil.csproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <Import Project="..\TargetFrameworks.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,6 +9,7 @@
     <AssemblyName>mautil</AssemblyName>
     <SchemaVersion>2.0</SchemaVersion>
     <RootNamespace>mautil</RootNamespace>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -32,9 +32,6 @@
     <Commandlineparameters>rb /home/lluis/work/monodevelop/main/build/AddIns/NUnit</Commandlineparameters>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
     <ProjectReference Include="..\Mono.Addins\Mono.Addins.csproj">
       <Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project>
       <Name>Mono.Addins</Name>
@@ -48,5 +45,11 @@
     <Compile Include="Main.cs" />
     <Compile Include="AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net462" Version="1.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file