Merge upstream

.config/dotnet-tools.json

@@ -15,13 +15,13 @@
  ]
  },
  "microsoft.dotnet.xharness.cli": {
- "version": "1.0.0-prerelease.21511.3",
+ "version": "1.0.0-prerelease.21561.1",
  "commands": [
  "xharness"
  ]
  },
  "microsoft.visualstudio.slngen.tool": {
- "version": "6.1.10",
+ "version": "6.3.0",
  "commands": [
  "slngen"
  ]

.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/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,12 +6,14 @@ on:
  workflow_dispatch:
 jobs:
  createPrebuild:
+ permissions:
+ contents: write
  runs-on: ubuntu-latest
  steps:
  - uses: actions/checkout@v2
- - uses: github/codespaces-precache@v1.0.1
+ - uses: github/codespaces-precache@v1-stable
  with:
- regions: WestUs2
- sku_name: standardLinux32gb
+ regions: WestUs2 EastUs WestEurope
+ sku_name: premiumLinux
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/markdownlint.yml

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

.vsconfig

@@ -27,7 +27,6 @@
  "Microsoft.Net.Component.4.7.TargetingPack",
  "Microsoft.VisualStudio.Component.ClassDesigner",
  "Microsoft.VisualStudio.Component.GraphDocument",
- "Microsoft.VisualStudio.Component.CodeMap",
  "Microsoft.VisualStudio.Component.VC.CoreIde",
  "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
  "Microsoft.VisualStudio.Component.Windows10SDK.19041",
@@ -37,7 +36,6 @@
  "Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging",
  "Microsoft.VisualStudio.Workload.ManagedDesktop",
  "Microsoft.VisualStudio.Component.VC.Redist.14.Latest",
- "Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native",
  "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core",
  "Microsoft.VisualStudio.Component.VC.Tools.ARM64",
  "Microsoft.VisualStudio.Component.VC.CLI.Support",

Directory.Build.props

@@ -20,6 +20,7 @@
  <_hostOS Condition="'$(TargetOS)' == 'Browser'">Browser</_hostOS>
  <TargetOS Condition="'$(TargetOS)' == ''">$(_hostOS)</TargetOS>
  <TargetsMobile Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator' or '$(TargetOS)' == 'Android' or '$(TargetOS)' == 'Browser'">true</TargetsMobile>
+ <TargetsAppleMobile Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator'">true</TargetsAppleMobile>
  </PropertyGroup>
 
  <!-- Platform property is required by RepoLayout.props in Arcade SDK. -->
@@ -122,7 +123,7 @@
  <_parseDistroRid>$(__DistroRid)</_parseDistroRid>
  <_parseDistroRid Condition="'$(_parseDistroRid)' == '' and '$(MSBuildRuntimeType)' == 'core'">$([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier)</_parseDistroRid>
  <_parseDistroRid Condition="'$(_parseDistroRid)' == '' and '$(MSBuildRuntimeType)' != 'core'">win-$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant)</_parseDistroRid>
- <_distroRidIndex>$(_parseDistroRid.LastIndexOfAny("-"))</_distroRidIndex>
+ <_distroRidIndex>$(_parseDistroRid.LastIndexOf('-'))</_distroRidIndex>
 
  <_runtimeOS>$(RuntimeOS)</_runtimeOS>
  <_runtimeOS Condition="'$(_runtimeOS)' == ''">$(_parseDistroRid.SubString(0, $(_distroRidIndex)))</_runtimeOS>
@@ -294,9 +295,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>

Directory.Build.targets

@@ -9,6 +9,7 @@
 
  <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
  <Import Project="$(RepositoryEngineeringDir)liveBuilds.targets" />
+ <Import Project="$(RepositoryEngineeringDir)generators.targets" />
  <Import Project="$(RepositoryEngineeringDir)python.targets" />
 
  <PropertyGroup>
@@ -17,14 +18,14 @@
  unconditionally in Microsoft.NETCoreSdk.BundledVersions.props.
  -->
  <NETCoreAppMaximumVersion>$(MajorVersion).$(MinorVersion)</NETCoreAppMaximumVersion>
- <EnableNETAnalyzers Condition="'$(EnableAnalyzers)' != 'true'">false</EnableNETAnalyzers>
+ <EnableNETAnalyzers Condition="'$(EnableNETAnalyzers)' == ''">$(RunAnalyzers)</EnableNETAnalyzers>
  <!-- SDK sets product to assembly but we want it to be our product name -->
  <Product>Microsoft%AE .NET</Product>
  <!-- Use the .NET product branding version for informational version description -->
  <InformationalVersion Condition="'$(InformationalVersion)' == '' and '$(VersionSuffix)' == ''">$(ProductVersion)</InformationalVersion>
  <InformationalVersion Condition="'$(InformationalVersion)' == '' and '$(VersionSuffix)' != ''">$(ProductVersion)-$(VersionSuffix)</InformationalVersion>
  </PropertyGroup>
- 
+
  <!-- The Default behavior in VS is to show files for the first target framework in TargetFrameworks property.
  This is required to show all the files corresponding to all target frameworks in VS. -->
  <ItemGroup Condition="'$(DefaultLanguageSourceExtension)' != '' and

README.md

@@ -9,7 +9,7 @@ all supported platforms, as well as the sources to .NET runtime and libraries.
 
 ## What is .NET?
 
-Official Starting Page: https://dotnet.microsoft.com/
+Official Starting Page: https://dotnet.microsoft.com
 
 * [How to use .NET](https://docs.microsoft.com/dotnet/core/get-started) (with VS, VS Code, command-line CLI)
  * [Install official releases](https://dotnet.microsoft.com/download)
@@ -46,8 +46,8 @@ For other issues, please use the following repos:
 ## Useful Links
 
 * [.NET Core source index](https://source.dot.net) / [.NET Framework source index](https://referencesource.microsoft.com)
-* [API Reference docs](https://docs.microsoft.com/dotnet/api/?view=netcore-3.1)
-* [.NET API Catalog](http://apisof.net) (incl. APIs from daily builds and API usage info)
+* [API Reference docs](https://docs.microsoft.com/dotnet/api)
+* [.NET API Catalog](https://apisof.net) (incl. APIs from daily builds and API usage info)
 * [API docs writing guidelines](https://github.com/dotnet/dotnet-api-docs/wiki) - useful when writing /// comments
 * [.NET Discord Server](https://aka.ms/dotnet-discord) - a place to talk and hang out with .NET community
 
@@ -58,11 +58,11 @@ For other issues, please use the following repos:
 There are many .NET related projects on GitHub.
 
 - [.NET home repo](https://github.com/Microsoft/dotnet) - links to 100s of .NET projects, from Microsoft and the community.
-- [ASP.NET Core home](https://docs.microsoft.com/aspnet/core/?view=aspnetcore-3.1) - the best place to start learning about ASP.NET Core.
+- [ASP.NET Core home](https://docs.microsoft.com/aspnet/core) - the best place to start learning about ASP.NET Core.
 
-This project has adopted the code of conduct defined by the [Contributor Covenant](http://contributor-covenant.org/) to clarify expected behavior in our community. For more information, see the [.NET Foundation Code of Conduct](http://www.dotnetfoundation.org/code-of-conduct).
+This project has adopted the code of conduct defined by the [Contributor Covenant](https://contributor-covenant.org) to clarify expected behavior in our community. For more information, see the [.NET Foundation Code of Conduct](https://www.dotnetfoundation.org/code-of-conduct).
 
-General .NET OSS discussions: [.NET Foundation forums](https://forums.dotnetfoundation.org)
+General .NET OSS discussions: [.NET Foundation Discussions](https://github.com/dotnet-foundation/Home/discussions)
 
 ## License
 

docs/area-owners.md

@@ -53,6 +53,7 @@ Note: Editing this file doesn't update the mapping used by the `@msftbot` issue
 | area-Microsoft.Extensions | @ericstj | @maryamariyan @michaelgsharp @safern @tarekgh | Consultants: @eerhardt |
 | area-Microsoft.VisualBasic | @jaredpar | @cston @333fred | Archived component - limited churn/contributions (see [#27790](https://github.com/dotnet/runtime/issues/27790)) |
 | area-Microsoft.Win32 | @ericstj | @Anipik @ViktorHofer | Including System.Windows.Extensions |
+| area-NativeAOT-coreclr | @agocke | @MichalStrehovsky @jkotas | |
 | area-PAL-coreclr | @mangod9 | @janvorli | |
 | area-PAL-libraries | @jeffhandley | @bartonjs @GrabYourPitchforks | |
 | area-Performance-mono | @SamMonoRT | @SamMonoRT | |
@@ -71,10 +72,10 @@ Note: Editing this file doesn't update the mapping used by the `@msftbot` issue
 | area-System.Composition | @jeffhandley | @buyaa-n @joperezr | Consultants: @steveharter |
 | area-System.Configuration | @jeffhandley | @buyaa-n @joperezr | Consultants: @steveharter |
 | area-System.Console | @jeffhandley | @adamsitnik @carlossanlop @jozkee | Consultants: @GrabYourPitchForks |
-| area-System.Data | @ajcvickers | @ajcvickers @cheenamalhotra @david-engel | <ul><li>Odbc, OleDb - @saurabh500</li></ul> |
+| area-System.Data | @ajcvickers | @ajcvickers @davoudeshtehari @david-engel | <ul><li>Odbc, OleDb - @saurabh500</li></ul> |
 | area-System.Data.Odbc | @ajcvickers | @ajcvickers | |
 | area-System.Data.OleDB | @ajcvickers | @ajcvickers | |
-| area-System.Data.SqlClient | @David-Engel | @cheenamalhotra @david-engel @karinazhou @JRahnama | Archived component - limited churn/contributions (see https://devblogs.microsoft.com/dotnet/introducing-the-new-microsoftdatasqlclient/) |
+| area-System.Data.SqlClient | @David-Engel | @davoudeshtehari @david-engel @jrahnama | Archived component - limited churn/contributions (see https://devblogs.microsoft.com/dotnet/introducing-the-new-microsoftdatasqlclient/) |
 | area-System.Diagnostics | @tommcdon | @tommcdon | |
 | area-System.Diagnostics-coreclr | @tommcdon | @tommcdon | |
 | area-System.Diagnostics-mono | @lewing | @thaystg @radical | |