Apply latest Library.Template including SDT additions

Directory.Build.props

@@ -41,6 +41,10 @@
     <PackageReference Include="CSharpIsNullAnalyzer" Version="0.1.300" PrivateAssets="all" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="$(RepoRootPath)obj/NOTICE" Pack="true" PackagePath="" Visible="false" Condition=" Exists('$(RepoRootPath)obj/NOTICE') " />
+  </ItemGroup>
+
   <ItemGroup>
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" />
   </ItemGroup>

azure-pipelines/Get-SymbolFiles.ps1

@@ -5,12 +5,16 @@
     The root path to recursively search for PDBs.
 .PARAMETER Tests
     A switch indicating to find test-related PDBs instead of product-only PDBs.
+.PARAMETER ConvertToWindowsPDBs
+    A switch to convert and return paths to Windows PDBs instead of portable PDBs.
+    Ignored on non-Windows agents.
 #>
 [CmdletBinding()]
 param (
     [parameter(Mandatory=$true)]
     [string]$Path,
-    [switch]$Tests
+    [switch]$Tests,
+    [switch]$ConvertToWindowsPDBs=$true
 )
 
 $WindowsPdbSubDirName = "symstore"
@@ -54,7 +58,7 @@ $PDBs |% {
 
     Write-Output $BinaryImagePath
 
-    if (-not ($IsMacOS -or $IsLinux)) {
+    if ($ConvertToWindowsPDBs -and -not ($IsMacOS -or $IsLinux)) {
         # Convert the PDB to legacy Windows PDBs
         Write-Host "Converting PDB for $_" -ForegroundColor DarkGray
         $WindowsPdbDir = "$($_.Directory.FullName)\$WindowsPdbSubDirName"
@@ -65,5 +69,7 @@ $PDBs |% {
         }
 
         Write-Output "$WindowsPdbDir\$($_.BaseName).pdb"
+    } else {
+        Write-Output $_.FullName
     }
 }

azure-pipelines/PoliCheckExclusions.xml

@@ -0,0 +1,10 @@
+<PoliCheckExclusions>
+    <!--Each of these exclusions is a folder name -if \[name]\exists in the file path, it will be skipped -->
+    <Exclusion Type="FolderPathFull">NODE_MODULES|.STORE</Exclusion>
+    <!--Each of these exclusions is a folder name -if any folder or file starts with "\[name]", it will be skipped -->
+    <!-- <Exclusion Type="FolderPathStart">ABC|XYZ</Exclusion>-->
+    <!--Each of these file types will be completely skipped for the entire scan -->
+    <!-- <Exclusion Type="FileType">.ABC|.XYZ</Exclusion>-->
+    <!--The specified file names will be skipped during the scan regardless which folder they are in -->
+    <!-- <Exclusion Type="FileName">ABC.TXT|XYZ.CS</Exclusion>-->
+</PoliCheckExclusions>

azure-pipelines/artifacts/testResults.ps1

@@ -1,12 +1,18 @@
+$result = @{}
+
 if ($env:AGENT_TEMPDIRECTORY) {
     # The DotNetCoreCLI uses an alternate location to publish these files
     $guidRegex = '^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$'
-    @{
-        $env:AGENT_TEMPDIRECTORY = (Get-ChildItem $env:AGENT_TEMPDIRECTORY -Directory |? { $_.Name -match $guidRegex } |% { Get-ChildItem "$($_.FullName)\dotnet*.dmp","$($_.FullName)\testhost*.dmp","$($_.FullName)\Sequence_*.xml" -Recurse });
-    }
-} else {
+    $result[$env:AGENT_TEMPDIRECTORY] = (Get-ChildItem $env:AGENT_TEMPDIRECTORY -Directory |? { $_.Name -match $guidRegex } |% { Get-ChildItem "$($_.FullName)\dotnet*.dmp","$($_.FullName)\testhost*.dmp","$($_.FullName)\Sequence_*.xml" -Recurse });
+}
+else {
     $testRoot = Resolve-Path "$PSScriptRoot\..\..\test"
-    @{
-        $testRoot = (Get-ChildItem "$testRoot\TestResults" -Recurse -Directory | Get-ChildItem -Recurse -File);
-    }
+    $result[$testRoot] = (Get-ChildItem "$testRoot\TestResults" -Recurse -Directory | Get-ChildItem -Recurse -File)
+}
+
+$testlogsPath = "$env:BUILD_ARTIFACTSTAGINGDIRECTORY\test_logs"
+if (Test-Path $testlogsPath) {
+    $result[$testlogsPath] = Get-ChildItem "$testlogsPath\*";
 }
+
+$result

azure-pipelines/build.yml

@@ -5,10 +5,17 @@ parameters:
     vmImage: windows-2022
 - name: ShouldSkipOptimize
 - name: includeMacOS
+- name: EnableAPIScan
+  type: boolean
+  default: false
 
 jobs:
 - job: Windows
   pool: ${{ parameters.windowsPool }}
+  variables:
+  - ${{ if eq(variables['system.collectionId'], '011b8bdf-6d56-4f87-be0d-0092136884d9') }}:
+    # https://dev.azure.com/devdiv/DevDiv/_wiki/wikis/DevDiv.wiki/25351/APIScan-step-by-step-guide-to-setting-up-a-Pipeline
+    - group: VSCloudServices-APIScan
   steps:
   - checkout: self
     clean: true
@@ -18,7 +25,7 @@ jobs:
 
   - template: install-dependencies.yml
 
-  - powershell: '& (./azure-pipelines/Get-nbgv.ps1) cloud'
+  - powershell: '& (./azure-pipelines/Get-nbgv.ps1) cloud -ca'
     displayName: Set build number
 
   - ${{ if eq(variables['system.collectionId'], '011b8bdf-6d56-4f87-be0d-0092136884d9') }}:
@@ -30,6 +37,8 @@ jobs:
 
   - ${{ if eq(variables['system.collectionId'], '011b8bdf-6d56-4f87-be0d-0092136884d9') }}:
     - template: microbuild.after.yml
+      parameters:
+        EnableAPIScan: ${{ parameters.EnableAPIScan }}
 
 - job: Linux
   condition: ne(variables['OptProf'], 'true')

azure-pipelines/dotnet.yml

@@ -1,5 +1,5 @@
 steps:
-# We use VSBuild instead of "dotnet build" on Windows where MicroBuild tasks have to run (since they don't support MSBuild Core yet).
+# We use VSBuild instead of "dotnet build" on Windows because dllexport doesn't work on dotnet build.
 - task: VSBuild@1
   displayName: Build Visual Studio solution
   inputs:
@@ -16,15 +16,15 @@ steps:
   displayName: dotnet test -f net472
   inputs:
     command: test
-    arguments: --no-build -c $(BuildConfiguration) -f net472 --filter "TestCategory!=FailsInCloudTest" -v n /p:CollectCoverage=true --settings "$(Build.Repository.LocalPath)/azure-pipelines/$(Agent.OS).runsettings" /bl:"$(Build.ArtifactStagingDirectory)/build_logs/test_net472.binlog"
+    arguments: --no-build -c $(BuildConfiguration) -f net472 --filter "TestCategory!=FailsInCloudTest" -v n /p:CollectCoverage=true --settings "$(Build.Repository.LocalPath)/azure-pipelines/$(Agent.OS).runsettings" /bl:"$(Build.ArtifactStagingDirectory)/build_logs/test_net472.binlog" --diag "$(Build.ArtifactStagingDirectory)/test_logs/net472.txt"
     testRunTitle: net472-$(Agent.JobName)
   condition: and(ne(variables['OptProf'], 'true'), eq(variables['Agent.OS'], 'Windows_NT'))
 
 - task: DotNetCoreCLI@2
   displayName: dotnet test -f netcoreapp3.1
   inputs:
     command: test
-    arguments: --no-build -c $(BuildConfiguration) -f netcoreapp3.1 --filter "TestCategory!=FailsInCloudTest" -v n /p:CollectCoverage=true --settings "$(Build.Repository.LocalPath)/azure-pipelines/$(Agent.OS).runsettings" /bl:"$(Build.ArtifactStagingDirectory)/build_logs/test_netcoreapp3.1.binlog"
+    arguments: --no-build -c $(BuildConfiguration) -f netcoreapp3.1 --filter "TestCategory!=FailsInCloudTest" -v n /p:CollectCoverage=true --settings "$(Build.Repository.LocalPath)/azure-pipelines/$(Agent.OS).runsettings" /bl:"$(Build.ArtifactStagingDirectory)/build_logs/test_netcoreapp3.1.binlog" --diag "$(Build.ArtifactStagingDirectory)/test_logs/netcoreapp3.1.txt"
     testRunTitle: netcoreapp3.1-$(Agent.JobName)
     workingDirectory: test/Microsoft.VisualStudio.Threading.Tests
   condition: ne(variables['OptProf'], 'true')
@@ -33,7 +33,7 @@ steps:
   displayName: dotnet test -f net5.0
   inputs:
     command: test
-    arguments: --no-build -c $(BuildConfiguration) -f net5.0 --filter "TestCategory!=FailsInCloudTest" -v n /p:CollectCoverage=true --settings "$(Build.Repository.LocalPath)/azure-pipelines/$(Agent.OS).runsettings" /bl:"$(Build.ArtifactStagingDirectory)/build_logs/test_net5.0.binlog"
+    arguments: --no-build -c $(BuildConfiguration) -f net5.0 --filter "TestCategory!=FailsInCloudTest" -v n /p:CollectCoverage=true --settings "$(Build.Repository.LocalPath)/azure-pipelines/$(Agent.OS).runsettings" /bl:"$(Build.ArtifactStagingDirectory)/build_logs/test_net5.0.binlog" --diag "$(Build.ArtifactStagingDirectory)/test_logs/net5.0.txt"
     testRunTitle: net5.0-$(Agent.JobName)
     workingDirectory: test/Microsoft.VisualStudio.Threading.Tests
   condition: ne(variables['OptProf'], 'true')

azure-pipelines/falsepositives.gdnsuppress

@@ -0,0 +1,104 @@
+{
+  "version": "latest",
+  "suppressionSets": {
+    "falsepositives": {
+      "name": "falsepositives",
+      "createdDate": "2022-01-05 22:51:28Z",
+      "lastUpdatedDate": "2022-01-05 22:51:28Z"
+    }
+  },
+  "results": {
+    "f2d4b996c6d7c4016ec4fcd8ffee323140ad820bf3e162080d3def56e8341e91": {
+      "signature": "f2d4b996c6d7c4016ec4fcd8ffee323140ad820bf3e162080d3def56e8341e91",
+      "alternativeSignatures": [],
+      "target": "src/Microsoft.VisualStudio.Threading.Analyzers.CSharp/VSTHRD003UseJtfRunAsyncAnalyzer.cs",
+      "memberOf": [
+        "falsepositives"
+      ],
+      "tool": "policheck",
+      "ruleId": "80411",
+      "justification": null,
+      "createdDate": "2022-01-05 21:55:03Z",
+      "expirationDate": null,
+      "type": null
+    },
+    "5bd7dbbf8a0e638bc4ee65d7db6dc4ab9054ddd64f8ec5cf4031380b01100b63": {
+      "signature": "5bd7dbbf8a0e638bc4ee65d7db6dc4ab9054ddd64f8ec5cf4031380b01100b63",
+      "alternativeSignatures": [],
+      "target": "src/Microsoft.VisualStudio.Threading.Analyzers.CSharp/VSTHRD003UseJtfRunAsyncAnalyzer.cs",
+      "memberOf": [
+        "falsepositives"
+      ],
+      "tool": "policheck",
+      "ruleId": "80411",
+      "justification": null,
+      "createdDate": "2022-01-05 21:55:03Z",
+      "expirationDate": null,
+      "type": null
+    },
+    "ed020ef10e60a1a49245aad9cd8922514ac643fe6f2f689cabdfc2205d725de5": {
+      "signature": "ed020ef10e60a1a49245aad9cd8922514ac643fe6f2f689cabdfc2205d725de5",
+      "alternativeSignatures": [
+        "2b12d128e16023e34f3070e5d1c3014207692966829acbf838fe1ec92ddf6798"
+      ],
+      "target": "microsoft.visualstudio.threading/release/net472/microsoft.visualstudio.threading.dll",
+      "memberOf": [
+        "falsepositives"
+      ],
+      "tool": "apiscan",
+      "ruleId": "documentationnotfound",
+      "justification": null,
+      "createdDate": "2022-01-05 21:55:03Z",
+      "expirationDate": null,
+      "type": null
+    },
+    "72600e5e09c73929820080a3d7fbbd591c4aac41a606251af6755e2ea3e96286": {
+      "signature": "72600e5e09c73929820080a3d7fbbd591c4aac41a606251af6755e2ea3e96286",
+      "alternativeSignatures": [
+        "e0697b669d792491bda5ab3c49a1c1bc71adc6c2a4cd903163c8d956aec5d16f"
+      ],
+      "target": "microsoft.visualstudio.threading/release/netstandard2.0/microsoft.visualstudio.threading.dll",
+      "memberOf": [
+        "falsepositives"
+      ],
+      "tool": "apiscan",
+      "ruleId": "documentationnotfound",
+      "justification": null,
+      "createdDate": "2022-01-05 21:55:03Z",
+      "expirationDate": null,
+      "type": null
+    },
+    "020f08af56f0cc9f5fe08f1a8b1fd0c1e4eae1c279dd347be77f1a7fabcff8f6": {
+      "signature": "020f08af56f0cc9f5fe08f1a8b1fd0c1e4eae1c279dd347be77f1a7fabcff8f6",
+      "alternativeSignatures": [
+        "a558e750375b35019cd9a75dbad28be2d3ca71e5fe00a69e275f097b7fd94483"
+      ],
+      "target": "bin/SosThreadingTools/Release/net472/win-x64/SosThreadingTools.dll",
+      "memberOf": [
+        "falsepositives"
+      ],
+      "tool": "binskim",
+      "ruleId": "BA2010",
+      "justification": null,
+      "createdDate": "2022-01-05 22:51:28Z",
+      "expirationDate": null,
+      "type": null
+    },
+    "c26038cded62714187b699785c344c1732b33f73f98e738270603dc5c03a8be8": {
+      "signature": "c26038cded62714187b699785c344c1732b33f73f98e738270603dc5c03a8be8",
+      "alternativeSignatures": [
+        "7964039bd373d0bc2e2f97d0b4a4f8d7b8b94c226fedb17c5bc9a012866ce46a"
+      ],
+      "target": "bin/SosThreadingTools/Release/net472/win-x86/SosThreadingTools.dll",
+      "memberOf": [
+        "falsepositives"
+      ],
+      "tool": "binskim",
+      "ruleId": "BA2010",
+      "justification": null,
+      "createdDate": "2022-01-05 22:51:28Z",
+      "expirationDate": null,
+      "type": null
+    }
+  }
+}

azure-pipelines/microbuild.after.yml

@@ -1,3 +1,7 @@
+parameters:
+- name: EnableAPIScan
+  type: boolean
+
 steps:
 - task: MicroBuildCodesignVerify@3
   displayName: Verify Signed Files
@@ -9,9 +13,6 @@ steps:
   condition: succeededOrFailed()
   displayName: MicroBuild Cleanup
 
-- task: ComponentGovernanceComponentDetection@0
-  displayName: Component Detection
-
 - task: ms-vscs-artifact.build-tasks.artifactDropTask-1.artifactDropTask@0
   inputs:
     dropServiceURI: https://devdiv.artifacts.visualstudio.com
@@ -45,3 +46,5 @@ steps:
   continueOnError: true
 
 - template: secure-development-tools.yml
+  parameters:
+    EnableAPIScan: ${{ parameters.EnableAPIScan }}

azure-pipelines/microbuild.before.yml

@@ -2,6 +2,15 @@ parameters:
 - name: ShouldSkipOptimize
 
 steps:
+- task: ComponentGovernanceComponentDetection@0
+  displayName: Component Detection
+
+- task: notice@0
+  displayName: Generate NOTICE file
+  inputs:
+    outputfile: $(System.DefaultWorkingDirectory)/obj/NOTICE
+    outputformat: text
+
 - task: MicroBuildOptProfPlugin@6
   inputs:
     ProfilingInputsDropName: ProfilingInputs/$(System.TeamProject)/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildNumber)

