Commit Graph

37066 Commits

Author SHA1 Message Date
Pranav K 70aad7cb70
Merge branch 'master' into merge/release/2.2-to-master 2018-10-25 09:35:47 -07:00
Pranav K 2d6643bc85 Cleanup Microsoft.NET.Sdk.Razor package output
* Remove unnecessary \ incorrect package references
* Remove extraneous build outputs in the tasks project that weren't present when the tasks were in Razor.Design
2018-10-25 09:26:04 -07:00
Nate McMaster 909c85ee99
Merge pull request #803 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-25 09:08:53 -07:00
Pavel Krymets 044f613804
Include failed HRESULTs and exceptions in FREB log (#1548) 2018-10-25 08:48:21 -07:00
Justin Kotalik de185b6a06
Duplicate debug log handle for console logging (#1558) 2018-10-25 08:47:31 -07:00
ASP.NET CI a2280926cb Updating BuildTools from 3.0.0-alpha1-20181019.6 to 3.0.0-alpha1-20181024.6
[auto-updated: buildtools]
2018-10-25 00:05:58 -07:00
ASP.NET CI b70e2fefa4 Updating submodule(s)
BasicMiddleware => 268290a8b5
EntityFrameworkCore => 3d5264adbee103b0522b332d67018b0994a45699
IISIntegration => 7652c09cfe
KestrelHttpServer => 253f81c2f2
Logging => 1a7ed658f8e00bc7abadfbda64c255cea346028e
Mvc => ce11eb9b71
Razor => 357657fc45
Routing => 8acbae76e8
SignalR => d5a01a4d9d
StaticFiles => 9c40a7237c
Templating => 7a3ce69b99

[auto-updated: submodules]
2018-10-25 00:05:49 -07:00
Nate McMaster 11d0b328ba
Remove VS.Web.CodeGeneration packages from the fallback folder cache (#3717) 2018-10-24 21:05:44 -07:00
Nate McMaster 654debe8fb
Merge branch 'master' into merge/release/2.2-to-master 2018-10-24 17:51:56 -07:00
Nate McMaster 7bde7399e9
2.2: remove Microsoft.VisualStudio.Web.CodeGeneration.Design from templates (#802)
This package does not need to be in the project until someone uses Visual Studio code generation. Visual Studio will automatically add this package when scaffolding is used for the first time, so it's unnecessary to put this in our templates.
2018-10-24 17:42:02 -07:00
Nate McMaster fd48670abe
Add a restore source to the artifacts/build folder and ensure build number is consistent when running local builds 2018-10-24 17:11:28 -07:00
Justin Kotalik 7a3ce69b99
Merge pull request #800 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-24 16:52:33 -07:00
James Newton-King 8acbae76e8
Merge pull request #893 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-25 12:44:43 +13:00
James Newton-King f2345a043a
Merge 2.2 to master 2018-10-25 12:32:40 +13:00
James Newton-King 81aeba6ef0
Merge branch 'merge/release/2.2-to-master' of https://github.com/dotnet-maestro-bot/Routing into merge/release/2.2-to-master 2018-10-25 12:28:19 +13:00
ASP.NET CI e6ad75c80d Updating BuildTools from 2.1.3-rtm-15829 to 2.1.3-rtm-15830
[auto-updated: buildtools]
2018-10-24 23:24:52 +00:00
Justin Kotalik 171c2073d1 update 2018-10-24 16:20:23 -07:00
ASP.NET CI a71aebbde6 Updating BuildTools from 2.1.3-rtm-15828 to 2.1.3-rtm-15829
[auto-updated: buildtools]
2018-10-24 23:07:26 +00:00
Nate McMaster 968df9578b
Refactor shared framework projects targets and project layout (#3703)
This refactors the targets used to build the shared framework and its .zip files. There are lots of reasons motivating this: Arcade convergence, migration to VSTS, making it easier to build this locally, etc.

Changes:
* Moves move content of build/Sharedfx.{props/targets} into eng/targets/SharedFx.Common.{props/targets}
* Update the build to produce a `runtime.$rid.Microsoft.AspNetCore.App` package (not just the one with symbols in it)
* Refactor the targets which produce .tar.gz/.zip files into separate projects in `src/Installers/`
* Refactor installers, unit tests, and the framework projects to use ProjectReference to flow dependencies between different parts of the build.
* Makes it easier to build the shared framework locally (for the inner dev loop, you can run `dotnet build -p src/Framework/Microsoft.AspNetCore.App/src/ -r win-x64`)
2018-10-24 15:42:06 -07:00
Hao Kung 91db78cf92
Add safe copy for enumeration (#1052) 2018-10-24 15:10:19 -07:00
Mikael Mengistu 132eac5e37
Add version numbers to the build.gradle file (#3195) 2018-10-24 13:42:33 -07:00
James Newton-King 3d828221a1
Rename sandbox website directory (#892) 2018-10-25 09:22:31 +13:00
Nate McMaster 2950b11b0a
Add aspnetcore-dev and vside.devcore myget feeds to restore 2018-10-24 13:09:13 -07:00
Nate McMaster 22e65480c5
Merge branch 'release/2.2' 2018-10-24 13:08:06 -07:00
Nate McMaster e3dc0edecb
Merge branch 'release/2.2' 2018-10-24 13:07:05 -07:00
Nate McMaster 5acbb9d138
Remove dotnet-httprepl from the list of expected packages 2018-10-24 13:03:14 -07:00
Nate McMaster 01f9af21c5
Temporarily stop producing a package for dotnet-httprepl (#505)
This package isn't quite ship-shape yet, so we're delaying this from shipping with 2.2 RTM.

Setting IsPackable=false so we avoid accidentally building a 2.2.0 RTM version of this package along with the rest of the 2.2.0 RTM tools in this repo, like dotnet-watch.
2018-10-24 13:02:25 -07:00
Javier Calvarro Nelson aa88f16b08
Fix cors with creds (#193) 2018-10-24 12:56:07 -07:00
Nate McMaster 43792f20b2
Merge branch 'release/2.2' 2018-10-24 12:45:15 -07:00
Nate McMaster 37915c9b58
Remove the aspnet/Common git submodule (#3715)
As a part of merging and reducing the number of repos we use, the aspnet/Common repo was renamed to aspnet/Extensions and it now builds on its own and not as a submodule of this repo.
2018-10-24 12:38:03 -07:00
Justin Kotalik ee78882b27 update master 2018-10-24 12:07:51 -07:00
Justin Kotalik 4437c72e30 Merge branch 'merge/release/2.2-to-master' of https://github.com/dotnet-maestro-bot/Templating into merge/release/2.2-to-master 2018-10-24 12:05:12 -07:00
ASP.NET CI 9df348a171 Updating submodule(s)
BasicMiddleware => 2d3ad1cb0f
EntityFrameworkCore => ec2d9b9992df41da8731cd4cb5f8e46189be1409
IISIntegration => 5c3017524f
KestrelHttpServer => a8073167e7
Logging => 2e30d867a412cd7b543f7ec0ed3932be0d08b8e3
Mvc => 2544926b2f
Routing => 577be72faa
SignalR => 29c06e2636
StaticFiles => a5fcd9dd87
Templating => 70a786adcd

[auto-updated: submodules]
2018-10-24 12:04:23 -07:00
Justin Kotalik 70a786adcd
Make AspNetCoreHostingModel element not be insert when targeting net461 and inprocess => InProcess (#797) 2018-10-24 11:36:07 -07:00
Justin Kotalik 7652c09cfe
Merge pull request #1557 from dotnet-maestro-bot/merge/release/2.2-to-master 2018-10-24 11:35:00 -07:00
Mikael Mengistu d5a01a4d9d
Merge pull request #3196 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-24 11:20:52 -07:00
Pranav K ce11eb9b71
Merge pull request #8641 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-24 11:19:50 -07:00
BrennanConroy 29c06e2636
Update deps (#3170) 2018-10-24 11:18:41 -07:00
Andrew Stanton-Nurse c129d272a4
Update npm readme with Node info (#3194)
I noticed that these READMEs are out of date now that we have "official" node support.
2018-10-24 11:15:34 -07:00
Mikael Mengistu 7eb5afd141
Update Build Badges (#3184) 2018-10-24 11:03:10 -07:00
Justin Kotalik c9806524b2 Update master 2018-10-24 10:33:13 -07:00
Pranav K 2544926b2f Provide a convenience API to configure ApiBehaviorOptions 2018-10-24 10:10:33 -07:00
Justin Kotalik 5c3017524f
Fix upgrade deps and run upgrade deps (#1553) 2018-10-24 10:04:59 -07:00
James Newton-King 9be8075742
Merge pull request #891 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-24 21:45:11 +13:00
James Newton-King 06ce57da55
Merge 2.2 to master 2018-10-24 21:36:28 +13:00
Ryan Nowak 357657fc45 Implements versions for generated code
This change implements version tracking the inputs and outputs of
generated code.

Version tracking is still best-effort - meaning that in some cases a
perfect system could avoid doing more work. However, since we base the
versions off of all of the inputs, we now that the guarantee that code
generation operations that happen 'out of order' will always result in
the newer inputs generating the newer outputs.

Fixes: https://github.com/aspnet/Razor/issues/2650
2018-10-23 18:19:18 -07:00
James Newton-King 577be72faa
Split sandbox and functional tests websites (#890) 2018-10-24 13:54:50 +13:00
Anton Piskunov b260e7752a
Merge pull request #504 from aspnet/dev/antonpis/SecretsManagerCPSBreak
Update CPS packages with breaking changes
2018-10-23 16:58:58 -07:00
Ryan Nowak 029304ae69 This is the correct version for now 2018-10-23 16:37:23 -07:00
Ryan Nowak 0e51d2ecdd Fix version of StreamJsonRpc
I got a little too ambitious with bumping up this version. This isn't in
the VS that we're using yet, so I have to bump it back down.
2018-10-23 16:37:11 -07:00