Changed Mono.Addins.Setup to netstandard2.0 and included ResolveAddinReferences.cs.

Removed dependencies for Mono.Addins.MSBuild on Mono.Addins.Setup. Not needed

5 files changed, 4 insertions, 7 deletions

diff --git a/Mono.Addins.MSBuild/Mono.Addins.MSBuild.csproj b/Mono.Addins.MSBuild/Mono.Addins.MSBuild.csproj
index 00988c6..57af6e8 100644
--- a/Mono.Addins.MSBuild/Mono.Addins.MSBuild.csproj
+++ b/Mono.Addins.MSBuild/Mono.Addins.MSBuild.csproj
@@ -33,13 +33,12 @@
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.8.0" />
+    <ProjectReference Include="..\Mono.Addins.Setup\Mono.Addins.Setup.csproj" />
     <ProjectReference Include="..\Mono.Addins\Mono.Addins.csproj">
       <Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project>
       <Name>Mono.Addins</Name>
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Remove="ResolveAddinReferences.cs" />
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Mono.Addins.Setup/Mono.Addins.Setup.csproj b/Mono.Addins.Setup/Mono.Addins.Setup.csproj
index 5ff131b..a115eda 100644
--- a/Mono.Addins.Setup/Mono.Addins.Setup.csproj
+++ b/Mono.Addins.Setup/Mono.Addins.Setup.csproj
@@ -13,6 +13,7 @@
     <SchemaVersion>2.0</SchemaVersion>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -45,7 +46,6 @@
     <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>
diff --git a/Mono.Addins.Setup/Mono.Addins.Setup/AddinPackage.cs b/Mono.Addins.Setup/Mono.Addins.Setup/AddinPackage.cs
index c7a3ec7..6929928 100644
--- a/Mono.Addins.Setup/Mono.Addins.Setup/AddinPackage.cs
+++ b/Mono.Addins.Setup/Mono.Addins.Setup/AddinPackage.cs
@@ -42,7 +42,6 @@ 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 feffcf3..e9ee1d4 100644
--- a/Mono.Addins.Setup/Mono.Addins.Setup/SetupService.cs
+++ b/Mono.Addins.Setup/Mono.Addins.Setup/SetupService.cs
@@ -37,7 +37,6 @@ 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/Mono.Addins.Description/ModuleDescription.cs b/Mono.Addins/Mono.Addins.Description/ModuleDescription.cs
index c31c7a8..dfbd169 100644
--- a/Mono.Addins/Mono.Addins.Description/ModuleDescription.cs
+++ b/Mono.Addins/Mono.Addins.Description/ModuleDescription.cs
@@ -135,7 +135,7 @@ namespace Mono.Addins.Description
 		/// <summary>
 		/// Gets the list of external assemblies used by this module.
 		/// </summary>
-		internal StringCollection Assemblies {
+		public StringCollection Assemblies {
 			get {
 				if (assemblies == null) {
 					if (Element != null)