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

44999 Commits

Author SHA1 Message Date
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
Doug Bunting 6860a706ef
Merge pull request #30052 from dotnet/dougbu/branding/5.0.4 
Update branding to 5.0.4
 2021-02-09 17:50:57 -08:00
Doug Bunting 2cd8730864
Update branding to 5.0.4 
- move to latest Microsoft.AspNetCore.Azure.AppServices.SiteExtension.31 version
 2021-02-09 15:21:42 -08:00
Doug Bunting ea16885865
Update package baselines 2021-02-09 15:06:28 -08:00
Doug Bunting a8c77a90b1
Update to 5.0.3 SDK 
- also update downlevel runtimes
 2021-02-09 14:56:06 -08:00
Doug Bunting eaa99dc6e3
Merge commit 'd827c653b787c07de908240b7746ce34d3e6271e' into dougbu/branding/5.0.4 2021-02-09 14:47:58 -08:00
DotNet Bot 4d86ae0653 [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime 2021-02-04 07:41:23 +00:00
DotNet Bot d827c653b7 [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime 2021-01-23 12:11:24 +00:00
DotNet Bot 37c0ed28bc [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime 2021-01-22 14:15:56 +00:00
DotNet Bot c414be3d46 Merged PR 12345: [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**: 20210121.10
- **Date Produced**: 1/21/2021 9:52 PM
- **Commit**: fe8a2d0a4e37e58aa497ecb0a00bc61e9d8004c4
- **Branch**: refs/heads/internal/release/5.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **System.Diagnostics.EventLog**: [from 5.0.1 to 5.0.1][1]
  - **Microsoft.NETCore.App.Internal**: [from 5.0.3-servicing.21070.15 to 5.0.3-servicing.21071.10][1]
  - **System.Drawing.Common**: [from 5.0.0 to 5.0.1][2]
  - **Microsoft.NETCore.Platforms**: [from 5.0.1 to 5.0.1][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 5.0.3 to 5.0.3][1]
  - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 5.0.3-servicing.21070.15 to 5.0.3-servicing.21071.10][1]

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:d7d10d70-26ab-4663-2902-08d89c6af29b)
 2021-01-22 01:42:33 +00:00
DotNet Bot 75f582f48b [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime 2021-01-21 09:54:13 +00:00
DotNet Bot 1966f61396 [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime 2021-01-19 21:35:54 +00:00
DotNet Bot d17c7b5d3d [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime 
- Correct System.Diagnostics.EventLog.Messages workaround for servicing

 - Update tests to expect System.Diagnostics.EventLog.Messages

 - Merge remote-tracking branch 'dnceng/internal/release/5.0' into darc-internal/release/5.0-109c1e6f-a65e-448d-b842-9621f60826f6
 2021-01-15 21:57:55 +00:00
dotnet-bot 56200466cc Merge in 'release/5.0' changes 2021-01-15 19:23:52 +00:00
Brennan 264e185bdc
[Java] Catch exceptions from users and change close state correctly (#29249) 
* [Java] Catch exceptions from users and change close state correctly

* log

* link
 2021-01-15 11:21:48 -08:00
DotNet Bot 8c48adb36f [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-efcore 2021-01-15 19:14:51 +00:00
Doug Bunting 940fed892b
Merge branch 'release/5.0' into 'internal/release/5.0' 2021-01-14 14:14:55 -08:00
Pranav K fe37d39281
Produce correct blazor.boot.json when using StaticWebAssetBasePath (#29293) 2021-01-14 13:11:08 -08:00
Doug Bunting 8872b75001
[release/5.0] Update to 1.0.2 SDK (#29276) 
- also use latest 2.1 and 3.1 runtimes
 2021-01-14 10:13:25 -08:00
dotnet-maestro[bot] 4a46036cc3
Update dependencies from https://github.com/dotnet/arcade build 20210113.3 (#29309) 
[release/5.0] Update dependencies from dotnet/arcade
 2021-01-14 16:57:00 +00:00
Matt Mitchell ae430f3dab Merged PR 12027: [internal/release/5.0] Feed update 
Feed update
 2021-01-14 15:33:07 +00:00
DotNet Bot bdd83f02bc [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime 2021-01-14 08:35:44 +00:00
DotNet Bot 1df5737944 [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-efcore 2021-01-14 01:39:31 +00:00
dotnet-bot 5386c92f74 Merge in 'release/5.0' changes 2021-01-13 19:37:19 +00:00
William Godbe fc451917f8
[release/5.0] Don't include RuntimeList.xml in sharedFx archive (#29109) 
* Don't include RuntimeList.xml in sharedFx archive

* Don't output RuntimeList.xml to SharedFx dir

* Add comment
 2021-01-13 11:34:57 -08:00
dotnet-bot 4a46d9d836 Merge in 'release/5.0' changes 2021-01-13 18:27:44 +00:00