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

Update the 1.x templates for the latest patch

This commit is contained in:
Nate McMaster 2017-10-13 10:08:31 -07:00
parent 0a82a7376c
commit 38be05d442
6 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Microsoft.DotNet.Web.ProjectTemplates.1.x/content/EmptyWeb-CSharp/Company.WebApplication1.csproj
View File

@ -12,8 +12,8 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.0.0" Condition="'$(IncludeApplicationInsights)' == 'True'" /> <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.0.0" Condition="'$(IncludeApplicationInsights)' == 'True'" />
<PackageReference Include="Microsoft.AspNetCore" Version="1.0.6" Condition="'$(Framework)' != 'netcoreapp1.1'" /> <PackageReference Include="Microsoft.AspNetCore" Version="1.0.7" Condition="'$(Framework)' != 'netcoreapp1.1'" />
<PackageReference Include="Microsoft.AspNetCore" Version="1.1.3" Condition="'$(Framework)' == 'netcoreapp1.1'" /> <PackageReference Include="Microsoft.AspNetCore" Version="1.1.4" Condition="'$(Framework)' == 'netcoreapp1.1'" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
src/Microsoft.DotNet.Web.ProjectTemplates.1.x/content/EmptyWeb-FSharp/Company.WebApplication1.fsproj
View File

@ -13,8 +13,8 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.0.0" Condition="'$(IncludeApplicationInsights)' == 'True'" /> <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.0.0" Condition="'$(IncludeApplicationInsights)' == 'True'" />
<PackageReference Include="Microsoft.AspNetCore" Version="1.0.6" Condition="'$(Framework)' != 'netcoreapp1.1'" /> <PackageReference Include="Microsoft.AspNetCore" Version="1.0.7" Condition="'$(Framework)' != 'netcoreapp1.1'" />
<PackageReference Include="Microsoft.AspNetCore" Version="1.1.3" Condition="'$(Framework)' == 'netcoreapp1.1'" /> <PackageReference Include="Microsoft.AspNetCore" Version="1.1.4" Condition="'$(Framework)' == 'netcoreapp1.1'" />
</ItemGroup> </ItemGroup>
</Project> </Project>

40
src/Microsoft.DotNet.Web.ProjectTemplates.1.x/content/StarterWeb-CSharp/Company.WebApplication1.csproj
View File

