Commit graph

11 commits

Author SHA1 Message Date
Livar
b50595c419 Merge branch 'master' into merges/release/15.5-to-master-20171019-070029 2017-10-19 11:26:33 -07:00
Livar
8e2b99dae1 Removing a bundled template that should not be here.
Microsoft.DotNet.Web.Client.ItemTemplates should not be here yet.
2017-10-17 17:53:18 -07:00
Livar Cunha
e1916cc4dc Merge remote-tracking branch 'dotnet/release/15.5' into merges/release/15.5-to-master-20171016-070031
* dotnet/release/15.5: (21 commits)
  Manually merging some changes that git merged wrong and deleted from the 15.5 branch.
  Separating the 'legacy' URL construction from the 'current' URL construction methods and logic.
  Use temporary path for fake deps.json in test
  Use same build number for roslyn and F# satellites
  Updating Roslyn satellites and SDK versions
  Insert NuGet Build 4.5.0-preview2-4529 into cli
  Update NuGet to 4529 (signed)
  MSBuild 15.5.154
  MSBuild 15.5.153
  removed commented out config I'd meant to remove
  added a way to specify the asp.net template versions
  Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0
  'NuGet.master.config' does not appear to be used.
  Fixed tests
  Update branch info to release/15.5
  Updating the websdk version to 2.0.0-rel-20171010-665
  Insert NuGet Build 4.5.0-preview1-4526 into cli
  Update DependencyVersions.props
  Updated version of TestPlatform to 15.5.0-preview-20170923-02
  MSBuild 15.4.8
  ...
2017-10-16 15:42:40 -07:00
seancpeters
2d6314e78f removed commented out config I'd meant to remove 2017-10-11 16:37:49 -07:00
seancpeters
c6139adcc9 added a way to specify the asp.net template versions 2017-10-11 16:22:03 -07:00
John Beisner
74ad01b576 Adding consistent "Project" headers to inported props and target files. 2017-09-05 14:44:25 -07:00
seancpeters
79e94eb908 Updating new templates to 2.1.0 versions 2017-08-29 15:21:13 -07:00
Steve Sanderson
7e0747ec89 Bundle SPA templates package 2017-06-06 11:11:34 +01:00
Livar
4f6fbc4a7f Merge pull request #6362 from mlorbetske/dev/mlorbe/Update20Templates
Update templates and engine, pin ASP.NET package versions, add web item templates
2017-04-22 12:00:08 -07:00
Mike Lorbetske
9bb88734ea Update to template engine build 166 and updates to 2.0 templates 2017-03-27 17:46:32 -07:00
Justin Goshi
62abef428e Rename build files 2017-02-14 15:42:13 -08:00
Renamed from build/Microsoft.DotNet.Cli.BundledTemplates.props (Browse further)