diff options
| author | Rodrigo Moya <rodrigo.moya@xamarin.com> | 2019-05-07 19:37:25 +0300 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2019-05-08 13:19:13 +0300 |
| commit | 2ae20157ecda230b13aa67082b64b5be23e28946 (patch) | |
| tree | f4989b6f19fe316f08c0eff25ec22c4fcb62fdab /main | |
| parent | 2c358261b2252d70522baec541bc9a29e72949ba (diff) | |
[Core] Fix build with .NET Core 3.0 preview5 installed
.NET Core NuGet resolver expects a NuGetPackageId set for every
reference from a NuGet package, so cheat it by adding it.
See https://github.com/dotnet/core-sdk/issues/1904
Diffstat (limited to 'main')
| -rw-r--r-- | main/msbuild/MonoDevelop.BeforeCommon.targets | 1 | ||||
| -rw-r--r-- | main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/main/msbuild/MonoDevelop.BeforeCommon.targets b/main/msbuild/MonoDevelop.BeforeCommon.targets index ea5a8c3fef..4ea19e082c 100644 --- a/main/msbuild/MonoDevelop.BeforeCommon.targets +++ b/main/msbuild/MonoDevelop.BeforeCommon.targets @@ -87,6 +87,7 @@ <ItemGroup Condition="$(MSBuildProjectName) != 'MonoDevelop.Core'"> <Reference Include="$(NuGetPackageRoot)microsoft.visualstudio.composition/$(NuGetVersionVSComposition)/lib/net45/Microsoft.VisualStudio.Composition.dll"> <Private>false</Private> + <NuGetPackageId>Microsoft.VisualStudio.Composition</NuGetPackageId> </Reference> </ItemGroup> diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj index d77a440196..b3c6dd9ced 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj @@ -92,6 +92,7 @@ <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"> + <NuGetPackageId>Microsoft.VisualStudio.Composition</NuGetPackageId> <Private>true</Private> </Reference> <PackageReference Include="Mono.Cecil" Version="$(NuGetVersionCecil)" PrivateAssets="runtime" /> |