Merge branch 'dotnet:main' into fix-producesresponsetype-minimal-api-again

Author: sander1095

.azure/pipelines/ci-public.yml

@@ -19,6 +19,15 @@ pr:
   branches:
     include:
     - '*'
+  paths:
+    exclude:
+    - .devcontainer/*
+    - .github/*
+    - .vscode/*
+    - docs/*
+    - '**/*.md'
+    - LICENSE.TXT
+    - THIRD-PARTY-NOTICES.TXT
 
 parameters:
 # Choose whether to skip tests when running pipeline manually.
@@ -632,8 +641,8 @@ stages:
       platform:
         name: 'Managed'
         container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64'
-        buildScript: './eng/build.sh --publish --no-build-repo-tasks $(_PublishArgs) $(_InternalRuntimeDownloadArgs)'
-        skipPublishValidation: true
+        buildScript: './eng/build.sh'
+        buildArguments: '--source-build $(_InternalRuntimeDownloadArgs)'
         jobProperties:
           timeoutInMinutes: 120
           variables:

.azure/pipelines/ci.yml

@@ -79,14 +79,14 @@ variables:
 - name: WindowsArm64InstallersLogArgs
   value: /bl:artifacts/log/Release/Build.Installers.Arm64.binlog
 - name: _InternalRuntimeDownloadArgs
-  value: -RuntimeSourceFeed https://dotnetbuilds.blob.core.windows.net/internal
+  value: -RuntimeSourceFeed https://ci.dot.net/internal
          -RuntimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
          /p:DotNetAssetRootAccessTokenSuffix='$(dotnetbuilds-internal-container-read-token-base64)'
 # The code signing doesn't use the aspnet build scripts, so the msbuild parameters have to be passed directly. This
 # is awkward but necessary because the eng/common/ build scripts don't add the msbuild properties automatically.
 - name: _InternalRuntimeDownloadCodeSignArgs
   value: $(_InternalRuntimeDownloadArgs)
-         /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
+         /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal
          /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
 - group: DotNet-HelixApi-Access
 - ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
@@ -173,6 +173,8 @@ extends:
                     $(_BuildArgs)
                     $(_InternalRuntimeDownloadArgs)
                     $(Windows64LogArgs)
+            env:
+              MSBUILDUSESERVER: "1"
             displayName: Build x64
 
           # Build the x86 shared framework
@@ -190,6 +192,8 @@ extends:
                     $(_BuildArgs)
                     $(_InternalRuntimeDownloadArgs)
                     $(Windows86LogArgs)
+            env:
+              MSBUILDUSESERVER: "1"
             displayName: Build x86
 
           # Build the arm64 shared framework
@@ -207,6 +211,8 @@ extends:
                     $(_BuildArgs)
                     $(_InternalRuntimeDownloadArgs)
                     $(WindowsArm64LogArgs)
+            env:
+              MSBUILDUSESERVER: "1"
             displayName: Build ARM64
 
           - script: .\src\SiteExtensions\build.cmd
@@ -218,6 +224,8 @@ extends:
                     -noBuildNative
                     $(_BuildArgs)
                     $(_InternalRuntimeDownloadArgs)
+            env:
+              MSBUILDUSESERVER: "1"
             displayName: Build SiteExtension
 
           # This runs code-signing on all packages, zips, and jar files as defined in build/CodeSign.targets. If
@@ -233,6 +241,8 @@ extends:
                     /p:DotNetSignType=$(_SignType)
                     $(_BuildArgs)
                     $(WindowsSignLogArgs)
+            env:
+              MSBUILDUSESERVER: "1"
             displayName: Code sign packages
 
           # Windows installers bundle x86/x64/arm64 assets
@@ -247,6 +257,8 @@ extends:
                     $(_BuildArgs)
                     $(_InternalRuntimeDownloadArgs)
                     $(WindowsInstallersLogArgs)
+            env:
+              MSBUILDUSESERVER: "1"
             displayName: Build Installers
 
           # Windows installers bundle and sharedfx msi for arm64
@@ -265,6 +277,8 @@ extends:
                     $(_PublishArgs)
                     $(_InternalRuntimeDownloadArgs)
                     $(WindowsArm64InstallersLogArgs)
+            env:
+              MSBUILDUSESERVER: "1"
             displayName: Build ARM64 Installers
 
           artifacts:
@@ -534,32 +548,33 @@ extends:
           parameters:
             inputName: Linux_musl_arm64
 
