Skip to content

Commit

Permalink
Merge branch 'main' into fast_x64_uint128_div
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel-Svensson committed Apr 19, 2024
2 parents a63f780 + b621129 commit 2aa355d
Show file tree
Hide file tree
Showing 1,116 changed files with 25,954 additions and 13,967 deletions.
21 changes: 21 additions & 0 deletions .config/1espt/PipelineAutobaseliningConfig.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
## DO NOT MODIFY THIS FILE MANUALLY. This is part of auto-baselining from 1ES Pipeline Templates. Go to [https://aka.ms/1espt-autobaselining] for more details.

pipelines:
679:
retail:
binary:
credscan:
lastModifiedDate: 2024-04-11
binskim:
lastModifiedDate: 2024-04-11
spotbugs:
lastModifiedDate: 2024-04-11
source:
credscan:
lastModifiedDate: 2024-04-11
eslint:
lastModifiedDate: 2024-04-11
psscriptanalyzer:
lastModifiedDate: 2024-04-11
armory:
lastModifiedDate: 2024-04-11
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": "9.0.0-prerelease.24203.1",
"version": "9.0.0-prerelease.24208.1",
"commands": [
"xharness"
]
Expand Down
61 changes: 61 additions & 0 deletions .config/guardian/.gdnbaselines
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{
"properties": {
"helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/baselines"
},
"version": "1.0.0",
"baselines": {
"default": {
"name": "default",
"createdDate": "2024-04-10 20:32:31Z",
"lastUpdatedDate": "2024-04-10 20:32:31Z"
}
},
"results": {
"3b1bb0185d74dd310884a85ad1252953dab0747790f5aecd5bf5bb3c1e2b515c": {
"signature": "3b1bb0185d74dd310884a85ad1252953dab0747790f5aecd5bf5bb3c1e2b515c",
"alternativeSignatures": [],
"target": "src/libraries/System.Security.Cryptography/tests/X509Certificates/TestData.cs",
"line": 3441,
"memberOf": [
"default"
],
"tool": "credscan",
"ruleId": "CSCAN-GENERAL0060",
"createdDate": "2024-04-10 20:32:31Z",
"expirationDate": "2024-09-28 00:14:56Z",
"justification": "This error is baselined with an expiration date of 180 days from 2024-04-11 00:14:56Z"
},
"2e4598005fdee72a4700697760c5f1b199c25d15a7c54de438ce939f125f3710": {
"signature": "2e4598005fdee72a4700697760c5f1b199c25d15a7c54de438ce939f125f3710",
"alternativeSignatures": [
"6b533da7f95704f4476b24f493f88b2b1fd7d3bba69105bf63530140e0b3c8f1"
],
"target": "src/libraries/Common/tests/System/Net/Prerequisites/Deployment/setup_activedirectory_domaincontroller.ps1",
"line": 36,
"memberOf": [
"default"
],
"tool": "psscriptanalyzer",
"ruleId": "PSAvoidUsingConvertToSecureStringWithPlainText",
"createdDate": "2024-04-10 20:32:31Z",
"expirationDate": "2024-09-28 00:14:56Z",
"justification": "This error is baselined with an expiration date of 180 days from 2024-04-11 00:14:56Z"
},
"df6d1096725378c354a363dbb40fca84b9eed42a724ffbde7de57a88fc4042df": {
"signature": "df6d1096725378c354a363dbb40fca84b9eed42a724ffbde7de57a88fc4042df",
"alternativeSignatures": [
"b090ab235a86ec5bc15243c19bc432f09e5aef816854bcbe120ab04c7c0332e1"
],
"target": "src/libraries/Common/tests/System/Net/Prerequisites/Deployment/setup_iisserver.ps1",
"line": 82,
"memberOf": [
"default"
],
"tool": "psscriptanalyzer",
"ruleId": "PSAvoidUsingConvertToSecureStringWithPlainText",
"createdDate": "2024-04-10 20:32:31Z",
"expirationDate": "2024-09-28 00:14:56Z",
"justification": "This error is baselined with an expiration date of 180 days from 2024-04-11 00:14:56Z"
}
}
}
209 changes: 207 additions & 2 deletions .github/policies/resourceManagement.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,213 @@ configuration:
- or:
- payloadType: Issues
- payloadType: Pull_Request
- isAction:
action: Opened
- or:
- labelAdded:
label: area-AssemblyLoader-coreclr
- labelAdded:
label: area-AssemblyLoader-mono
- labelAdded:
label: area-CodeGen-coreclr
- labelAdded:
label: area-Codegen-Interpreter-mono
- labelAdded:
label: area-Codegen-JIT-Mono
- labelAdded:
label: area-CodeGen-LLVM-Mono
- labelAdded:
label: area-Codegen-Intrinsics-mono
- labelAdded:
label: area-CodeGen-meta-Mono
- labelAdded:
label: area-System.DateTime
- labelAdded:
label: area-Debugger-mono
- labelAdded:
label: area-DependencyModel
- labelAdded:
label: area-Diagnostics-coreclr
- labelAdded:
label: area-Extensions-Caching
- labelAdded:
label: area-Extensions-Configuration
- labelAdded:
label: area-Extensions-DependencyInjection
- labelAdded:
label: area-Extensions-FileSystem
- labelAdded:
label: area-Extensions-Hosting
- labelAdded:
label: area-Extensions-HttpClientFactory
- labelAdded:
label: area-Extensions-Logging
- labelAdded:
label: area-Extensions-Options
- labelAdded:
label: area-Extensions-Primitives
- labelAdded:
label: area-GC-coreclr
- labelAdded:
label: area-GC-mono
- labelAdded:
label: area-Host
- labelAdded:
label: area-HostModel
- labelAdded:
label: area-ILTools-coreclr
- labelAdded:
label: area-Tools-ILVerification
- labelAdded:
label: area-Infrastructure
- labelAdded:
label: area-Infrastructure-coreclr
- labelAdded:
label: area-Infrastructure-libraries
- labelAdded:
label: area-Infrastructure-mono
- labelAdded:
label: area-Meta
- labelAdded:
label: area-Microsoft.CSharp
- labelAdded:
label: area-Microsoft.Extensions
- labelAdded:
label: area-Microsoft.VisualBasic
- labelAdded:
label: area-Microsoft.Win32
- labelAdded:
label: area-NativeAOT-coreclr
- labelAdded:
label: area-Single-File
- labelAdded:
label: area-System.Buffers
- labelAdded:
label: area-System.CodeDom
- labelAdded:
label: area-System.Collections
- labelAdded:
label: area-System.ComponentModel
- labelAdded:
label: area-System.ComponentModel.Composition
- labelAdded:
label: area-System.ComponentModel.DataAnnotations
- labelAdded:
label: area-System.Composition
- labelAdded:
label: area-System.Configuration
- labelAdded:
label: area-System.Console
- labelAdded:
label: area-System.Data
- labelAdded:
label: area-System.Data.Odbc
- labelAdded:
label: area-System.Data.OleDB
- labelAdded:
label: area-System.Data.SqlClient
- labelAdded:
label: area-System.Diagnostics
- labelAdded:
label: area-System.Diagnostics.Activity
- labelAdded:
label: area-System.Diagnostics.EventLog
- labelAdded:
label: area-System.Diagnostics.PerformanceCounter
- labelAdded:
label: area-System.Diagnostics.Process
- labelAdded:
label: area-System.Diagnostics.TraceSource
- labelAdded:
label: area-System.Diagnostics.Tracing
- labelAdded:
label: area-System.DirectoryServices
- labelAdded:
label: area-System.Drawing
- labelAdded:
label: area-System.Dynamic.Runtime
- labelAdded:
label: area-System.Formats.Asn1
- labelAdded:
label: area-System.Formats.Cbor
- labelAdded:
label: area-System.Formats.Tar
- labelAdded:
label: area-System.Globalization
- labelAdded:
label: area-System.IO
- labelAdded:
label: area-System.IO.Compression
- labelAdded:
label: area-System.IO.Hashing
- labelAdded:
label: area-System.IO.Ports
- labelAdded:
label: area-System.Linq
- labelAdded:
label: area-System.Linq.Expressions
- labelAdded:
label: area-System.Linq.Parallel
- labelAdded:
label: area-System.Management
- labelAdded:
label: area-System.Memory
- labelAdded:
label: area-System.Net
- labelAdded:
label: area-System.Net.Http
- labelAdded:
label: area-System.Net.Quic
- labelAdded:
label: area-System.Net.Security
- labelAdded:
label: area-System.Net.Sockets
- labelAdded:
label: area-System.Numerics
- labelAdded:
label: area-System.Numerics.Tensors
- labelAdded:
label: area-System.Reflection
- labelAdded:
label: area-System.Reflection.Emit
- labelAdded:
label: area-System.Reflection.Metadata
- labelAdded:
label: area-System.Resources
- labelAdded:
label: area-System.Runtime
- labelAdded:
label: area-System.Runtime.CompilerServices
- labelAdded:
label: area-System.Runtime.InteropServices
- labelAdded:
label: area-System.Runtime.Intrinsics
- labelAdded:
label: area-System.Security
- labelAdded:
label: area-System.ServiceProcess
- labelAdded:
label: area-System.Speech
- labelAdded:
label: area-System.Text.Encoding
- labelAdded:
label: area-System.Text.Encodings.Web
- labelAdded:
label: area-System.Text.Json
- labelAdded:
label: area-System.Text.RegularExpressions
- labelAdded:
label: area-System.Threading
- labelAdded:
label: area-System.Threading.Channels
- labelAdded:
label: area-System.Threading.Tasks
- labelAdded:
label: area-System.Transactions
- labelAdded:
label: area-System.Xml
- labelAdded:
label: area-Tools-ILLink
- labelAdded:
label: area-vm-coreclr
then:
- if:
- hasLabel:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bump-chrome-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
run: >-
make -C src/mono/wasm build-tasks &&
PATH=$PWD/.dotnet:$PATH dotnet build eng/testing/bump-chrome-version.proj -p:Configuration=Release &&
git add eng/testing/ChromeVersions.props &&
git add eng/testing/BrowserVersions.props &&
cat eng/testing/bump-chrome-pr.env >> "$GITHUB_ENV"
- name: Check for changes
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/locker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,14 @@ permissions:
jobs:
main:
runs-on: ubuntu-latest
if: ${{ github.repository_owner == 'dotnet' }}
steps:
- name: Checkout Actions
uses: actions/checkout@v4
with:
repository: "microsoft/vscode-github-triage-actions"
path: ./actions
ref: cd16cd2aad6ba2da74bb6c6f7293adddd579a90e
ref: 066bee9cefa6f0b4bf306040ff36fc7d96a6d56d # locker action commit sha
- name: Install Actions
run: npm install --production --prefix ./actions
- name: Run Locker
Expand Down
5 changes: 3 additions & 2 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,10 @@
</PropertyGroup>