@ -18,18 +18,18 @@
<ItemGroup Condition="'$(Framework)' != 'netcoreapp1.1'"> <ItemGroup Condition="'$(Framework)' != 'netcoreapp1.1'">
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.0.0" Condition="'$(IncludeApplicationInsights)' == 'True'" /> <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.0.0" Condition="'$(IncludeApplicationInsights)' == 'True'" />
<PackageReference Include="Microsoft.AspNetCore" Version="1.0.6" /> <PackageReference Include="Microsoft.AspNetCore" Version="1.0.7" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="1.0.4" Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="1.0.5" Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="1.0.4" Condition="'$(OrganizationalAuth)' == 'True'" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="1.0.5" Condition="'$(OrganizationalAuth)' == 'True'" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="1.0.4" Condition="'$(IndividualAuth)' == 'True'" /> <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="1.0.5" Condition="'$(IndividualAuth)' == 'True'" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="1.0.4" Condition="'$(IndividualAuth)' == 'True'" /> <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="1.0.5" Condition="'$(IndividualAuth)' == 'True'" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.0.5" /> <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.0.6" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.0.4" /> <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="1.0.5" PrivateAssets="All" Condition="'$(IndividualAuth)' == 'True'" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="1.0.6" PrivateAssets="All" Condition="'$(IndividualAuth)' == 'True'" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="1.0.5" Condition=" '$(IndividualAuth)' == 'True' AND '$(UseLocalDB)' != 'True' " /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="1.0.6" Condition=" '$(IndividualAuth)' == 'True' AND '$(UseLocalDB)' != 'True' " />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Design" Version="1.0.5" PrivateAssets="All" Condition=" '$(IndividualAuth)' == 'True' AND '$(UseLocalDB)' != 'True' " /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Design" Version="1.0.6" PrivateAssets="All" Condition=" '$(IndividualAuth)' == 'True' AND '$(UseLocalDB)' != 'True' " />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="1.0.5" Condition=" '$(IndividualAuth)' == 'True' AND '$(UseLocalDB)' == 'True' " /> <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="1.0.6" Condition=" '$(IndividualAuth)' == 'True' AND '$(UseLocalDB)' == 'True' " />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.0.5" PrivateAssets="All" Condition=" '$(IndividualAuth)' == 'True' AND '$(UseLocalDB)' == 'True' " /> <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.0.6" PrivateAssets="All" Condition=" '$(IndividualAuth)' == 'True' AND '$(UseLocalDB)' == 'True' " />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="1.0.2" PrivateAssets="All" Condition="'$(IndividualAuth)' == 'True'" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="1.0.2" PrivateAssets="All" Condition="'$(IndividualAuth)' == 'True'" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="1.0.2" Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'" /> <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="1.0.2" Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.0.2" /> <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.0.2" />
@ -38,18 +38,18 @@
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(Framework)' == 'netcoreapp1.1'"> <ItemGroup Condition="'$(Framework)' == 'netcoreapp1.1'">
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.0.0" Condition="'$(IncludeApplicationInsights)' == 'True'" /> <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.0.0" Condition="'$(IncludeApplicationInsights)' == 'True'" />
<PackageReference Include="Microsoft.AspNetCore" Version="1.1.3" /> <PackageReference Include="Microsoft.AspNetCore" Version="1.1.4" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="1.1.3" Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="1.1.3" Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="1.1.3" Condition="'$(OrganizationalAuth)' == 'True'" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="1.1.3" Condition="'$(OrganizationalAuth)' == 'True'" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="1.1.3" Condition="'$(IndividualAuth)' == 'True'" /> <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="1.1.4" Condition="'$(IndividualAuth)' == 'True'" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="1.1.3" Condition="'$(IndividualAuth)' == 'True'" /> <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="1.1.4" Condition="'$(IndividualAuth)' == 'True'" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.4" /> <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.4" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.3" /> <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="1.1.3" PrivateAssets="All" Condition="'$(IndividualAuth)' == 'True'" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="1.1.4" PrivateAssets="All" Condition="'$(IndividualAuth)' == 'True'" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="1.1.3" Condition=" '$(IndividualAuth)' == 'True' AND '$(UseLocalDB)' != 'True' " /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="1.1.4" Condition=" '$(IndividualAuth)' == 'True' AND '$(UseLocalDB)' != 'True' " />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Design" Version="1.1.3" PrivateAssets="All" Condition=" '$(IndividualAuth)' == 'True' AND '$(UseLocalDB)' != 'True' " /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Design" Version="1.1.4" PrivateAssets="All" Condition=" '$(IndividualAuth)' == 'True' AND '$(UseLocalDB)' != 'True' " />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="1.1.3" Condition=" '$(IndividualAuth)' == 'True' AND '$(UseLocalDB)' == 'True' " /> <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="1.1.4" Condition=" '$(IndividualAuth)' == 'True' AND '$(UseLocalDB)' == 'True' " />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.3" PrivateAssets="All" Condition=" '$(IndividualAuth)' == 'True' AND '$(UseLocalDB)' == 'True' " /> <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.4" PrivateAssets="All" Condition=" '$(IndividualAuth)' == 'True' AND '$(UseLocalDB)' == 'True' " />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="1.1.2" PrivateAssets="All" Condition="'$(IndividualAuth)' == 'True'" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="1.1.2" PrivateAssets="All" Condition="'$(IndividualAuth)' == 'True'" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="1.1.2" Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'" /> <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="1.1.2" Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" /> <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" />

8
src/Microsoft.DotNet.Web.ProjectTemplates.1.x/content/StarterWeb-FSharp/Company.WebApplication1.fsproj
View File