+      - template: .azure/pipelines/jobs/default-build.yml@self
+        parameters:
+          jobName: Windows_Test
+          jobDisplayName: "Test: Windows Server x64"
+          agentOs: Windows
+          isAzDOTestingJob: true
+          continueOnError: true
+          # Just uploading artifacts/logs/ files can take 15 minutes. Doubling the cancel timeout for this job.
+          cancelTimeoutInMinutes: 30
+          buildArgs: -all -pack -test -binaryLog /p:SkipHelixReadyTests=true /p:SkipIISNewHandlerTests=true /p:SkipIISTests=true
+                     /p:SkipIISExpressTests=true /p:SkipIISNewShimTests=true /p:RunBlazorPlaywrightTemplateTests=true /p:DoNotCleanUpTemplates=true
+                     $(_InternalRuntimeDownloadArgs)
+          beforeBuild:
+          - powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
+            displayName: Setup IISExpress test certificates and schema
+          artifacts:
+          - name: Windows_Test_Logs_Attempt_$(System.JobAttempt)
+            path: artifacts/log/
+            publishOnError: true
+            includeForks: true
+          - name: Windows_Test_Results_Attempt_$(System.JobAttempt)
+            path: artifacts/TestResults/
+            publishOnError: true
+            includeForks: true
+
       - ${{ if and(ne(parameters.skipTests, 'true'), in(variables['Build.Reason'], 'PullRequest', 'Manual')) }}:
         # Test jobs
-        - template: .azure/pipelines/jobs/default-build.yml@self
-          parameters:
-            jobName: Windows_Test
-            jobDisplayName: "Test: Windows Server x64"
-            agentOs: Windows
-            isAzDOTestingJob: true
-            # Just uploading artifacts/logs/ files can take 15 minutes. Doubling the cancel timeout for this job.
-            cancelTimeoutInMinutes: 30
-            buildArgs: -all -pack -test -binaryLog /p:SkipHelixReadyTests=true /p:SkipIISNewHandlerTests=true /p:SkipIISTests=true
-                       /p:SkipIISExpressTests=true /p:SkipIISNewShimTests=true /p:RunTemplateTests=false /p:RunBlazorPlaywrightTemplateTests=true
-                       $(_InternalRuntimeDownloadArgs)
-            beforeBuild:
-            - powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
-              displayName: Setup IISExpress test certificates and schema
-            artifacts:
-            - name: Windows_Test_Logs_Attempt_$(System.JobAttempt)
-              path: artifacts/log/
-              publishOnError: true
-              includeForks: true
-            - name: Windows_Test_Results_Attempt_$(System.JobAttempt)
-              path: artifacts/TestResults/
-              publishOnError: true
-              includeForks: true
-
         - template: .azure/pipelines/jobs/default-build.yml@self
           parameters:
             jobName: MacOS_Test
@@ -615,6 +630,8 @@ extends:
             # Build the shared framework
             - script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -all -pack -arch x64
                       /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
+              env:
+                MSBUILDUSESERVER: "1"
               displayName: Build shared fx
             # -noBuildRepoTasks -noBuildNative -noBuild to avoid repeating work done in the previous step.
             - script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -all -noBuildRepoTasks -noBuildNative -noBuild -test
@@ -668,16 +685,15 @@ extends:
                 path: artifacts/log/
                 publishOnError: true
                 includeForks: true
-
       # Source build
       - template: /eng/common/templates-official/job/source-build.yml@self
         parameters:
           enableInternalSources: true
           platform:
             name: 'Managed'
-            container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
-            buildScript: './eng/build.sh --publish --no-build-repo-tasks $(_PublishArgs) $(_InternalRuntimeDownloadArgs)'
-            skipPublishValidation: true
+            container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-10-amd64'
+            buildScript: './eng/build.sh'
+            buildArguments: '--source-build $(_InternalRuntimeDownloadArgs)'
             jobProperties:
               timeoutInMinutes: 120
               variables:

.azure/pipelines/components-e2e-tests.yml

@@ -17,6 +17,15 @@ pr:
   branches:
     include:
     - '*'
+  paths:
+    exclude:
+    - .devcontainer/*
+    - .github/*
+    - .vscode/*
+    - docs/*
+    - '**/*.md'
+    - LICENSE.TXT
+    - THIRD-PARTY-NOTICES.TXT
 
 variables:
 - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE

.azure/pipelines/jobs/default-build.yml

@@ -62,6 +62,7 @@ parameters:
   isAzDOTestingJob: false
   enablePublishTestResults: ''
   enableSbom: true
+  continueOnError: false
   variables: []
 
   configuration: 'Release'
@@ -128,6 +129,8 @@ jobs:
       - TeamName: AspNetCore
       - ${{ if ne(parameters.codeSign, true) }}:
         - _SignType: ''
+      - ${{ if ne(parameters.isAzDOTestingJob, true) }}:
+        - MSBUILDUSESERVER: "1"
       - LC_ALL: 'en_US.UTF-8'
       - LANG: 'en_US.UTF-8'
       - LANGUAGE: 'en_US.UTF-8'
@@ -207,13 +210,15 @@ jobs:
           - script: $(BuildDirectory)\build.cmd -ci -prepareMachine -nativeToolsOnMachine -Configuration $(BuildConfiguration) $(BuildScriptArgs)
               /p:DotNetSignType=$(_SignType)
             displayName: Run build.cmd
