Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into mergeMain
Browse files Browse the repository at this point in the history
  • Loading branch information
@elinor-fung
elinor-fung committed Jun 18, 2021
2 parents 78804fb + cff5854 commit b3d6fb1
Show file tree
Hide file tree
Showing 629 changed files with 16,499 additions and 9,483 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "1.0.0-prerelease.21307.1",
"version": "1.0.0-prerelease.21314.1",
"commands": [
"xharness"
]
Expand Down
26 changes: 26 additions & 0 deletions THIRD-PARTY-NOTICES.TXT
View file
Original file line number Diff line number Diff line change
Expand Up @@ -952,3 +952,29 @@ by constants, including codegen instructions. The unsigned division incorporates
"round down" optimization per ridiculous_fish.

This is free and unencumbered software. Any copyright is dedicated to the Public Domain.


License notice for mimalloc
-----------------------------------

MIT License

Copyright (c) 2019 Microsoft Corporation, Daan Leijen

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.
2 changes: 1 addition & 1 deletion docs/coding-guidelines/libraries-packaging.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ The library should have both a `ref` and `src` project. Its reference assembly w

Including a library in the shared framework only includes the best applicable TargetFramework build of that library: `$(NetCoreAppCurrent)` if it exists, but possibly `netstandard2.1` or another if that is best. If a library has builds for other frameworks those will only be shipped if the library also produces a [Nuget package](#nuget-package).

In some occasions we may want to include a library in the shared framework, but not expose it publicly. To do so, include the library in the `NetCoreAppLibraryNoReference` property in [NetCoreAppLibrary.props](../../src/libraries/NetCoreAppLibrary.props). The library should also be named in a way to discourage use at runtime, for example using the `System.Private` prefix. We should avoid hiding arbitrary public libraries as it complicates deployment and servicing, though some platform specific libraries are in this state due to historical reasons.
In some occasions we may want to include a library in the shared framework, but not expose it publicly. The library should be named in a way to discourage use at runtime, for example using the `System.Private` prefix. We should avoid hiding arbitrary public libraries as it complicates deployment and servicing.

Libraries included in the shared framework should ensure all direct and transitive assembly references are also included in the shared framework. This will be validated as part of the build and errors raised if any dependencies are unsatisfied.

Expand Down
8 changes: 6 additions & 2 deletions docs/coding-guidelines/project-guidelines.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,10 @@ Library projects should use the following directory layout.

```
src\<Library Name>\src - Contains the source code for the library.
src\<Library Name>\ref - Contains any reference assembly projects for the library
src\<Library Name>\ref - Contains any reference assembly projects for the library.
src\<Library Name>\pkg - Contains package projects for the library.
src\<Library Name>\tests - Contains the test code for a library
src\<Library Name>\tests - Contains the test code for a library.
src\<Library Name>\gen - Contains source code for the assembly's source generator.
```

## ref
Expand Down Expand Up @@ -163,6 +164,9 @@ All test outputs should be under

`bin\$(MSBuildProjectName)\$(TargetFramework)`

## gen
In the gen directory any source generator related to the assembly should exist. This does not mean the source generator is only used for that assembly only that it is conceptually apart of that assembly. For example, the assembly may provide attributes or low-level types the source generator uses.

## Facades
Facade are unique in that they don't have any code and instead are generated by finding a contract reference assembly with the matching identity and generating type forwards for all the types to where they live in the implementation assemblies (aka facade seeds). There are also partial facades which contain some type forwards as well as some code definitions. All the various build configurations should be contained in the one csproj file per library.

Expand Down
3 changes: 1 addition & 2 deletions eng/Signing.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<DownloadedSymbolPackagesWithoutPaths Include="@(DownloadedSymbolPackages->'%(Filename)%(Extension)')" />
<FileSignInfo Include="@(DownloadedSymbolPackagesWithoutPaths->Distinct())" CertificateName="None" />

<FileExtensionSignInfo Include=".mibc" CertificateName="MicrosoftDotNet500" />
<FileExtensionSignInfo Include=".msi" CertificateName="MicrosoftDotNet500" />
<FileExtensionSignInfo Include=".pkg" CertificateName="8003" />
<FileExtensionSignInfo Include=".deb;.rpm" CertificateName="LinuxSign" />
Expand Down Expand Up @@ -77,7 +76,7 @@
Exclude="mscordaccore.dll"
CertificateName="MicrosoftSHA2" />
</ItemGroup>

<ItemGroup Condition="'$(SignDiagnosticsPackages)' == 'true'">
<!-- The cross OS diagnostics symbol packages need to be signed as they are the only packages
that have a specific version of assets that are only meant to be indexed in symbol servers.
Expand Down
126 changes: 63 additions & 63 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,69 +6,69 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21304.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21311.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>85a65ea1fca1d0867f699fed44d191358270bf6a</Sha>
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21304.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21311.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>85a65ea1fca1d0867f699fed44d191358270bf6a</Sha>
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21304.1">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21311.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>85a65ea1fca1d0867f699fed44d191358270bf6a</Sha>
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21304.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21311.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>85a65ea1fca1d0867f699fed44d191358270bf6a</Sha>
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21304.1">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21311.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>85a65ea1fca1d0867f699fed44d191358270bf6a</Sha>
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21304.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21311.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>85a65ea1fca1d0867f699fed44d191358270bf6a</Sha>
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21304.1">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21311.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>85a65ea1fca1d0867f699fed44d191358270bf6a</Sha>
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21304.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21311.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>85a65ea1fca1d0867f699fed44d191358270bf6a</Sha>
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21304.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21311.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>85a65ea1fca1d0867f699fed44d191358270bf6a</Sha>
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21304.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21311.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>85a65ea1fca1d0867f699fed44d191358270bf6a</Sha>
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21304.1">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21311.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>85a65ea1fca1d0867f699fed44d191358270bf6a</Sha>
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21304.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21311.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>85a65ea1fca1d0867f699fed44d191358270bf6a</Sha>
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21304.1">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21311.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>85a65ea1fca1d0867f699fed44d191358270bf6a</Sha>
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21304.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21311.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>85a65ea1fca1d0867f699fed44d191358270bf6a</Sha>
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21304.1">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21311.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>85a65ea1fca1d0867f699fed44d191358270bf6a</Sha>
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21304.1">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21311.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>85a65ea1fca1d0867f699fed44d191358270bf6a</Sha>
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
<Uri>https://github.com/microsoft/vstest</Uri>
Expand Down Expand Up @@ -146,73 +146,73 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>38017c3935de95d0335bac04f4901ddfc2718656</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHost" Version="6.0.0-preview.6.21307.1">
<Dependency Name="Microsoft.NETCore.DotNetHost" Version="6.0.0-preview.6.21314.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711</Sha>
<Sha>af5c238556e204583b129cc8f5c7338f84dc2c40</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="6.0.0-preview.6.21307.1">
<Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="6.0.0-preview.6.21314.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711</Sha>
<Sha>af5c238556e204583b129cc8f5c7338f84dc2c40</Sha>
</Dependency>
<Dependency Name="runtime.native.System.IO.Ports" Version="6.0.0-preview.6.21307.1">
<Dependency Name="runtime.native.System.IO.Ports" Version="6.0.0-preview.6.21314.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711</Sha>
<Sha>af5c238556e204583b129cc8f5c7338f84dc2c40</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.0-preview.6.21307.1">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.0-preview.6.21314.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711</Sha>
<Sha>af5c238556e204583b129cc8f5c7338f84dc2c40</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="6.0.0-preview.6.21307.1">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="6.0.0-preview.6.21314.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711</Sha>
<Sha>af5c238556e204583b129cc8f5c7338f84dc2c40</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="6.0.0-preview.6.21307.1">
<Dependency Name="System.Text.Json" Version="6.0.0-preview.6.21314.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711</Sha>
<Sha>af5c238556e204583b129cc8f5c7338f84dc2c40</Sha>
</Dependency>
<Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-preview.6.21307.1">
<Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-preview.6.21314.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1d2aa13ffc256a8c3f645de9c4d0f1d4f3296711</Sha>
<Sha>af5c238556e204583b129cc8f5c7338f84dc2c40</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21308.1">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21310.3">
<Uri>https://github.com/mono/linker</Uri>
<Sha>802aa459394baa2451ffacc02219ba54ef77ca44</Sha>
<Sha>caeaf2a3fb3f636805fdd4881df4f9a539fff8f6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21307.1">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21314.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>2751a33949055a45fd79e2ae126f127daf1aee44</Sha>
<Sha>d6f8a4ad30908fb210390380eae97264e4fbe8ce</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21307.1">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21314.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>2751a33949055a45fd79e2ae126f127daf1aee44</Sha>
<Sha>d6f8a4ad30908fb210390380eae97264e4fbe8ce</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21304.1">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21311.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>85a65ea1fca1d0867f699fed44d191358270bf6a</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21308.4">
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21313.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>6d1aebccb1ae6c3562bb0cceba8464f78b4e1afd</Sha>
<Sha>4e5bea15eb5a9c8cf9142195b1c9c78437a5b27f</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.21308.4">
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.21313.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>6d1aebccb1ae6c3562bb0cceba8464f78b4e1afd</Sha>
<Sha>4e5bea15eb5a9c8cf9142195b1c9c78437a5b27f</Sha>
</Dependency>
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.21308.4">
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.21313.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>6d1aebccb1ae6c3562bb0cceba8464f78b4e1afd</Sha>
<Sha>4e5bea15eb5a9c8cf9142195b1c9c78437a5b27f</Sha>
</Dependency>
<Dependency Name="optimization.PGO.CoreCLR" Version="1.0.0-prerelease.21308.4">
<Dependency Name="optimization.PGO.CoreCLR" Version="1.0.0-prerelease.21313.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>6d1aebccb1ae6c3562bb0cceba8464f78b4e1afd</Sha>
<Sha>4e5bea15eb5a9c8cf9142195b1c9c78437a5b27f</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.Emscripten.2.0.21.Node.win-x64" Version="6.0.0-preview.6.21275.1">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>defa37b05c734e025292c5747664e970cd2ac444</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="1.0.1-alpha.0.21307.1">
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="1.0.1-alpha.0.21311.1">
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
<Sha>04541efa21e114256a1ca9ca4a14685fd9f7e48e</Sha>
<Sha>25b814e010cd4796cedfbcce72a274c26928f496</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
Loading

0 comments on commit b3d6fb1

Please sign in to comment.