diff options
author | Matt Ward <matt.ward@xamarin.com> | 2016-12-09 21:12:25 +0300 |
---|---|---|
committer | Matt Ward <matt.ward@xamarin.com> | 2016-12-09 21:12:25 +0300 |
commit | 40d078b1421c09efb4b04e1bdf8f6ad9cecbc34d (patch) | |
tree | 57d5002eeb94ab7dd0b02e8bfa55ea752ea8caec /main/src/core/MonoDevelop.Ide/AssemblyInfo.cs | |
parent | c6fdc5c197dfa293cd29824a7e54504748f83fbd (diff) | |
parent | 46c45bf316c19b3140476cd55d7cdf7a8d8c48fe (diff) |
Merge remote-tracking branch 'monodevelop/dotnetcore' into vNext
Conflicts:
main/Main.sln
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectTemplatePackageReference.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
version-checks
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/AssemblyInfo.cs')
-rw-r--r-- | main/src/core/MonoDevelop.Ide/AssemblyInfo.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/main/src/core/MonoDevelop.Ide/AssemblyInfo.cs b/main/src/core/MonoDevelop.Ide/AssemblyInfo.cs index 53ca899aa2..bb0a8be3af 100644 --- a/main/src/core/MonoDevelop.Ide/AssemblyInfo.cs +++ b/main/src/core/MonoDevelop.Ide/AssemblyInfo.cs @@ -32,5 +32,7 @@ using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("MonoDevelop.GtkCore")] [assembly: InternalsVisibleTo("MonoDevelop.PackageManagement")] [assembly: InternalsVisibleTo("Xamarin.Forms.Addin.Tests")] +[assembly: InternalsVisibleTo("MonoDevelop.Packaging")] +[assembly: InternalsVisibleTo("MonoDevelop.Packaging.Tests")] [assembly: InternalsVisibleTo ("MonoDevelop.FSharp.Tests")] [assembly: InternalsVisibleTo ("MonoDevelop.VBNetBinding")] |