Merge main in rel/17.7

CODEOWNERS

@@ -9,6 +9,6 @@ PublicAPI.Unshipped.txt @nohwnd @MarcoRossignoli
 TelemetryDataConstants.cs @cvpoienaru @nohwnd
 
 # Changes here might break our contracts with other adapters, and possibly
-# Visual Studio. 
-/src/Microsoft.TestPlatform.AdapterUtilities/ @haplois @Evangelink 
-/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/  @haplois @Evangelink
+# Visual Studio.
+/src/Microsoft.TestPlatform.AdapterUtilities/ @nohwnd @Evangelink
+/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/ @nohwnd @Evangelink

Directory.Build.targets

@@ -11,11 +11,6 @@
     <TargetFramework Condition=" '$(TargetFramework)' != '' ">$(NetCurrent)</TargetFramework>
   </PropertyGroup>
 
-  <!-- Allows build of .NET Framework assemblies on MacOS and Linux https://github.com/dotnet/designs/pull/33#issuecomment-489264196 -->
-  <ItemGroup>
-    <PackageReference Condition=" '$(OS)' != 'Windows_NT' " Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="All" />
-  </ItemGroup>
-
   <!-- Test project settings -->
   <Choose>
     <When Condition="$(TestProject) == 'true'">

NuGet.config

@@ -7,6 +7,7 @@
     <clear />
     <!-- When building TestAssets we read the keys from here and provide them directly to dotnet restore together with path to artifacts/packages/<configuration>/Shipping,
     because the path to packages contains configuration and we don't want to modify a checked-in file in our repo to be able to build. -->
+    <add key="vssdk-archived" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk-archived/nuget/v3/index.json" />
     <add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
     <add key="test-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/test-tools/nuget/v3/index.json" />
@@ -15,8 +16,10 @@
     <add key="dotnet5" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet5/nuget/v3/index.json" />
     <add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
     <add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
+    <add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
+    <add key="vs-impl-archived" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl-archived/nuget/v3/index.json" />
     <!-- When building isolated test projects we copy this file into temp, and insert localy-built-packages source here, that points to artifacts/packages/<configuration>/Shipping. -->
   </packageSources>
   <fallbackPackageFolders>

azure-pipelines.yml

@@ -1,7 +1,19 @@
 # Branches that trigger a build on commit
 trigger:
