Skip to content

Commit 1930315

Browse files
committed
Merge remote-tracking branch 'origin/main' into improve_hot_reload_debug_tests
* origin/main: (274 commits) Disable test ConnectWithCertificateForDifferentName_Throws (dotnet#56456) Update dependencies from https://github.com/mono/linker build 20210726.2 (dotnet#56374) Cleanup disabled test conditions (dotnet#56381) [mono] Add GC unsafe transition to mono_unhandled_exception (dotnet#56380) don't fail the file extraction when we can't set last write time (dotnet#56370) Properly rebuild optimization data when it changes (dotnet#56397) Make open function calls in coreclr EINTR resilient on macOS (dotnet#56403) Fix dependency from EventLog to TraceSource ref (dotnet#56417) Fix comments in asm with JitDiffableDasm=1 (dotnet#56416) Catch TcpClient ctor exceptions in FtpWebRequest.CreateConnectionAsync (dotnet#56379) Add interop between serializer and DOMs (dotnet#56112) Fix type loader not recognizing overridden method (dotnet#56337) Prevent Segfault in EventPipe on disable (dotnet#56104) Update runtimeconfig.json and deps.json paths when these break past the MAX_PATH threshold (dotnet#56224) Use native allocator instead of pinning when decompressing embedded PDB (dotnet#56336) Specify win-x64 as a valid platform in the microsoft-net-runtime-* workloads for iOS/tvOS/MacCatalyst (dotnet#56311) Fix FailFast message formatting race (dotnet#56388) Try to fix finalizer-based async tests (dotnet#56384) Fix MetricsEventSource tests (dotnet#56382) Remove invalid Castle.DynamicProxy.Internal.AbstractInvocation from ILLink descriptor files (dotnet#56392) ...
2 parents 0a734ac + 6c64d2e commit 1930315

847 files changed

Lines changed: 17201 additions & 10087 deletions

File tree

Some content is hidden

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

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

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
/src/libraries/Common/src/Interop/ @dotnet/platform-deps-team
55
/src/libraries/Common/src/System/Net/Http/aspnetcore/ @dotnet/http
66
/src/libraries/Common/tests/Tests/System/Net/aspnetcore/ @dotnet/http
7-
/src/libraries/System.Text.Json/ @steveharter @layomia @Jozkee @eiriktsarpalis
7+
/src/libraries/System.Text.Json/ @steveharter @layomia @eiriktsarpalis
88

99
# CoreCLR Code Owners
1010

.vsconfig

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,55 @@
11
{
22
"version": "1.0",
33
"components": [
4-
"Microsoft.VisualStudio.Component.CoreEditor",
5-
"Microsoft.VisualStudio.Workload.CoreEditor",
6-
"Microsoft.NetCore.Component.SDK",
7-
"Microsoft.VisualStudio.Component.NuGet",
8-
"Microsoft.Net.Component.4.6.1.TargetingPack",
94
"Microsoft.VisualStudio.Component.Roslyn.Compiler",
105
"Microsoft.VisualStudio.Component.Roslyn.LanguageServices",
11-
"Microsoft.VisualStudio.Component.FSharp",
12-
"Microsoft.NetCore.Component.DevelopmentTools",
6+
"Microsoft.Component.MSBuild",
7+
"Microsoft.Net.Component.4.5.2.TargetingPack",
8+
"Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime",
9+
"Microsoft.VisualStudio.Component.SQL.CLR",
10+
"Microsoft.VisualStudio.Component.CoreEditor",
11+
"Microsoft.VisualStudio.Workload.CoreEditor",
1312
"Microsoft.Net.Component.4.8.SDK",
1413
"Microsoft.Net.Component.4.7.2.TargetingPack",
1514
"Microsoft.Net.ComponentGroup.DevelopmentPrerequisites",
16-
"Microsoft.Component.MSBuild",
1715
"Microsoft.VisualStudio.Component.TextTemplating",
18-
"Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime",
19-
"Microsoft.VisualStudio.Component.SQL.CLR",
16+
"Microsoft.VisualStudio.Component.NuGet",
2017
"Microsoft.VisualStudio.Component.ManagedDesktop.Core",
21-
"Microsoft.Net.Component.4.5.2.TargetingPack",
22-
"Microsoft.Net.Component.4.5.TargetingPack",
23-
"Microsoft.VisualStudio.Component.IntelliCode",
24-
"Microsoft.Net.Component.4.TargetingPack",
25-
"Microsoft.Net.Component.4.5.1.TargetingPack",
26-
"Microsoft.Net.Component.4.6.TargetingPack",
27-
"Microsoft.Net.ComponentGroup.TargetingPacks.Common",
18+
"Microsoft.NetCore.Component.SDK",
19+
"Microsoft.VisualStudio.Component.FSharp",
20+
"Microsoft.ComponentGroup.ClickOnce.Publish",
21+
"Microsoft.NetCore.Component.DevelopmentTools",
22+
"Microsoft.Net.Component.4.8.TargetingPack",
23+
"Microsoft.Net.Component.4.6.1.TargetingPack",
2824
"Microsoft.VisualStudio.Component.DiagnosticTools",
25+
"Microsoft.VisualStudio.Component.IntelliCode",
2926
"Microsoft.Net.Component.4.6.2.TargetingPack",
30-
"Microsoft.Net.ComponentGroup.4.6.2.DeveloperTools",
3127
"Microsoft.Net.Component.4.7.TargetingPack",
32-
"Microsoft.Net.ComponentGroup.4.7.DeveloperTools",
33-
"Microsoft.Net.Component.4.8.TargetingPack",
28+
"Microsoft.VisualStudio.Component.ClassDesigner",
29+
"Microsoft.VisualStudio.Component.GraphDocument",
30+
"Microsoft.VisualStudio.Component.CodeMap",
3431
"Microsoft.VisualStudio.Component.VC.CoreIde",
3532
"Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
36-
"Microsoft.VisualStudio.Component.Windows10SDK.18362",
33+
"Microsoft.VisualStudio.Component.Windows10SDK.19041",
3734
"Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites",
3835
"Microsoft.ComponentGroup.Blend",
3936
"Microsoft.VisualStudio.Component.FSharp.Desktop",
4037
"Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging",
4138
"Microsoft.VisualStudio.Workload.ManagedDesktop",
4239
"Microsoft.VisualStudio.Component.VC.Redist.14.Latest",
40+
"Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native",
4341
"Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core",
42+
"Microsoft.VisualStudio.Component.VC.Tools.ARM64",
4443
"Microsoft.VisualStudio.Component.VC.CLI.Support",
4544
"Microsoft.VisualStudio.Workload.NativeDesktop",
46-
"Microsoft.VisualStudio.Component.VC.Tools.ARM64",
4745
"Microsoft.VisualStudio.Component.VC.Tools.ARM",
46+
"Microsoft.Net.ComponentGroup.TargetingPacks.Common",
47+
"Microsoft.Net.Component.4.6.TargetingPack",
4848
"Microsoft.VisualStudio.Component.Git",
4949
"Microsoft.VisualStudio.Component.LinqToSql",
50+
"Microsoft.NetCore.Component.Runtime.3.1",
51+
"Microsoft.NetCore.Component.Runtime.5.0",
5052
"Microsoft.Net.Component.4.6.2.SDK",
5153
"Microsoft.Net.Component.4.7.SDK"
5254
]
53-
}
55+
}

Directory.Build.props

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
<CoreClrProjectRoot>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src', 'coreclr'))</CoreClrProjectRoot>
6060
<MonoProjectRoot>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src', 'mono'))</MonoProjectRoot>
6161
<InstallerProjectRoot>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src', 'installer'))</InstallerProjectRoot>
62+
<WorkloadsProjectRoot>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src', 'workloads'))</WorkloadsProjectRoot>
6263
<SharedNativeRoot>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'native'))</SharedNativeRoot>
6364
<RepoToolsLocalDir>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'tools-local'))</RepoToolsLocalDir>
6465
<RepoTasksDir>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src', 'tasks'))</RepoTasksDir>
@@ -279,6 +280,9 @@
279280
<AppDesignerFolder>Properties</AppDesignerFolder>
280281
<!-- By default the SDK produces ref assembly for 5.0 or later -->
281282
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
283+
<!-- We have very special projects that don't always contain default references. We also build MSBuild Tasks
284+
and there are some implicit namespaces that clash, i.e System.Threading.Tasks. -->
285+
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
282286
</PropertyGroup>
283287

284288
<PropertyGroup>

0 commit comments

Comments
 (0)