upstream main merge 2021 11 29

.config/dotnet-tools.json

@@ -15,7 +15,7 @@
       ]
     },
     "microsoft.dotnet.xharness.cli": {
-      "version": "1.0.0-prerelease.21529.1",
+      "version": "1.0.0-prerelease.21576.2",
       "commands": [
         "xharness"
       ]

.devcontainer/devcontainer.json

@@ -12,7 +12,11 @@
 
 	"settings": {
 		// Loading projects on demand is better for larger codebases
-		"omnisharp.enableMsBuildLoadProjectsOnDemand": true
+		"omnisharp.enableMsBuildLoadProjectsOnDemand": true,
+		"omnisharp.enableRoslynAnalyzers": true,
+		"omnisharp.enableEditorConfigSupport": true,
+		"omnisharp.enableAsyncCompletion": true,
+		"omnisharp.testRunSettings": "${containerWorkspaceFolder}/artifacts/obj/vscode/.runsettings"
 	},
 
 	// Add the IDs of extensions you want installed when the container is created.
@@ -23,6 +27,9 @@
 	// Use 'onCreateCommand' to run pre-build commands inside the codespace
 	"onCreateCommand": "${containerWorkspaceFolder}/.devcontainer/scripts/onCreateCommand.sh",
 
+	// Use 'postCreateCommand' to run commands after the container is created.
+	"postCreateCommand": "${containerWorkspaceFolder}/.devcontainer/scripts/postCreateCommand.sh",
+
 	// Add the locally installed dotnet to the path to ensure that it is activated
 	// This allows developers to just use 'dotnet build' on the command-line, and the local dotnet version will be used.
 	"remoteEnv": {

.devcontainer/scripts/onCreateCommand.sh

@@ -4,3 +4,8 @@ set -e
 
 # prebuild the repo, so it is ready for development
 ./build.sh libs+clr -rc Release
+# restore libs tests so that the project is ready to be loaded by OmniSharp
+./build.sh libs.tests -restore
+
+# save the commit hash of the currently built assemblies, so developers know which version was built
+git rev-parse HEAD > ./artifacts/prebuild.sha

.devcontainer/scripts/postCreateCommand.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -e
+
+# reset the repo to the commit hash that was used to build the prebuilt Codespace
+git reset --hard $(cat ./artifacts/prebuild.sha)

.github/ISSUE_TEMPLATE/02_api_proposal.yml

@@ -33,15 +33,15 @@ body:
                 public void Fancy(T item);
             }
         }
-        ```     
+        ```
     validations:
       required: true
   - type: textarea
     id: api-usage
     attributes:
       label: API Usage
       description: |
