Commit Graph

71 Commits

Author SHA1 Message Date
John Luo ba6d839f71
Merge branch 'master' into merge/release/3.1-to-master 2020-02-20 16:07:37 -08:00
William Godbe c6257f42ba
Update baselines (#19123) 2020-02-18 15:13:45 -08:00
Stephen Halter 88073f86ff Merge branch 'release/3.1' into master 2020-02-18 13:46:51 -08:00
William Godbe 49920aa9d0
Update branding to 3.1.3 (#19015)
* Update branding to 3.1.3

* TargetingPackVersionPrefix -> 3.1.0
2020-02-13 15:45:36 -08:00
John Luo 67122035d0 Update baselines 2020-01-14 17:45:17 -08:00
John Luo 32de399cda Update branding to 3.1.2 2020-01-14 01:27:55 -08:00
Will Godbe 90aa91ab8c Merged PR 4684: Merge 'release/3.1' into internal branch
Fixed a merge conflict in the code mirror from github into 'internal/release/3.1'
2019-12-05 02:27:14 +00:00
John Luo 6c961ae4e2
Update branding for Blazor packages and update baseline (#17346)
* Disable baseline generation in CodeCheck
2019-11-25 16:17:22 -08:00
Brennan Conroy a0183b1fac Merged PR 4506: [SignalR] Wait to complete pipe and cancel long sends 2019-11-25 19:37:46 +00:00
wtgodbe 73ffb2d975 Update package baseline 2019-09-25 12:28:45 -07:00
wtgodbe 481df9d64c Merge branches 2019-09-24 14:36:18 -07:00
Doug Bunting 731293d6da Update branding to 2.2.8
- aspnet/AspNetCore-Internal#3153
2019-09-23 22:46:06 -07:00
Doug Bunting e9acab1d36
Merge branch 'release/2.2' into 'master' 2019-07-16 12:18:36 -07:00
Doug Bunting 4fd1d01467
Update branding to 2.2.7 (#12100)
* Add Microsoft.AspNetCore.Mvc.Api.Analyzers to baselines
* also improve PreparingPatchUpdates.md
  - document changes to dependencies.props
  - reflect changes in how Templating is handled
    - e.g. use EF Core examples
  - nit: adjust indentation to avoid markdown warnings
2019-07-12 06:56:50 -07:00
Nate McMaster 002b305c9f
Merge branch 'release/2.2' 2019-06-05 10:33:30 -07:00
Nate McMaster 3501a42239
Prepare 2.2.6 2019-06-05 08:59:30 -07:00
Nate McMaster f9ef0abcf8
Merge branch 'release/2.1' into release/2.2 2019-06-04 17:06:19 -07:00
Nate McMaster 6ab3df58af
Update branding to 2.1.12 (#10865) 2019-06-04 16:58:12 -07:00
Doug Bunting 66e32ff1c8
Merge branch 'release/2.2' => 'master' 2019-04-11 15:26:10 -07:00
Doug Bunting c53bd798c4 Update branding to 2.1.11
- no ArchiveBaseline.*.txt additions necessary
2019-04-10 08:59:44 -07:00
Doug Bunting 46fac99de5 Update branding to 2.2.5
- no ArchiveBaseline.*.txt additions necessary
2019-04-10 08:59:29 -07:00
Ryan Brandenburg aa57df121b Updated PR with my changes 2019-03-08 09:48:08 -08:00
Doug Bunting 4cbc33da74 Update branding to 2.2.4 2019-03-07 11:53:17 -08:00
Doug Bunting e497f4101f
Update branding to 2.1.10 (#8265) 2019-03-06 19:45:46 -08:00
Doug Bunting 8d58116d6d Fix Microsoft.AspNetCore version in baseline
- odd that Microsoft.AspNetCore.Server.IISIntegration didn't have correct version before…
2019-02-14 11:25:36 -08:00
Doug Bunting e089cfc11c
Merge branch 'release/2.2' 2019-02-14 06:29:38 -08:00
Doug Bunting d102d10a81 Update branding to 2.2.3
- new version
- update baselines
- grab latest released Microsoft.NetCore.App and Microsoft.NETCore.DotNetAppHost

nit:
- updated ZipManifestGenerator's README.md to use 2.2 examples
2019-02-13 23:15:58 -08:00
Doug Bunting 5bb5bafbed Update branding to 2.1.9 2019-02-12 19:12:20 -08:00
Doug Bunting 63ee551b6b
Merge `release/2.2` to `master` 2019-01-14 20:23:51 -08:00
John Luo 90a9fa7aac Merge branch 'release/2.1' into release/2.2 2019-01-14 12:57:34 -08:00
Mikael Mengistu 5e825f4fd8
Update the package baseline (#6614) 2019-01-14 12:21:45 -08:00
Doug Bunting 970bced25c
Update branding to 2.2.2 (#6608)
- pin System.Net.WebSockets.WebSocketProtocol to version 4.5.3
- update Directory.Build.targets files to correct build issues
- fix duplicate metadata during static analysis
2019-01-14 11:40:01 -08:00
Nate McMaster 3cd5054eb5
Merge branch 'release/2.2' 2019-01-11 07:20:00 -08:00
Nate McMaster 22f3166fa6
Merge branch 'release/2.1' into release/2.2 2019-01-10 01:22:10 -08:00
John Luo e5d943a7e3
Convert MvcPrecomp to Reference (#6472)
* Convert MvcPrecomp to use Reference and move to MVC
2019-01-09 18:48:01 -08:00
Nate McMaster d3838620d6
Convert SignalR projects to build with ProjectReference (#6457)
Part of #4246 

Changes:
* Update source code layout to follow the new conventions for this repo
* Update project files to use `<Reference>`
* Update targets to build NPM packages
* Update BuildTools to support custom 'restore' and 'test' targets
2019-01-09 13:12:35 -08:00
Nate McMaster edfb2ab8ab
Merge branch 'release/2.2' 2019-01-05 00:34:13 -08:00
Nate McMaster 9556cc133d
Merge branch 'release/2.1' into release/2.2 2019-01-04 14:17:28 -08:00
Nate McMaster bfec2c14be
Merge branch 'release/2.2' 2019-01-03 12:18:01 -08:00
Nate McMaster 65ff6e951a
Merge branch release/2.1 into release/2.2 2019-01-02 14:34:45 -08:00
Nate McMaster d66537c7d1
Convert Azure hosting startup and integration projects to use ProjectRef (#6207) 2019-01-02 09:56:39 -08:00
Nate McMaster 61e505c894
Merge branch 'release/2.1' into release/2.2 2019-01-02 08:58:22 -08:00
Justin Kotalik e8d898dcd9 Merge branch 'release/2.2' 2018-12-26 14:21:28 -08:00
Ajay Bhargav Baaskaran 3787fbf3a3 Merge branch 'release/2.2' 2018-12-21 18:29:32 -08:00
John Luo edcee859f0
Convert Identity to Reference (#6086)
* Convert Identity to Reference
* Remove Microsoft.AspNet.Identity.AspNetCoreCompat
2018-12-21 15:29:35 -08:00
Nate McMaster f4bb260444
Merge branch release/2.1 into release/2.2 2018-12-21 13:24:33 -08:00
Nate McMaster 3641761d18
Convert AADIntegration projects to ProjectRef (#6082) 2018-12-21 11:43:09 -08:00
Ajay Bhargav Baaskaran af2461d524 Merge branch 'release/2.1' into release/2.2 2018-12-21 11:38:25 -08:00
Justin Kotalik ce481c6c79
Make JavaScriptServices use ProjectReference (#5953) 2018-12-20 23:50:53 -08:00
Ajay Bhargav Baaskaran 7f17d095d8
Convert Mvc to use Reference (#6047)
* Convert Mvc to use Reference

* Use ProjectReference for test assets
2018-12-20 16:27:32 -08:00