+            continueOnError: ${{ parameters.continueOnError }}
             env:
               COMPlus_DbgEnableMiniDump: 1
               COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"
               DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token)
         - ${{ if ne(parameters.agentOs, 'Windows') }}:
           - script: $(BuildDirectory)/build.sh --ci --configuration $(BuildConfiguration) $(BuildScriptArgs)
             displayName: Run build.sh
+            continueOnError: ${{ parameters.continueOnError }}
             env:
               COMPlus_DbgEnableMiniDump: 1
               COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"
@@ -345,6 +350,8 @@ jobs:
         - LANGUAGE: 'en_US.UTF-8'
       - ${{ if ne(parameters.codeSign, true) }}:
         - _SignType: ''
+      - ${{ if ne(parameters.isAzDOTestingJob, true) }}:
+        - MSBUILDUSESERVER: "1"
       - ${{ else }}:
         - ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
           - _SignType: real
@@ -443,13 +450,15 @@ jobs:
           - script: $(BuildDirectory)\build.cmd -ci -prepareMachine -nativeToolsOnMachine -Configuration $(BuildConfiguration) $(BuildScriptArgs)
               /p:DotNetSignType=$(_SignType)
             displayName: Run build.cmd
+            continueOnError: ${{ parameters.continueOnError }}
             env:
               COMPlus_DbgEnableMiniDump: 1
               COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"
               DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token)
         - ${{ if ne(parameters.agentOs, 'Windows') }}:
           - script: $(BuildDirectory)/build.sh --ci --configuration $(BuildConfiguration) $(BuildScriptArgs)
             displayName: Run build.sh
+            continueOnError: ${{ parameters.continueOnError }}
             env:
               COMPlus_DbgEnableMiniDump: 1
               COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"

.editorconfig

@@ -464,6 +464,13 @@ dotnet_diagnostic.IDE0161.severity = silent
 # IDE0005: Remove unused usings. Ignore for shared src files since imports for those depend on the projects in which they are included.
 dotnet_diagnostic.IDE0005.severity = silent
 
+[{**/microsoft.dotnet.hotreload.agent*/**.cs}]
+# IDE0005: Remove unused usings. Ignore for shared src files coming from nuget package.
+dotnet_diagnostic.IDE0005.severity = silent
+# IDE0073: A source file is missing a required header. Ignore for shared src files coming from nuget package.
+dotnet_diagnostic.IDE0073.severity = silent
+
+
 # Verify settings
 [*.{received,verified}.{txt,xml,json}]
 charset = "utf-8-bom"

.github/CODEOWNERS

@@ -14,7 +14,6 @@
 /eng/                                                                             @dotnet/aspnet-build @wtgodbe
 /eng/Versions.props                                                               @dotnet/aspnet-build @wtgodbe
 /eng/Version.Details.xml                                                          @dotnet/aspnet-build @wtgodbe
-/eng/SourceBuild*                                                                 @dotnet/source-build
 /src/Caching/                                                                     @captainsafia @halter73 @mgravell
 /src/Components/                                                                  @dotnet/aspnet-blazor-eng
 /src/DefaultBuilder/                                                              @halter73

.github/copilot-instructions.md

@@ -0,0 +1,34 @@
+## General
+
+* Make only high confidence suggestions when reviewing code changes.
+* Always use the latest version C#, currently C# 13 features.
+* Never change global.json unless explicitly asked to.
+* Never change package.json or package-lock.json files unless explicitly asked to.
+* Never change NuGet.config files unless explicitly asked to.
+
+## Formatting
+
+* Apply code-formatting style defined in `.editorconfig`.
+* Prefer file-scoped namespace declarations and single-line using directives.
+* Insert a newline before the opening curly brace of any code block (e.g., after `if`, `for`, `while`, `foreach`, `using`, `try`, etc.).
+* Ensure that the final return statement of a method is on its own line.
+* Use pattern matching and switch expressions wherever possible.
+* Use `nameof` instead of string literals when referring to member names.
+* Ensure that XML doc comments are created for any public APIs. When applicable, include `<example>` and `<code>` documentation in the comments.
+
+### Nullable Reference Types
+
+* Declare variables non-nullable, and check for `null` at entry points.
+* Always use `is null` or `is not null` instead of `== null` or `!= null`.
+* Trust the C# null annotations and don't add null checks when the type system says a value cannot be null.
+
+### Testing
+
+* We use xUnit SDK v3 for tests.
+* Do not emit "Act", "Arrange" or "Assert" comments.
+* Use Moq for mocking in tests.
+* Copy existing style in nearby files for test method names and capitalization.
+
+## Running tests
+
+* To build and run tests in the repo, use the `build.sh` script that is located in each subdirectory within the `src` folder. For example, to run the build with tests in the `src/Http` directory, run `./src/Http/build.sh -test`.