maxmustermann/dotnet-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into newmayrel

Browse source
This commit is contained in:
Rahul Bhandari 2020-05-12 13:55:53 -07:00 committed by GitHub
parent a7c5246f82 e89db3677a
commit 8e3bd0e752
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Documentation/linux-prereqs.md
View file

@ -2,8 +2,7 @@
The following table represents the minimum library requirements to create, and run, a basic "hello world" console or MVC application with .NET Core. This table lists .NET Core Runtime requirements; applications could introduce additional dependencies.
| Distro | 2.1 | 2.2 | 3.0 |
| Distro | 2.1 | 2.2 | 3.1 |
| ------------ | ------------------------- | ------------------------- | ------------------------- |
| Ubuntu 19.04 | libicu63, libssl1.1 | libicu63, libssl1.1 | libicu63, libssl1.1 |
| Ubuntu 18.04 | libicu60, openssl1.0 | libicu60, openssl1.0 | libicu60, openssl1.0 |
@ -17,3 +16,4 @@ The following table represents the minimum library requirements to create, and r
| OpenSUSE Leap | libicu | libicu | libicu |
| SLES 15 | libicu | libicu | libicu |
| SLES 12 | libicu | libicu | libicu |
| Alpine Linux | icu-libs, krb5-libs, libintl, libssl1.1 (Alpine >= 3.9), libssl1.0 (< 3.9), libstdc++, sttng-ust, numactl (optional), zlib | icu-libs, krb5-libs, libintl, libssl1.1 (Alpine >= 3.9), libssl1.0 (< 3.9), libstdc++, sttng-ust, numactl (optional), zlib | icu-libs, krb5-libs, libintl, libssl1.1 (Alpine >= 3.9), libssl1.0 (< 3.9), libstdc++, sttng-ust, numactl (optional), zlib | | libicu |

32
license-information-windows.md Normal file
View file

@ -0,0 +1,32 @@
# License information for .NET
The Windows distribution of .NET 5.0 contains files that are provided under
multiple licenses.
This information is provided to help you to understand if the files, and their
associated licenses terms, apply to your use.
By using any or all of these files you agree to their associated license terms.
The following binaries are licensed with the
[.NET Library License](https://dotnet.microsoft.com/en/dotnet_library_license.htm)
* WPF: PresentationNative_cor3.dll
* WPF: wpfgfx_cor3.dll
The following binaries are licensed with the
[Visual Studio 2019 License](https://visualstudio.microsoft.com/license-terms/mlt031619/)
(not as a "trial"):
* WPF: vcruntime140_cor3.dll
* SDK Tools: Microsoft.DiaSymReader.Native.{x86|amd64|arm|arm64}.dll
The following binaries are licensed with the
[Windows SDK License](https://docs.microsoft.com/legal/windows-sdk/license):
* .NET Core: api-ms-*.*
* .NET Core: ucrtbase.dll
* WPF: D3DCompiler_47_cor3.dll
All other binaries and files are licensed with the
[MIT license](https://github.com/dotnet/core/blob/master/LICENSE.TXT)
This document is provided for informative purposes only, and is not itself a license.