huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Exclude SQLitePCl.bundle_green targets when reference included via the Microsoft.AspNetCore.All metapackage

This commit is contained in:
Nate McMaster 2017-05-03 11:15:46 -07:00
parent 634c9c180c
commit ebdc68ac10
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/common.props
View File

@ -127,6 +127,8 @@
<FullMetaPackagePackageReference Include="Microsoft.CodeAnalysis.Razor" Version="$(AspNetCoreVersion)" PrivateAssets="None" /> <FullMetaPackagePackageReference Include="Microsoft.CodeAnalysis.Razor" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
<FullMetaPackagePackageReference Include="Microsoft.Data.Sqlite" Version="$(AspNetCoreVersion)" PrivateAssets="None" /> <FullMetaPackagePackageReference Include="Microsoft.Data.Sqlite" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
<FullMetaPackagePackageReference Include="Microsoft.Data.Sqlite.Core" Version="$(AspNetCoreVersion)" PrivateAssets="None" /> <FullMetaPackagePackageReference Include="Microsoft.Data.Sqlite.Core" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
<!-- workaround for https://github.com/dotnet/sdk/issues/1166 and https://github.com/ericsink/SQLitePCL.raw/issues/157 -->
<FullMetaPackagePackageReference Include="SQLitePCLRaw.bundle_green" Version="$(SQLitePCLRawVersion)" PrivateAssets="Build" />
<FullMetaPackagePackageReference Include="Microsoft.EntityFrameworkCore" Version="$(AspNetCoreVersion)" PrivateAssets="None" /> <FullMetaPackagePackageReference Include="Microsoft.EntityFrameworkCore" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
<FullMetaPackagePackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="$(AspNetCoreVersion)" PrivateAssets="None" /> <FullMetaPackagePackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
<FullMetaPackagePackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(AspNetCoreVersion)" PrivateAssets="None" /> <FullMetaPackagePackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(AspNetCoreVersion)" PrivateAssets="None" />

1
build/dependencies.props
View File

@ -8,6 +8,7 @@
<MoqVersion>4.7.1</MoqVersion> <MoqVersion>4.7.1</MoqVersion>
<NETStandardImplicitPackageVersion>$(BundledNETStandardPackageVersion)</NETStandardImplicitPackageVersion> <NETStandardImplicitPackageVersion>$(BundledNETStandardPackageVersion)</NETStandardImplicitPackageVersion>
<NewtonsoftJsonVersion>10.0.1</NewtonsoftJsonVersion> <NewtonsoftJsonVersion>10.0.1</NewtonsoftJsonVersion>
<SQLitePCLRawVersion>1.1.5</SQLitePCLRawVersion>
<TestSdkVersion>15.0.0</TestSdkVersion> <TestSdkVersion>15.0.0</TestSdkVersion>
<XunitVersion>2.2.0</XunitVersion> <XunitVersion>2.2.0</XunitVersion>
</PropertyGroup> </PropertyGroup>

2
src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj
View File

@ -14,7 +14,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="@(FullMetaPackagePackageReference)" /> <PackageReference Include="@(FullMetaPackagePackageReference)" />
<PackageReference Include="@(FullMetaPackagePackageNoRuntimeStoreReference)" /> <PackageReference Include="@(FullMetaPackagePackageNoRuntimeStoreReference)" />
<ProjectReference Include="@(FullMetaPackageProjectReference)" /> <ProjectReference Include="@(FullMetaPackageProjectReference)" PrivateAssets="None" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>