Commit Graph

3165 Commits

Author SHA1 Message Date
ASP.NET CI 9730a8d427 Updating submodule(s)
IISIntegration => 1822992354

[auto-updated: submodules]
2018-06-04 15:38:46 -07:00
Nate McMaster 236b55a3b1
Merge pull request #1197 from aspnet/namc/merge-rel-21
Merge branch release/2.1 into dev
2018-06-04 15:05:59 -07:00
ASP.NET CI 482845e90a Updating submodule(s)
Scaffolding => 83986929b7c79f2bd5c95f58f62001ecf5e149fd

[auto-updated: submodules]
2018-06-04 13:58:15 -07:00
Nate McMaster 451c7036a6
Merge branch 'release/2.1' into dev 2018-06-04 13:05:46 -07:00
ASP.NET CI c7eb99c504 Updating submodule(s)
Common => 949cfef962f2b4ef934059e0e65a36040e5387ce

[auto-updated: submodules]
2018-06-04 12:14:11 -07:00
ASP.NET CI b328a105b3 Updating submodule(s)
IISIntegration => ef071f605f

[auto-updated: submodules]
2018-06-04 11:44:17 -07:00
ASP.NET CI 97f185de36 Updating submodule(s)
Scaffolding => 54c350194501a9931a1a3e7b3bb560e65ed92363

[auto-updated: submodules]
2018-06-04 11:05:28 -07:00
Nate McMaster 6586c921f0
Fix compiler error introduced by merge conflict 2018-06-04 10:39:30 -07:00
ASP.NET CI 2ecd68b4d2 Updating submodule(s)
SignalR => 948ebf34ec

[auto-updated: submodules]
2018-06-04 10:37:33 -07:00
Nate McMaster a7194f0a6e
Merge branch 'release/2.0' into release/2.1 2018-06-04 10:35:13 -07:00
Nate McMaster 704ad8086d
Update description of script [ci skip] 2018-06-04 10:34:22 -07:00
dotnet-maestro-bot afbd7d4ef3 Upgrade to .NET Core 2.2.0-preview1-26604-01 2018-06-04 08:42:14 -07:00
Nate McMaster c2a267b085
Update branch name and description of dotnet-maestro-bot prs 2018-06-03 20:41:59 -07:00
Nate McMaster c98b2d1089
Allow specifying commit message for auto-generated commits 2018-06-03 20:40:21 -07:00
dotnet-maestro-bot 168be585d6 Upgrade to .NET Core 2.2.0-preview1-26603-04 2018-06-03 20:36:16 -07:00
ASP.NET CI cb84bdcb80 Updating submodule(s)
AADIntegration => 268e97c424
Antiforgery => 07de046022
AuthSamples => e207b980ba
AzureIntegration => eb649cf65f
BasicMiddleware => 5975eb78a0
BrowserLink => 1dcc1093f9723d7e53af51f0cfd5f58b6a444bf7
Caching => 719ba5af2f87886010bcb4ae95fa515587e257a3
Common => 0ae17b8a22fd0daad442404ca43bc149a18059a0
Configuration => 801e27052fd9f26f4e5aa4afea5a7b1c6894c650
CORS => b65803a891
DataProtection => 4303def2ff
DependencyInjection => 9213e77ed62b2ad82ff3adb0b166fbc0f4921940
Diagnostics => d8ecc6c967
DotNetTools => fed623db5c
EntityFrameworkCore => 68b9ad18cbee1df23724ef891dd005def38e484e
EventNotification => 9ed57ca6281a00305a68daf5c7c96d9b25f51164
FileSystem => 0d73f9a335ab860732cde6b61749d26c6d98392c
Hosting => ec51afd9d0
HtmlAbstractions => fe4ff1a2c4
HttpAbstractions => b3fc9aa4a5
HttpClientFactory => 777e9895e60bbd32c1237b89597e812a96e8ed00
HttpSysServer => 4f30967f80
Identity => 4f3d1f4f75
IISIntegration => e999010122
JavaScriptServices => b616db4918
JsonPatch => 75126c0726
KestrelHttpServer => 40d1b75272
Localization => f97bbd9a67
Logging => a2d49bd92d29c5e356f30916ae46a38ca65d5cd1
MetaPackages => a797456a0d
Microsoft.Data.Sqlite => 73801e521369cb82f34cc439c197c200afc33c41
MusicStore => 8f0fab5916
Mvc => 839223756b
MvcPrecompilation => 3bc13cdfbf
Options => 862ee3bb1e99e2f19b3e146e423789bbc9e80aa2
Proxy => 9ad1d6c2d14898dbbe7df0aaa2df90f4814ad5e8
Razor => 41324bd37a
ResponseCaching => 927c3f93fe
Routing => df857a0369
Scaffolding => 0bf2ab5d6ba73c1a5c171477535a78174f014c53
Security => 0d4438d4c9
ServerTests => 6622801f53
Session => 504f6eb9a4
SignalR => 8df8445cff
StaticFiles => 2972814b22
Templating => ec6cb2a646
WebHooks => dd54e5ccac71748bfef5bf502d68ccc37b3f5721
WebSockets => 89536c2081

