Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Prev Previous commit
Merge branch 'main' into mapichov/44580_quic_update
  • Loading branch information
ManickaP committed Mar 26, 2021
commit c0f896fec63ec059abddaf4c7f08b395cb2cfb97
60 changes: 1 addition & 59 deletions .config/CredScanSuppressions.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,7 @@
"tool": "Credential Scanner",
"suppressions": [
{
"_justification": "Unit test containing connection strings under the test.",
"file": [
"src/libraries/System.Data.Common/tests/System/Data/Common/DbConnectionStringBuilderTest.cs"
]
},
{
"_justification": "Private key for testing purpose.",
"_justification": "Suppression approved. Private key for testing purpose.",
"file": [
"src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/DSA/DSAKeyPemTests.cs",
"src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/EC/ECKeyPemTests.cs",
Expand All @@ -19,58 +13,6 @@
"-----BEGIN PRIVATE KEY-----",
"-----BEGIN * PRIVATE KEY-----"
]
},
{
"_justification": "Test credential for Uri testing",
"file": [
"src/libraries/System.Net.Http/tests/UnitTests/HttpEnvironmentProxyTest.cs",
"src/libraries/System.Private.Uri/tests/ExtendedFunctionalTests/UriRelativeResolutionTest.cs",
"src/libraries/System.Private.Uri/tests/FunctionalTests/UriBuilderRefreshTest.cs",
"src/libraries/System.Private.Uri/tests/FunctionalTests/UriBuilderTests.cs",
"src/libraries/System.Private.Uri/tests/FunctionalTests/UriRelativeResolutionTest.cs",
"src/libraries/System.Runtime/tests/System/Uri.CreateStringTests.cs"
],
"placeholder": [
"//*:;&$=123USERINFO@",
"//*:bar@",
"//*:bar1@",
"//*:password1@",
"//*:psw@",
"//*:userinfo2@"
]
},
{
"_justification": "Generic test password.",
"file": [
"src/libraries/Common/tests/System/Net/Configuration.Certificates.cs",
"src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Authentication.cs",
"src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.cs",
"src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.DefaultProxyCredentials.cs",
"src/libraries/Common/tests/System/Net/Http/PostScenarioTest.cs",
"src/libraries/Common/tests/System/Net/Prerequisites/Deployment/setup_certificates.ps1",
"src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs",
"src/libraries/System.Net.Http/tests/UnitTests/DigestAuthenticationTests.cs",
"src/libraries/System.Net.Http/tests/UnitTests/HttpEnvironmentProxyTest.cs",
"src/libraries/System.Net.Mail/tests/Functional/SmtpClientTest.cs",
"src/libraries/System.Security.Cryptography.Xml/tests/SignedXmlTest.cs",
"src/libraries/System.Security.Cryptography.Xml/tests/TestHelpers.cs",
"src/libraries/System.Security.Cryptography.Csp/tests/PasswordDeriveBytesTests.cs",
"src/libraries/System.Security.Cryptography.Csp/tests/TrimmingTests/PasswordDeriveBytesTest.cs",
"src/libraries/System.Security.Cryptography.Algorithms/tests/Rfc2898OneShotTests.cs"
],
"placeholder": [
"\"anotherpassword\"",
"\"bar\"",
"\"mono\"",
"\"password1\"",
"\"rightpassword\"",
"\"testcertificate\"",
"\"unused\"",
"\"wrongpassword\"",
"\"PasswordGoesHere\"",
"\"FakePasswordsAreHard\"",
"\"tired\""
]
}
]
}
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.21173.1",
"version": "1.0.0-prerelease.21175.2",
"commands": [
"xharness"
]
Expand Down
3 changes: 2 additions & 1 deletion docs/coding-guidelines/coding-style.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ The general rule we follow is "use Visual Studio defaults".
Consider enabling "View White Space (Ctrl+R, Ctrl+W)" or "Edit -> Advanced -> View White Space" if using Visual Studio to aid detection.
9. If a file happens to differ in style from these guidelines (e.g. private members are named `m_member`
rather than `_member`), the existing style in that file takes precedence.
10. We only use `var` when it's obvious what the variable type is (e.g. `var stream = new FileStream(...)` not `var stream = OpenStandardInput()`).
10. We only use `var` when the type is explicitly named on the right-hand side, typically due to either `new` or an explicit cast, e.g. `var stream = new FileStream(...)` not `var stream = OpenStandardInput()`.
11. We use language keywords instead of BCL types (e.g. `int, string, float` instead of `Int32, String, Single`, etc) for both type references as well as method calls (e.g. `int.Parse` instead of `Int32.Parse`). See issue [#13976](https://github.com/dotnet/runtime/issues/13976) for examples.
12. We use PascalCasing to name all our constant local variables and fields. The only exception is for interop code where the constant value should exactly match the name and value of the code you are calling via interop.
13. We use PascalCasing for all method names, including local functions.
Expand All @@ -35,6 +35,7 @@ The general rule we follow is "use Visual Studio defaults".
- Never use single-line form (for example: `if (source == null) throw new ArgumentNullException("source");`)
- Using braces is always accepted, and required if any block of an `if`/`else if`/.../`else` compound statement uses braces or if a single statement body spans multiple lines.
- Braces may be omitted only if the body of *every* block associated with an `if`/`else if`/.../`else` compound statement is placed on a single line.
19. Make all internal and private types static or sealed unless derivation from them is required. As with any implementation detail, they can be changed if/when derivation is required in the future.

An [EditorConfig](https://editorconfig.org "EditorConfig homepage") file (`.editorconfig`) has been provided at the root of the runtime repository, enabling C# auto-formatting conforming to the above guidelines.

Expand Down
112 changes: 56 additions & 56 deletions eng/Version.Details.xml
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.21167.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21175.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21167.3">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21175.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21167.3">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21175.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21167.3">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21175.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21167.3">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21175.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21167.3">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21175.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21167.3">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21175.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21167.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21175.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21167.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21175.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21173.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21175.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>91c8909b64fc346c7a44384a10ee9a45a7e3455d</Sha>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21167.3">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21175.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21167.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21175.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21167.3">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21175.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21167.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21175.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21167.3">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21175.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21167.3">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21175.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20200806.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand All @@ -94,41 +94,41 @@
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>140434f7109d357d0158ade9e5164a4861513965</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="6.0.0-beta.21162.1">
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="6.0.0-beta.21174.2">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>f01b1fca0c9157a16ade2629eb7d49a220b7e9ba</Sha>
<Sha>055ed026132a7070e41629cfb5e410f0fcbdf948</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common.TestData" Version="6.0.0-beta.21162.1">
<Dependency Name="System.Drawing.Common.TestData" Version="6.0.0-beta.21174.2">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>f01b1fca0c9157a16ade2629eb7d49a220b7e9ba</Sha>
<Sha>055ed026132a7070e41629cfb5e410f0fcbdf948</Sha>
</Dependency>
<Dependency Name="System.IO.Compression.TestData" Version="6.0.0-beta.21162.1">
<Dependency Name="System.IO.Compression.TestData" Version="6.0.0-beta.21174.2">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>f01b1fca0c9157a16ade2629eb7d49a220b7e9ba</Sha>
<Sha>055ed026132a7070e41629cfb5e410f0fcbdf948</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging.TestData" Version="6.0.0-beta.21162.1">
<Dependency Name="System.IO.Packaging.TestData" Version="6.0.0-beta.21174.2">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>f01b1fca0c9157a16ade2629eb7d49a220b7e9ba</Sha>
<Sha>055ed026132a7070e41629cfb5e410f0fcbdf948</Sha>
</Dependency>
<Dependency Name="System.Net.TestData" Version="6.0.0-beta.21162.1">
<Dependency Name="System.Net.TestData" Version="6.0.0-beta.21174.2">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>f01b1fca0c9157a16ade2629eb7d49a220b7e9ba</Sha>
<Sha>055ed026132a7070e41629cfb5e410f0fcbdf948</Sha>
</Dependency>
<Dependency Name="System.Private.Runtime.UnicodeData" Version="6.0.0-beta.21162.1">
<Dependency Name="System.Private.Runtime.UnicodeData" Version="6.0.0-beta.21174.2">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>f01b1fca0c9157a16ade2629eb7d49a220b7e9ba</Sha>
<Sha>055ed026132a7070e41629cfb5e410f0fcbdf948</Sha>
</Dependency>
<Dependency Name="System.Runtime.TimeZoneData" Version="6.0.0-beta.21162.1">
<Dependency Name="System.Runtime.TimeZoneData" Version="6.0.0-beta.21174.2">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>f01b1fca0c9157a16ade2629eb7d49a220b7e9ba</Sha>
<Sha>055ed026132a7070e41629cfb5e410f0fcbdf948</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="6.0.0-beta.21162.1">
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="6.0.0-beta.21174.2">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>f01b1fca0c9157a16ade2629eb7d49a220b7e9ba</Sha>
<Sha>055ed026132a7070e41629cfb5e410f0fcbdf948</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions.TestData" Version="6.0.0-beta.21162.1">
<Dependency Name="System.Windows.Extensions.TestData" Version="6.0.0-beta.21174.2">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>f01b1fca0c9157a16ade2629eb7d49a220b7e9ba</Sha>
<Sha>055ed026132a7070e41629cfb5e410f0fcbdf948</Sha>
</Dependency>
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.21172.2">
<Uri>https://github.com/dotnet/llvm-project</Uri>
Expand Down Expand Up @@ -198,17 +198,17 @@
<Uri>https://github.com/mono/linker</Uri>
<Sha>2f5594e95e1a5227103b9b7d6b92f4b2250be2d7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21173.1">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21175.2">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>bb960200cb1f171f11ecd8cf9e45d97218e2241e</Sha>
<Sha>f4d7df9189d3b8ab04c6ba9a94dc8ccff255224e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21173.1">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21175.2">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>bb960200cb1f171f11ecd8cf9e45d97218e2241e</Sha>
<Sha>f4d7df9189d3b8ab04c6ba9a94dc8ccff255224e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageValidation" Version="6.0.0-beta.21167.3">
<Dependency Name="Microsoft.DotNet.PackageValidation" Version="6.0.0-beta.21175.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.