Commit Graph

470 Commits

Author SHA1 Message Date
Nate McMaster ee11d10f04
Remove BrowserLink and Scaffolding gitsubmodules (#3730)
As a part of simplifying the way we build ASP.NET Core, the BrowserLink and Scaffolding repos and the packages they produce will be independent from aspnet/AspNetCore.
2018-10-26 10:17:57 -07:00
Nate McMaster dc37a2c23d
Merge branch 'release/2.2' 2018-10-19 14:11:58 -07:00
Pavel Krymets d3216a66c1
Create a build configuraition to build OOB logging site extension package (#3643) 2018-10-19 12:19:33 -07:00
Nate McMaster 84ca21ed06
Merge branch 'release/2.2' 2018-10-19 10:26:30 -07:00
Nate McMaster 36add43f11
Merge branch release/2.1 into release/2.2 2018-10-18 16:53:03 -07:00
dotnet-maestro-bot 31849575f1 Upgrade to .NET Core 2.1.6-servicing-27017-02 2018-10-18 13:48:06 -07:00
Justin Kotalik 22c737c3ee
Merge pull request #3663 from aspnet/release/2.2
Revert restarting was when installing ANCM (#3662)
2018-10-17 22:45:39 -07:00
Justin Kotalik 6dc4673881
Revert restarting was when installing ANCM (#3662) 2018-10-17 22:44:41 -07:00
Nate McMaster 674401235b
Fix local builds of src/DataProtection/build.cmd 2018-10-17 17:35:01 -07:00
Nate McMaster 6994c4fc48
Merge release/2.2 and aspnet/WebSockets master branch 2018-10-17 16:06:14 -07:00
Nate McMaster 9ce78f36d5
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in afeb7fe49b
2018-10-17 15:57:02 -07:00
Nate McMaster d991c50c82
Merge release/2.1 and aspnet/WebSockets release/2.2 2018-10-17 15:47:04 -07:00
Nate McMaster 24f85a200c
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in a036f920b8
2018-10-17 15:34:25 -07:00
Nate McMaster b1427c759b
Remove the WebSockets submodule 2018-10-17 14:53:22 -07:00
Nate McMaster 9e952a22ed
Merge source code from aspnet/WebSockets 2018-10-17 14:30:38 -07:00
Nate McMaster 5d84c92b74
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganiziation, this source code was found in 67f2c3149e
2018-10-17 14:27:00 -07:00
Justin Kotalik 3c44d27974
Merge pull request #1514 from aspnet/release/2.2
Merge release/2.2 into master: Fix path to aspnetcoreca.dll for signed output (#1513)
2018-10-16 15:59:08 -07:00
Justin Kotalik b951ac9b64
Fix path to aspnetcoreca.dll for signed output (#1513) 2018-10-16 15:55:15 -07:00
Nate McMaster 4d631ffed3
Merge branch 'release/2.2' 2018-10-16 12:06:16 -07:00
Nate McMaster a35226131a
Merge branch release/2.2 2018-10-16 12:02:18 -07:00
Nate McMaster 6366deb193
Update dataprotection to 2.2.0-rtm 2018-10-16 11:33:17 -07:00
Nate McMaster b64e64d9e5
Merge branch 'namc/merge-dp-22' into release/2.2 2018-10-16 11:32:28 -07:00
Justin Kotalik 92baa4a75b
Cleanup ANCM installers/ Sign AspNetCore custom action (#1499) (#1502) 2018-10-15 17:46:36 -07:00
Justin Kotalik eced46c579
Cleanup ANCM installers/ Sign AspNetCore custom action (#1499) 2018-10-15 17:10:08 -07:00
Nate McMaster 6a14b47ccd
Add infrastructure changes to src/DataProtection can build on its own 2018-10-15 11:17:06 -07:00
Nate McMaster 89e2508acf
Merge branch 'release/2.2' 2018-10-15 11:03:28 -07:00
Nate McMaster 3eb0764fae
Reorganize source code from aspnet/DataProtection into a subfolder
Prior to reorg, this source existed at 9c7731f1fa
2018-10-15 10:47:38 -07:00
Nate McMaster 489a88d21e
Merge aspnet/DataProtection release/2.2 into this repo 2018-10-15 10:21:02 -07:00
Nate McMaster a673bfd741
Add build script and CI config for the DataProtection folder 2018-10-15 10:13:04 -07:00
Nate McMaster 4dfd351c84
Remove DataProtection submodule and update path to DP source code to local folder 2018-10-15 09:46:20 -07:00
Nate McMaster c355f10074
Merge source code from aspnet/DataProtection 2018-10-15 09:40:44 -07:00
Nate McMaster 24d13700d7
Merge branch 'release/2.2' 2018-10-12 17:56:10 -07:00
Nate McMaster c37a332a6a
Merge branch 'release/2.1' into release/2.2 2018-10-12 16:56:47 -07:00
Justin Kotalik dbc1d38a58
Move ANCM installers to Universe (#1456) 2018-10-12 14:32:12 -07:00
Nate McMaster 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
Nate McMaster f4026cc100
Reorganize source code from aspnet/DataProtection into a subfolder
Prior to reorg, this source existed at 3f5f419df8
2018-10-12 13:14:22 -07:00
Nate McMaster 4f14cda425
Reorganize source code from aspnet/DataProtection into a subfolder
Prior to reorg, this source existed at b62bb5778b
2018-10-12 10:07:51 -07:00
BrennanConroy 9c7731f1fa Merge branch 'release/2.2' 2018-10-11 10:23:24 -07:00
BrennanConroy 3f5f419df8
Add Redis 2.0 package (#325) 2018-10-10 16:40:52 -07:00
Nate McMaster ef18c467aa
Merge branch 'release/2.2' 2018-10-02 14:45:17 -07:00
Nate McMaster f2691ee4b6
Add a copy of scripts from dotnet-deb-tool 2.0.0 to this repo (#1442)
We currently build .deb files using dotnet-deb-tool, which comes from a package feed. We're not completely sure where the source code is for this tool, so this moves the scripts from the dotnet-deb-tool 2.0.0 package into this repo for safe keeping.
2018-10-02 14:32:12 -07:00
Nate McMaster 18e245ecf0
Merge branch 'release/2.2' 2018-10-01 16:00:30 -07:00
Nate McMaster 7d3628b8ac
Merge branch 'release/2.1' into release/2.2 2018-10-01 15:58:37 -07:00
Nate McMaster 72cd5eedcf
Prepare the 2.1.6 patch (#1434) 2018-09-28 17:57:33 -07:00
Nate McMaster 0eb57b2a29
automated: bulk infrastructure updates. Update bootstrapper scripts and remove unnecessary signing properties 2018-09-28 17:19:45 -07:00
Justin Kotalik 33b5575017 Merge branch 'release/2.2' 2018-09-27 16:54:43 -07:00
Justin Kotalik fc39ea3bec
Make hosting bundle get prodcon runtime versions (#1435) 2018-09-27 16:44:40 -07:00
Nate McMaster 6fb4de5962
Merge branch 'release/2.2' 2018-09-06 23:05:08 -07:00
Nate McMaster e3ba165baa
Update build.ps1 2018-09-06 23:04:43 -07:00
Nate McMaster 9941fb825f
Update TFM to .NET Core 3.0 (#324) 2018-09-06 08:23:55 -07:00