Commit Graph

2165 Commits

Author SHA1 Message Date
Doug Bunting 82cb080502
Merge branch 'release/2.2' into merge/release/2.1-to-release/2.2 2019-09-10 19:39:46 -07:00
Chris R 1fe84a6ded Replace obsolete feeds 2019-09-10 18:42:11 -07:00
dotnet-bot b75fa18cf5 Merge in 'release/2.1' changes 2019-07-25 03:38:08 +00:00
John Luo f7a7c98e53
Ship templates in 2.1 (#12540)
Addresses https://github.com/aspnet/AspNetCore/issues/12208
2019-07-24 20:36:52 -07:00
Mikael Mengistu dd212d7029 Merged PR 2184: rel/2.2 Bump version of Microsoft.Data.OData to 5.8.4
Bump version of Microsoft.Data.OData to 5.8.4 in the 2.2 branch

Work item: https://dev.azure.com/dnceng/internal/_workitems/edit/222/

Related work items: #222
2019-07-19 15:38:34 +00:00
Mikael Mengistu fd023a6698 Merged PR 2157: Bump version of Microsoft.Data.OData to 5.8.4
Bump version of Microsoft.Data.OData to 5.8.4

Work item: https://dev.azure.com/dnceng/internal/_workitems/edit/222/
2019-07-19 15:38:28 +00:00
Doug Bunting 5712263dda
Re-pin EF dependencies (#12132)
- not shipping this time around
- bump a few versions to match newer 'release/2.1' dependencies
  - System.Diagnostics.DiagnosticSource
  - System.Security.Principal.Windows
  - System.Threading.Tasks.Extensions (will bump this again in 'release/2.1')
2019-07-13 11:05:28 -07:00
Doug Bunting 6ed7bf85b1 Re-pin System.Threading.Tasks.Extensions
- not shipping this time around
2019-07-12 12:47:47 -07:00
Ryan Brandenburg 797f7b1670 Version the SPA template package (#11773)
* Version the SPA template package

* Fix templates
2019-07-12 11:46:06 -07:00
Ryan Brandenburg c8fc054096 Version the SPA template package [release/2.1] (#11774)
* Version the SPA template package

* Update src/Templating/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj

* Fix templates
2019-07-12 11:45:46 -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
Doug Bunting 59d43346e6
Update branding to 2.1.12 (#12096)
* 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-11 15:35:47 -07:00
Nate McMaster d8581565da Fix order in which EF properties are set 2019-06-14 13:49:52 -07:00
Arthur Vickers 21f6b5f664 Update submodules.props for EF 2.2.6 2019-06-14 13:49:52 -07:00
Matt Mitchell dab998e7d2 Unpin 2.1.12 package versions (#11091) 2019-06-11 09:07:33 -07:00
Nate McMaster 3501a42239
Prepare 2.2.6 2019-06-05 08:59:30 -07:00
Nate McMaster 6ab3df58af
Update branding to 2.1.12 (#10865) 2019-06-04 16:58:12 -07:00
dotnet-bot 1435be9c02 Merge in 'release/2.2' changes 2019-05-07 08:18:32 +00:00
John Luo 6e691e9f20
Use nuget release of netfx ref package (#10024) 2019-05-07 01:17:14 -07:00
dotnet-bot 33c2d01092 Merge in 'release/2.2' changes 2019-04-19 22:58:25 +00:00
Doug Bunting e22a7d1b97 Unpin the Microsoft.Extensions.Diagnostics.HealthChecks package version
- aspnet/AspNetCore-Internal#2337
2019-04-19 15:57:11 -07:00
dotnet-bot a88706c89a Merge in 'release/2.2' changes 2019-04-16 21:49:02 +00:00
Nate McMaster dd655bcc9a
Merge branch 'release/2.1' into release/2.2 2019-04-16 14:13:01 -07:00
Nate McMaster 2a99b8608d
Merge changes from 'release/2.2' 2019-04-16 11:57:15 -07:00
dotnet-bot d5d91ad3a9 Merge in 'release/2.1' changes 2019-04-16 18:55:33 +00:00
Matt Mitchell 860071e31c Pin System.Net.WinHttpHandler (#9427) 2019-04-16 11:54:06 -07:00
dotnet-bot 339bed91f2 Merge in 'release/2.1' changes 2019-04-16 17:13:42 +00:00
Matt Mitchell 180554e732 Unpin System.Memory (#9425) 2019-04-16 10:12:10 -07:00
BrennanConroy d93b207485 Add Site Extension to patch (#9336)
- make build.cmd work
- update build/repo.props

Co-Authored-By: BrennanConroy <brecon@microsoft.com>
2019-04-15 22:21:27 -07:00
Nate McMaster fafae36461
Merge changes from 'release/2.1' 2019-04-15 17:02:10 -07:00
Nate McMaster d004cf0f14
Merge branch 'release/2.1' into release/2.2 2019-04-15 16:42:07 -07:00
Brice Lambson dad3703d1b [2.1] Include EntityFrameworkCore in the 2.1.11 patch (#9397) 2019-04-15 16:08:43 -07:00
dotnet-bot 05f07e2df2 Merge in 'release/2.2' changes 2019-04-15 22:20:57 +00:00
Nate McMaster 79e98dd169
Update dependency version of Extensions.Binder to avoid downgrading sharedfx versions from 2.1.10 (#9393) 2019-04-15 15:19:40 -07:00
Nate McMaster 5b65cbfadc
Fix aspnet/AspNetCore-Internal#2269 - fix for missing dependency metadata on a few Extensions packages when building in ProdCon (#9387) 2019-04-15 15:19:27 -07:00
dotnet-bot 5cc0e7f69c Merge in 'release/2.2' changes 2019-04-15 16:22:05 +00:00
Matt Mitchell bfcbc4fd26 Unpin 2 packages (#9380)
- Microsoft.Extensions.Logging.Azure.AppServices
- System.Data.SqlClient
2019-04-15 09:20:34 -07:00
Brennan Conroy 4332a25c43 Update Redis dependency 2019-04-15 15:49:37 +00:00
Brennan Conroy 6ecdff7c68 Merged PR 898: Update MessagePack dependency
Update MessagePack dependency
2019-04-12 22:25:38 +00:00
Brennan Conroy 182c48f0b0 Merged PR 891: Update MessagePack dependency
Update MessagePack dependency

Related work items: #142
2019-04-12 17:40:48 +00:00
Pranav K 5424045dac Ensure PackageArchive contains the right build of Razor.Design package (#6992)
* Ensure PackageArchive contains the right build of Razor.Design package

* Re-order values in build\dependencies.props to ensure Razor.Design's package version is
  overwritten.
* Convert additional package refs to project refs

Fixes https://github.com/aspnet/AspNetCore-Internal/issues/1708

* Update CodeCheck.ps1
2019-04-11 17:14:11 -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
John Luo de5310e886 Update build tools (#8528)
* update build tools' aka KoreBuild aka Internal SDK versions
* update EF submodule
* fix submodule builds with trimming
  - path must not contain trailing slashes apparently
* bump Microsoft.NETFramework.ReferenceAssemblies package version to align with KoreBuild
2019-03-18 14:49:15 -07:00
Doug Bunting 909d951caf Unpin 3 Microsoft.Extensions.Configuration packages
- shipping in this release
2019-03-15 17:31:59 -07:00
Doug Bunting 73f288bcb6
Merge branch 'release/2.2' into merge/release/2.1-to-release/2.2 2019-03-15 14:25:55 -07:00
Doug Bunting 2a2809afe4 Unpin Microsoft.Extensions.Configuration.Binder package
- included in this release
2019-03-15 13:28:14 -07:00
Matt Mitchell 7c732d55f6 Pin System.Net.Http package version 2019-03-15 08:11:22 -07:00
Doug Bunting 4941c7b90d Unpin the System.Net.Http.WinHttpHandler package version
- CoreFx shipping a new version
2019-03-14 11:57:12 -07:00
Doug Bunting e7c5e09ad2 Unpin our System.Net.Http package version
- shipped in the past patch
2019-03-08 10:19:17 -08:00