<PropertyGroup>
<!-- when building from source we need to use the current version of MetadataLoadContext as the toolset version, but source-build imports
another props file which overrides the SystemReflectionMetadataLoadContextVersion from Version.props so we can't set it there -->
<!-- when building from source we need to use the current version of various packages as the toolset version, but source-build imports
another props file which overrides the versions from Version.props so we can't set it there -->
<SystemReflectionMetadataLoadContextToolsetVersion Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(SystemReflectionMetadataLoadContextVersion)</SystemReflectionMetadataLoadContextToolsetVersion>
<SystemTextJsonToolsetVersion Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(SystemTextJsonVersion)</SystemTextJsonToolsetVersion>
</PropertyGroup>

<Target Name="ValidateTargetOSLowercase"
Expand Down
4 changes: 2 additions & 2 deletions docs/design/datacontracts/contract-descriptor.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ struct DotNetRuntimeContractDescriptor
uint32_t flags;
uint32_t descriptor_size;
const char *descriptor;
uint32_t aux_data_count;
uint32_t pointer_data_count;
uint32_t pad0;
uintptr_t *aux_data;
uintptr_t *pointer_data;
};
```

Expand Down
4 changes: 4 additions & 0 deletions docs/design/datacontracts/data/empty.jsonc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// the empty baseline data descriptor
{
"version": 0
}
1 change: 1 addition & 0 deletions docs/project/list-of-diagnostics.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ The PR that reveals the implementation of the `<IncludeInternalObsoleteAttribute
| __`SYSLIB0052`__ | This API supports obsolete mechanisms for Regex extensibility. It is not supported. |
| __`SYSLIB0053`__ | AesGcm should indicate the required tag size for encryption and decryption. Use a constructor that accepts the tag size. |
| __`SYSLIB0054`__ | Thread.VolatileRead and Thread.VolatileWrite are obsolete. Use Volatile.Read or Volatile.Write respectively instead. |
| __`SYSLIB0055`__ | The underlying hardware instruction does not perform a signed saturate narrowing operation, and it always returns an unsigned result. Use the unsigned overload instead. |

## Analyzer Warnings

Expand Down
Loading

0 comments on commit 2aa355d

Please sign in to comment.