Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Suppressing RequiresDynamicCodeAttribute for Compiled Regex #67299

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
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
  •  
  •  
  •  
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.22173.1",
"version": "1.0.0-prerelease.22206.1",
"commands": [
"xharness"
]
Expand Down
48 changes: 24 additions & 24 deletions .github/fabricbot.json
Original file line number Diff line number Diff line change
Expand Up @@ -4562,7 +4562,7 @@
{
"name": "isInProjectColumn",
"parameters": {
"projectName": "Area Pod: Carlos / Jeremy - Issue Triage",
"projectName": "Area Pod: Carlos / Viktor - Issue Triage",
"columnName": "Triaged",
"isOrgProject": true
}
Expand Down Expand Up @@ -4671,7 +4671,7 @@
{
"name": "isInProject",
"parameters": {
"projectName": "Area Pod: Carlos / Jeremy - Issue Triage",
"projectName": "Area Pod: Carlos / Viktor - Issue Triage",
"isOrgProject": true
}
}
Expand All @@ -4682,12 +4682,12 @@
"issues",
"project_card"
],
"taskName": "[Area Pod: Carlos / Jeremy - Issue Triage] Moved to Another Area",
"taskName": "[Area Pod: Carlos / Viktor - Issue Triage] Moved to Another Area",
"actions": [
{
"name": "addToProject",
"parameters": {
"projectName": "Area Pod: Carlos / Jeremy - Issue Triage",
"projectName": "Area Pod: Carlos / Viktor - Issue Triage",
"columnName": "Triaged",
"isOrgProject": true
}
Expand Down Expand Up @@ -4854,7 +4854,7 @@
{
"name": "isInProject",
"parameters": {
"projectName": "Area Pod: Carlos / Jeremy - Issue Triage",
"projectName": "Area Pod: Carlos / Viktor - Issue Triage",
"isOrgProject": true
}
}
Expand All @@ -4863,7 +4863,7 @@
{
"name": "isInProjectColumn",
"parameters": {
"projectName": "Area Pod: Carlos / Jeremy - Issue Triage",
"projectName": "Area Pod: Carlos / Viktor - Issue Triage",
"isOrgProject": true,
"columnName": "Triaged"
}
Expand All @@ -4877,19 +4877,19 @@
"issues",
"project_card"
],
"taskName": "[Area Pod: Carlos / Jeremy - Issue Triage] Needs Triage",
"taskName": "[Area Pod: Carlos / Viktor - Issue Triage] Needs Triage",
"actions": [
{
"name": "removeFromProject",
"parameters": {
"projectName": "Area Pod: Carlos / Jeremy - Issue Triage",
"projectName": "Area Pod: Carlos / Viktor - Issue Triage",
"isOrgProject": true
}
},
{
"name": "addToProject",
"parameters": {
"projectName": "Area Pod: Carlos / Jeremy - Issue Triage",
"projectName": "Area Pod: Carlos / Viktor - Issue Triage",
"columnName": "Needs Triage",
"isOrgProject": true
}
Expand Down Expand Up @@ -4989,7 +4989,7 @@
{
"name": "isInProject",
"parameters": {
"projectName": "Area Pod: Carlos / Jeremy - Issue Triage",
"projectName": "Area Pod: Carlos / Viktor - Issue Triage",
"isOrgProject": true
}
}
Expand All @@ -4998,7 +4998,7 @@
{
"name": "isInProjectColumn",
"parameters": {
"projectName": "Area Pod: Carlos / Jeremy - Issue Triage",
"projectName": "Area Pod: Carlos / Viktor - Issue Triage",
"columnName": "Triaged",
"isOrgProject": true
}
Expand All @@ -5011,19 +5011,19 @@
"eventNames": [
"issue_comment"
],
"taskName": "[Area Pod: Carlos / Jeremy - Issue Triage] Needs Further Triage",
"taskName": "[Area Pod: Carlos / Viktor - Issue Triage] Needs Further Triage",
"actions": [
{
"name": "removeFromProject",
"parameters": {
"projectName": "Area Pod: Carlos / Jeremy - Issue Triage",
"projectName": "Area Pod: Carlos / Viktor - Issue Triage",
"isOrgProject": true
}
},
{
"name": "addToProject",
"parameters": {
"projectName": "Area Pod: Carlos / Jeremy - Issue Triage",
"projectName": "Area Pod: Carlos / Viktor - Issue Triage",
"columnName": "Needs Triage",
"isOrgProject": true
}
Expand All @@ -5044,7 +5044,7 @@
{
"name": "isInProject",
"parameters": {
"projectName": "Area Pod: Carlos / Jeremy - Issue Triage",
"projectName": "Area Pod: Carlos / Viktor - Issue Triage",
"isOrgProject": true
}
},
Expand Down Expand Up @@ -5082,12 +5082,12 @@
"issues",
"project_card"
],
"taskName": "[Area Pod: Carlos / Jeremy - Issue Triage] Triaged",
"taskName": "[Area Pod: Carlos / Viktor - Issue Triage] Triaged",
"actions": [
{
"name": "addToProject",
"parameters": {
"projectName": "Area Pod: Carlos / Jeremy - Issue Triage",
"projectName": "Area Pod: Carlos / Viktor - Issue Triage",
"columnName": "Triaged",
"isOrgProject": true
}
Expand Down Expand Up @@ -5117,7 +5117,7 @@
{
"name": "isInProjectColumn",
"parameters": {
"projectName": "Area Pod: Carlos / Jeremy - PRs",
"projectName": "Area Pod: Carlos / Viktor - PRs",
"columnName": "Done",
"isOrgProject": true
}
Expand Down Expand Up @@ -5220,7 +5220,7 @@
{
"name": "isInProject",
"parameters": {
"projectName": "Area Pod: Carlos / Jeremy - PRs",
"projectName": "Area Pod: Carlos / Viktor - PRs",
"isOrgProject": true
}
}
Expand All @@ -5232,12 +5232,12 @@
"issues",
"project_card"
],
"taskName": "[Area Pod: Carlos / Jeremy - PRs] Moved to Another Area",
"taskName": "[Area Pod: Carlos / Viktor - PRs] Moved to Another Area",
"actions": [
{
"name": "addToProject",
"parameters": {
"projectName": "Area Pod: Carlos / Jeremy - PRs",
"projectName": "Area Pod: Carlos / Viktor - PRs",
"columnName": "Done",
"isOrgProject": true
}
Expand Down Expand Up @@ -5314,7 +5314,7 @@
{
"name": "isInProject",
"parameters": {
"projectName": "Area Pod: Carlos / Jeremy - PRs",
"projectName": "Area Pod: Carlos / Viktor - PRs",
"isOrgProject": true
}
}
Expand All @@ -5328,12 +5328,12 @@
"issues",
"project_card"
],
"taskName": "[Area Pod: Carlos / Jeremy - PRs] Needs Champion",
"taskName": "[Area Pod: Carlos / Viktor - PRs] Needs Champion",
"actions": [
{
"name": "addToProject",
"parameters": {
"projectName": "Area Pod: Carlos / Jeremy - PRs",
"projectName": "Area Pod: Carlos / Viktor - PRs",
"columnName": "Needs Champion",
"isOrgProject": true
}
Expand Down
8 changes: 8 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,12 @@
<NetFrameworkToolCurrent>net472</NetFrameworkToolCurrent>
<!-- Don't build for NETFramework during source-build. -->
<NetFrameworkToolCurrent Condition="'$(DotNetBuildFromSource)' == 'true'" />

<TargetFrameworkForNETFrameworkTasks>$(NetFrameworkToolCurrent)</TargetFrameworkForNETFrameworkTasks>
<!-- Don't build for NETFramework during source-build. -->
<TargetFrameworkForNETFrameworkTasks Condition="'$(DotNetBuildFromSource)' == 'true'" />

<TargetFrameworkForNETCoreTasks>$(NetCoreAppToolCurrent)</TargetFrameworkForNETCoreTasks>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -93,6 +99,7 @@
<WorkloadBuildTasksDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'WorkloadBuildTasks', 'Debug', '$(NetCoreAppToolCurrent)', 'publish'))</WorkloadBuildTasksDir>
<MonoAOTCompilerDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'MonoAOTCompiler', 'Debug', '$(NetCoreAppToolCurrent)'))</MonoAOTCompilerDir>
<MonoTargetsTasksDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'MonoTargetsTasks', 'Debug', '$(NetCoreAppToolCurrent)'))</MonoTargetsTasksDir>
<TestExclusionListTasksDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'TestExclusionListTasks', 'Debug', '$(NetCoreAppToolCurrent)'))</TestExclusionListTasksDir>
<InstallerTasksAssemblyPath Condition="'$(MSBuildRuntimeType)' == 'Core'">$([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'installer.tasks', 'Debug', '$(NetCoreAppToolCurrent)', 'installer.tasks.dll'))</InstallerTasksAssemblyPath>
<InstallerTasksAssemblyPath Condition="'$(MSBuildRuntimeType)' != 'Core'">$([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'installer.tasks', 'Debug', '$(NetFrameworkToolCurrent)', 'installer.tasks.dll'))</InstallerTasksAssemblyPath>
<Crossgen2SdkOverridePropsPath Condition="'$(MSBuildRuntimeType)' == 'Core'">$([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'Crossgen2Tasks', 'Debug', '$(NetCoreAppToolCurrent)', 'Microsoft.NET.CrossGen.props'))</Crossgen2SdkOverridePropsPath>
Expand All @@ -104,6 +111,7 @@
<WorkloadBuildTasksAssemblyPath>$([MSBuild]::NormalizePath('$(WorkloadBuildTasksDir)', 'WorkloadBuildTasks.dll'))</WorkloadBuildTasksAssemblyPath>
<MonoAOTCompilerTasksAssemblyPath>$([MSBuild]::NormalizePath('$(MonoAOTCompilerDir)', 'MonoAOTCompiler.dll'))</MonoAOTCompilerTasksAssemblyPath>
<MonoTargetsTasksAssemblyPath>$([MSBuild]::NormalizePath('$(MonoTargetsTasksDir)', 'MonoTargetsTasks.dll'))</MonoTargetsTasksAssemblyPath>
<TestExclusionListTasksAssemblyPath>$([MSBuild]::NormalizePath('$(TestExclusionListTasksDir)', 'TestExclusionListTasks.dll'))</TestExclusionListTasksAssemblyPath>
<ILAsmToolPath Condition="'$(DotNetBuildFromSource)' == 'true'">$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'coreclr', '$(TargetOS).$(TargetArchitecture).$(Configuration)'))</ILAsmToolPath>
</PropertyGroup>

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ Official Starting Page: https://dotnet.microsoft.com
* [Install daily builds](docs/project/dogfooding.md)
* [Documentation](https://docs.microsoft.com/dotnet/core) (Get Started, Tutorials, Porting from .NET Framework, API reference, ...)
* [Deploying apps](https://docs.microsoft.com/dotnet/core/deploying)
* [Supported OS versions](https://github.com/dotnet/core/blob/master/os-lifecycle-policy.md)
* [Roadmap](https://github.com/dotnet/core/blob/master/roadmap.md)
* [Releases](https://github.com/dotnet/core/tree/master/release-notes)
* [Supported OS versions](https://github.com/dotnet/core/blob/main/os-lifecycle-policy.md)
* [Roadmap](https://github.com/dotnet/core/blob/main/roadmap.md)
* [Releases](https://github.com/dotnet/core/tree/main/release-notes)

## How can I contribute?

Expand Down
17 changes: 17 additions & 0 deletions THIRD-PARTY-NOTICES.TXT
Original file line number Diff line number Diff line change
Expand Up @@ -967,6 +967,23 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

License for remote stack unwind (https://github.com/llvm/llvm-project/blob/main/lldb/source/Symbol/CompactUnwindInfo.cpp)
--------------------------------------

Copyright 2019 LLVM Project

Licensed under the Apache License, Version 2.0 (the "License") with LLVM Exceptions;
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

https://llvm.org/LICENSE.txt

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

License notice for Apple header files
-------------------------------------

Expand Down
6 changes: 2 additions & 4 deletions docs/coding-guidelines/coding-style.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
C# Coding Style
===============

For C++ files (*.cpp and *.h), we use clang-format (version 3.8) to ensure code styling. After changing any Cpp or H file and before merging, src/Native/format-code.sh must be run. This script will ensure that all native code files adhere to the coding style guidelines.

For other types of files (xml, bat, sh, etc), our current best guidance is consistency. When editing files, keep new code and changes consistent with the style in the files. For new files, it should conform to the style for that component. If there is a completely new component, anything that is reasonably broadly accepted is fine. For script files, please refer to the scripting blog for [tips](https://devblogs.microsoft.com/scripting/tag/powertip) and [best practices](https://devblogs.microsoft.com/scripting/tag/best-practices).

The general rule we follow is "use Visual Studio defaults".

1. We use [Allman style](http://en.wikipedia.org/wiki/Indent_style#Allman_style) braces, where each brace begins on a new line. A single line statement block can go without braces but the block must be properly indented on its own line and must not be nested in other statement blocks that use braces (See rule 18 for more details). One exception is that a `using` statement is permitted to be nested within another `using` statement by starting on the following line at the same indentation level, even if the nested `using` contains a controlled block.
Expand Down Expand Up @@ -138,3 +134,5 @@ namespace System.Collections.Generics
}
}
```

For other languages, our current best guidance is consistency. When editing files, keep new code and changes consistent with the style in the files. For new files, it should conform to the style for that component. If there is a completely new component, anything that is reasonably broadly accepted is fine. For script files, please refer to the scripting blog for [tips](https://devblogs.microsoft.com/scripting/tag/powertip) and [best practices](https://devblogs.microsoft.com/scripting/tag/best-practices).
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ C:\> set co
```

```
Cor_Enable_Profiling=0x1
COR_PROFILER={C5F90153-B93E-4138-9DB7-EB7156B07C4C}
CORECLR_ENABLE_PROFILING=0x1
CORECLR_PROFILER={C5F90153-B93E-4138-9DB7-EB7156B07C4C}
```

If your scenario doesn't allow you to just run the process from a command prompt, like say an asp.net scenario, you may want to attach a debugger to the process that's supposed to be profiled, or use IFEO (HKEY\_LOCAL\_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options) to force a debugger to start when the worker process starts. In the debugger, you can then use "!peb" to view the environment block, which will include the environment variables.

Once you verify Cor\_Enable\_Profiling and COR\_PROFILER are ok, it's time to search the registry for the very same GUID set in your COR\_PROFILER environment variable. You should find it at a path like this:
Once you verify CORECLR\_ENABLE\_PROFILING and CORECLR\_PROFILER are ok, it's time to search the registry for the very same GUID set in your CORECLR\_PROFILER environment variable. You should find it at a path like this:

HKEY\_LOCAL\_MACHINE\SOFTWARE\Classes\CLSID\{C5F90153-B93E-4138-9DB7-EB7156B07C4C}

Expand Down
Loading