Skip to content

Commit 76f04f7

Browse files
GrabYourPitchforksGrabYourPitchforks
committed
Merge remote-tracking branch 'origin/main' into encoder
2 parents 0d84fc4 + 11c5181 commit 76f04f7

File tree

1,161 files changed

+44677
-24583
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,161 files changed

+44677
-24583
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "1.0.0-prerelease.21154.2",
18+
"version": "1.0.0-prerelease.21165.2",
1919
"commands": [
2020
"xharness"
2121
]

‎.dockerignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@
292292
!**/src/pal/prebuilt/idl/*_i.c
293293

294294
# Valid 'debug' folder, that contains CLR debugging code
295-
!**/src/debug
295+
!**/src/**/debug
296296

297297
# Ignore folders created by the CLR test build
298298
**/TestWrappers_x64_[d|D]ebug

‎Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
<WasmAppBuilderDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'WasmAppBuilder', 'Debug', '$(NetCoreAppToolCurrent)', 'publish'))</WasmAppBuilderDir>
7171
<WasmBuildTasksDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'WasmBuildTasks', 'Debug', '$(NetCoreAppToolCurrent)', 'publish'))</WasmBuildTasksDir>
7272
<MonoAOTCompilerDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'MonoAOTCompiler', 'Debug', '$(NetCoreAppToolCurrent)'))</MonoAOTCompilerDir>
73+
<RuntimeConfigParserDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'RuntimeConfigParser', 'Debug', '$(NetCoreAppToolCurrent)', 'publish'))</RuntimeConfigParserDir>
7374

7475
<InstallerTasksAssemblyPath Condition="'$(MSBuildRuntimeType)' == 'Core'">$([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'installer.tasks', 'Debug', '$(NetCoreAppToolCurrent)', 'installer.tasks.dll'))</InstallerTasksAssemblyPath>
7576
<InstallerTasksAssemblyPath Condition="'$(MSBuildRuntimeType)' != 'Core'">$([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'installer.tasks', 'Debug', 'net461', 'installer.tasks.dll'))</InstallerTasksAssemblyPath>
@@ -78,6 +79,7 @@
7879
<WasmAppBuilderTasksAssemblyPath>$([MSBuild]::NormalizePath('$(WasmAppBuilderDir)', 'WasmAppBuilder.dll'))</WasmAppBuilderTasksAssemblyPath>
7980
<WasmBuildTasksAssemblyPath>$([MSBuild]::NormalizePath('$(WasmBuildTasksDir)', 'WasmBuildTasks.dll'))</WasmBuildTasksAssemblyPath>
8081
<MonoAOTCompilerTasksAssemblyPath>$([MSBuild]::NormalizePath('$(MonoAOTCompilerDir)', 'MonoAOTCompiler.dll'))</MonoAOTCompilerTasksAssemblyPath>
82+
<RuntimeConfigParserTasksAssemblyPath>$([MSBuild]::NormalizePath('$(RuntimeConfigParserDir)', 'RuntimeConfigParser.dll'))</RuntimeConfigParserTasksAssemblyPath>
8183
</PropertyGroup>
8284

8385
<PropertyGroup Label="CalculateConfiguration">
@@ -220,8 +222,6 @@
220222
<GitHubRepositoryName>runtime</GitHubRepositoryName>
221223
<RepositoryUrl>https://github.com/dotnet/$(GitHubRepositoryName)</RepositoryUrl>
222224
<PackageProjectUrl>https://dot.net</PackageProjectUrl>
223-
<!-- Remove ProjectUrl after https://github.com/dotnet/arcade/pull/6995 is merged and consumed. -->
224-
<ProjectUrl>$(PackageProjectUrl)</ProjectUrl>
225225
<Owners>microsoft,dotnetframework</Owners>
226226
<RuntimeIdGraphDefinitionFile>$([MSBuild]::NormalizePath('$(LibrariesProjectRoot)', 'Microsoft.NETCore.Platforms', 'pkg', 'runtime.json'))</RuntimeIdGraphDefinitionFile>
227227
<LicenseFile>$(MSBuildThisFileDirectory)LICENSE.TXT</LicenseFile>

‎docs/area-owners.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Note: Editing this file doesn't update the mapping used by the `@msftbot` issue
88