[auto-updated: submodules]
2018-06-03 19:38:23 +00:00
ASP.NET CI a7233a7163 Updating submodule(s)
Routing => 2fed6710a9

[auto-updated: submodules]
2018-06-01 22:25:03 -07:00
ASP.NET CI 4f8d604454 Updating submodule(s)
Routing => dc4be30d88

[auto-updated: submodules]
2018-06-01 21:37:47 -07:00
Nate McMaster d5d1246c46
Fixup bad changes from merge 2018-06-01 17:16:43 -07:00
Nate McMaster d418981924
Merge branch 'release/2.1' into namc/merge-rel-20 2018-06-01 17:13:24 -07:00
Nate McMaster ca4e81b975
Merge branch 'release/2.0' into release/2.1 2018-06-01 17:08:08 -07:00
ASP.NET CI 936f373788 Updating submodule(s)
IISIntegration => e1ae70166b

[auto-updated: submodules]
2018-06-01 16:47:28 -07:00
ASP.NET CI 70a725c203 Updating submodule(s)
KestrelHttpServer => 0aff4a0440

[auto-updated: submodules]
2018-06-01 15:14:42 -07:00
ASP.NET CI 1f5093f6db Updating submodule(s)
Common => 88d23363f739511aa9306b91504e4d9247273951

[auto-updated: submodules]
2018-06-01 14:45:22 -07:00
ASP.NET CI 3733f9a2f2 Updating submodule(s)
EntityFrameworkCore => d2847f263fea8e151c92f97153cb3b3fd674a406

[auto-updated: submodules]
2018-06-01 13:52:05 -07:00
ASP.NET CI d85e2441a9 Updating submodule(s)
EntityFrameworkCore => f3a183efd51c9dda512b8af9a4274b36b7c1450c

[auto-updated: submodules]
2018-06-01 20:49:23 +00:00
ASP.NET CI c596bd8ae3 Updating submodule(s)
IISIntegration => f09edb3b5d
SignalR => 10efae64e0

[auto-updated: submodules]
2018-06-01 09:40:24 -07:00
ASP.NET CI 85f02118b9 Updating submodule(s)
BasicMiddleware => 898586722c

[auto-updated: submodules]
2018-06-01 09:10:50 -07:00
Nate McMaster 5fc61022bc
Don't expect the site extension zip to exist in build output if AzureIntegration is not patching 2018-05-31 22:52:09 -07:00
ASP.NET CI 51289e5ca6 Updating submodule(s)
Templating => ef67a7fae6

[auto-updated: submodules]
2018-05-31 21:13:27 -07:00
ASP.NET CI 3a16c4ff6f Updating submodule(s)
Templating => 34725c0117

