Merge branch 'main' into issue-33587

* main:
  Handle more cases with the new entry point pattern (dotnet#33500)
  [main] Update dependencies from dotnet/runtime dotnet/efcore (dotnet#33560)
  Refactor LongPolling in Java to avoid stackoverflow (dotnet#33564)
  Optimize QueryCollection (dotnet#32829)
  Switch to in-org action (dotnet#33610)
  Improve Codespaces + C# extension interaction (dotnet#33614)

Author: jeffl8n

.devcontainer/devcontainer.json

@@ -18,6 +18,11 @@
 		"ms-dotnettools.csharp"
 	],
 
+	"settings": {
+		// Loading projects on demand is better for larger codebases
+		"omnisharp.enableMsBuildLoadProjectsOnDemand": true
+	},
+
 	// Use 'postCreateCommand' to run commands after the container is created.
 	"onCreateCommand": "bash -i ${containerWorkspaceFolder}/.devcontainer/scripts/container-creation.sh",
 

.devcontainer/scripts/container-creation.sh

@@ -6,4 +6,6 @@ set -e
 # the repo directory on the container so we do this post-create
 git submodule update --init --recursive
 # Install SDK and tool dependencies before container starts
-./eng/build.sh --only-build-repo-tasks
+# Also run the full restore on the repo so that go-to definition
+# and other language features will be available in C# files
+./restore.sh

.github/workflows/runtime-sync.yml

@@ -59,7 +59,7 @@ jobs:
     - name: Send PR
       if: steps.check.outputs.changed == 'true'
       # https://github.com/marketplace/actions/create-pull-request
-      uses: peter-evans/create-pull-request@v3
+      uses: dotnet/actions-create-pull-request@v3
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         path: .\aspnetcore

AspNetCore.sln

@@ -1624,6 +1624,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PhotinoTestApp", "src\Compo
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Components.WebView.Photino", "src\Components\WebView\Samples\PhotinoPlatform\src\Microsoft.AspNetCore.Components.WebView.Photino.csproj", "{B1AA24A4-5E02-4DC1-B57F-6EB03F91E4DD}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleWebSiteWithWebApplicationBuilderException", "src\Mvc\test\WebSites\SimpleWebSiteWithWebApplicationBuilderException\SimpleWebSiteWithWebApplicationBuilderException.csproj", "{5C641396-7E92-4F5C-A5A1-B4CDF480539B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -7731,6 +7733,18 @@ Global
 		{B1AA24A4-5E02-4DC1-B57F-6EB03F91E4DD}.Release|x64.Build.0 = Release|Any CPU
 		{B1AA24A4-5E02-4DC1-B57F-6EB03F91E4DD}.Release|x86.ActiveCfg = Release|Any CPU
 		{B1AA24A4-5E02-4DC1-B57F-6EB03F91E4DD}.Release|x86.Build.0 = Release|Any CPU
+		{5C641396-7E92-4F5C-A5A1-B4CDF480539B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5C641396-7E92-4F5C-A5A1-B4CDF480539B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5C641396-7E92-4F5C-A5A1-B4CDF480539B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5C641396-7E92-4F5C-A5A1-B4CDF480539B}.Debug|x64.Build.0 = Debug|Any CPU
+		{5C641396-7E92-4F5C-A5A1-B4CDF480539B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5C641396-7E92-4F5C-A5A1-B4CDF480539B}.Debug|x86.Build.0 = Debug|Any CPU
+		{5C641396-7E92-4F5C-A5A1-B4CDF480539B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5C641396-7E92-4F5C-A5A1-B4CDF480539B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5C641396-7E92-4F5C-A5A1-B4CDF480539B}.Release|x64.ActiveCfg = Release|Any CPU
+		{5C641396-7E92-4F5C-A5A1-B4CDF480539B}.Release|x64.Build.0 = Release|Any CPU
+		{5C641396-7E92-4F5C-A5A1-B4CDF480539B}.Release|x86.ActiveCfg = Release|Any CPU
+		{5C641396-7E92-4F5C-A5A1-B4CDF480539B}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -8535,6 +8549,7 @@ Global
 		{3EC71A0E-6515-4A5A-B759-F0BCF1BCFC56} = {44963D50-8B58-44E6-918D-788BCB406695}
 		{558C46DE-DE16-41D5-8DB7-D6D748E32977} = {3EC71A0E-6515-4A5A-B759-F0BCF1BCFC56}
 		{B1AA24A4-5E02-4DC1-B57F-6EB03F91E4DD} = {44963D50-8B58-44E6-918D-788BCB406695}
+		{5C641396-7E92-4F5C-A5A1-B4CDF480539B} = {088C37A5-30D2-40FB-B031-D163CFBED006}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3E8720B3-DBDD-498C-B383-2CC32A054E8F}

eng/Dependencies.props

@@ -79,6 +79,12 @@ and are generated based on the last package release.
     <LatestPackageReference Include="System.Threading.Channels" />
     <LatestPackageReference Include="System.ValueTuple" />
 
+    <!-- Runtime packages referenced only for exclusions -->
+    <LatestPackageReference Include="Microsoft.Win32.SystemEvents" />
+    <LatestPackageReference Include="System.Drawing.Common" />
+    <LatestPackageReference Include="System.Security.Permissions" />
+    <LatestPackageReference Include="System.Windows.Extensions" />
+
     <!-- Runtime packages required for crossgen -->
     <LatestPackageReference Include="Microsoft.NETCore.App.Runtime.win-x64" />
     <LatestPackageReference Include="Microsoft.NETCore.App.Runtime.win-x86" />

eng/SharedFramework.External.props

@@ -89,14 +89,4 @@
     <_CompilationOnlyReference Include="System.Runtime.CompilerServices.Unsafe" />
     <_CompilationOnlyReference Include="System.Text.Json" />
   </ItemGroup>
-
-  <!--
-    These compilation references are necessary to workaround the mismatch of what is found in the ref pack for NETCore.App and what
-    is actually present at runtime. See https://github.com/dotnet/corefx/issues/34906
-  -->
-  <ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' or $(TargetFrameworks.Contains('$(DefaultNetCoreTargetFramework)'))">
-    <_CompilationOnlyReference Include="Microsoft.Win32.Registry" />
-    <_CompilationOnlyReference Include="System.Security.Principal.Windows" />
-  </ItemGroup>
-
 </Project>