Skip to content

Commit a3ca77d

Browse files
EgorBoEgorBo
committed
Merge branch 'main' of github.com:dotnet/runtime into jit-inlined-is-static-inited-check
2 parents 667ba3d + 49eed0e commit a3ca77d

File tree

410 files changed

+10776
-5531
lines changed

Some content is hidden

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

410 files changed

+10776
-5531
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.21152.1",
18+
"version": "1.0.0-prerelease.21154.2",
1919
"commands": [
2020
"xharness"
2121
]

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ dotnet build -p:Configuration=Release
3535
set COMPLUS_TieredPGO=1
3636
set COMPLUS_TC_QuickJitForLoops=1
3737
set COMPLUS_TC_CallCountThreshold=10000
38-
set COMPLUS_ZapDisable=1
38+
set COMPLUS_ReadyToRun=0
3939
4040
dotnet-trace collect --providers Microsoft-Windows-DotNETRuntime:0x1E000080018:4 -- bin\Release\net6.0\pgotest.exe
4141
4242
set COMPLUS_TieredPGO=
4343
set COMPLUS_TC_QuickJitForLoops=
4444
set COMPLUS_TC_CallCountThreshold=
45-
set COMPLUS_ZapDisable=
45+
set COMPLUS_ReadyToRun=
4646
4747
dotnet-pgo --trace trace.nettrace --output trace.mibc
4848
@@ -94,9 +94,9 @@ Merge multiple Mibc profile data files into one file.
9494
```
9595
usage: dotnet-pgo merge --input <arg>... --output-file-name <arg> [--exclude-reference <arg>] [--verbosity <arg>] [--compressed] [-h]
9696
97-
-i, --input <arg> Specify the trace file to be parsed.
97+
-i, --input <arg> Specify the input file(s) to be parsed. Multiple --input options may be specified. The wild cards * and ? are supported by this option.
9898
-o, --output-file-name <arg> Specify the output filename to be created.
99-
--exclude-reference <arg> Exclude references to the specified assembly from the output.
99+
--include-reference <arg> If specified, include in Mibc file only references to the specified assemblies. Assemblies are specified as assembly names, not filenames. For instance, "System.Private.CoreLib" not "System.Private.CoreLib.dll". Multiple --include-reference options may be specified.
100100
-v, --verbosity <arg> Adjust verbosity level. Supported levels are minimal, normal, detailed, and diagnostic.
101101
--compressed Generate compressed mibc
102102
-h, --help Display this usage message.
@@ -106,6 +106,6 @@ usage: dotnet-pgo merge --input <arg>... --output-file-name <arg> [--exclude-ref
106106

107107
At least one `--input` switch must be specified. Only one `--output-file-name` may be specified.
108108

109-
The `--exclude-reference` switch may be used to remove any references to the specified assembly from the output mibc.
109+
The `--include-reference` switch may be used to restrict the contents of the mibc file to only refer to a specific set of assemblies.
110110

111111
The mibc file format may be compressed. This will require slightly more time to create and process, but it will produce a smaller binary if the mibc files needs to be distributed to multiple developers. Create a compressed mibc by using the `--compressed` switch.

‎docs/workflow/building/mono/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ The following packages will be created under `artifacts\packages\<configuration>
8585
Try the sample at `src/mono/sample/HelloWorld`.
8686
To run this sample, from the above folder
8787
```cd ../..
88-
make run-sample
88+
make run
8989
```
9090

9191
## Important Notes

‎docs/workflow/testing/libraries/filtering-tests.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ This attribute returns the 'failing' category, which is disabled by default.
6262
```cs
6363
[ActiveIssue(string issue, TestPlatforms platforms, TargetFrameworkMonikers frameworks)]
6464
```
65+
**Disable using PlatformDetection filter:**
66+
```cs
67+
[ActiveIssue(string issue, typeof(PlatformDetection), nameof(PlatformDetection.{member name}))]
68+
```
6569
Use this attribute over test methods to skip failing tests only on the specific platforms and the specific target frameworks.
6670

6771
#### SkipOnTargetFrameworkAttribute

