Pavel Krymets
dc1445cc62
Merge branch 'merge/release/2.2-to-master'
2018-08-06 15:40:25 -07:00
Mike Harder
60a559719f
Reduce probability of startup port collisions ( #1136 )
...
- GetTickCount() is limited to the resolution of the system timer, which is typically 10-16 ms. If two apps in separate app pools are started within this time window, it's possible GetTickCount() will return the same value, which causes the apps to try the same random port(s).
- Addresses #1124
2018-08-06 14:41:11 -07:00
ASP.NET CI
8f3513b9ec
Update dependencies.props
...
[auto-updated: dependencies]
2018-08-06 20:39:09 +00:00
Pavel Krymets
4e7cbb1931
Initialize logging under exclusive lock ( #1161 )
2018-08-06 12:30:58 -07:00
Ryan Brandenburg
9f4375e55e
Merge branch 'merge/release/2.2-to-master'
2018-08-06 10:43:06 -07:00
Pavel Krymets
959771e73a
Fix incrementality checks for test projects ( #1145 )
2018-08-06 09:46:40 -07:00
Pavel Krymets
c2f5101b73
Split managed application status and IApplication status ( #1148 )
...
Split managed application status and IApplication status
2018-08-06 09:41:56 -07:00
ASP.NET CI
3f6288e141
Update dependencies.props
...
[auto-updated: dependencies]
2018-08-05 19:16:42 +00:00
Mike Harder
d199de2c80
Revert "Replace "std::experimental::filesystem" with "std::filesystem" ( #1153 )"
...
This reverts commit 2a761d635c .
2018-08-03 15:44:35 -07:00
Pavel Krymets
92cca2381f
Merge pull request #1141 from dotnet-maestro-bot/merge/release/2.2-to-master
...
[automated] Merge branch 'release/2.2' => 'master'
2018-08-03 15:33:21 -07:00
Mike Harder
2a761d635c
Replace "std::experimental::filesystem" with "std::filesystem" ( #1153 )
...
* Continuation of #1082
2018-08-03 14:04:32 -07:00
Pavel Krymets
9ff001d57c
Capture global logs on VSTS ( #1151 )
2018-08-03 13:55:33 -07:00
Pavel Krymets
f867367b56
Use V2 schema for V1 outputs, do not pack pdb's ( #1152 )
2018-08-03 13:55:25 -07:00
Pavel Krymets
05eb6a7f7c
Add ERROR_SHARING_VIOLATION to retry list for IISDeployer.Start ( #1147 )
2018-08-02 16:51:00 -07:00
Pavel Krymets
4eb2e41601
Wait between requests while checking app_offline ( #1144 )
2018-08-02 15:03:50 -07:00
Pavel Krymets
477fd1d90d
Aquire exclusive lock when creating application info ( #1142 )
2018-08-02 13:17:17 -07:00
Pavel Krymets
1d1b2155c4
Merge pull request #1117 from aspnet/shirhatti/updatemodulename
...
Update module version property to match exact name of the module
2018-08-02 08:57:10 -07:00
Pavel Krymets
57404f08d0
Merge pull request #1132 from dotnet-maestro-bot/merge/release/2.2-to-master
...
* Remove extra logic from file watcher (#1107 )
* Fix ServerShutsDownWhenMainExits test (#1120 )
* Fix HTTPS certs on VSTS (#1123 )
* Update resources.h (#1134 )
* Use TestApplication (#1118 )
* Reduce msbuild invocations while building native (#1135 )
* Ship shim with integration testing (#1129 )
* Update deps
2018-08-02 08:39:01 -07:00
Pavel Krymets
9cec10e305
Update deps
2018-08-02 08:20:21 -07:00
Pavel Krymets
a9e2e435ba
Merge branch 'master' into merge/release/2.2-to-master
2018-08-02 08:07:37 -07:00
Pavel Krymets
8ea2cd9081
Ship shim with integration testing ( #1129 )
2018-08-01 15:40:45 -07:00
Pavel Krymets
f4c71da996
Reduce msbuild invocations while building native ( #1135 )
2018-08-01 14:37:23 -07:00
Pavel Krymets
4b5a32d3b9
Use TestApplication ( #1118 )
2018-07-31 19:32:48 -07:00
Mike Harder
ff0a5bbbdf
Update resources.h ( #1134 )
2018-07-31 19:21:32 -07:00
Pavel Krymets
d99d2d881c
Fix HTTPS certs on VSTS ( #1123 )
2018-07-31 16:35:34 -07:00
dotnet-maestro-bot
75316cc0a4
[automated] Merge branch 'release/2.2' => 'master' ( #1122 )
...
* Remove extra logic from file watcher (#1107 )
* Fix ServerShutsDownWhenMainExits test (#1120 )
2018-07-30 15:33:05 -07:00
Pavel Krymets
652c529f8f
Fix ServerShutsDownWhenMainExits test ( #1120 )
2018-07-30 14:52:04 -07:00
Pavel Krymets
5d4fedaeac
Remove extra logic from file watcher ( #1107 )
2018-07-30 14:37:33 -07:00
Justin Kotalik
d4d6db80eb
merge release/2.2 into master
2018-07-30 14:04:01 -07:00
Justin Kotalik
7a4a945fd6
Stop site and app pool before restoring config ( #1112 )
2018-07-30 12:58:48 -07:00
Sourabh Shirhatti
132a382838
Update Microsoft.AspNetCore.Server.IISIntegration.targets
2018-07-30 09:51:17 -07:00
Sourabh Shirhatti
6a29b5296b
Update Microsoft.AspNetCore.Server.IIS.targets
2018-07-30 09:50:14 -07:00
Pavel Krymets
7d641f8796
Skip VSTS attribute ( #1115 )
2018-07-30 08:27:06 -07:00
Justin Kotalik
41493f01e3
Don't stop redirect stdout/stderr after startup is done. ( #1067 )
2018-07-29 23:25:32 -07:00
ASP.NET CI
763f659951
Update dependencies.props
...
[auto-updated: dependencies]
2018-07-29 19:58:36 +00:00
ASP.NET CI
b7e26fed99
Update dependencies.props
...
[auto-updated: dependencies]
2018-07-29 12:15:13 -07:00
Justin Kotalik
0af3bef0fe
Fix win7 test failures. ( #1109 )
2018-07-27 17:32:01 -07:00
Nate McMaster
7e0d322510
Merge branch 'release/2.2'
2018-07-27 16:36:47 -07:00
Ryan Brandenburg
c6ba21efc1
Add VSTS ci pipeline ( #893 )
2018-07-27 16:34:21 -07:00
Pavel Krymets
12011b3809
Cleanup testsite module locations ( #1110 )
2018-07-27 16:11:17 -07:00
Justin Kotalik
f901bca8a7
Fixing jenkins agents. ( #1106 )
2018-07-27 15:00:04 -07:00
Pavel Krymets
7067d92c75
Limit RH native assets to netcoreapp2.2 ( #1105 )
2018-07-26 14:15:50 -07:00
Pavel Krymets
afa5d60821
Add content/webroot and currect directory tests ( #1103 )
2018-07-26 12:12:12 -07:00
Pavel Krymets
61b4473abe
Fix another shutdown race and appofline race ( #1071 )
2018-07-26 08:12:08 -07:00
Justin Kotalik
da25232c48
Merge pull request #1095 from dotnet-maestro-bot/merge/release/2.2-to-master
2018-07-25 16:17:38 -07:00
Justin Kotalik
ba18129d79
Skip win7 tests ( #1096 )
2018-07-25 15:26:01 -07:00
Pavel Krymets
aa8a8b7471
Skip IIS Jenkins ( #1094 )
2018-07-25 13:11:40 -07:00
Justin Kotalik
8813000fa4
Merge release/2.2 into master
2018-07-24 13:22:38 -07:00
Justin Kotalik
5bd475ef90
Add event logs for some startup failure cases ( #1081 )
2018-07-24 13:17:05 -07:00
Nate McMaster
00d7073811
Merge branch 'release/2.1' into release/2.2
2018-07-24 12:07:21 -07:00