[auto-updated: submodules]
2018-05-31 20:59:56 -07:00
ASP.NET CI 6200a1c0fd Updating submodule(s)
DotNetTools => e74907d6bf

[auto-updated: submodules]
2018-06-01 03:41:07 +00:00
ASP.NET CI 6252f3d3b2 Updating BuildTools from 2.2.0-preview1-17066 to 2.2.0-preview1-17067
[auto-updated: buildtools]
2018-05-31 20:11:54 -07:00
ASP.NET CI acfe20f4be Updating submodule(s)
Routing => acea87a617

[auto-updated: submodules]
2018-05-31 20:11:52 -07:00
ASP.NET CI ac8f2cf698 Updating submodule(s)
EntityFrameworkCore => 70b07906dee3acaedda5ca0e2231130026d75e00

[auto-updated: submodules]
2018-06-01 01:43:16 +00:00
ASP.NET CI 15c92fa97f Updating BuildTools from 2.1.1-rtm-15792 to 2.1.1-rtm-15793
[auto-updated: buildtools]
2018-05-31 18:36:18 -07:00
ASP.NET CI 04806d72ca Updating submodule(s)
EntityFrameworkCore => ef61273ed948a2be8f0a081dc57b16ad3bc2de03

[auto-updated: submodules]
2018-05-31 18:36:16 -07:00
ASP.NET CI 8a00a0bbb5 Updating submodule(s)
Routing => 72a7c31973

[auto-updated: submodules]
2018-06-01 01:09:43 +00:00
Nate McMaster a03ef8b5f5
Merge branch 'release/2.1' into dev 2018-05-31 17:56:48 -07:00
Nate McMaster 5f0b4e1322
Refactor property names for computing .deb/.rpm file names and dependencies 2018-05-31 17:49:19 -07:00
ASP.NET CI 3d621f8260 Updating submodule(s)
EntityFrameworkCore => 995822a14ee160d178cc97e6b80500cdfb86b9ee
Hosting => 8d55a447d4
IISIntegration => a02892f139
KestrelHttpServer => aa9b9ca724
MusicStore => 3ffb75f896
Razor => eaa5e30132
ServerTests => 1f5df1eb0b
SignalR => 4f85ca2b1d

[auto-updated: submodules]
2018-05-31 23:54:34 +00:00
ASP.NET CI a5981cb09f Updating submodule(s)
KestrelHttpServer => e4d290b601

[auto-updated: submodules]
2018-05-31 16:45:15 -07:00
dotnet-maestro-bot 6dbe179476 Upgrade to NETCore.App 2.2.0-preview1-26531-03 (#1184) 2018-05-31 16:24:02 -07:00
ASP.NET CI 454567bc71 Updating submodule(s)
KestrelHttpServer => d1416e679b

[auto-updated: submodules]
2018-05-31 23:02:14 +00:00
ASP.NET CI 591a790aa6 Updating submodule(s)
KestrelHttpServer => 28dad2b2b1
Routing => 591ce7b1e8

[auto-updated: submodules]
2018-05-31 15:57:45 -07:00
Nate McMaster b8d742a850
Merge branch 'release/2.1' into dev 2018-05-31 15:13:55 -07:00
Nate McMaster c801671fbf
Stop producing old-style rpm/deb installers (#1191) 2018-05-31 15:01:28 -07:00
ASP.NET CI 350baded76 Updating submodule(s)
Routing => 60f63cf9fb

[auto-updated: submodules]
2018-05-31 14:48:35 -07:00
ASP.NET CI 7280b1e445 Updating submodule(s)
EntityFrameworkCore => 9581b48549df849e25235e622e39195071af4650

[auto-updated: submodules]
2018-05-31 14:20:46 -07:00
ASP.NET CI b55ec6f5b7 Updating submodule(s)
EntityFrameworkCore => 98eef4c22fd6687bffd4d643e6f980ca1bc8137c

[auto-updated: submodules]
2018-05-31 13:53:31 -07:00