Commit Graph

122 Commits

Author SHA1 Message Date
Nate McMaster 6cc9f6f130
Merge release/2.2 and replace submodules
* Replace the aspnet/JsonPatch git submodule and merge the master branch of its source to this repo
* Likewise for aspnet/DotNetTools
* And aspnet/HtmlAbstractions
* merge latest infrastructure changes from the release/2.2 branch
2018-11-14 22:57:10 -08:00
Nate McMaster c1c7d711b6
Merge branch 'release/2.1' into release/2.2 2018-11-14 09:27:23 -08:00
Nate McMaster 34999a804e
Remove submodules for repos that merged to aspnet/Extensions (#3671)
Builds of the packages in aspnet/Extensions repo go through ProdCon instead of building as a submodule of this repo.
2018-11-09 08:48:42 -08:00
Nate McMaster 6994c4fc48
Merge release/2.2 and aspnet/WebSockets master branch 2018-10-17 16:06:14 -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 c2e4a74f7d
React to renaming this repo from Universe to AspNetCore 2018-10-17 10:24:18 -07:00
Nate McMaster 9cc4d8d95a
Merge branch 'release/2.2' 2018-10-16 15:01:01 -07:00
Nate McMaster eb9061103e
Merge branch 'release/2.1' into release/2.2 2018-10-16 14:59:03 -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
Nate McMaster f09aa6eacb
Backport cleanups to infrastructure
* Fix README links to use https
* Add a bigger timeout to PushToBlobFeed
* Remove hard-coded restore source for the 2.1.4 build
* Fail the build if korebuild.json cannot be parsed
* Fix output path for sharedfx .tar.gz files to avoid max path issues
2018-10-12 16:36:34 -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
Ryan Brandenburg 29cabb688e Merge branch 'merge/release/2.2-to-master' 2018-10-10 16:18:07 -07:00
Ryan Brandenburg 2c365b8fc5 Explicitly push to a branch 2018-10-10 10:16:53 -07:00
BrennanConroy 26eecf5d92 Merge release/2.2 to master 2018-10-10 08:57:30 -07:00
Ryan Brandenburg 3cf20afc8a Fix syntax error 2018-10-09 15:42:46 -07:00
Nate McMaster cc8cc7b443
Merge branch 'release/2.2' 2018-10-09 13:24:13 -07:00
Ryan Brandenburg f65c1a4e3d Push UpdateRepos to maestro branch 2018-10-09 12:40:10 -07:00
Ryan Brandenburg 2948972bfb Revert "Update repos send PRs"
This reverts commit 1593966f3b.
2018-10-09 12:40:10 -07:00
Nate McMaster 050dea3f04
Merge branch 'release/2.2' 2018-10-09 12:14:55 -07:00
Nate McMaster eaad1eb3aa
Remove tasks for analyzing the repo graph (#1469)
As a part of converging repos, we no longer need this code. It is currently buggy and slow, and we can get away without by hard-coding the repo graph (which rarely changes)
2018-10-09 12:01:41 -07:00
Ryan Brandenburg 1593966f3b Update repos send PRs 2018-10-09 09:30:01 -07:00
Nate McMaster 6effb13bbd
Update to .NET Core 2.1.5 2018-09-28 19:39:46 -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 fe759072f8
Merge branch 'release/2.2' 2018-08-31 16:58:52 -07:00
Nate McMaster a57ed95fd3
Fix errors connecting to github from powershell and TLS1.2 in test scripts 2018-08-31 11:20:58 -07:00
Ryan Brandenburg 115398ea8b
Tag builds in release/2.2 (#1361)
* Add a script for tagging TeamCity builds

* chmod +x
2018-08-30 13:36:01 -07:00
Ryan Brandenburg 961321a464 chmod +x 2018-08-30 11:26:37 -07:00
Ryan Brandenburg d19976e5ee Add a script for tagging TeamCity builds 2018-08-30 11:26:37 -07:00
Nate McMaster c6fe1d9928
Merge branch 'release/2.2' 2018-08-24 10:52:01 -07:00
Nate McMaster 12e2d30f6b
Publish .jar files to ProdCon output 2018-08-22 19:08:17 -07:00
Nate McMaster da48de7d75
Merge branch 'release/2.2' 2018-08-20 19:13:05 -07:00
Nate McMaster b67a141263
Add code for building the Windows Hosting Bundle and ASP.NET Core runtime installers into this repo
This code previously was in private repos because it had references to internal locations and drop shares. This code has been modified to remove these internal-only pieces.
2018-08-20 15:56:22 -07:00
Nate McMaster 68fd26a46b
Merge branch 'release/2.2' 2018-07-25 11:19:21 -07:00
Nate McMaster 2e96271e69
Merge branch 'release/2.1' into release/2.2 2018-07-25 09:29:48 -07:00
Nate McMaster e69a47f230
Implement patch policies per repo and set default to ProductChangesOnly
Our policy since 1.0.0 has been to always cascade version updates in the packages we own. e.g. if Logging has a product change in 2.1.x, then Kestrel, EF Core, Mvc, etc also re-ship with the updated Logging dependency. This has been done for a variety of reasons:

* NuGet does not show updates for transitive dependencies, only direct ones
* NuGet does resolves the lowest compatible transitive dependencies
* ASP.NET Core ships to both .NET Framework (where transitive dependency version matters) and .NET Core (where it matters less if you use the shared framework)

While transitive dependencies is still an important scenario, this practice of always patching has led to bigger issues.

* High probability users will unintentionally upgrade out of the shared framework: #3307
* Conflicts with metapackages that attempt to use exact version constraints: aspnet/Universe#1180
* A quality perception issue: the high volume of new versions in servicing updates with only metadata changes has created the impression that new versions of packages may not be very important. It's also made it appear like there are more issues product than there really are.
* High volume of packages changing with only metadata changes. Of the last 301 packages published in a servicing update, only 11 contained actual changes to the implementation assemblies. (3.5%)

This change implements a system to verify a new, non-cascading versioning policy for servicing updates. This required changes to repos to pin version variables to that matter per-repo,
and to remove some of the restrictions and checks.

Incidentally, this should make defining new patches easier because it automatically determines which packages are or are not patching in the release.
2018-07-12 21:33:50 -07:00
Nate McMaster 1aa529ddf6
Merge branch 'release/2.2' 2018-07-10 16:22:44 -07:00
Nate McMaster 9ad9ada9ea
Pin to the latest stable 2.1.x corefx packages 2018-07-09 18:16:57 -07:00
Nate McMaster 9276602279
Merge branch 'release/2.1' into release/2.2 2018-07-06 13:43:43 -07:00
Nate McMaster d7721fdff4
Merge branch 'release/2.0' into release/2.1 2018-07-05 20:12:24 -07:00
Nate McMaster a21d455b51
Change default branch to master 2018-07-02 11:50:02 -07:00
Nate McMaster 0c5f0dd923
Update branding to 3.0.0-alpha1 2018-06-28 17:01:31 -07:00
Nate McMaster 1c1256406e
Update README, config, and scripts to use release/2.2 (#1232) 2018-06-28 15:51:15 -07:00
Nate McMaster 93f2e99d40
Fix for uploading blobs to private Azure blob containers 2018-06-14 09:34:07 -07:00
Nate McMaster aa91b802f9
Add script used to deploy blobs to Azure storage 2018-06-13 14:26:46 -07:00
Nate McMaster e4e3551a1e
Prepare 2.1.2 patch 2018-06-12 15:18:36 -07:00
Nate McMaster 451c7036a6
Merge branch 'release/2.1' into dev 2018-06-04 13:05:46 -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