-        Please provide code examples that highlight how the proposed API additions are meant to be consumed. This will help suggest whether the API has the right shape to be functional, performant and useable.
+        Please provide code examples that highlight how the proposed API additions are meant to be consumed. This will help suggest whether the API has the right shape to be functional, performant and usable.
       placeholder: API usage
       value: |
         ```C#
@@ -52,7 +52,7 @@ body:
         // Getting the values out
         foreach (var v in c)
             Console.WriteLine(v);
-        ```     
+        ```
     validations:
       required: true
   - type: textarea

.github/workflows/aspnetcore-sync-checkdiff.ps1

@@ -0,0 +1,3 @@
+# Check the code is in sync
+$changed = (select-string "nothing to commit" artifacts\status.txt).count -eq 0
+return $changed

.github/workflows/aspnetcore-sync.yml

@@ -0,0 +1,70 @@
+name: AspNetCore->Runtime Code Sync
+on:
+  # Manual run
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+
+jobs:
+  compare_repos:
+    # Comment out this line to test the scripts in a fork
+    if: github.repository == 'dotnet/runtime'
+    name: Sync Code
+    runs-on: windows-latest
+    steps:
+    - name: Checkout aspnetcore
+      uses: actions/[email protected]
+      with:
+        # Test this script using changes in a fork
+        repository: 'dotnet/aspnetcore'
+        path: aspnetcore
+        ref: main
+    - name: Checkout runtime
+      uses: actions/[email protected]
+      with:
+        # Test this script using changes in a fork
+        repository: 'dotnet/runtime'
+        path: runtime
+        ref: main
+    - name: Copy
+      shell: cmd
+      working-directory: .\aspnetcore\src\Shared\runtime\
+      env:
+        RUNTIME_REPO: d:\a\runtime\runtime\runtime\
+      run: CopyToRuntime.cmd
+    - name: Diff
+      shell: cmd
+      working-directory: .\runtime\
+      run: |
+        mkdir ..\artifacts
+        git status > ..\artifacts\status.txt
+        git diff > ..\artifacts\diff.txt
+    - uses: actions/upload-artifact@v1
+      with:
+        name: results
+        path: artifacts
+    - name: Check
+      id: check
+      shell: pwsh
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        $changed = .\runtime\.github\workflows\aspnetcore-sync-checkdiff.ps1
+        echo "::set-output name=changed::$changed"
+    - name: Send PR
+      if: steps.check.outputs.changed == 'true'
+      # https://github.com/marketplace/actions/create-pull-request
+      uses: dotnet/actions-create-pull-request@v3
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        path: .\runtime
+        commit-message: 'Sync shared code from aspnetcore'
+        title: 'Sync shared code from aspnetcore'
+        body: 'This PR was automatically generated to sync shared code changes from aspnetcore. Fixes https://github.com/dotnet/aspnetcore/issues/18943'
+        labels: area-System.Net.Http
+        base: main
+        branch: github-action/sync-aspnetcore
+        branch-suffix: timestamp

.github/workflows/backport.yml

@@ -3,6 +3,11 @@ on:
   issue_comment:
     types: [created]
 
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+
 jobs:
   backport:
     if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/backport to')

.github/workflows/create-codespaces-prebuild.yml

@@ -6,6 +6,8 @@ on:
   workflow_dispatch:
 jobs:
   createPrebuild:
+    permissions:
+      contents: write
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

.github/workflows/markdownlint.yml

@@ -1,5 +1,8 @@
 name: Markdownlint
 
+permissions:
+  contents: read
+
 on:
   pull_request:
     paths:

Directory.Build.props

@@ -266,13 +266,11 @@
     <!-- Indicates this is not an officially supported release. Release branches should set this to false. -->
     <!-- Keep it in sync with PRERELEASE in eng/native/configureplatform.cmake -->
     <IsPrerelease>true</IsPrerelease>
-    <IsExperimentalAssembly>$(MSBuildProjectName.Contains('Experimental'))</IsExperimentalAssembly>
     <IsPrivateAssembly>$(MSBuildProjectName.Contains('Private'))</IsPrivateAssembly>
-    <!-- Experimental packages should not be stable -->
-    <SuppressFinalPackageVersion Condition="'$(SuppressFinalPackageVersion)' == '' and ($(IsExperimentalAssembly) or $(IsPrivateAssembly))">true</SuppressFinalPackageVersion>
-    <IsShippingAssembly Condition="$(IsExperimentalAssembly)">false</IsShippingAssembly>
+    <!-- Private packages should not be stable -->
+    <SuppressFinalPackageVersion Condition="'$(SuppressFinalPackageVersion)' == '' and $(IsPrivateAssembly)">true</SuppressFinalPackageVersion>
     <!-- We don't want Private packages to be shipped to NuGet.org -->
-    <IsShippingPackage Condition="$(MSBuildProjectName.Contains('Private')) or $(IsExperimentalAssembly)">false</IsShippingPackage>
+    <IsShippingPackage Condition="$(IsPrivateAssembly)">false</IsShippingPackage>
     <PlaceholderFile>$(RepositoryEngineeringDir)_._</PlaceholderFile>
   </PropertyGroup>
 
@@ -295,9 +293,6 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <!-- By default the SDK produces ref assembly for 5.0 or later -->
     <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
-    <!-- We have very special projects that don't always contain default references. We also build MSBuild Tasks
-    and there are some implicit namespaces that clash, i.e System.Threading.Tasks. -->
-    <DisableImplicitNamespaceImports_DotNet>true</DisableImplicitNamespaceImports_DotNet>
   </PropertyGroup>
 
   <PropertyGroup>