‎eng/Version.Details.xml

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -6,69 +6,69 @@
66
</Dependency>
77
</ProductDependencies>
88
<ToolsetDependencies>
9-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21125.5">
9+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21152.1">
1010
<Uri>https://github.com/dotnet/arcade</Uri>
11-
<Sha>15246f4af00a1cb2e580783d32ec2937b1878a64</Sha>
11+
<Sha>f95dc73e2028d630d67b782c9dcccbe464cf9677</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21125.5">
13+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21152.1">
1414
<Uri>https://github.com/dotnet/arcade</Uri>
15-
<Sha>15246f4af00a1cb2e580783d32ec2937b1878a64</Sha>
15+
<Sha>f95dc73e2028d630d67b782c9dcccbe464cf9677</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21125.5">
17+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21152.1">
1818
<Uri>https://github.com/dotnet/arcade</Uri>
19-
<Sha>15246f4af00a1cb2e580783d32ec2937b1878a64</Sha>
19+
<Sha>f95dc73e2028d630d67b782c9dcccbe464cf9677</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21125.5">
21+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21152.1">
2222
<Uri>https://github.com/dotnet/arcade</Uri>
23-
<Sha>15246f4af00a1cb2e580783d32ec2937b1878a64</Sha>
23+
<Sha>f95dc73e2028d630d67b782c9dcccbe464cf9677</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21125.5">
25+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21152.1">
2626
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>15246f4af00a1cb2e580783d32ec2937b1878a64</Sha>
27+
<Sha>f95dc73e2028d630d67b782c9dcccbe464cf9677</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21125.5">
29+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21152.1">
3030
<Uri>https://github.com/dotnet/arcade</Uri>
31-
<Sha>15246f4af00a1cb2e580783d32ec2937b1878a64</Sha>
31+
<Sha>f95dc73e2028d630d67b782c9dcccbe464cf9677</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21125.5">
33+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21152.1">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>15246f4af00a1cb2e580783d32ec2937b1878a64</Sha>
35+
<Sha>f95dc73e2028d630d67b782c9dcccbe464cf9677</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21125.5">
37+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21152.1">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>15246f4af00a1cb2e580783d32ec2937b1878a64</Sha>
39+
<Sha>f95dc73e2028d630d67b782c9dcccbe464cf9677</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21125.5">
41+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21152.1">
4242
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>15246f4af00a1cb2e580783d32ec2937b1878a64</Sha>
43+
<Sha>f95dc73e2028d630d67b782c9dcccbe464cf9677</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21125.5">
45+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21152.1">
4646
<Uri>https://github.com/dotnet/arcade</Uri>
47-
<Sha>15246f4af00a1cb2e580783d32ec2937b1878a64</Sha>
47+
<Sha>f95dc73e2028d630d67b782c9dcccbe464cf9677</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21125.5">
49+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21152.1">
5050
<Uri>https://github.com/dotnet/arcade</Uri>
51-
<Sha>15246f4af00a1cb2e580783d32ec2937b1878a64</Sha>
51+
<Sha>f95dc73e2028d630d67b782c9dcccbe464cf9677</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21125.5">
53+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21152.1">
5454
<Uri>https://github.com/dotnet/arcade</Uri>
55-
<Sha>15246f4af00a1cb2e580783d32ec2937b1878a64</Sha>
55+
<Sha>f95dc73e2028d630d67b782c9dcccbe464cf9677</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21125.5">
57+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21152.1">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>15246f4af00a1cb2e580783d32ec2937b1878a64</Sha>
59+
<Sha>f95dc73e2028d630d67b782c9dcccbe464cf9677</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21125.5">
61+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21152.1">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>15246f4af00a1cb2e580783d32ec2937b1878a64</Sha>
63+
<Sha>f95dc73e2028d630d67b782c9dcccbe464cf9677</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21125.5">
65+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21152.1">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>15246f4af00a1cb2e580783d32ec2937b1878a64</Sha>
67+
<Sha>f95dc73e2028d630d67b782c9dcccbe464cf9677</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21125.5">
69+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21152.1">
7070
<Uri>https://github.com/dotnet/arcade</Uri>
71-
<Sha>15246f4af00a1cb2e580783d32ec2937b1878a64</Sha>
71+
<Sha>f95dc73e2028d630d67b782c9dcccbe464cf9677</Sha>
7272
</Dependency>
7373
<Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20200806.6">
7474
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
@@ -130,37 +130,37 @@
130130
<Uri>https://github.com/dotnet/runtime-assets</Uri>
131131
<Sha>ad3e62eb902b7ab02a12ea40d35e0d35e067afe3</Sha>
132132
</Dependency>
133-
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.21151.1">
133+
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.21154.1">
134134
<Uri>https://github.com/dotnet/llvm-project</Uri>
135-
<Sha>380f74637f22577be108919689a6536b395b4a3e</Sha>
135+
<Sha>f2a7fc3d94f1a30b822d79ffe453e6b88ae242cf</Sha>
136136
</Dependency>
137-
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.21151.1">
137+
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.21154.1">
138138
<Uri>https://github.com/dotnet/llvm-project</Uri>
139-
<Sha>380f74637f22577be108919689a6536b395b4a3e</Sha>
139+
<Sha>f2a7fc3d94f1a30b822d79ffe453e6b88ae242cf</Sha>
140140
</Dependency>
141-
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.21151.1">
141+
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.21154.1">
142142
<Uri>https://github.com/dotnet/llvm-project</Uri>
143-
<Sha>380f74637f22577be108919689a6536b395b4a3e</Sha>
143+
<Sha>f2a7fc3d94f1a30b822d79ffe453e6b88ae242cf</Sha>
144144
</Dependency>
145-
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.21151.1">
145+
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.21154.1">
146146
<Uri>https://github.com/dotnet/llvm-project</Uri>
147-
<Sha>380f74637f22577be108919689a6536b395b4a3e</Sha>
147+
<Sha>f2a7fc3d94f1a30b822d79ffe453e6b88ae242cf</Sha>
148148
</Dependency>
149-
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.21151.1">
149+
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.21154.1">
150150
<Uri>https://github.com/dotnet/llvm-project</Uri>
151-
<Sha>380f74637f22577be108919689a6536b395b4a3e</Sha>
151+
<Sha>f2a7fc3d94f1a30b822d79ffe453e6b88ae242cf</Sha>
152152
</Dependency>
153-
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.21151.1">
153+
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.21154.1">
154154
<Uri>https://github.com/dotnet/llvm-project</Uri>
155-
<Sha>380f74637f22577be108919689a6536b395b4a3e</Sha>
155+
<Sha>f2a7fc3d94f1a30b822d79ffe453e6b88ae242cf</Sha>
156156
</Dependency>
157-
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.21151.1">
157+
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.21154.1">
158158
<Uri>https://github.com/dotnet/llvm-project</Uri>
159-
<Sha>380f74637f22577be108919689a6536b395b4a3e</Sha>
159+
<Sha>f2a7fc3d94f1a30b822d79ffe453e6b88ae242cf</Sha>
160160
</Dependency>
161-
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.21151.1">
161+
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.21154.1">
162162
<Uri>https://github.com/dotnet/llvm-project</Uri>
163-
<Sha>380f74637f22577be108919689a6536b395b4a3e</Sha>
163+
<Sha>f2a7fc3d94f1a30b822d79ffe453e6b88ae242cf</Sha>
164164
</Dependency>
165165
<Dependency Name="Microsoft.NETCore.App" Version="5.0.0-rc.1.20451.14">
166166
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -198,13 +198,13 @@
198198
<Uri>https://github.com/mono/linker</Uri>
199199
<Sha>0c4902a114192fce1e7570d998e70d24669e9cc3</Sha>
200200
</Dependency>
201-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21152.1">
201+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21154.2">
202202
<Uri>https://github.com/dotnet/xharness</Uri>
203-
<Sha>42b46b78f4c10db3baf61ddc5b1129a61e2e75bc</Sha>
203+
<Sha>645910141e0ef98efee3c5bf9128b8fefb1a3c01</Sha>
204204
</Dependency>
205-
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21152.1">
205+
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21154.2">
206206
<Uri>https://github.com/dotnet/xharness</Uri>
207-
<Sha>42b46b78f4c10db3baf61ddc5b1129a61e2e75bc</Sha>
207+
<Sha>645910141e0ef98efee3c5bf9128b8fefb1a3c01</Sha>
208208
</Dependency>
209209
</ToolsetDependencies>
210210
</Dependencies>

0 commit comments

Comments
 (0)