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

Merge in 'release/2.1' changes

This commit is contained in:
dotnet-bot 2018-12-20 18:55:13 +00:00
parent fe0d8ca083 686ce02cc8
commit 94a236e196
4 changed files with 3 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build/SharedFx.targets
View File

@ -9,7 +9,6 @@
<ItemGroup> <ItemGroup>
<_MetapackageProject Include="$(RepositoryRoot)src\Packages\Microsoft.AspNetCore.All\Microsoft.AspNetCore.All.csproj" /> <_MetapackageProject Include="$(RepositoryRoot)src\Packages\Microsoft.AspNetCore.All\Microsoft.AspNetCore.All.csproj" />
<_MetapackageProject Include="$(RepositoryRoot)src\Packages\Microsoft.AspNetCore.App\Microsoft.AspNetCore.App.csproj" /> <_MetapackageProject Include="$(RepositoryRoot)src\Packages\Microsoft.AspNetCore.App\Microsoft.AspNetCore.App.csproj" />
<_MetapackageProject Include="$(RepositoryRoot)src\Packages\Microsoft.AspNetCore.Analyzers\Microsoft.AspNetCore.Analyzers.csproj" />
</ItemGroup> </ItemGroup>
<MSBuild Projects="@(_MetapackageProject)" <MSBuild Projects="@(_MetapackageProject)"
@ -92,14 +91,6 @@
MetapackageDependencyVersionRangeType=Minimum MetapackageDependencyVersionRangeType=Minimum
</AdditionalProperties> </AdditionalProperties>
</_MetapackageBuilderProject> </_MetapackageBuilderProject>
<_MetapackageBuilderProject Include="$(MSBuildProjectFullPath)">
<AdditionalProperties>
MetapackageName=Microsoft.AspNetCore.Analyzers;
MetapackageReferenceType=Analyzer;
MetapackageDependencyVersionRangeType=Minimum
</AdditionalProperties>
</_MetapackageBuilderProject>
</ItemGroup> </ItemGroup>
<MSBuild <MSBuild

6
build/artifacts.props
View File

@ -6,8 +6,6 @@
<AppMetapackage>false</AppMetapackage> <AppMetapackage>false</AppMetapackage>
<!-- When true, this dependency will be included in the Microsoft.AspNetCore.All metapackage. --> <!-- When true, this dependency will be included in the Microsoft.AspNetCore.All metapackage. -->
<AllMetapackage>false</AllMetapackage> <AllMetapackage>false</AllMetapackage>
<!-- When true, this dependency will be included in the Microsoft.AspNetCore.Analyzers metapackage. -->
<Analyzer>false</Analyzer>
<!-- <!--
Other known package types: Other known package types:
Dependency = for packages that are installed via PackageReference Dependency = for packages that are installed via PackageReference
@ -26,7 +24,6 @@
<PackageArtifact Include="dotnet-watch" Category="ship" /> <PackageArtifact Include="dotnet-watch" Category="ship" />
<PackageArtifact Include="Microsoft.AspNet.Identity.AspNetCoreCompat" Category="noship" /> <PackageArtifact Include="Microsoft.AspNet.Identity.AspNetCoreCompat" Category="noship" />
<PackageArtifact Include="Microsoft.AspNetCore.All" Category="ship" /> <PackageArtifact Include="Microsoft.AspNetCore.All" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.Analyzers" Category="shipoob" />
<PackageArtifact Include="Microsoft.AspNetCore.Antiforgery" AllMetapackage="true" AppMetapackage="true" Category="ship" /> <PackageArtifact Include="Microsoft.AspNetCore.Antiforgery" AllMetapackage="true" AppMetapackage="true" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.App" Category="ship" /> <PackageArtifact Include="Microsoft.AspNetCore.App" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" AllMetapackage="true" Category="ship" /> <PackageArtifact Include="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" AllMetapackage="true" Category="ship" />
@ -89,8 +86,7 @@
<PackageArtifact Include="Microsoft.AspNetCore.Localization" AllMetapackage="true" AppMetapackage="true" Category="ship" /> <PackageArtifact Include="Microsoft.AspNetCore.Localization" AllMetapackage="true" AppMetapackage="true" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.MiddlewareAnalysis" AllMetapackage="true" AppMetapackage="true" Category="ship" /> <PackageArtifact Include="Microsoft.AspNetCore.MiddlewareAnalysis" AllMetapackage="true" AppMetapackage="true" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.Mvc.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" /> <PackageArtifact Include="Microsoft.AspNetCore.Mvc.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.Mvc.Analyzers.Experimental" Analyzer="true" Category="shipoob" /> <PackageArtifact Include="Microsoft.AspNetCore.Mvc.Analyzers" AllMetapackage="true" AppMetapackage="true" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.Mvc.Analyzers" Analyzer="true" AllMetapackage="true" AppMetapackage="true" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.Mvc.ApiExplorer" AllMetapackage="true" AppMetapackage="true" Category="ship" /> <PackageArtifact Include="Microsoft.AspNetCore.Mvc.ApiExplorer" AllMetapackage="true" AppMetapackage="true" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.Mvc.Core" AllMetapackage="true" AppMetapackage="true" Category="ship" /> <PackageArtifact Include="Microsoft.AspNetCore.Mvc.Core" AllMetapackage="true" AppMetapackage="true" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.Mvc.Cors" AllMetapackage="true" AppMetapackage="true" Category="ship" /> <PackageArtifact Include="Microsoft.AspNetCore.Mvc.Cors" AllMetapackage="true" AppMetapackage="true" Category="ship" />

8
src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers.Experimental/Microsoft.AspNetCore.Mvc.Analyzers.Experimental.csproj
View File

@ -2,12 +2,8 @@
<PropertyGroup> <PropertyGroup>
<Description>CSharp Analyzers for ASP.NET Core MVC.</Description> <Description>CSharp Analyzers for ASP.NET Core MVC.</Description>
<PackageTags>aspnetcore;aspnetcoremvc</PackageTags> <PackageTags>aspnetcore;aspnetcoremvc</PackageTags>
<!-- These analyzers do not need to put into a package. -->
<VerifyVersion>false</VerifyVersion> <IsPackable>false</IsPackable>
<VersionPrefix>$(ExperimentalVersionPrefix)</VersionPrefix>
<VersionSuffix>$(ExperimentalVersionSuffix)</VersionSuffix>
<PackageVersion>$(ExperimentalPackageVersion)</PackageVersion>
<TargetFramework>netstandard1.3</TargetFramework> <TargetFramework>netstandard1.3</TargetFramework>
<IncludeBuildOutput>false</IncludeBuildOutput> <IncludeBuildOutput>false</IncludeBuildOutput>
<EnableApiCheck>false</EnableApiCheck> <EnableApiCheck>false</EnableApiCheck>

18
src/Packages/Microsoft.AspNetCore.Analyzers/Microsoft.AspNetCore.Analyzers.csproj
View File

@ -1,18 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<IncludeBuildOutput>false</IncludeBuildOutput>
<IncludeSymbols>false</IncludeSymbols>
<TargetFramework>netstandard2.0</TargetFramework>
<PackageTags>aspnetcore</PackageTags>
<Description>Microsoft.AspNetCore.Analyzers</Description>
<VersionPrefix>$(ExperimentalVersionPrefix)</VersionPrefix>
<VersionSuffix>$(ExperimentalVersionSuffix)</VersionSuffix>
<PackageVersion>$(ExperimentalPackageVersion)</PackageVersion>
<VerifyVersion>false</VerifyVersion>
<EnableApiCheck>false</EnableApiCheck>
</PropertyGroup>
</Project>