99
| Area | Lead | Owners (area experts to tag in PR's and issues) | Notes |
1010
|------------------------------------------------|---------------|-----------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
11-
| area-AssemblyLoader-coreclr | @agocke | @agocke @vitek-karas | |
11+
| area-AssemblyLoader-coreclr | @agocke | @agocke @vitek-karas @vsadov | |
1212
| area-AssemblyLoader-mono | @SamMonoRT | @CoffeeFlux | |
1313
| area-Build-mono | @steveisok | @akoeplinger | |
1414
| area-Codegen-AOT-mono | @SamMonoRT | @vargaz | |
@@ -35,7 +35,7 @@ Note: Editing this file doesn't update the mapping used by the `@msftbot` issue
3535
| area-Extensions-Primitives | @ericstj | @maryamariyan @michaelgsharp @safern @tarekgh | Consultants: @eerhardt |
3636
| area-GC-coreclr | @mangod9 | @Maoni0 | |
3737
| area-GC-mono | @SamMonoRT | @BrzVlad | |
38-
| area-Host | @agocke | @jeffschwMSFT @vitek-karas | Issues with dotnet.exe including bootstrapping, framework detection, hostfxr.dll and hostpolicy.dll |
38+
| area-Host | @agocke | @jeffschwMSFT @vitek-karas @vsadov | Issues with dotnet.exe including bootstrapping, framework detection, hostfxr.dll and hostpolicy.dll |
3939
| area-HostModel | @agocke | @vitek-karas | |
4040
| area-ILTools-coreclr | @JulieLeeMSFT | @BruceForstall @dotnet/jit-contrib | |
4141
| area-ILVerification | @JulieLeeMSFT | @BruceForstall @dotnet/jit-contrib | |
@@ -57,7 +57,7 @@ Note: Editing this file doesn't update the mapping used by the `@msftbot` issue
5757
| area-ReadyToRun-coreclr | @mangod9 | @nattress | |
5858
| area-Serialization | @HongGit | @StephenMolloy @HongGit | Packages:<ul><li>System.Runtime.Serialization.Xml</li><li>System.Runtime.Serialization.Json</li><li>System.Private.DataContractSerialization</li><li>System.Xml.XmlSerializer</li></ul> Excluded:<ul><li>System.Runtime.Serialization.Formatters</li></ul> |
5959
| area-Setup | @dleeapho | @NikolaMilosavljevic @dleeapho | Distro-specific (Linux, Mac and Windows) setup packages and msi files |
60-
| area-Single-File | @agocke | @vitek-karas | |
60+
| area-Single-File | @agocke | @vitek-karas @vsadov | |
6161
| area-Snap | @dleeapho | @dleeapho @leecow @MichaelSimons | |
6262
| area-System.Buffers | @jeffhandley | @pgovind @tannergooding | Consultants: @GrabYourPitchforks |
6363
| area-System.CodeDom | @jeffhandley | @buyaa-n @joperezr @krwq | |

‎docs/design/coreclr/botr/readytorun-format.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Revisions:
55
* 1.1 - [Jan Kotas](https://github.com/jkotas) - 2015
66
* 3.1 - [Tomas Rylek](https://github.com/trylek) - 2019
77
* 4.1 - [Tomas Rylek](https://github.com/trylek) - 2020
8+
* 5.3 - [Tomas Rylek](https://github.com/trylek) - 2021
89

910
# Introduction
1011

@@ -161,6 +162,8 @@ The following section types are defined and described later in this document:
161162
| InliningInfo2 | 114 | Image (added in V4.1)
162163
| ComponentAssemblies | 115 | Image (added in V4.1)
163164
| OwnerCompositeExecutable | 116 | Image (added in V4.1)
165+
| PgoInstrumentationData | 117 | Image (added in V5.2)
166+
| ManifestAssemblyMvids | 118 | Image (added in V5.3)
164167

165168
## ReadyToRunSectionType.CompilerIdentifier
166169

@@ -540,6 +543,17 @@ the `OwnerCompositeExecutable` section that contains a UTF-8 string encoding the
540543
composite R2R executable this MSIL belongs to with extension (without path). Runtime uses this
541544
information to locate the composite R2R executable with the compiled native code when loading the MSIL.
542545

546+
## ReadyToRunSectionType.PgoInstrumentationData (v5.2+)
547+
548+
**TODO**: document PGO instrumentation data
549+
550+
## ReadyToRunSectionType.ManifestAssemblyMvids (v5.3+)
551+
552+
This section is a binary array of 16-byte MVID records, one for each assembly in the manifest metadata.
553+
Number of assemblies stored in the manifest metadata is equal to the number of MVID records in the array.
554+
MVID records are used at runtime to verify that the assemblies loaded match those referenced by the
555+
manifest metadata representing the versioning bubble.
556+
543557
# Native Format
544558

545559
Native format is set of encoding patterns that allow persisting type system data in a binary format that is

‎docs/design/features/covariant-return-methods.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Covariant Return Methods
22

3-
Covariant return methods is a runtime feature designed to support the [covariant return types](https://github.com/dotnet/csharplang/blob/master/proposals/covariant-returns.md) and [records](https://github.com/dotnet/csharplang/blob/master/proposals/records.md) C# language features posed for C# 9.0.
3+
Covariant return methods is a runtime feature designed to support the [covariant return types](https://github.com/dotnet/csharplang/blob/master/proposals/csharp-9.0/covariant-returns.md) and [records](https://github.com/dotnet/csharplang/blob/master/proposals/csharp-9.0/records.md) C# language features posed for C# 9.0.
44

55
This feature allows an overriding method to have a return type that is different than the one on the method it overrides, but compatible with it. The type compability rules are defined in ECMA I.8.7.1. Example: using a more derived return type.
66

‎docs/design/features/dotnet-pgo.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ set COMPLUS_TC_QuickJitForLoops=
4444
set COMPLUS_TC_CallCountThreshold=
4545
set COMPLUS_ReadyToRun=
4646
47-
dotnet-pgo --trace trace.nettrace --output trace.mibc
47+
dotnet-pgo create-mibc --trace trace.nettrace --output trace.mibc
4848
4949
dotnet publish --runtime win-x64 -p:PublishReadyToRun=true -p:ReadyToRunOptimizationData=trace.mibc
5050
```

0 commit comments

Comments
 (0)