@ -15,14 +15,14 @@
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(Framework)' != 'netcoreapp1.1'"> <ItemGroup Condition="'$(Framework)' != 'netcoreapp1.1'">
<PackageReference Include="Microsoft.AspNetCore" Version="1.0.6" /> <PackageReference Include="Microsoft.AspNetCore" Version="1.0.7" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.0.5" /> <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.0.6" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.0.4" /> <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.0.5" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.0.2" /> <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.0.2" />
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.0.1" Condition="'$(UseBrowserLink)' == 'True'" /> <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.0.1" Condition="'$(UseBrowserLink)' == 'True'" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(Framework)' == 'netcoreapp1.1'"> <ItemGroup Condition="'$(Framework)' == 'netcoreapp1.1'">
<PackageReference Include="Microsoft.AspNetCore" Version="1.1.3" /> <PackageReference Include="Microsoft.AspNetCore" Version="1.1.4" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.4" /> <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.4" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.3" /> <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.3" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" /> <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" />

8
src/Microsoft.DotNet.Web.ProjectTemplates.1.x/content/WebApi-CSharp/Company.WebApplication1.csproj
View File

@ -16,15 +16,15 @@
<ItemGroup Condition="'$(Framework)' != 'netcoreapp1.1'"> <ItemGroup Condition="'$(Framework)' != 'netcoreapp1.1'">
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.0.0" Condition="'$(IncludeApplicationInsights)' == 'True'" /> <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.0.0" Condition="'$(IncludeApplicationInsights)' == 'True'" />
<PackageReference Include="Microsoft.AspNetCore" Version="1.0.6" /> <PackageReference Include="Microsoft.AspNetCore" Version="1.0.7" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="1.0.4" Condition="'$(OrganizationalAuth)' == 'True'" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="1.0.5" Condition="'$(OrganizationalAuth)' == 'True'" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.0.5" /> <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.0.6" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="1.0.2" Condition="'$(OrganizationalAuth)' == 'True'" /> <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="1.0.2" Condition="'$(OrganizationalAuth)' == 'True'" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.0.2" /> <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.0.2" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(Framework)' == 'netcoreapp1.1'"> <ItemGroup Condition="'$(Framework)' == 'netcoreapp1.1'">
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.0.0" Condition="'$(IncludeApplicationInsights)' == 'True'" /> <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.0.0" Condition="'$(IncludeApplicationInsights)' == 'True'" />
<PackageReference Include="Microsoft.AspNetCore" Version="1.1.3" /> <PackageReference Include="Microsoft.AspNetCore" Version="1.1.4" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="1.1.3" Condition="'$(OrganizationalAuth)' == 'True'" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="1.1.3" Condition="'$(OrganizationalAuth)' == 'True'" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.4" /> <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.4" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="1.1.2" Condition="'$(OrganizationalAuth)' == 'True'" /> <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="1.1.2" Condition="'$(OrganizationalAuth)' == 'True'" />

4
src/Microsoft.DotNet.Web.ProjectTemplates.1.x/content/WebApi-FSharp/Company.WebApplication1.fsproj
View File

@ -14,8 +14,8 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.0.0" Condition="'$(IncludeApplicationInsights)' == 'True'" /> <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.0.0" Condition="'$(IncludeApplicationInsights)' == 'True'" />
<PackageReference Include="Microsoft.AspNetCore" Version="1.0.6" Condition="'$(Framework)' != 'netcoreapp1.1'" /> <PackageReference Include="Microsoft.AspNetCore" Version="1.0.7" Condition="'$(Framework)' != 'netcoreapp1.1'" />
<PackageReference Include="Microsoft.AspNetCore" Version="1.1.3" Condition="'$(Framework)' == 'netcoreapp1.1'" /> <PackageReference Include="Microsoft.AspNetCore" Version="1.1.4" Condition="'$(Framework)' == 'netcoreapp1.1'" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.4" /> <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.4" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" /> <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" />