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

44924 Commits

Author SHA1 Message Date
dotnet-bot 09668a6b9f Merge in 'release/5.0' changes 2021-03-10 17:40:26 +00:00
Doug Bunting 6b1c28e772
[release/5.0] Merge, update baselines, SDK and runtimes (#30781) 
- dotnet/aspnetcore-internal#3783
- Merge commit 'e882394a7bb38930da748291fe2c2ceaa6a80588' into 'release/5.0'
- Update `$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion)`
- Correct problem in `BaselineGenerator`
- Re-enable baseline validation
- Update package baselines
- Update SDK and runtime versions
 2021-03-10 09:38:59 -08:00
dotnet-bot 83610bb9e8 Merge in 'release/5.0' changes 2021-03-10 00:01:16 +00:00
dotnet-maestro[bot] bf9a344a24
Update dependencies from https://github.com/dotnet/arcade build 20210309.2 (#30789) 
[release/5.0] Update dependencies from dotnet/arcade
 2021-03-09 23:59:25 +00:00
Doug Bunting f636f74ac2
Update conditions in Baseline.Designer.props 
- run fixed `BaselineGenerator`
 2021-03-09 15:25:25 -08:00
Doug Bunting f190980f62
Update `BaselineGenerator` 
- handle `netcoreapp5.0` from `NuspecReader`
 2021-03-09 15:21:41 -08:00
Doug Bunting dfad24463e
Re-enable package baseline validation 2021-03-09 15:21:05 -08:00
DotNet Bot 99b15ac290 [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime 2021-03-09 21:11:58 +00:00
Doug Bunting 0332d9d929
Update SDK and runtime versions 2021-03-09 11:13:56 -08:00
Doug Bunting a52244340b
Update package baselines 2021-03-09 11:09:13 -08:00
Doug Bunting 6704a0143f
Update `$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion)` 2021-03-09 11:03:58 -08:00
Doug Bunting 5b8aceff38
Merge commit 'e882394a7bb38930da748291fe2c2ceaa6a80588' into 'release/5.0' 2021-03-09 10:56:06 -08:00
dotnet-bot f8e88852a1 Merge in 'release/5.0' changes 2021-03-05 00:12:04 +00:00
Tanay Parikh 59875890f3
Update selenium version (#30576) (#30621) 
* Update selenium version

* Update more versions

* Update Versions.props

* Update selenium-config.json

* Update Versions.props

Co-authored-by: John Luo <johluo@microsoft.com>
 2021-03-04 16:10:41 -08:00
dotnet-bot 9addc6b6b6 Merge in 'release/5.0' changes 2021-02-25 21:40:40 +00:00
William Godbe 2922f539aa
Update branding to 5.0.5 (#30464) 2021-02-25 13:36:44 -08:00
DotNet Bot e882394a7b [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-efcore 2021-02-19 01:12:18 +00:00
Matt Mitchell 94ab46fb66 Merged PR 13034: Fixup shas for 5.0.3 incrementally serviced packages 
Fixup shas for 5.0.3 incrementally serviced packages
 2021-02-18 15:57:18 +00:00
DotNet Bot 324cf99ce3 Merged PR 12929: [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime 
This pull request updates the following dependencies

[marker]: <> (Begin:d7d10d70-26ab-4663-2902-08d89c6af29b)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: d7d10d70-26ab-4663-2902-08d89c6af29b
- **Build**: 20210216.14
- **Date Produced**: 2/16/2021 11:36 PM
- **Commit**: f27d33729518f5aa478aa818b7b4f54a4d50bef1
- **Branch**: refs/heads/internal/release/5.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **System.Drawing.Common**: [from 5.0.2 to 5.0.2][1]
  - **Microsoft.NETCore.App.Internal**: [from 5.0.4-servicing.21116.6 to 5.0.4-servicing.21116.14][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 5.0.4 to 5.0.4][1]
  - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 5.0.4-servicing.21116.6 to 5.0.4-servicing.21116.14][1]
  - **System.Text.Encodings.Web**: [from 5.0.0 to 5.0.1][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC10fccb8&targetVersion=GCf27d337&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCcf258a1&targetVersion=GCf27d337&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:d7d10d70-26ab-4663-2902-08d89c6af29b)
 2021-02-17 20:43:45 +00:00
DotNet Bot 1df900ee43 [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime 2021-02-16 22:37:35 +00:00
Will Godbe bb8f30bff6 Merged PR 12911: Merge from github 2021-02-16 17:51:42 +00:00
Will Godbe 050e7e257f Resolve merge conflicts 2021-02-16 09:50:53 -08:00
DotNet Bot 1db035bc91 [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime 2021-02-15 02:41:35 +00:00
dotnet-maestro[bot] acad85f792
Update dependencies from https://github.com/dotnet/arcade build 20210212.3 (#30155) 
[release/5.0] Update dependencies from dotnet/arcade
 2021-02-12 21:52:48 +00:00
dotnet-bot 61fc832b61 Merge in 'release/5.0' changes 2021-02-12 00:27:43 +00:00
Michelle McDaniel 3aad49b708
Merge pull request #30004 from adiaaida/renameProductVersion (#30124) 
Duplicate productVersion.txt with repo-specific name
 2021-02-11 16:25:47 -08:00
dotnet-bot 1ff21d0691 Merge in 'release/5.0' changes 2021-02-11 21:40:49 +00:00
Brennan 2cc9c2d4f3
[release/5.0] Update Node dependencies for SignalR (#30036) 
* Update Node dependencies for SignalR

* rebase
 2021-02-11 13:39:07 -08:00
dotnet-bot c52be62e66 Merge in 'release/5.0' changes 2021-02-11 21:31:52 +00:00
Steve Sanderson 5b4f3003af
Fix E2E test use of logs (#27114) (#27166) 
* Restore support for logs in E2E tests. Fixes #25803

* Revert earlier workaround

* Update message in assertion

* Remove redundant script references
 2021-02-11 13:30:17 -08:00
dotnet-bot 1fe6369ecc Merge in 'release/5.0' changes 2021-02-11 20:35:49 +00:00
William Godbe efa72d92c3
Add Custom UI strings for en-us bundle (#30108) 2021-02-11 12:33:06 -08:00
dotnet-bot 0499ae3d29 Merge in 'release/5.0' changes 2021-02-11 19:03:16 +00:00
Phil Henning c097bb9ce7
Update localization for templates. (#30101) 
# Conflicts:
#	src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/.template.config/es-ES/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/.template.config/it-IT/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/.template.config/pt-BR/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/.template.config/ru-RU/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/es-ES/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/it-IT/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/pt-BR/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/ru-RU/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/cs-CZ/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/de-DE/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/es-ES/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/it-IT/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/ja-JP/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/pl-PL/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/pt-BR/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/ru-RU/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/tr-TR/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/zh-CN/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/zh-TW/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/cs-CZ/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/de-DE/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/es-ES/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/it-IT/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/ja-JP/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/pl-PL/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/pt-BR/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/ru-RU/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/tr-TR/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/zh-CN/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/zh-TW/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/it-IT/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/ru-RU/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/zh-TW/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/it-IT/strings.json
#	src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/ru-RU/strings.json
 2021-02-11 10:58:32 -08:00
dotnet-bot fc95610dea Merge in 'release/5.0' changes 2021-02-11 18:29:43 +00:00
Safia Abdalla 230c9ca5aa
Update JavaScript dependencies for Web.JS project (#30054) 2021-02-11 10:27:51 -08:00
DotNet Bot d1303d01b3 [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime 2021-02-11 13:02:43 +00:00
DotNet Bot 0b6dec7ccc [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime 2021-02-11 10:23:44 +00:00
DotNet Bot 0ebd814d2d [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime 2021-02-11 07:25:57 +00:00
Doug Bunting 357a302f40
Merge remote-tracking branch 'internal/release/5.0' into 'internal/release/5.0' 2021-02-10 15:50:43 -08:00
DotNet Bot f605914f4a [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime 2021-02-10 21:49:32 +00:00
Doug Bunting 9d14b146e0
[internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime (#30074) 
- partial cherry-pick from 8be5bd6de6f5
- needed to get internal merges going again
- also correct confusion in NuGet.config from e9a385dba2

Co-authored-by: DotNet Bot <dn-bot@microsoft.com>
 2021-02-10 12:54:18 -08:00
Safia Abdalla 42ccba7f10
Update Node dependencies for Angular template (#29833) 2021-02-10 11:17:37 -08:00
DotNet Bot 3da1f90d82 [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime 2021-02-10 17:52:10 +00:00
dotnet-maestro[bot] e9a385dba2
Update dependencies from https://github.com/dotnet/arcade build 20210209.6 (#30058) 
[release/5.0] Update dependencies from dotnet/arcade
 2021-02-10 03:35:35 +00:00
dotnet-bot f39b67b084 Merge in 'release/5.0' changes 2021-02-10 02:44:18 +00:00
Pranav K fbdf5c5b1c
Stop building dotnet-watch in AspNetCore (#29722) 
* Stop building dotnet-watch in AspNetCore

* PR feedback
 2021-02-09 18:43:18 -08:00
Sayed Ibrahim Hashimi 6c22e5a2f4
Update appSettings.json to have a comment for org auth cases (#29610) 
* adding comment into appSettings.json for org auth scenarios

* fix to escape url
 2021-02-09 18:43:06 -08:00
Chris Ross 9ab6dbd593
Fix Server_RegisterUnavailablePrefix_ThrowsActionableHttpSysException #26156 (#26203) (#29368) 2021-02-09 18:42:22 -08:00
dotnet-bot 258eeedbed Merge in 'release/5.0' changes 2021-02-10 01:52:56 +00:00