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

Merge branch 'release/2.2'

This commit is contained in:
Nate McMaster 2018-08-30 15:29:49 -07:00
parent ce5433622e a6a21351b6
commit 2d4dd7251b
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
4 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.vsts/builds/ci-official.yml
View File

@ -15,9 +15,6 @@ phases:
matrix: matrix:
Release: Release:
BuildConfiguration: Release BuildConfiguration: Release
# see https://github.com/dotnet/core-eng/issues/4053 - MSI's cannot build from the NTAuthority\NetworkService account
demands:
- agent.name -equals DDVSOWINAGE087
variables: variables:
CI: true CI: true
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true

2
modules/EntityFrameworkCore

@ -1 +1 @@
Subproject commit f925bb53283dac1e56ef879a14e6d090346ab182 Subproject commit 8bf757b3078a7b3c0184afb95373c89cf0e3c6ff

5
src/Packages/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj
View File

@ -6,10 +6,9 @@
<TargetFramework>netcoreapp3.0</TargetFramework> <TargetFramework>netcoreapp3.0</TargetFramework>
<PackageTags>aspnetcore</PackageTags> <PackageTags>aspnetcore</PackageTags>
<EnableApiCheck>false</EnableApiCheck> <EnableApiCheck>false</EnableApiCheck>
<PackageDescription>Provides a default set of API for building an ASP.NET Core application, and also includes API for third-party integrations with ASP.NET Core. <PackageDescription>Provides a default set of APIs for building an ASP.NET Core application, and also includes API for third-party integrations with ASP.NET Core.
This package requires the ASP.NET Core runtime. This runtime is installed by the .NET Core SDK, This package requires the ASP.NET Core runtime. This runtime is installed by the .NET Core SDK, or can be acquired separately using installers available at https://aka.ms/dotnet-download.
or can be acquired separately using installers available at https://aka.ms/dotnet-download.
</PackageDescription> </PackageDescription>
</PropertyGroup> </PropertyGroup>

5
src/Packages/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj
View File

@ -6,10 +6,9 @@
<TargetFramework>netcoreapp3.0</TargetFramework> <TargetFramework>netcoreapp3.0</TargetFramework>
<PackageTags>aspnetcore</PackageTags> <PackageTags>aspnetcore</PackageTags>
<EnableApiCheck>false</EnableApiCheck> <EnableApiCheck>false</EnableApiCheck>
<PackageDescription>Provides a default set of API for building an ASP.NET Core application. <PackageDescription>Provides a default set of APIs for building an ASP.NET Core application.
This package requires the ASP.NET Core runtime. This runtime is installed by the .NET Core SDK, This package requires the ASP.NET Core runtime. This runtime is installed by the .NET Core SDK, or can be acquired separately using installers available at https://aka.ms/dotnet-download.
or can be acquired separately using installers available at https://aka.ms/dotnet-download.
</PackageDescription> </PackageDescription>
</PropertyGroup> </PropertyGroup>