diff options
| author | Kirill Osenkov <KirillOsenkov@users.noreply.github.com> | 2019-01-18 02:12:01 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-18 02:12:01 +0300 |
| commit | 4ebb2e60e7e98d3658585061a1d3f183a81d57bb (patch) | |
| tree | b9c8a7d25a54d5d2c824991bdb90729ed46a37f9 /main/src | |
| parent | 9f3222546fda2f2717a07629fd6087d399ee270a (diff) | |
Copy the net45 version of MS.VS.Composition to output. (#96)
* Copy the net45 version of MS.VS.Composition to output.
See bug https://github.com/mono/mono/issues/12461 for details. The net45 version has a workaround for .NET Framework bug that is still present on Mono. Later versions of the binary do not include the workaround and we still need it.
We ExcludeAssets="runtime" to not copy the default version of VSMef to output (net46).
We also add a manual reference to where the .dll is on disk and make it Private true so it gets copied to output.
* Reference net45 version of MS.VS.Composition manually.
Diffstat (limited to 'main/src')
| -rw-r--r-- | main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj index ed1c0f3566..79de114fd3 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj @@ -88,7 +88,11 @@ <PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures" Version="$(NuGetVersionRoslyn)" PrivateAssets="runtime" /> <PackageReference Include="Microsoft.CodeAnalysis.ExternalAccess.MonoDevelop" Version="$(NuGetVersionRoslyn)" PrivateAssets="runtime" /> <PackageReference Include="Microsoft.VisualStudio.CodingConventions" Version="1.1.20180503.2" PrivateAssets="runtime" /> - <PackageReference Include="Microsoft.VisualStudio.Composition" Version="$(NuGetVersionVSComposition)" PrivateAssets="runtime" /> + <PackageReference Include="Microsoft.VisualStudio.Composition" Version="$(NuGetVersionVSComposition)" ExcludeAssets="all" /> + <!-- Need the net45 version, see https://github.com/mono/mono/issues/12461 --> + <Reference Include="$(NuGetPackageRoot)microsoft.visualstudio.composition/$(NuGetVersionVSComposition)/lib/net45/Microsoft.VisualStudio.Composition.dll"> + <Private>true</Private> + </Reference> <PackageReference Include="Microsoft.VisualStudio.Language.NavigateTo.Interfaces" Version="$(NuGetVersionVSEditor)" PrivateAssets="runtime" /> <PackageReference Include="Mono.Cecil" Version="$(NuGetVersionCecil)" PrivateAssets="runtime" /> <PackageReference Include="MonoDevelopDev.Analyzers" Version="$(NuGetVersionMonoDevelopAnalyzers)" /> |