-- main
-- rel/*
+  branches:
+    include:
+    - main
+    - rel/*
+    exclude:
+    - rel/15.*
+    - rel/16.*
+    - rel/17.0
+    - rel/17.1
+    - rel/17.2
+    - rel/17.3
+    - rel/17.4
+    - rel/17.5
+    - rel/17.6
 
 # Branch(es) that trigger(s) build(s) on PR
 pr:
@@ -23,7 +35,7 @@ pr:
 
 parameters:
 - name: isRTM
-  displayName: "Release a RTM version?"
+  displayName: "Produce RTM version?"
   type: boolean
   default: False
 
@@ -50,7 +62,7 @@ variables:
   # under some circumstances, but we don't respect that in our code and try to find them
   # in .packages. Force the location of packages to that folder.
   - name: NUGET_PACKAGES
-    value: '$(Build.SourcesDirectory)/.packages'
+    value: '$(Build.SourcesDirectory)/.packages/'
 
   # Produce real signed binaries for Internal builds
   - ${{ if eq(variables._RunAsInternal, True) }}:
@@ -76,6 +88,11 @@ variables:
         /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
         /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
         /p:VisualStudioDropName=$(VisualStudioDropName)
+        /p:GenerateSbom=true
+
+  - ${{ if eq(parameters.isRTM, True) }}:
+    - name: _InternalBuildArgs
+      value: $(_InternalBuildArgs) /p:DotNetFinalVersionKind=release
 
 stages:
 
@@ -119,6 +136,10 @@ stages:
             command: custom
             custom: '--info'
 
+        # Restore internal tools required for SBOM generation
+        - ${{ if eq(variables._RunAsInternal, True) }}:
+          - template: /eng/restore-internal-tools.yml
+
         - powershell: eng\common\CIBuild.cmd
             -configuration $(_BuildConfig)
             -prepareMachine
@@ -144,7 +165,7 @@ stages:
             PathtoPublish: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
             ArtifactName: TestResults
           condition: failed()
-        
+
         # Public pipeline does not upload packages into artifacts, but we need them for tests on Linux and MacOS.
         - ${{ if eq(variables._RunAsPublic, True) }}:
           - task: PublishBuildArtifacts@1
@@ -164,7 +185,7 @@ stages:
           inputs:
             PathtoPublish: '$(Build.SourcesDirectory)/artifacts/VSSetup/$(_BuildConfig)'
             ArtifactName: VSSetupArtifacts
-      
+
       - job: OtherOSes
         dependsOn: Windows
         workspace:
@@ -188,30 +209,30 @@ stages:
         - checkout: self
           fetchDepth: 1
           clean: true
-        
+
         # Build but don't pack, packing does not work on non-windows and we want to test what we built on Windows
         # anyway. Because that is what we will publish.
         - script: ./build.sh
             --configuration $(_BuildConfig)
             --ci
           name: Build
           displayName: Build
-        
+
         # Download the built packages into local package source, as if we built them on this machine.
         - task: DownloadPipelineArtifact@2
           displayName: Download Package Artifacts
           inputs:
             artifactName: PackageArtifacts
             targetPath: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/Shipping'
-        
+
         - script: ./test.sh
             --configuration $(_BuildConfig)
             --ci
             --integrationTest
             --performanceTest
           name: Test
           displayName: Test
-        
+
         # This step is only helpful for diagnosing some issues with vstest/test host that would not appear
         # through the console or trx
         - task: PublishBuildArtifacts@1
@@ -221,39 +242,34 @@ stages:
             ArtifactName: TestResults
           condition: failed()
 
-      - job: Publish
-        dependsOn: OtherOSes
-        pool:
-          ${{ if eq(variables._RunAsPublic, True) }}:
-            name: NetCore-Public
-            demands: ImageOverride -equals windows.vs2022.amd64.open
-          ${{ if eq(variables._RunAsInternal, True) }}:
-            name: NetCore1ESPool-Internal
-            demands: ImageOverride -equals 1es-windows-2022
-        strategy:
-          matrix:
-            Release:
-              _BuildConfig: Release
-            # ${{ if eq(variables._RunAsPublic, True) }}:
-            #   Debug:
-            #     _BuildConfig: Debug
-        steps:
-          # Download the built packages into local package source, as if we built them on this machine.
-          - task: DownloadPipelineArtifact@2
-            displayName: Download Package Artifacts
-            inputs:
-              artifactName: PackageArtifacts
-              targetPath: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/Shipping'
-
-          - task: DownloadPipelineArtifact@2
-            displayName: Download VSSetup Artifacts
-            inputs:
-              artifactName: VSSetupArtifacts
-              targetPath: '$(Build.SourcesDirectory)/artifacts/VSSetup/$(_BuildConfig)'
-
-          # TODO: Publishing to the feeds is making non-arcade CI acceptance tests fail so we disable these steps for now.
-          #       They will need to be re-enabled once this is merged to main.
-          - ${{ if eq(variables._RunAsInternal, True) }}:
+      - ${{ if eq(variables._RunAsInternal, True) }}:
+        - job: Publish
+          dependsOn: OtherOSes
+          pool:
+              name: NetCore1ESPool-Internal
+              demands: ImageOverride -equals 1es-windows-2022
+          strategy:
+            matrix:
+              Release:
+                _BuildConfig: Release
+          steps:
+            # The template job needs a log, otherwise it writes a warning. We can disable log uploading only for
+            # the whole stage, which is not what we want to do. So we write an empty file instead.
+            - pwsh: 'New-Item -Type file -Force "$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/empty.log"'
+              name: 'Add_empty_logfile'
+            # Download the built packages into local package source, as if we built them on this machine.
+            - task: DownloadPipelineArtifact@2
+              displayName: Download Package Artifacts
+              inputs:
+                artifactName: PackageArtifacts
+                targetPath: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/Shipping'
+
+            - task: DownloadPipelineArtifact@2
+              displayName: Download VSSetup Artifacts
+              inputs:
+                artifactName: VSSetupArtifacts
+                targetPath: '$(Build.SourcesDirectory)/artifacts/VSSetup/$(_BuildConfig)'
+
             - task: NuGetAuthenticate@0
               displayName: 'NuGet Authenticate to dotnet-tools and test-tools feeds'
 

docs/releases.md

@@ -1,5 +1,34 @@
 # Release Notes
 
+## 17.6.1 and newer
+
+Please see release notes directly in the release page: https://github.com/microsoft/vstest/releases
+
+## 17.6.0
+
+### Issues Fixed
+
+* Add legacy feeds
+* [rel/17.6] Fix Newtonsoft versions in testhost.deps.json [#4372](https://github.com/microsoft/vstest/pull/4372)
+* Revert "Revert "Fix signature verification" (#4333" [#4345](https://github.com/microsoft/vstest/pull/4345)
+* Revert "Fix signature verification" [#4333](https://github.com/microsoft/vstest/pull/4333)
+* Fix signature verification [#4331](https://github.com/microsoft/vstest/pull/4331)
+* Pre-start testhosts [#3666](https://github.com/microsoft/vstest/pull/3666)
+* Add `dotnet vstest` deprecation message [#4297](https://github.com/microsoft/vstest/pull/4297)
+* Catch unhandled exception and avoid crash on test host exit [#4291](https://github.com/microsoft/vstest/pull/4291)
+* Remove chutzpah [#4249](https://github.com/microsoft/vstest/pull/4249)
+* Fix string conversion of `Microsoft.TestPlatform.Extensions.TrxLogger.ObjectMode.TestOutcome` [#4243](https://github.com/microsoft/vstest/pull/4243)
+* Fix potential trx logger NRE [#4240](https://github.com/microsoft/vstest/pull/4240)
+* handle object disposed exception [#4221](https://github.com/microsoft/vstest/pull/4221)
+* Added support for checking testhost compatibility with test sessions [#4199](https://github.com/microsoft/vstest/pull/4199)
+
+See full log [here](https://github.com/microsoft/vstest/compare/v17.5.0...v17.6.0)
+
+### Artifacts
+
+* TestPlatform vsix: [17.6.0](https://vsdrop.corp.microsoft.com/file/v1/Products/DevDiv/microsoft/vstest/17.6/20230515-01;/TestPlatform.vsix)
+* Microsoft.TestPlatform.ObjectModel : [17.6.0](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/17.6.0)
+
 ## 17.3.3
 
 ### Issues Fixed