Merge branch 'main' into finalizer-csharp

Author: kasperk81

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "microsoft.dotnet.darc": {
-      "version": "1.1.0-beta.25113.5",
+      "version": "1.1.0-beta.25128.5",
       "commands": [
         "darc"
       ]

.github/policies/resourceManagement.yml

@@ -1,115 +1,115 @@
-id: 
-name: GitOps.PullRequestIssueManagement
-description: GitOps.PullRequestIssueManagement primitive
-owner: 
-resource: repository
-disabled: false
-where: 
-configuration:
-  resourceManagementConfiguration:
-    scheduledSearches:
-    - description: Auto close "Area-NuGet" issues and add a comment pointing to NuGet repo
-      frequencies:
-      - daily:
-          time: 16:0
-      filters:
-      - isIssue
-      - isOpen
-      - hasLabel:
-          label: Area-NuGet
-      actions:
-      - addReply:
-          reply: >-
-            Thanks for creating this issue! We believe this issue is related to NuGet tooling, which is maintained by the NuGet team. Thus, we closed this one and encourage you to raise this issue in the [NuGet repository](https://github.com/NuGet/Home) instead. Don’t forget to check out [NuGet’s contributing guide](https://github.com/NuGet/Home/blob/dev/CONTRIBUTING.md#before-submitting-an-issue) before submitting an issue!
-
-
-            If you believe this issue was closed out of error, please comment to let us know.
-
-
-            Happy Coding!
-      - closeIssue
-    eventResponderTasks:
-    - if:
-      - payloadType: Pull_Request
-      - hasLabel:
-          label: Auto-Merge If Tests Pass
-      then:
-      - enableAutoMerge:
-          mergeMethod: Squash
-      description: Automatically merge pull requests
-    - if:
-      - payloadType: Pull_Request
-      - labelRemoved:
-          label: Auto-Merge If Tests Pass
-      then:
-      - disableAutoMerge
-      description: Automatically merge pull requests
-    - if:
-      - payloadType: Issues
-      - labelAdded:
-          label: Area-ApiCompat
-      then:
-      - addReply:
-          reply: '@dotnet/area-infrastructure-libraries a new issue has been filed in the ApiCompat area, please triage'
-      description: Notify apicompat of new untriaged bugs
-    - if:
-      - payloadType: Issues
-      - labelAdded:
-          label: Area-ILLink
-      then:
-      - addReply:
-          reply: '@dotnet/illink a new issue has been filed in the ILLink area, please triage'
-      description: Notify linker of new untriaged bugs
-    - if:
-      - payloadType: Pull_Request
-      - labelAdded:
-          label: Area-AspNetCore
-      - isOpen
-      then:
-      - addReply:
-          reply: >-
-            Thanks for your PR, @${issueAuthor}.
-
-            To learn about the PR process and branching schedule of this repo, please take a look at the [SDK PR Guide](https://github.com/dotnet/sdk/blob/main/documentation/project-docs/SDK-PR-guide.md).
-      description: Remind ASP.NET Core PR authors the process to follow
-    - if:
-      - payloadType: Issues
-      - labelAdded:
-          label: breaking-change
-      then:
-      - addLabel:
-          label: needs-breaking-change-doc-created
-      - addReply:
-          reply: >-
-            Added `needs-breaking-change-doc-created` label because this issue has the `breaking-change` label. 
-
-
-            1. [ ] Create and link to this issue a matching issue in the dotnet/docs repo using the [breaking change documentation template](https://aka.ms/dotnet/docs/new-breaking-change-issue), then remove this `needs-breaking-change-doc-created` label.
-
-
-            Tagging @dotnet/compat for awareness of the breaking change.
-      description: Add breaking change doc label to issue
-    - if:
-      - payloadType: Pull_Request
-      - labelAdded:
-          label: breaking-change
-      then:
-      - addLabel:
-          label: needs-breaking-change-doc-created
-      - addReply:
-          reply: >-
-            Added `needs-breaking-change-doc-created` label because this PR has the `breaking-change` label. 
-
-
-            When you commit this breaking change:
-
-
-            1. [ ] Create and link to this PR and the issue a matching issue in the dotnet/docs repo using the [breaking change documentation template](https://aka.ms/dotnet/docs/new-breaking-change-issue), then remove this `needs-breaking-change-doc-created` label.
-
-            2. [ ] Ask a committer to mail the `.NET Breaking Change Notification` DL.
-
-
-            Tagging @dotnet/compat for awareness of the breaking change.
-      description: Add breaking change doc label to PR
-onFailure: 
-onSuccess: 
+id: 
+name: GitOps.PullRequestIssueManagement
+description: GitOps.PullRequestIssueManagement primitive
+owner: 
+resource: repository
+disabled: false
+where: 
+configuration:
+  resourceManagementConfiguration:
+    scheduledSearches:
+    - description: Auto close "Area-NuGet" issues and add a comment pointing to NuGet repo
+      frequencies:
+      - daily:
+          time: 16:0
+      filters:
+      - isIssue
+      - isOpen
+      - hasLabel:
+          label: Area-NuGet
+      actions:
+      - addReply:
+          reply: >-
+            Thanks for creating this issue! We believe this issue is related to NuGet tooling, which is maintained by the NuGet team. Thus, we closed this one and encourage you to raise this issue in the [NuGet repository](https://github.com/NuGet/Home) instead. Don’t forget to check out [NuGet’s contributing guide](https://github.com/NuGet/Home/blob/dev/CONTRIBUTING.md#before-submitting-an-issue) before submitting an issue!
+
+
+            If you believe this issue was closed out of error, please comment to let us know.
+
+
+            Happy Coding!
+      - closeIssue
+    eventResponderTasks:
+    - if:
+      - payloadType: Pull_Request
+      - hasLabel:
+          label: Auto-Merge If Tests Pass
+      then:
+      - enableAutoMerge:
+          mergeMethod: Squash
+      description: Automatically merge pull requests
+    - if:
+      - payloadType: Pull_Request
+      - labelRemoved:
+          label: Auto-Merge If Tests Pass
+      then:
+      - disableAutoMerge
+      description: Automatically merge pull requests
+    - if:
+      - payloadType: Issues
+      - labelAdded:
+          label: Area-ApiCompat
+      then:
+      - addReply:
+          reply: '@dotnet/area-infrastructure-libraries a new issue has been filed in the ApiCompat area, please triage'
+      description: Notify apicompat of new untriaged bugs
+    - if:
+      - payloadType: Issues
+      - labelAdded:
+          label: Area-ILLink
+      then:
+      - addReply:
+          reply: '@dotnet/illink a new issue has been filed in the ILLink area, please triage'
+      description: Notify linker of new untriaged bugs
+    - if:
+      - payloadType: Pull_Request
+      - labelAdded:
+          label: Area-AspNetCore
+      - isOpen
+      then:
+      - addReply:
+          reply: >-
+            Thanks for your PR, @${issueAuthor}.
+
+            To learn about the PR process and branching schedule of this repo, please take a look at the [SDK PR Guide](https://github.com/dotnet/sdk/blob/main/documentation/project-docs/SDK-PR-guide.md).
+      description: Remind ASP.NET Core PR authors the process to follow
+    - if:
+      - payloadType: Issues
+      - labelAdded:
+          label: breaking-change
+      then:
+      - addLabel:
+          label: needs-breaking-change-doc-created
+      - addReply:
+          reply: >-
+            Added `needs-breaking-change-doc-created` label because this issue has the `breaking-change` label. 
+
+
+            1. [ ] Create and link to this issue a matching issue in the dotnet/docs repo using the [breaking change documentation template](https://aka.ms/dotnet/docs/new-breaking-change-issue), then remove this `needs-breaking-change-doc-created` label.
+
+
+            Tagging @dotnet/compat for awareness of the breaking change.
+      description: Add breaking change doc label to issue
+    - if:
+      - payloadType: Pull_Request
+      - labelAdded:
+          label: breaking-change
+      then:
+      - addLabel:
+          label: needs-breaking-change-doc-created
+      - addReply:
+          reply: >-
+            Added `needs-breaking-change-doc-created` label because this PR has the `breaking-change` label. 
+
+
+            When you commit this breaking change:
+
+
+            1. [ ] Create and link to this PR and the issue a matching issue in the dotnet/docs repo using the [breaking change documentation template](https://aka.ms/dotnet/docs/new-breaking-change-issue), then remove this `needs-breaking-change-doc-created` label.
+
+            2. [ ] Ask a committer to mail the `.NET Breaking Change Notification` DL.
+
+
+            Tagging @dotnet/compat for awareness of the breaking change.
+      description: Add breaking change doc label to PR
+onFailure: 
+onSuccess: 

.github/workflows/backport.yml

@@ -1,19 +1,19 @@
-name: Backport PR to branch
-on:
-  issue_comment:
-    types: [created]
-
-permissions:
-  contents: write
-  issues: write
-  pull-requests: write
-  actions: write
-
-jobs:
-  backport:
-    uses: dotnet/arcade/.github/workflows/backport-base.yml@main
-    with:
-        pr_description_template: |
-          Backport of #%source_pr_number% to %target_branch%
-
+name: Backport PR to branch
+on:
+  issue_comment:
+    types: [created]
+
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+  actions: write
+
+jobs:
+  backport:
+    uses: dotnet/arcade/.github/workflows/backport-base.yml@main
+    with:
+        pr_description_template: |
+          Backport of #%source_pr_number% to %target_branch%
+
           /cc %cc_users%

.gitignore

@@ -46,3 +46,6 @@ cmake/
 # Test results
 **/*.trx
 /TestResults
+
+# Live Unit Testing
+*.lutconfig

.vsts-ci.yml

@@ -5,7 +5,7 @@ trigger:
   branches:
     include:
     - main
-    - release/9.0.3xx
+    - release/10.0.1xx-*
     - internal/release/*
     - exp/*
 
@@ -212,6 +212,14 @@ extends:
               officialBuildProperties: $(_officialBuildProperties)
               osProperties: $(linuxOsPortableProperties) /p:BuildSdkDeb=true
               runTests: false
+            - categoryName: Portable
+              buildArchitecture: arm64
+              runtimeIdentifier: linux-arm64
+              # Do not publish zips and tarballs. The linux-arm64 binaries are already published by Official.
+              publishArgument: $(_publishArgument) /p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true
+              officialBuildProperties: $(_officialBuildProperties)
+              osProperties: $(linuxOsPortableProperties) /p:BuildSdkDeb=true
+              runTests: false
             - categoryName: Portable
               container: centosStream9
               # Do not publish zips and tarballs. The linux-x64 binaries are already published by Official.

CODEOWNERS

@@ -57,7 +57,6 @@
 
 # Area-Templates
 /src/Cli/dotnet/commands/dotnet-new @dotnet/templating-engine-maintainers
-/src/Cli/dotnet-new3 @dotnet/templating-engine-maintainers
 /src/Cli/Microsoft.TemplateEngine.Cli @dotnet/templating-engine-maintainers
 /test/dotnet-new.Tests @dotnet/templating-engine-maintainers
 /test/Microsoft.TemplateEngine.* @dotnet/templating-engine-maintainers
@@ -66,12 +65,12 @@
 # ILLink and ReadyToRun targets and tasks owned by runtime team
 # Area-ILLink Area-ReadyToRun
 /src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ILLink.targets @dotnet/illink
-/src/Tasks/Microsoft.NET.Build.Tasks/PrepareForReadyToRunCompilation.cs @AntonLapounov
-/src/Tasks/Microsoft.NET.Build.Tasks/RunReadyToRunCompiler.cs @AntonLapounov
+/src/Tasks/Microsoft.NET.Build.Tasks/PrepareForReadyToRunCompilation.cs @dotnet/area-type-system-and-startup 
+/src/Tasks/Microsoft.NET.Build.Tasks/RunReadyToRunCompiler.cs @dotnet/area-type-system-and-startup 
 /test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs @dotnet/illink
-/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishReadyToRun.cs @AntonLapounov
+/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishReadyToRun.cs @dotnet/area-type-system-and-startup
 # Publish.targets related to ILLink and ReadyToRun is own by both runtime and SDK team
-/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets @dotnet/illink @AntonLapounov @dotnet/dotnet-cli
+/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets @dotnet/illink @dotnet/area-type-system-and-startup @dotnet/dotnet-cli
 # Area-ClickOnce
 /src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ClickOnce.targets @sujitnayak
 

Directory.Build.props

@@ -86,6 +86,8 @@
 
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
+
+    <SdkLayoutOutputDirectory>$(ArtifactsBinDir)redist\$(Configuration)\layouts\dotnet-toolset-internal\</SdkLayoutOutputDirectory>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(IsTestProject)' == 'true'">

NuGet.config

@@ -28,6 +28,8 @@
     <add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
     <!-- Used for Rich Navigation indexing task -->
     <add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
+    <!-- mstest dependencies -->
+    <add key="test-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/test-tools/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />

TemplateEngine.slnf

@@ -8,7 +8,6 @@
       "src\\Cli\\Microsoft.DotNet.Configurer\\Microsoft.DotNet.Configurer.csproj",
       "src\\Cli\\Microsoft.DotNet.InternalAbstractions\\Microsoft.DotNet.InternalAbstractions.csproj",
       "src\\Cli\\Microsoft.TemplateEngine.Cli\\Microsoft.TemplateEngine.Cli.csproj",
-      "src\\Cli\\dotnet-new3\\dotnet-new3.csproj",
       "src\\Cli\\dotnet\\dotnet.csproj",
       "src\\Microsoft.DotNet.TemplateLocator\\Microsoft.DotNet.TemplateLocator.csproj",
       "src\\Microsoft.Win32.Msi\\Microsoft.Win32.Msi.csproj",

build.cmd

@@ -2,11 +2,11 @@
 
 echo %* | findstr /C:"-pack" >nul
 if %errorlevel%==0 (
-    set PackInstaller=
+    set SkipBuildingInstallers=
 ) else (
     REM disable crossgen for inner-loop builds to save a ton of time
-    set PackInstaller=/p:PackInstaller=false
+    set SkipBuildingInstallers=/p:SkipBuildingInstallers=true
     set DISABLE_CROSSGEN=true
 )
-powershell -NoLogo -NoProfile -ExecutionPolicy ByPass -command "& """%~dp0eng\common\build.ps1""" -restore -build -msbuildEngine dotnet %PackInstaller% %*"
+powershell -NoLogo -NoProfile -ExecutionPolicy ByPass -command "& """%~dp0eng\common\build.ps1""" -restore -build -msbuildEngine dotnet %SkipBuildingInstallers% %*"
 exit /b %ErrorLevel%