Merge latest Library.Template (#378)

* Drop redundant condition from YAML

* Merge pull request 435 from trevors20/dev/trevors/microbuild/updateinsert251110

Add the VSDrop service connection to the insert vs payload

* Update dependency Microsoft.NET.Test.Sdk to 18.0.1

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Build with the .NET 10 SDK

* Adapt to breaking .NET 10 SDK change

Workaround for dotnet/sdk#51666

* Fix ARM64 detection on macOS

* Pin mcr.microsoft.com/dotnet/sdk Docker tag to c7445f1

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Bump C# language version to 14

---------

Co-authored-by: trevors20 <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Author: 3 people

.github/workflows/docs_validate.yml

@@ -29,4 +29,3 @@ jobs:
       run: dotnet build -c Release tools/analyzers.proj
     - name: 📚 Verify docfx build
       run: dotnet docfx docfx/docfx.json --warningsAsErrors --disableGitFeatures
-      if: runner.os == 'Linux'

Directory.Build.props

@@ -15,6 +15,7 @@
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
+    <RestoreEnablePackagePruning>true</RestoreEnablePackagePruning>
 
     <!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/apicompat/package-validation/overview -->
     <EnablePackageValidation>true</EnablePackageValidation>
@@ -42,7 +43,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <LangVersion Condition="'$(MSBuildProjectExtension)'=='.csproj'">13</LangVersion>
+    <LangVersion Condition="'$(MSBuildProjectExtension)'=='.csproj'">14</LangVersion>
     <LangVersion Condition="'$(MSBuildProjectExtension)'=='.vbproj'">16.9</LangVersion>
   </PropertyGroup>
 

Directory.Packages.props

@@ -37,7 +37,7 @@
     <PackageVersion Include="xunit.v3.core.mtp-v1" Version="3.2.0" />
   </ItemGroup>
   <ItemGroup Label="Library.Template">
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageVersion Include="Microsoft.VisualStudio.Internal.MicroBuild.NonShipping" Version="$(MicroBuildVersion)" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
     <PackageVersion Include="xunit.v3" Version="3.2.0" />

azure-pipelines/OptProf.yml

@@ -97,6 +97,10 @@ stages:
         TeamEmail: $(TeamEmail)
         SkipCreatePR: true
         CustomScriptExecutionCommand: src\VSSDK\NuGet\AllowUnstablePackages.ps1
+        ${{ if eq(variables['system.collectionId'], '011b8bdf-6d56-4f87-be0d-0092136884d9') }}:
+          ConnectedVSDropServiceName: 'VSEng-VSDrop-MI'
+      env:
+        SYSTEM_ACCESSTOKEN: $(System.AccessToken)
     - task: benjhuser.tfs-extensions-build-tasks.trigger-build-task.TriggerBuild@3
       displayName: Trigger a new build of DD-CB-TestSignVS-devCI
       inputs:

azure-pipelines/vs-insertion.yml

@@ -69,6 +69,11 @@ extends:
             AutoCompletePR: true
             AutoCompleteMergeStrategy: Squash
             ShallowClone: true
+            ${{ if eq(variables['system.collectionId'], '011b8bdf-6d56-4f87-be0d-0092136884d9') }}:
+              ConnectedVSDropServiceName: 'VSEng-VSDrop-MI'
+          env:
+            SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+
         - powershell: |
             $contentType = 'application/json';
             $headers = @{ Authorization = 'Bearer $(System.AccessToken)' };

azure-pipelines/vs-validation.yml

@@ -111,6 +111,10 @@ extends:
             DraftPR: false # set to true and update InsertionBuildPolicy when we can specify all the validations we want to run (https://dev.azure.com/devdiv/DevDiv/_workitems/edit/2224288)
             AutoCompletePR: false
             ShallowClone: true
+            ${{ if eq(variables['system.collectionId'], '011b8bdf-6d56-4f87-be0d-0092136884d9') }}:
+              ConnectedVSDropServiceName: 'VSEng-VSDrop-MI'
+          env:
+            SYSTEM_ACCESSTOKEN: $(System.AccessToken)
         - powershell: |
             $insertionPRId = azure-pipelines/Get-InsertionPRId.ps1
             $Markdown = @"

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.306",
+    "version": "10.0.100",
     "rollForward": "patch",
     "allowPrerelease": false
   },

tools/Install-DotNetSdk.ps1

@@ -197,7 +197,7 @@ if ($InstallLocality -eq 'machine') {
         $restartRequired = $false
         $sdks |% {
             if ($_.Version) { $version = $_.Version } else { $version = $_.Channel }
-            if ($PSCmdlet.ShouldProcess(".NET SDK $_", "Install")) {
+            if ($PSCmdlet.ShouldProcess(".NET SDK $version ($arch)", "Install")) {
                 Install-DotNet -Version $version -Architecture $arch
                 $restartRequired = $restartRequired -or ($LASTEXITCODE -eq 3010)
 
@@ -281,10 +281,10 @@ if ($IncludeX86) {
 }
 
 if ($IsMacOS -or $IsLinux) {
-    $DownloadUri = "https://raw.githubusercontent.com/dotnet/install-scripts/0b09de9bc136cacb5f849a6957ebd4062173c148/src/dotnet-install.sh"
+    $DownloadUri = "https://raw.githubusercontent.com/dotnet/install-scripts/a3fbd0fd625032bac207f1f590e5353fe26faa59/src/dotnet-install.sh"
     $DotNetInstallScriptPath = "$DotNetInstallScriptRoot/dotnet-install.sh"
 } else {
-    $DownloadUri = "https://raw.githubusercontent.com/dotnet/install-scripts/0b09de9bc136cacb5f849a6957ebd4062173c148/src/dotnet-install.ps1"
+    $DownloadUri = "https://raw.githubusercontent.com/dotnet/install-scripts/a3fbd0fd625032bac207f1f590e5353fe26faa59/src/dotnet-install.ps1"
     $DotNetInstallScriptPath = "$DotNetInstallScriptRoot/dotnet-install.ps1"
 }
 
@@ -306,7 +306,7 @@ $global:LASTEXITCODE = 0
 $sdks |% {
     if ($_.Version) { $parameters = '-Version', $_.Version } else { $parameters = '-Channel', $_.Channel }
 
-    if ($PSCmdlet.ShouldProcess(".NET SDK $_", "Install")) {
+    if ($PSCmdlet.ShouldProcess(".NET SDK $_ ($arch)", "Install")) {
         $anythingInstalled = $true
         Invoke-Expression -Command "$DotNetInstallScriptPathExpression $parameters -Architecture $arch -InstallDir $DotNetInstallDir $switches"