huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
555 Commits 1 Branch 0 Tags 251 MiB
Commit Graph

28 Commits

Author SHA1 Message Date
Justin Kotalik 4437c72e30 Merge branch 'merge/release/2.2-to-master' of https://github.com/dotnet-maestro-bot/Templating into merge/release/2.2-to-master 2018-10-24 12:05:12 -07:00
Justin Kotalik 70a786adcd
Make AspNetCoreHostingModel element not be insert when targeting net461 and inprocess => InProcess (#797) 2018-10-24 11:36:07 -07:00
Nate McMaster 00e2b6201e
automated: merge branch release/2.2 2018-09-28 17:28:07 -07:00
Ryan Brandenburg c6347f035f Conditionally include RootNamespace 2018-09-25 15:48:08 -07:00
Ryan Brandenburg 5f5524a477 Merge branch 'merge/release/2.2-to-master' 2018-08-30 15:23:14 -07:00
Pavel Krymets 26710080fe
Set AspNetCoreHostingModel in templates (#716) 2018-08-29 16:08:58 -07:00
Patrick Westerhoff 208f6ff568 Fix #574: Set NoDefaultLaunchSettingsFile 
When a project is created with ExcludeLaunchSettings enabled, set the
NoDefaultLaunchSettingsFile property to prevent Visual Studio from
creating a launchSettings.json.
 2018-08-29 11:35:16 -07:00
Nate McMaster 7d91d659ff
Merge branch 'release/2.2' 2018-08-10 11:06:49 -07:00
Nate McMaster af616d9b99
Remove KoreBuild-isms from project templates (#667) 
Removing MSBuild properties and items are for our build infrastructure, not for customers.
 2018-08-10 11:01:56 -07:00
Nate McMaster ba02ab85c1
Merge branch 'release/2.2' 2018-07-24 13:00:07 -07:00
Nate McMaster 0435add47a
Merge branch 'release/2.1' into release/2.2 2018-07-24 11:59:30 -07:00
Nate McMaster 55b697ab05
Revert "Add package version to Microsoft.AspNetCore.App in project templates" 
This reverts commit 727bd52b64.
 2018-07-18 13:11:01 -07:00
Nate McMaster 4ca00f6b1b
Merge branch 'release/2.2' 2018-07-03 17:55:29 -07:00
Nate McMaster 263e369b2e
Merge branch 'release/2.1' into release/2.2 2018-07-03 17:21:16 -07:00
Nate McMaster 727bd52b64
Add package version to Microsoft.AspNetCore.App in project templates 
As discussed in aspnet/Home#3292, we're reversing course on the implicit package version feature. This adds a package version for Microsoft.AspNetCore.App to the `dotnet new` and VS templates.
 2018-07-03 16:53:46 -07:00
Nate McMaster 1f2e966454
Update templating to use netcoreapp3.0 2018-06-29 16:32:30 -07:00
Ryan Brandenburg 15ca3dcdaa Move templates to netcoreapp2.2 2018-05-18 09:28:12 -07:00
Jass Bagga 99114c25a4
Adjust spacing in csproj files (#492) 
Address #462 and fix build break
 2018-05-03 11:40:39 -07:00
John Luo a8c3615df4 React to implicit Microsoft.AspNetCore.App reference 2018-04-19 16:49:13 -07:00
John Luo 94cfac8ec6 Use Microsoft.AspNetCore.App in templates 
- Add BrowserLink and Sqlite for Razor and StarterWeb templates when required
- Add tests for LocalDB scenarios
 2018-02-01 12:52:05 -08:00
Nate McMaster 04dfc5cc6b Remove RuntimeFrameworkVersion from the templates 
This property is no longer needed because the Microsoft.AspNetCore.All and .App packages set the shared framework version. RuntimeFrameworkVersion is inferred by Microsoft.NET.Sdk
 2018-01-25 12:25:34 -08:00
Pranav K a6eb93cfdd Merge branch 'release/2.0' into release/2.1 
# Conflicts:
#	src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Account/AccessDenied.cshtml
#	src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Account/Manage/EnableAuthenticator.cshtml
#	src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Account/Manage/EnableAuthenticator.cshtml.cs
#	src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Account/Manage/GenerateRecoveryCodes.cshtml
#	src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Account/Manage/GenerateRecoveryCodes.cshtml.cs
#	src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/Controllers/ManageController.cs
#	src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/Models/ManageViewModels/EnableAuthenticatorViewModel.cs
#	src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/Models/ManageViewModels/ShowRecoveryCodesViewModel.cs
#	src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Manage/EnableAuthenticator.cshtml
#	src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Manage/GenerateRecoveryCodes.cshtml
#	src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Manage/TwoFactorAuthentication.cshtml
 2018-01-25 11:12:48 -08:00
Jass Bagga a177c557c5
[2.0.x PATCH] Add app.config to net 4.x templates (#231) 
Addresses #170
 2018-01-18 18:19:18 -08:00
Phillip Carter 5b34474502 Update F# templates (#190) 2018-01-04 10:56:54 -08:00
Jass Bagga 886a985726 Target netcoreapp2.1 2017-12-28 17:01:30 -08:00
Jass Bagga eb74ea32f1
Add app.config to net 4.x templates (#191) 
Addresses #73
 2017-12-13 11:12:12 -08:00
Nate McMaster aee0d26d67 Merge build infrastructure changes from rel/2.0.3 
Changes:
- Replaces PackageLineup with the dependencies.props approach to manage package versions.
- Generate the csproj/fsproj files that go into template packages
- Remove the DependencyUpdater and PullRequestSubmitter tasks
- Remove bower.json and bowerrc from Microsoft.DotNet.Web.ProjectTemplates
- Set MyGet feeds via MSBuild instead of NuGet.config
- Upgrades to the functional tests
- Update Selenium
- Make it possible to run tests on macOS/linux
- Disable test parallelization
 2017-11-06 16:06:24 -08:00
Nate McMaster 1ffcf2c009 Reorganize repo branch and project folder structure 
When the code lived in dotnet/templating, the 1.x, 2.0, and 2.1 templates all needed to sit side-by-side.
Now that this code builds from aspnet/templating, we're reorganizing the folder and branch structure to
match the aspnetcore runtime repos.

Branches:

rel/1.1.5 = Microsoft.DotNet.Web.ProjectTemplates.1.x
rel/2.0.3 = Microsoft.DotNet.Web.ProjectTemplates.2.0
dev = Microsoft.DotNet.Web.ProjectTemplates.2.1
 2017-11-06 10:19:59 -08:00