43792f20b2
Merge branch 'release/2.2'
2018-10-24 12:45:15 -07:00
935df249c4
Shorten siteextension version to fit into 20 chars ( #3707 )
2018-10-23 16:27:23 -07:00
dc37a2c23d
Merge branch 'release/2.2'
2018-10-19 14:11:58 -07:00
d3216a66c1
Create a build configuraition to build OOB logging site extension package ( #3643 )
2018-10-19 12:19:33 -07:00
6994c4fc48
Merge release/2.2 and aspnet/WebSockets master branch
2018-10-17 16:06:14 -07:00
d991c50c82
Merge release/2.1 and aspnet/WebSockets release/2.2
2018-10-17 15:47:04 -07:00
b1427c759b
Remove the WebSockets submodule
2018-10-17 14:53:22 -07:00
c2e4a74f7d
React to renaming this repo from Universe to AspNetCore
2018-10-17 10:24:18 -07:00
a35226131a
Merge branch release/2.2
2018-10-16 12:02:18 -07:00
489a88d21e
Merge aspnet/DataProtection release/2.2 into this repo
2018-10-15 10:21:02 -07:00
a673bfd741
Add build script and CI config for the DataProtection folder
2018-10-15 10:13:04 -07:00
24d13700d7
Merge branch 'release/2.2'
2018-10-12 17:56:10 -07:00
c37a332a6a
Merge branch 'release/2.1' into release/2.2
2018-10-12 16:56:47 -07:00
fb3f5d95c2
Backport infrastructure changes and source reorganization
...
* Add build definition for Azure DevOps
* Put code for metapackages in a subfolder
* Update targets to prepare for submodules merging into this repo
* Add source code for windows installer
* Add source code for Debian installers
2018-10-12 13:59:43 -07:00
991526bbc9
Merge pull request #1449 from dotnet-maestro-bot/merge/release/2.2-to-master
...
[automated] Merge branch 'release/2.2' => 'master'
2018-10-03 13:57:50 -07:00
51491de90b
Enable Node10 for macOS ( #1448 )
2018-10-03 12:56:07 -07:00
e2a0746663
Merge branch 'merge/release/2.2-to-master'
2018-10-03 12:05:53 -07:00
79ccb2b90d
Merge branch 'merge/release/2.1-to-release/2.2' into release/2.2
2018-10-03 11:15:18 -07:00
9c37082a74
Add Linux, Node8, and Node10 to test matrix ( #1445 )
...
- Test both Node8 and Node10 on Windows and Linux
- Only test Node8 on MacOS, since the ASP.NET Core 2.1.X templates are incompatible with Node10 on macOS
- https://github.com/aspnet/Templating/issues/608
- Move Windows build to "Hosted VS2017" pool which has more agents
- We would rather use the "Hosted" pool, but "npm restore" currently fails on agents in this pool
- Remove "Preview" from Mac pool name
2018-10-03 11:02:59 -07:00
7c0bad4cef
Merge branch 'release/2.2'
2018-09-27 13:00:01 -07:00
cf204df326
Merge branch 'release/2.2' into merge/release/2.1-to-release/2.2
2018-09-27 12:24:12 -07:00
e8d3321025
Add AdditionalRestoreSources parameter to Cli.FunctionalTests ( #1429 )
...
- Required for builds which need to restore from multiple feeds
2018-09-27 12:17:14 -07:00
3dc53456e2
Merge branch 'release/2.2'
2018-09-26 11:10:00 -07:00
02dac71f64
Move e2e-tests.yml into the right folder
2018-09-26 10:58:07 -07:00
90ed3bde5e
Add more logging for E2E tests
...
Trying to diagnose why ProdCon fails to download metadata
2018-09-26 09:42:18 -07:00
1bf8e3985f
Merge branch 'release/2.2'
2018-09-25 10:25:03 -07:00
d8e9a95ee4
Merge branch 'release/2.1' into release/2.2
2018-09-25 10:23:40 -07:00
b40544979e
Rename .vsts folder to react to VSTS rebranding to Azure DevOps
2018-09-25 10:22:26 -07:00
Nate McMaster
Pavel Krymets
Mike Harder