Skip to content

Commit

Permalink
Merge pull request dotnet#595 from jkotas/runtime-merge
Browse files Browse the repository at this point in the history 
Merge from dotnet/runtime
  • Loading branch information
@jkotas
jkotas committed Jan 26, 2021
2 parents 36d6b3a + 719ca3c commit 91e5c36
Show file tree
Hide file tree
Showing 154 changed files with 29,738 additions and 28,516 deletions.
66 changes: 66 additions & 0 deletions THIRD-PARTY-NOTICES.TXT
View file
Original file line number Diff line number Diff line change
Expand Up @@ -882,3 +882,69 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

License notice for musl
-----------------------

musl as a whole is licensed under the following standard MIT license:

Copyright © 2005-2020 Rich Felker, et al.

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

License notice for Sun Microsystems
-----------------------------------


Copyright (c) 2002 Sun Microsystems, Inc. All Rights Reserved.

Redistribution and use in source and binary forms, with or
without modification, are permitted provided that the following
conditions are met:

-Redistribution of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

-Redistribution in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials
provided with the distribution.

Neither the name of Sun Microsystems, Inc. or the names of
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.

This software is provided "AS IS," without a warranty of any
kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND
WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE
HEREBY EXCLUDED. SUN MICROSYSTEMS, INC. ("SUN") AND ITS
LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY
LICENSEE AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THIS
SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR ITS
LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR
FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY
OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE
THIS SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY
OF SUCH DAMAGES.

You acknowledge that this software is not designed, licensed or
intended for use in the design, construction, operation or
maintenance of any nuclear facility.
6 changes: 3 additions & 3 deletions docs/area-owners.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ Note: Editing this file doesn't update the mapping used by the `@msftbot` issue
| area-Extensions-Logging | @ericstj | @maryamariyan @tarekgh | |
| area-Extensions-Options | @ericstj | @maryamariyan @ViktorHofer | |
| area-Extensions-Primitives | @ericstj | @maryamariyan @eerhardt | |
| area-GC-coreclr | @jeffschwMSFT | @Maoni0 | |
| area-GC-coreclr | @mangod9 | @Maoni0 | |
| area-GC-mono | @SamMonoRT | @BrzVlad | |
| area-Host | @agocke | @jeffschwMSFT @vitek-karas | Issues with dotnet.exe including bootstrapping, framework detection, hostfxr.dll and hostpolicy.dll |
| area-HostModel | @agocke | @vitek-karas | |
| area-ILTools-coreclr | @JulieLeeMSFT | @BruceForstall @dotnet/jit-contrib | |
| area-ILVerification | @JulieLeeMSFT | @BruceForstall @dotnet/jit-contrib | |
| area-Infrastructure | @ericstj | @ViktorHofer @jeffschwMSFT @dleeapho | |
| area-Infrastructure-coreclr | @jeffschwMSFT | @jeffschwMSFT @jashook @trylek | |
| area-Infrastructure-coreclr | @agocke | @jeffschwMSFT @trylek | |
| area-Infrastructure-installer | @dleeapho | @dleeapho @NikolaMilosavljevic | |
| area-Infrastructure-libraries | @ericstj | @ViktorHofer @ericstj @safern @Anipik | Covers:<ul><li>Packaging</li><li>Build and test infra for libraries in dotnet/runtime repo</li><li>VS integration</li></ul><br/> |
| area-Infrastructure-mono | @steveisok | @directhex | |
Expand Down Expand Up @@ -118,7 +118,7 @@ Note: Editing this file doesn't update the mapping used by the `@msftbot` issue
| area-System.Threading | @mangod9 | @kouvel | |
| area-System.Threading.Channels | @ericstj | @tarekgh @stephentoub | |
| area-System.Threading.Tasks | @ericstj | @tarekgh @stephentoub | |
| area-System.Transactions | @HongGit | @HongGit | |
| area-System.Transactions | @HongGit | @HongGit | |
| area-System.Xml | @jeffhandley | @buyaa-n @krwq | |
| area-Threading-mono | @SamMonoRT | @lambdageek | |
| area-TieredCompilation-coreclr | @mangod9 | @kouvel | |
Expand Down
Loading

0 comments on commit 91e5c36

Please sign in to comment.