diff options
author | Mikayla Hutchinson <m.j.hutchinson@gmail.com> | 2019-01-13 11:03:02 +0300 |
---|---|---|
committer | Mikayla Hutchinson <m.j.hutchinson@gmail.com> | 2019-01-13 11:29:12 +0300 |
commit | e17d92257c59ee8685bb46f0c44b48a429ce9bd1 (patch) | |
tree | baf339c9522cae0fe652cc681ade8a6dbb31d6d8 /main/src/addins | |
parent | 15e09661ada184d7effde511fa57cac96f378aae (diff) |
Suppress NuGet local copies unless explicitly listed in project
NuGet's PrivateAssets="runtime" does not work, resulting in transitive
references local copying their assemblies into every project. This
works around that by filtering out all local copies that are not
explictly listed.
This also makes it much harder to accidentally introduce local copies,
which is good as local copies in general are are not desirable due to
the way that dlls are loaded by the extension system.
Diffstat (limited to 'main/src/addins')
13 files changed, 56 insertions, 1 deletions
diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj index 3950f35d4b..24595eaf38 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj +++ b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj @@ -87,6 +87,13 @@ <Reference Include="System.ServiceModel" /> <Reference Include="System.Runtime.Serialization" /> <PackageReference Include="Microsoft.AspNet.Mvc" version="5.2.7" PrivateAssets="runtime" /> + <IncludeCopyLocal Include="System.Web.Mvc.dll" /> + <IncludeCopyLocal Include="System.Web.Razor.dll" /> + <IncludeCopyLocal Include="System.Web.Helpers.dll" /> + <IncludeCopyLocal Include="System.Web.WebPages.Deployment.dll" /> + <IncludeCopyLocal Include="System.Web.WebPages.Razor.dll" /> + <IncludeCopyLocal Include="System.Web.WebPages.dll" /> + <IncludeCopyLocal Include="Microsoft.Web.Infrastructure.dll" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="Properties\MonoDevelop.AspNet.addin.xml" /> diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.csproj b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.csproj index d3657e3e41..e36a3db61a 100644 --- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.csproj +++ b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.csproj @@ -57,6 +57,8 @@ <Name>Mono.Addins</Name> <Private>False</Private> </ProjectReference> + <IncludeCopyLocal Include="Mono.Debugger.Soft.dll" /> + <IncludeCopyLocal Include="Mono.Debugging.Soft.dll" /> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> </Project> diff --git a/main/src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/MonoDevelop.Debugger.VsCodeDebugProtocol/MonoDevelop.Debugger.VsCodeDebugProtocol.csproj b/main/src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/MonoDevelop.Debugger.VsCodeDebugProtocol/MonoDevelop.Debugger.VsCodeDebugProtocol.csproj index e73f08b74d..abfc017abb 100644 --- a/main/src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/MonoDevelop.Debugger.VsCodeDebugProtocol/MonoDevelop.Debugger.VsCodeDebugProtocol.csproj +++ b/main/src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/MonoDevelop.Debugger.VsCodeDebugProtocol/MonoDevelop.Debugger.VsCodeDebugProtocol.csproj @@ -40,6 +40,7 @@ <Name>Mono.Debugging</Name> <Private>False</Private> </ProjectReference> + <IncludeCopyLocal Include="Microsoft.VisualStudio.Shared.VSCodeDebugProtocol.dll" /> </ItemGroup> <ItemGroup> <Compile Include="AddinInfo.cs" /> diff --git a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32.csproj b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32.csproj index e2223deff8..74a63b4193 100644 --- a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32.csproj +++ b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32.csproj @@ -61,6 +61,9 @@ <Project>{74704c00-5861-4f86-920c-865148a175c5}</Project> <Name>Mono.Debugging.Win32</Name> </ProjectReference> + <IncludeCopyLocal Include="Mono.Debugging.Win32.dll" /> + <IncludeCopyLocal Include="CorApi2.dll" /> + <IncludeCopyLocal Include="CorApi.dll" /> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> </Project> diff --git a/main/src/addins/MonoDevelop.GtkCore/libsteticui/libsteticui.csproj b/main/src/addins/MonoDevelop.GtkCore/libsteticui/libsteticui.csproj index 3672c7afa8..0583de188d 100644 --- a/main/src/addins/MonoDevelop.GtkCore/libsteticui/libsteticui.csproj +++ b/main/src/addins/MonoDevelop.GtkCore/libsteticui/libsteticui.csproj @@ -17,6 +17,10 @@ <Reference Include="System.Xml" /> <Reference Include="System.Core" /> <PackageReference Include="Mono.Cecil" Version="0.10.1" /> + <SuppressCopyLocal Include="Mono.Cecil.Mdb.dll" /> + <SuppressCopyLocal Include="Mono.Cecil.Pdb.dll" /> + <SuppressCopyLocal Include="Mono.Cecil.Rocks.dll" /> + <SuppressCopyLocal Include="Mono.Cecil.dll" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\libstetic\libstetic.csproj"> diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj index 0d8010d28d..8cdfa25c46 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj @@ -28,7 +28,23 @@ <Reference Include="WindowsBase" /> <PackageReference Include="NuGet.PackageManagement" Version="4.8.0" PrivateAssets="runtime" /> <PackageReference Include="NuGet.Indexing" Version="4.8.0" PrivateAssets="runtime" /> - <PackageReference Include="SharpZipLib" Version="0.86.0" PrivateAssets="all" ExcludeAssets="all" /> + <IncludeCopyLocal Include="Lucene.Net.dll" /> + <IncludeCopyLocal Include="Microsoft.Web.XmlTransform.dll" /> + <IncludeCopyLocal Include="NuGet.Commands.dll" /> + <IncludeCopyLocal Include="NuGet.Common.dll" /> + <IncludeCopyLocal Include="NuGet.Configuration.dll" /> + <IncludeCopyLocal Include="NuGet.Credentials.dll" /> + <IncludeCopyLocal Include="NuGet.DependencyResolver.Core.dll" /> + <IncludeCopyLocal Include="NuGet.Frameworks.dll" /> + <IncludeCopyLocal Include="NuGet.Indexing.dll" /> + <IncludeCopyLocal Include="NuGet.LibraryModel.dll" /> + <IncludeCopyLocal Include="NuGet.PackageManagement.dll" /> + <IncludeCopyLocal Include="NuGet.Packaging.dll" /> + <IncludeCopyLocal Include="NuGet.Packaging.Core.dll" /> + <IncludeCopyLocal Include="NuGet.ProjectModel.dll" /> + <IncludeCopyLocal Include="NuGet.Protocol.dll" /> + <IncludeCopyLocal Include="NuGet.Resolver.dll" /> + <IncludeCopyLocal Include="NuGet.Versioning.dll" /> </ItemGroup> <ItemGroup> <Compile Include="AssemblyInfo.cs" /> diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj index 86d4e702b7..76c06d79e9 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj @@ -25,6 +25,7 @@ <HintPath>..\..\..\external\Xamarin.Mac.dll</HintPath> <Private>False</Private> </Reference> + <IncludeCopyLocal Include="RefactoringEssentials.dll" /> </ItemGroup> <ItemGroup> <Compile Include="AssemblyInfo.cs" /> diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/NUnit3Runner.csproj b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/NUnit3Runner.csproj index 0283f76666..45e051fb25 100644 --- a/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/NUnit3Runner.csproj +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/NUnit3Runner.csproj @@ -15,6 +15,11 @@ <Reference Include="System" /> <Reference Include="System.Xml" /> <PackageReference Include="NUnit.Engine" Version="$(NuGetVersionNUnit3)" PrivateAssets="runtime" /> + <IncludeCopyLocal Include="Mono.Cecil.dll" /> + <IncludeCopyLocal Include="nunit-agent-x86.exe" /> + <IncludeCopyLocal Include="nunit-agent.exe" /> + <IncludeCopyLocal Include="nunit.engine.api.dll" /> + <IncludeCopyLocal Include="nunit.engine.dll" /> </ItemGroup> <ItemGroup> <Compile Include="Program.cs" /> diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/NUnitRunner.csproj b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/NUnitRunner.csproj index 1066fcdfd3..227b513900 100644 --- a/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/NUnitRunner.csproj +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/NUnitRunner.csproj @@ -18,6 +18,10 @@ <!-- this is hacky but there is no package that exposes nunit.util.dll as a lib assembly --> <DownloadNupkg Include="NUnit.Runners" Version="$(NuGetVersionNUnit2)" /> <Reference Include="nunit.util" HintPath="$(DownloadNupkgDirectory)NUnit.Runners.$(NuGetVersionNUnit2)\tools\lib\nunit.util.dll" /> + <IncludeCopyLocal Include="nunit.framework.dll" /> + <IncludeCopyLocal Include="nunit.core.dll" /> + <IncludeCopyLocal Include="nunit.core.interfaces.dll" /> + <IncludeCopyLocal Include="nunit.util.dll" /> </ItemGroup> <ItemGroup> <Compile Include="NUnitTestRunner.cs" /> diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj index 57061dab26..264728ae52 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj +++ b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj @@ -20,6 +20,12 @@ <Reference Include="System.Runtime" /> <Reference Include="System.Runtime.Serialization" /> <PackageReference Include="Microsoft.TestPlatform.TranslationLayer" Version="$(NuGetVersionMicrosoftTestPlatform)" /> + <IncludeCopyLocal Include="Microsoft.TestPlatform.CoreUtilities.dll" /> + <IncludeCopyLocal Include="Microsoft.TestPlatform.PlatformAbstractions.dll" /> + <IncludeCopyLocal Include="Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" /> + <IncludeCopyLocal Include="Microsoft.TestPlatform.CommunicationUtilities.dll" /> + <IncludeCopyLocal Include="Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll" /> + <IncludeCopyLocal Include="Microsoft.VisualStudio.TestPlatform.Common.dll" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj"> diff --git a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj index 0691a23571..a816287845 100644 --- a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj +++ b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.csproj @@ -61,6 +61,7 @@ <Name>Mono.Addins</Name> <Private>False</Private> </ProjectReference> + <IncludeCopyLocal Include="Mono.TextTemplating.dll" /> </ItemGroup> <ItemGroup> <ExtensionContent Include="Templates\**\*.*" /> diff --git a/main/src/addins/WindowsPlatform/WindowsAPICodePack/Shell/Shell.csproj b/main/src/addins/WindowsPlatform/WindowsAPICodePack/Shell/Shell.csproj index 964a86c2e2..adb3982e19 100644 --- a/main/src/addins/WindowsPlatform/WindowsAPICodePack/Shell/Shell.csproj +++ b/main/src/addins/WindowsPlatform/WindowsAPICodePack/Shell/Shell.csproj @@ -26,6 +26,7 @@ <Reference Include="WindowsBase" /> <Reference Include="WindowsFormsIntegration" /> <Reference Include="System.Xaml" /> + <SuppressCopyLocal Include="Microsoft.WindowsAPICodePack.dll" /> </ItemGroup> <ItemGroup> <InternalsVisibleTo Include="Microsoft.WindowsAPICodePack.ShellExtensions" /> diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.csproj b/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.csproj index 055d750318..9739a3ea01 100644 --- a/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.csproj +++ b/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.csproj @@ -58,6 +58,10 @@ <Project>{C93D746E-1586-4D4F-B411-BF5A966E6A08}</Project> <Name>Xwt.WPF</Name> </ProjectReference> + <IncludeCopyLocal Include="Microsoft.WindowsAPICodePack.dll" /> + <IncludeCopyLocal Include="Microsoft.WindowsAPICodePack.Shell.dll" /> + <IncludeCopyLocal Include="Xwt.Gtk.Windows.dll" /> + <IncludeCopyLocal Include="Xwt.WPF.dll" /> </ItemGroup> <ItemGroup> <Compile Include="Dialogs\AddFileDialogHandler.cs" /> |