azure-pipelines/official.yml

@@ -35,6 +35,10 @@ parameters:
   displayName: Build on macOS
   type: boolean
   default: false # macOS is often bogged down in Azure Pipelines
+- name: EnableAPIScan
+  displayName: Run APIScan
+  type: boolean
+  default: false # enable when we get it passing
 
 variables:
   NugetSecurityAnalysisWarningLevel: none # nuget.config requires signed packages by trusted owners
@@ -53,6 +57,7 @@ stages:
   jobs:
   - template: build.yml
     parameters:
+      EnableAPIScan: ${{ parameters.EnableAPIScan }}
       windowsPool: VSEngSS-MicroBuild2022-1ES
       ShouldSkipOptimize: ${{ parameters.ShouldSkipOptimize }}
       includeMacOS: ${{ parameters.includeMacOS }}

azure-pipelines/publish-codecoverage.yml

@@ -18,10 +18,10 @@ steps:
 - powershell: |
     dotnet tool install --tool-path obj dotnet-reportgenerator-globaltool --version 4.8.5 --configfile azure-pipelines/justnugetorg.nuget.config
     Copy-Item -Recurse $(Pipeline.Workspace)/coverageResults-Windows/obj/* $(System.DefaultWorkingDirectory)/obj
-    Write-Host "Substituting {reporoot} with $(System.DefaultWorkingDirectory)"
-    $reports = Get-ChildItem -Recurse "$(Pipeline.Workspace)/coverage.*cobertura.xml"
+    Write-Host 'Substituting {reporoot} with $(System.DefaultWorkingDirectory)'
+    $reports = Get-ChildItem -Recurse '$(Pipeline.Workspace)/coverage.*cobertura.xml'
     $reports |% {
-        $content = Get-Content -Path $_ |% { $_.Replace("{reporoot}", "$(System.DefaultWorkingDirectory)") }
+        $content = Get-Content -Path $_ |% { $_.Replace('{reporoot}', '$(System.DefaultWorkingDirectory)') }
         Set-Content -Path $_ -Value $content -Encoding UTF8
     }
     $Inputs = [string]::join(';', ($reports |% { Resolve-Path -relative $_ }))

azure-pipelines/release.yml

@@ -47,8 +47,8 @@ stages:
                   { "label" : "enhancement", "displayName": "Enhancements", "state" : "closed" }
                 ]
 
-- stage: push_packages
-  displayName: Push packages
+- stage: nuget_org
+  displayName: nuget.org
   dependsOn: GitHubRelease
   jobs:
   - deployment: push
@@ -67,7 +67,7 @@ stages:
             inputs:
               versionSpec: 5.x
           - task: NuGetCommand@2
-            displayName: nuget.org
+            displayName: NuGet push
             inputs:
               command: push
               packagesToPush: $(Pipeline.Workspace)/CI/deployables-Windows/NuGet/*.nupkg