Commit Graph

7 Commits

Author SHA1 Message Date
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