Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into mod-opt-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
TIHan committed Jun 8, 2022
2 parents 68d8df9 + c0e9075 commit e9d332f
Show file tree
Hide file tree
Showing 68 changed files with 2,470 additions and 955 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
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.22270.1",
"version": "1.0.0-prerelease.22305.1",
"commands": [
"xharness"
]
Expand Down
7 changes: 7 additions & 0 deletions docs/design/specs/Ecma-335-Augments.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ This is a list of additions and edits to be made in ECMA-335 specifications. It
- [Ref field support](#ref-fields)
- [Rules for IL rewriters](#rules-for-il-rewriters)
- [Checked user-defined operators](#checked-user-defined-operators)
- [Atomic reads and writes](#atomic-reads-and-writes)

## Signatures

Expand Down Expand Up @@ -1013,3 +1014,9 @@ Section "I.10.3.3 Conversion operators" of ECMA-335 adds *op_CheckedExplicit* as
implementing checked explicit conversion operator.

A checked user-defined operator is expected to throw an exception when the result of an operation is too large to represent in the destination type. What does it mean to be too large actually depends on the nature of the destination type. Typically the exception thrown is a System.OverflowException.

## Atomic reads and writes

Section "I.12.6.6 Atomic reads and writes" adds clarification that the atomicity guarantees apply to built-in primitive value types and pointers only.

A conforming CLI shall guarantee that read and write access of *built-in primitive value types and pointers* to properly aligned memory locations no larger than the native word size (the size of type native int) is atomic (see §I.12.6.2) when all the write accesses to a location are the same size.
457 changes: 232 additions & 225 deletions docs/project/dogfooding.md

Large diffs are not rendered by default.

128 changes: 64 additions & 64 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="7.0.0-preview.5.22269.3">
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="7.0.0-preview.6.22306.1">
<Uri>https://github.com/dotnet/icu</Uri>
<Sha>769d436d511fc775473f2cd9dff15afbe5566010</Sha>
<Sha>7c13e1a1740e54ba0c9b38636ae36195c9e9d3bd</Sha>
</Dependency>
<Dependency Name="System.Net.MsQuic.Transport" Version="7.0.0-alpha.1.22273.1">
<Dependency Name="System.Net.MsQuic.Transport" Version="7.0.0-alpha.1.22301.1">
<Uri>https://github.com/dotnet/msquic</Uri>
<Sha>e9fbff6a1de0e390a636dc73dcd986ffa2ee88e7</Sha>
<Sha>b4d67ca60d3f819e2450095ab8a33a9f65513e4a</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-preview.5.22268.1">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-preview.6.22281.1">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>dca71051151e0515887671938196f3b87ad1c19f</Sha>
<Sha>ea10b4e5534de1806cc2e84ddd3b00eabcab962f</Sha>
</Dependency>
<Dependency Name="System.ServiceModel.Primitives" Version="4.9.0-rc2.21473.1">
<Uri>https://github.com/dotnet/wcf</Uri>
Expand Down Expand Up @@ -130,53 +130,53 @@
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>140434f7109d357d0158ade9e5164a4861513965</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.22267.1">
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.22281.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>bef6668f71c27e2e25d63712cbf02f67ef8c7863</Sha>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common.TestData" Version="7.0.0-beta.22267.1">
<Dependency Name="System.Drawing.Common.TestData" Version="7.0.0-beta.22281.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>bef6668f71c27e2e25d63712cbf02f67ef8c7863</Sha>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
</Dependency>
<Dependency Name="System.Formats.Tar.TestData" Version="7.0.0-beta.22267.1">
<Dependency Name="System.Formats.Tar.TestData" Version="7.0.0-beta.22281.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>bef6668f71c27e2e25d63712cbf02f67ef8c7863</Sha>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
</Dependency>
<Dependency Name="System.IO.Compression.TestData" Version="7.0.0-beta.22267.1">
<Dependency Name="System.IO.Compression.TestData" Version="7.0.0-beta.22281.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>bef6668f71c27e2e25d63712cbf02f67ef8c7863</Sha>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging.TestData" Version="7.0.0-beta.22267.1">
<Dependency Name="System.IO.Packaging.TestData" Version="7.0.0-beta.22281.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>bef6668f71c27e2e25d63712cbf02f67ef8c7863</Sha>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
</Dependency>
<Dependency Name="System.Net.TestData" Version="7.0.0-beta.22267.1">
<Dependency Name="System.Net.TestData" Version="7.0.0-beta.22281.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>bef6668f71c27e2e25d63712cbf02f67ef8c7863</Sha>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
</Dependency>
<Dependency Name="System.Private.Runtime.UnicodeData" Version="7.0.0-beta.22267.1">
<Dependency Name="System.Private.Runtime.UnicodeData" Version="7.0.0-beta.22281.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>bef6668f71c27e2e25d63712cbf02f67ef8c7863</Sha>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
</Dependency>
<Dependency Name="System.Runtime.TimeZoneData" Version="7.0.0-beta.22267.1">
<Dependency Name="System.Runtime.TimeZoneData" Version="7.0.0-beta.22281.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>bef6668f71c27e2e25d63712cbf02f67ef8c7863</Sha>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="7.0.0-beta.22267.1">
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="7.0.0-beta.22281.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>bef6668f71c27e2e25d63712cbf02f67ef8c7863</Sha>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
</Dependency>
<Dependency Name="System.Text.RegularExpressions.TestData" Version="7.0.0-beta.22267.1">
<Dependency Name="System.Text.RegularExpressions.TestData" Version="7.0.0-beta.22281.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>bef6668f71c27e2e25d63712cbf02f67ef8c7863</Sha>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions.TestData" Version="7.0.0-beta.22267.1">
<Dependency Name="System.Windows.Extensions.TestData" Version="7.0.0-beta.22281.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>bef6668f71c27e2e25d63712cbf02f67ef8c7863</Sha>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="7.0.0-beta.22267.1">
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="7.0.0-beta.22281.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>bef6668f71c27e2e25d63712cbf02f67ef8c7863</Sha>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
</Dependency>
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.22259.2">
<Uri>https://github.com/dotnet/llvm-project</Uri>
Expand Down Expand Up @@ -210,81 +210,81 @@
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>54cc196d506692c366d9e116cdb3a9a56342f720</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-preview.5.22272.3">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-preview.6.22305.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0864cc5539e0ddd109b443b0bee804878cd7ba76</Sha>
<Sha>f21ace52e357bbf0019da5c9e42d66705a087235</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHost" Version="7.0.0-preview.5.22272.3">
<Dependency Name="Microsoft.NETCore.DotNetHost" Version="7.0.0-preview.6.22305.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0864cc5539e0ddd109b443b0bee804878cd7ba76</Sha>
<Sha>f21ace52e357bbf0019da5c9e42d66705a087235</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="7.0.0-preview.5.22272.3">
<Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="7.0.0-preview.6.22305.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0864cc5539e0ddd109b443b0bee804878cd7ba76</Sha>
<Sha>f21ace52e357bbf0019da5c9e42d66705a087235</Sha>
</Dependency>
<Dependency Name="runtime.native.System.IO.Ports" Version="7.0.0-preview.5.22272.3">
<Dependency Name="runtime.native.System.IO.Ports" Version="7.0.0-preview.6.22305.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0864cc5539e0ddd109b443b0bee804878cd7ba76</Sha>
<Sha>f21ace52e357bbf0019da5c9e42d66705a087235</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="7.0.0-preview.5.22272.3">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="7.0.0-preview.6.22305.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0864cc5539e0ddd109b443b0bee804878cd7ba76</Sha>
<Sha>f21ace52e357bbf0019da5c9e42d66705a087235</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="7.0.0-preview.5.22272.3">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="7.0.0-preview.6.22305.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0864cc5539e0ddd109b443b0bee804878cd7ba76</Sha>
<Sha>f21ace52e357bbf0019da5c9e42d66705a087235</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="7.0.0-preview.5.22272.3">
<Dependency Name="System.Text.Json" Version="7.0.0-preview.6.22305.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0864cc5539e0ddd109b443b0bee804878cd7ba76</Sha>
<Sha>f21ace52e357bbf0019da5c9e42d66705a087235</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22306.1">
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>1481a51970586b26208a7bc6173dc77d658f3508</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="1.0.0-prerelease.22270.1">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="1.0.0-prerelease.22305.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>9cacd2f874c946a6497110124a2369fb5131c68f</Sha>
<Sha>a1d9a67e971fc0b8724507847491fe93f65728db</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.22270.1">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.22305.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>9cacd2f874c946a6497110124a2369fb5131c68f</Sha>
<Sha>a1d9a67e971fc0b8724507847491fe93f65728db</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.22270.1">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.22305.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>9cacd2f874c946a6497110124a2369fb5131c68f</Sha>
<Sha>a1d9a67e971fc0b8724507847491fe93f65728db</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22255.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ba1c3aff4be864c493031d989259ef92aaa23fc3</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22217.3">
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22279.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>198a04ad65a5c0731fb96dbc464f0a2a25812aff</Sha>
<Sha>d5b85fdae5fa46aa3955218446fb6809aeffb476</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.22217.3">
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.22279.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>198a04ad65a5c0731fb96dbc464f0a2a25812aff</Sha>
<Sha>d5b85fdae5fa46aa3955218446fb6809aeffb476</Sha>
</Dependency>
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.22217.3">
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.22279.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>198a04ad65a5c0731fb96dbc464f0a2a25812aff</Sha>
<Sha>d5b85fdae5fa46aa3955218446fb6809aeffb476</Sha>
</Dependency>
<Dependency Name="optimization.PGO.CoreCLR" Version="1.0.0-prerelease.22217.3">
<Dependency Name="optimization.PGO.CoreCLR" Version="1.0.0-prerelease.22279.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>198a04ad65a5c0731fb96dbc464f0a2a25812aff</Sha>
<Sha>d5b85fdae5fa46aa3955218446fb6809aeffb476</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="1.1.0-alpha.0.22281.2">
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="1.1.0-alpha.0.22306.2">
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
<Sha>09c99e3060bc9e5230bd0638e48535ef15c73160</Sha>
<Sha>3c641f5b79f90b0341bc0b6f728bae56ede711fd</Sha>
</Dependency>
<Dependency Name="System.Runtime.Numerics.TestData" Version="7.0.0-beta.22267.1">
<Dependency Name="System.Runtime.Numerics.TestData" Version="7.0.0-beta.22281.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>bef6668f71c27e2e25d63712cbf02f67ef8c7863</Sha>
<Sha>0920468fa7db4ee8ea8bbcba186421cb92713adf</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0-preview1.22252.2">
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0-preview1.22302.1">
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
<Sha>d2ef898a6283858c1224c0114cd87fa27b6cb091</Sha>
<Sha>114d5f2927b8afc90f169df80fdcbe8c7a644bac</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Compatibility" Version="2.0.0-alpha.1.21525.11">
<Uri>https://github.com/dotnet/sdk</Uri>
Expand Down
Loading

0 comments on commit e9d332f

Please sign in to comment.