From e5ad8448c8289e560d38222cc2271ff389020f25 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Dec 2021 13:21:36 +0000 Subject: [PATCH 01/32] Update dependencies from https://github.com/dotnet/roslyn build 20211216.3 Microsoft.NETCore.Compilers From Version 4.0.1-1.21573.5 -> To Version 4.0.1-1.21616.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e60a78a2c7..4161e08609 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/roslyn - 1fa6e45dd631b37e7b28a78907240aed8a300d50 + 66438a99ebddd5f58ef037ff7ce01668228b6183 https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index 469b0b1a35..9b4d5073c7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ 3.3.2 5.0.0 - 4.0.1-1.21573.5 + 4.0.1-1.21616.3 2.0.0-beta2.21615.1 0.4.0-alpha.21615.1 From 38e82ce24ea479ab9f014e89dcd957afa4e91719 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Sun, 19 Dec 2021 14:08:19 -0800 Subject: [PATCH 02/32] Use AnalyzerFileReference when loading analyzers --- .../AnalyzerReferenceInformationProvider.cs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/Analyzers/AnalyzerReferenceInformationProvider.cs b/src/Analyzers/AnalyzerReferenceInformationProvider.cs index 6b688878b4..7c82ec7614 100644 --- a/src/Analyzers/AnalyzerReferenceInformationProvider.cs +++ b/src/Analyzers/AnalyzerReferenceInformationProvider.cs @@ -7,6 +7,8 @@ using System.Linq; using System.Reflection; using System.Runtime.Loader; +using System.Runtime.Serialization; +using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.Tools.Utilities; using Microsoft.Extensions.Logging; @@ -31,14 +33,14 @@ public ImmutableDictionary GetAnalyzersAndFixers( private AnalyzersAndFixers GetAnalyzersAndFixers(Project project) { var analyzerAssemblies = project.AnalyzerReferences - .Select(reference => TryLoadAssemblyFrom(reference.FullPath)) + .Select(reference => TryLoadAssemblyFrom(reference.FullPath, reference as AnalyzerFileReference)) .OfType() .ToImmutableArray(); return AnalyzerFinderHelpers.LoadAnalyzersAndFixers(analyzerAssemblies); } - private static Assembly? TryLoadAssemblyFrom(string? path) + private static Assembly? TryLoadAssemblyFrom(string? path, AnalyzerFileReference? analyzerFileReference) { // Since we are not deploying these assemblies we need to ensure the files exist. if (path is null || !File.Exists(path)) @@ -55,6 +57,13 @@ private AnalyzersAndFixers GetAnalyzersAndFixers(Project project) try { + if (analyzerFileReference is not null) + { + var analyzerAssembly = analyzerFileReference.GetAssembly(); + s_pathsToAssemblies.Add(path, analyzerAssembly); + s_namesToAssemblies.Add(analyzerAssembly.GetName().FullName, analyzerAssembly); + } + var context = new AnalyzerLoadContext(path); var assembly = context.LoadFromAssemblyPath(path); From cd118c423c6aa18397841d444602e90eb6e04fbd Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Sun, 19 Dec 2021 14:11:26 -0800 Subject: [PATCH 03/32] Add comment --- src/Analyzers/AnalyzerReferenceInformationProvider.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Analyzers/AnalyzerReferenceInformationProvider.cs b/src/Analyzers/AnalyzerReferenceInformationProvider.cs index 7c82ec7614..2f73e76a0c 100644 --- a/src/Analyzers/AnalyzerReferenceInformationProvider.cs +++ b/src/Analyzers/AnalyzerReferenceInformationProvider.cs @@ -7,7 +7,6 @@ using System.Linq; using System.Reflection; using System.Runtime.Loader; -using System.Runtime.Serialization; using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.Tools.Utilities; using Microsoft.Extensions.Logging; @@ -59,6 +58,9 @@ private AnalyzersAndFixers GetAnalyzersAndFixers(Project project) { if (analyzerFileReference is not null) { + // If we have access to the analyzer file reference we can prepopulate our + // cache with the assembly. We will still go through the AnalyzerLoadContext + // so that dependency resolution will be handled. var analyzerAssembly = analyzerFileReference.GetAssembly(); s_pathsToAssemblies.Add(path, analyzerAssembly); s_namesToAssemblies.Add(analyzerAssembly.GetName().FullName, analyzerAssembly); From cf375d5e14bc6f78755f707e3dedf17725802043 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Sun, 19 Dec 2021 15:23:39 -0800 Subject: [PATCH 04/32] Fix double add scenario --- src/Analyzers/AnalyzerReferenceInformationProvider.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Analyzers/AnalyzerReferenceInformationProvider.cs b/src/Analyzers/AnalyzerReferenceInformationProvider.cs index 2f73e76a0c..8c1c05f30b 100644 --- a/src/Analyzers/AnalyzerReferenceInformationProvider.cs +++ b/src/Analyzers/AnalyzerReferenceInformationProvider.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft. All Rights Reserved. Licensed under the MIT license. See License.txt in the project root for license information. +// Copyright (c) Microsoft. All Rights Reserved. Licensed under the MIT license. See License.txt in the project root for license information. using System; using System.Collections.Generic; @@ -62,8 +62,7 @@ private AnalyzersAndFixers GetAnalyzersAndFixers(Project project) // cache with the assembly. We will still go through the AnalyzerLoadContext // so that dependency resolution will be handled. var analyzerAssembly = analyzerFileReference.GetAssembly(); - s_pathsToAssemblies.Add(path, analyzerAssembly); - s_namesToAssemblies.Add(analyzerAssembly.GetName().FullName, analyzerAssembly); + s_namesToAssemblies.TryAdd(analyzerAssembly.GetName().FullName, analyzerAssembly); } var context = new AnalyzerLoadContext(path); From a72ab9df2669797d03de40e59cbb8bc4042c0a04 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Dec 2021 13:18:40 +0000 Subject: [PATCH 05/32] Update dependencies from https://github.com/dotnet/roslyn build 20211219.1 Microsoft.NETCore.Compilers From Version 4.0.1-1.21573.5 -> To Version 4.0.1-1.21619.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4161e08609..53c9c1ba3b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/roslyn - 66438a99ebddd5f58ef037ff7ce01668228b6183 + 4bc1f9a38a54283007b9ba142f032ddc2e111cf4 https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index 9b4d5073c7..de4f3e00ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ 3.3.2 5.0.0 - 4.0.1-1.21616.3 + 4.0.1-1.21619.1 2.0.0-beta2.21615.1 0.4.0-alpha.21615.1 From 74c1bfb8a69ff076d720dc7010e80fee7e262b58 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Dec 2021 13:43:55 +0000 Subject: [PATCH 06/32] Update dependencies from https://github.com/dotnet/arcade build 20211220.3 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.21614.2 -> To Version 6.0.0-beta.21620.3 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e60a78a2c7..5f139c72ba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,9 +15,9 @@ - + https://github.com/dotnet/arcade - 47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e + a42dc50e586cfe499287120990ad916ecd504c6f diff --git a/global.json b/global.json index ac023c4da8..d9627da332 100644 --- a/global.json +++ b/global.json @@ -6,6 +6,6 @@ "version": "6.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21614.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21620.3" } } From a13780dcc69b521f021d9f6a45169e2a605ab278 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 Jan 2022 13:33:12 +0000 Subject: [PATCH 07/32] Update dependencies from https://github.com/dotnet/roslyn build 20220103.6 Microsoft.NETCore.Compilers From Version 4.0.1-1.21573.5 -> To Version 4.0.1-1.22053.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 53c9c1ba3b..488bc51afb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/roslyn - 4bc1f9a38a54283007b9ba142f032ddc2e111cf4 + 9942dc957472b9bf179b11742bc161ef6c79691e https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index de4f3e00ba..9c92434d30 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ 3.3.2 5.0.0 - 4.0.1-1.21619.1 + 4.0.1-1.22053.6 2.0.0-beta2.21615.1 0.4.0-alpha.21615.1 From bcbe2e7dd6ffd74fbe484bbccea5abc9ff2a2a9e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 Jan 2022 13:44:29 +0000 Subject: [PATCH 08/32] Update dependencies from https://github.com/dotnet/arcade build 20220103.5 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.21614.2 -> To Version 6.0.0-beta.22053.5 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5f139c72ba..7b2476df4b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,9 +15,9 @@ - + https://github.com/dotnet/arcade - a42dc50e586cfe499287120990ad916ecd504c6f + fa0c6cf0b524d23645310200040c2d8123446a9d diff --git a/global.json b/global.json index d9627da332..1d701ac2d0 100644 --- a/global.json +++ b/global.json @@ -6,6 +6,6 @@ "version": "6.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21620.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22053.5" } } From 59a27677ebf6991d591eff5eb25c2f255138e520 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 5 Jan 2022 13:41:52 +0000 Subject: [PATCH 09/32] Update dependencies from https://github.com/dotnet/arcade build 20220104.3 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.21614.2 -> To Version 6.0.0-beta.22054.3 --- eng/Version.Details.xml | 4 ++-- eng/common/sdl/packages.config | 2 +- eng/common/templates/job/execute-sdl.yml | 2 +- global.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7b2476df4b..f94ebf116e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,9 +15,9 @@ - + https://github.com/dotnet/arcade - fa0c6cf0b524d23645310200040c2d8123446a9d + 98018d5a808e5167a4ce5e81dc6513382676d4c9 diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config index 3bd8b29ebd..b7bcfe38ca 100644 --- a/eng/common/sdl/packages.config +++ b/eng/common/sdl/packages.config @@ -1,4 +1,4 @@ - + diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 4882dd9313..0ca2afe696 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -54,7 +54,7 @@ jobs: # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in # sync with the packages.config file. - name: DefaultGuardianVersion - value: 0.53.3 + value: 0.110.1 - name: GuardianVersion value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} - name: GuardianPackagesConfigFile diff --git a/global.json b/global.json index 1d701ac2d0..964255fdc1 100644 --- a/global.json +++ b/global.json @@ -6,6 +6,6 @@ "version": "6.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22053.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22054.3" } } From 272b450773e912d0377b9fc42768ff05fa072914 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Jan 2022 13:38:22 +0000 Subject: [PATCH 10/32] Update dependencies from https://github.com/dotnet/arcade build 20220112.1 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.21614.2 -> To Version 6.0.0-beta.22062.1 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f94ebf116e..e1dbb574c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,9 +15,9 @@ - + https://github.com/dotnet/arcade - 98018d5a808e5167a4ce5e81dc6513382676d4c9 + 23aac30db027b929a600791b1cf04e6d50182a6c diff --git a/global.json b/global.json index 964255fdc1..95d4b70a71 100644 --- a/global.json +++ b/global.json @@ -6,6 +6,6 @@ "version": "6.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22054.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22062.1" } } From 96dae0ed9506fd89daac53f0b3159aedbd02ffbc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Jan 2022 13:23:41 +0000 Subject: [PATCH 11/32] Update dependencies from https://github.com/dotnet/arcade build 20220119.6 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.21614.2 -> To Version 6.0.0-beta.22069.6 --- eng/Version.Details.xml | 4 +- eng/common/generate-graph-files.ps1 | 86 ------------------- .../templates/job/generate-graph-files.yml | 48 ----------- eng/common/templates/jobs/jobs.yml | 10 --- global.json | 2 +- 5 files changed, 3 insertions(+), 147 deletions(-) delete mode 100644 eng/common/generate-graph-files.ps1 delete mode 100644 eng/common/templates/job/generate-graph-files.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e1dbb574c4..d991a33048 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,9 +15,9 @@ - + https://github.com/dotnet/arcade - 23aac30db027b929a600791b1cf04e6d50182a6c + 9afb10914952d5c1e1705e74470ea0f0f805011a diff --git a/eng/common/generate-graph-files.ps1 b/eng/common/generate-graph-files.ps1 deleted file mode 100644 index 0728b1a8b5..0000000000 --- a/eng/common/generate-graph-files.ps1 +++ /dev/null @@ -1,86 +0,0 @@ -Param( - [Parameter(Mandatory=$true)][string] $barToken, # Token generated at https://maestro-prod.westus2.cloudapp.azure.com/Account/Tokens - [Parameter(Mandatory=$true)][string] $gitHubPat, # GitHub personal access token from https://github.com/settings/tokens (no auth scopes needed) - [Parameter(Mandatory=$true)][string] $azdoPat, # Azure Dev Ops tokens from https://dev.azure.com/dnceng/_details/security/tokens (code read scope needed) - [Parameter(Mandatory=$true)][string] $outputFolder, # Where the graphviz.txt file will be created - [string] $darcVersion, # darc's version - [string] $graphvizVersion = '2.38', # GraphViz version - [switch] $includeToolset # Whether the graph should include toolset dependencies or not. i.e. arcade, optimization. For more about - # toolset dependencies see https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md#toolset-vs-product-dependencies -) - -function CheckExitCode ([string]$stage) -{ - $exitCode = $LASTEXITCODE - if ($exitCode -ne 0) { - Write-PipelineTelemetryError -Category 'Arcade' -Message "Something failed in stage: '$stage'. Check for errors above. Exiting now..." - ExitWithExitCode $exitCode - } -} - -try { - $ErrorActionPreference = 'Stop' - . $PSScriptRoot\tools.ps1 - - Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1') - - Push-Location $PSScriptRoot - - Write-Host 'Installing darc...' - . .\darc-init.ps1 -darcVersion $darcVersion - CheckExitCode 'Running darc-init' - - $engCommonBaseDir = Join-Path $PSScriptRoot 'native\' - $graphvizInstallDir = CommonLibrary\Get-NativeInstallDirectory - $nativeToolBaseUri = 'https://netcorenativeassets.blob.core.windows.net/resource-packages/external' - $installBin = Join-Path $graphvizInstallDir 'bin' - - Write-Host 'Installing dot...' - .\native\install-tool.ps1 -ToolName graphviz -InstallPath $installBin -BaseUri $nativeToolBaseUri -CommonLibraryDirectory $engCommonBaseDir -Version $graphvizVersion -Verbose - - $darcExe = "$env:USERPROFILE\.dotnet\tools" - $darcExe = Resolve-Path "$darcExe\darc.exe" - - Create-Directory $outputFolder - - # Generate 3 graph descriptions: - # 1. Flat with coherency information - # 2. Graphviz (dot) file - # 3. Standard dependency graph - $graphVizFilePath = "$outputFolder\graphviz.txt" - $graphVizImageFilePath = "$outputFolder\graph.png" - $normalGraphFilePath = "$outputFolder\graph-full.txt" - $flatGraphFilePath = "$outputFolder\graph-flat.txt" - $baseOptions = @( '--github-pat', "$gitHubPat", '--azdev-pat', "$azdoPat", '--password', "$barToken" ) - - if ($includeToolset) { - Write-Host 'Toolsets will be included in the graph...' - $baseOptions += @( '--include-toolset' ) - } - - Write-Host 'Generating standard dependency graph...' - & "$darcExe" get-dependency-graph @baseOptions --output-file $normalGraphFilePath - CheckExitCode 'Generating normal dependency graph' - - Write-Host 'Generating flat dependency graph and graphviz file...' - & "$darcExe" get-dependency-graph @baseOptions --flat --coherency --graphviz $graphVizFilePath --output-file $flatGraphFilePath - CheckExitCode 'Generating flat and graphviz dependency graph' - - Write-Host "Generating graph image $graphVizFilePath" - $dotFilePath = Join-Path $installBin "graphviz\$graphvizVersion\release\bin\dot.exe" - & "$dotFilePath" -Tpng -o"$graphVizImageFilePath" "$graphVizFilePath" - CheckExitCode 'Generating graphviz image' - - Write-Host "'$graphVizFilePath', '$flatGraphFilePath', '$normalGraphFilePath' and '$graphVizImageFilePath' created!" -} -catch { - if (!$includeToolset) { - Write-Host 'This might be a toolset repo which includes only toolset dependencies. ' -NoNewline -ForegroundColor Yellow - Write-Host 'Since -includeToolset is not set there is no graph to create. Include -includeToolset and try again...' -ForegroundColor Yellow - } - Write-Host $_.ScriptStackTrace - Write-PipelineTelemetryError -Category 'Arcade' -Message $_ - ExitWithExitCode 1 -} finally { - Pop-Location -} \ No newline at end of file diff --git a/eng/common/templates/job/generate-graph-files.yml b/eng/common/templates/job/generate-graph-files.yml deleted file mode 100644 index e54ce956f9..0000000000 --- a/eng/common/templates/job/generate-graph-files.yml +++ /dev/null @@ -1,48 +0,0 @@ -parameters: - # Optional: dependencies of the job - dependsOn: '' - - # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool - pool: {} - - # Optional: Include toolset dependencies in the generated graph files - includeToolset: false - -jobs: -- job: Generate_Graph_Files - - dependsOn: ${{ parameters.dependsOn }} - - displayName: Generate Graph Files - - pool: ${{ parameters.pool }} - - variables: - # Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT - # DotNet-AllOrgs-Darc-Pats provides: dn-bot-devdiv-dnceng-rw-code-pat - - group: Publish-Build-Assets - - group: DotNet-AllOrgs-Darc-Pats - - name: _GraphArguments - value: -gitHubPat $(BotAccount-dotnet-maestro-bot-PAT) - -azdoPat $(dn-bot-devdiv-dnceng-rw-code-pat) - -barToken $(MaestroAccessToken) - -outputFolder '$(Build.StagingDirectory)/GraphFiles/' - - ${{ if ne(parameters.includeToolset, 'false') }}: - - name: _GraphArguments - value: ${{ variables._GraphArguments }} -includeToolset - - steps: - - task: PowerShell@2 - displayName: Generate Graph Files - inputs: - filePath: eng\common\generate-graph-files.ps1 - arguments: $(_GraphArguments) - continueOnError: true - - task: PublishBuildArtifacts@1 - displayName: Publish Graph to Artifacts - inputs: - PathtoPublish: '$(Build.StagingDirectory)/GraphFiles' - PublishLocation: Container - ArtifactName: GraphFiles - continueOnError: true - condition: always() diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 90015a7e5a..2cc0f67e15 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -87,13 +87,3 @@ jobs: runAsPublic: ${{ parameters.runAsPublic }} publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} - - - ${{ if eq(parameters.graphFileGeneration.enabled, true) }}: - - template: ../job/generate-graph-files.yml - parameters: - continueOnError: ${{ parameters.continueOnError }} - includeToolset: ${{ parameters.graphFileGeneration.includeToolset }} - dependsOn: - - Asset_Registry_Publish - pool: - vmImage: windows-2019 diff --git a/global.json b/global.json index 95d4b70a71..92ac658ec4 100644 --- a/global.json +++ b/global.json @@ -6,6 +6,6 @@ "version": "6.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22062.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22069.6" } } From ebd62605ced5f05c76f84bb9aee4eeb1a029cbe3 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Thu, 20 Jan 2022 13:40:13 -0800 Subject: [PATCH 12/32] Downgrade System.CommandLine. Reverts https://github.com/dotnet/format/pull/1436 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- src/Commands/FormatAnalyzersCommand.cs | 4 ++-- src/Commands/FormatCommandCommon.cs | 10 +++++----- src/Commands/FormatStyleCommand.cs | 4 ++-- src/Commands/RootFormatCommand.cs | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e60a78a2c7..ee8d4af625 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,13 +5,13 @@ https://github.com/dotnet/roslyn 1fa6e45dd631b37e7b28a78907240aed8a300d50 - + https://github.com/dotnet/command-line-api - c31ce2797305a4e084736c1d43a078d7e90f9b60 + 82273cb56c83b589e8e5b63da0ac9745ffc6e105 - + https://github.com/dotnet/command-line-api - c31ce2797305a4e084736c1d43a078d7e90f9b60 + 82273cb56c83b589e8e5b63da0ac9745ffc6e105 diff --git a/eng/Versions.props b/eng/Versions.props index 469b0b1a35..5c94ad6832 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,8 +19,8 @@ 4.0.1-1.21573.5 - 2.0.0-beta2.21615.1 - 0.4.0-alpha.21615.1 + 2.0.0-beta1.21473.1 + 0.3.0-alpha.21473.1 - 4.0.1-1.22053.6 + 4.0.1-1.22107.6 2.0.0-beta2.21615.1 0.4.0-alpha.21615.1 From 3ea63e928c906a0f373a658465ce0ca523b7ff86 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Feb 2022 13:39:06 +0000 Subject: [PATCH 20/32] Update dependencies from https://github.com/dotnet/arcade build 20220207.2 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.21614.2 -> To Version 6.0.0-beta.22107.2 --- eng/Version.Details.xml | 4 ++-- eng/common/templates/job/source-build.yml | 15 +++++++++------ global.json | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 655d5be22d..3aad51ff94 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,9 +15,9 @@ - + https://github.com/dotnet/arcade - 35cb0d91130a309154a03a7efa39fa6d389c43ec + fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index 5023d36dcb..5cd5325d7b 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -31,11 +31,6 @@ parameters: # container and pool. platform: {} - # The default VM host AzDO pool. This should be capable of running Docker containers: almost all - # source-build builds run in Docker, including the default managed platform. - defaultContainerHostPool: - vmImage: ubuntu-20.04 - jobs: - job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }} displayName: Source-Build (${{ parameters.platform.name }}) @@ -47,7 +42,15 @@ jobs: container: ${{ parameters.platform.container }} ${{ if eq(parameters.platform.pool, '') }}: - pool: ${{ parameters.defaultContainerHostPool }} + # The default VM host AzDO pool. This should be capable of running Docker containers: almost all + # source-build builds run in Docker, including the default managed platform. + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore1ESPool-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }} diff --git a/global.json b/global.json index 2e3d3c2b95..52a9af6958 100644 --- a/global.json +++ b/global.json @@ -6,6 +6,6 @@ "version": "6.0.101" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22104.4" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22107.2" } } From 1b571327e976094e6082c759bccdcb359bec8b3c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Feb 2022 13:40:32 +0000 Subject: [PATCH 21/32] Update dependencies from https://github.com/dotnet/arcade build 20220209.2 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.21614.2 -> To Version 6.0.0-beta.22109.2 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3aad51ff94..440a59caf3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,9 +15,9 @@ - + https://github.com/dotnet/arcade - fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d + b1d15320be336a880bf140a042b2b564b9d22dcf diff --git a/global.json b/global.json index 52a9af6958..f61ca04b9e 100644 --- a/global.json +++ b/global.json @@ -6,6 +6,6 @@ "version": "6.0.101" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22107.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22109.2" } } From 3652e43c164c43c92aa3e9c010c5b28d8edd4627 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 11 Feb 2022 13:37:18 +0000 Subject: [PATCH 22/32] Update dependencies from https://github.com/dotnet/roslyn build 20220210.3 Microsoft.NETCore.Compilers From Version 4.0.1-1.21573.5 -> To Version 4.0.1-1.22110.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7fbe32efc0..b5f1e49717 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/roslyn - ea52fcb54d7e2ab9354f24bfb318f187fa7ac999 + a48a49ca315c5b3de139ba23981e80e0522021fd https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index 489358e8f0..86d9be3936 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ 3.3.2 5.0.0 - 4.0.1-1.22107.6 + 4.0.1-1.22110.3 2.0.0-beta2.21615.1 0.4.0-alpha.21615.1 From ed22cd4e0156a8397580cd25b85f62df558fff97 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Feb 2022 13:44:24 +0000 Subject: [PATCH 23/32] Update dependencies from https://github.com/dotnet/roslyn build 20220214.6 Microsoft.NETCore.Compilers From Version 4.0.1-1.21573.5 -> To Version 4.0.1-1.22114.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b5f1e49717..863d51c0c1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/roslyn - a48a49ca315c5b3de139ba23981e80e0522021fd + 25e7a33de1c9e1d4840014db03c59bc4424c6188 https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index 86d9be3936..16f8833abc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ 3.3.2 5.0.0 - 4.0.1-1.22110.3 + 4.0.1-1.22114.6 2.0.0-beta2.21615.1 0.4.0-alpha.21615.1 From 8d65d7321d227379fe749abbf7b9d27f04c80f94 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Feb 2022 13:45:36 +0000 Subject: [PATCH 24/32] Update dependencies from https://github.com/dotnet/arcade build 20220214.1 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.21614.2 -> To Version 6.0.0-beta.22114.1 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 440a59caf3..7552e497e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,9 +15,9 @@ - + https://github.com/dotnet/arcade - b1d15320be336a880bf140a042b2b564b9d22dcf + 5f2a9f597cc846038e8cc664a4205303dc13b4e5 diff --git a/global.json b/global.json index f61ca04b9e..1f76265457 100644 --- a/global.json +++ b/global.json @@ -6,6 +6,6 @@ "version": "6.0.101" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22109.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22114.1" } } From 46fbb91b7d37b419779fdbb802583c202ed14492 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Feb 2022 13:27:58 +0000 Subject: [PATCH 25/32] Update dependencies from https://github.com/dotnet/roslyn build 20220216.5 Microsoft.NETCore.Compilers From Version 4.0.1-1.21573.5 -> To Version 4.0.1-1.22116.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 863d51c0c1..1c0f5a87cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/roslyn - 25e7a33de1c9e1d4840014db03c59bc4424c6188 + ff289c438fabbdb4755f3c92c976763705140bd9 https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index 16f8833abc..70a21d5c61 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ 3.3.2 5.0.0 - 4.0.1-1.22114.6 + 4.0.1-1.22116.5 2.0.0-beta2.21615.1 0.4.0-alpha.21615.1 From 5c5803f702e9c2900a80068152100cc43bc32785 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Feb 2022 13:28:59 +0000 Subject: [PATCH 26/32] Update dependencies from https://github.com/dotnet/arcade build 20220216.15 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.21614.2 -> To Version 6.0.0-beta.22116.15 --- eng/Version.Details.xml | 4 +- eng/common/generate-sbom-prep.ps1 | 19 +++++++++ eng/common/generate-sbom-prep.sh | 22 ++++++++++ eng/common/templates/job/job.yml | 10 +++++ eng/common/templates/steps/generate-sbom.yml | 44 ++++++++++++++++++++ global.json | 2 +- 6 files changed, 98 insertions(+), 3 deletions(-) create mode 100644 eng/common/generate-sbom-prep.ps1 create mode 100644 eng/common/generate-sbom-prep.sh create mode 100644 eng/common/templates/steps/generate-sbom.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7552e497e7..7b1699b492 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,9 +15,9 @@ - + https://github.com/dotnet/arcade - 5f2a9f597cc846038e8cc664a4205303dc13b4e5 + 40eacd2afc9cfd2ba892b5eadb3e728c1008fa38 diff --git a/eng/common/generate-sbom-prep.ps1 b/eng/common/generate-sbom-prep.ps1 new file mode 100644 index 0000000000..a733a88858 --- /dev/null +++ b/eng/common/generate-sbom-prep.ps1 @@ -0,0 +1,19 @@ +Param( + [Parameter(Mandatory=$true)][string] $ManifestDirPath # Manifest directory where sbom will be placed +) + +Write-Host "Creating dir $ManifestDirPath" +# create directory for sbom manifest to be placed +if (!(Test-Path -path $ManifestDirPath)) +{ + New-Item -ItemType Directory -path $ManifestDirPath + Write-Host "Successfully created directory $ManifestDirPath" +} +else{ + Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." +} + +Write-Host "Updating artifact name" +$artifact_name = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -replace '["/:<>\\|?@*"() ]', '_' +Write-Host "Artifact name $artifact_name" +Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$artifact_name" diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh new file mode 100644 index 0000000000..f6c7745314 --- /dev/null +++ b/eng/common/generate-sbom-prep.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash + +source="${BASH_SOURCE[0]}" + +manifest_dir=$1 + +if [ ! -d "$manifest_dir" ] ; then + mkdir -p "$manifest_dir" + echo "Sbom directory created." $manifest_dir +else + Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." +fi + +artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM" +echo "Artifact name before : "$artifact_name +# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts. +safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}" +echo "Artifact name after : "$safe_artifact_name +export ARTIFACT_NAME=$safe_artifact_name +echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name" + +exit 0 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 30d1de5835..547d878da0 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -31,6 +31,10 @@ parameters: name: '' preSteps: [] runAsPublic: false +# Sbom related params + enableSbom: true + PackageVersion: 6.0.0 + BuildDropPath: '$(Build.SourcesDirectory)/artifacts' jobs: - job: ${{ parameters.name }} @@ -247,3 +251,9 @@ jobs: ArtifactName: AssetManifests continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}: + - template: /eng/common/templates/steps/generate-sbom.yml + parameters: + PackageVersion: ${{ parameters.packageVersion}} + BuildDropPath: ${{ parameters.buildDropPath }} diff --git a/eng/common/templates/steps/generate-sbom.yml b/eng/common/templates/steps/generate-sbom.yml new file mode 100644 index 0000000000..f4d7937f37 --- /dev/null +++ b/eng/common/templates/steps/generate-sbom.yml @@ -0,0 +1,44 @@ +# BuildDropPath - The root folder of the drop directory for which the manifest file will be generated. +# PackageName - The name of the package this SBOM represents. +# PackageVersion - The version of the package this SBOM represents. +# ManifestDirPath - The path of the directory where the generated manifest files will be placed + +parameters: + PackageVersion: 6.0.0 + BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + PackageName: '.NET' + ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom + sbomContinueOnError: true + +steps: +- task: PowerShell@2 + displayName: Prep for SBOM generation in (Non-linux) + condition: or(eq(variables['Agent.Os'], 'Windows_NT'), eq(variables['Agent.Os'], 'Darwin')) + inputs: + filePath: ./eng/common/generate-sbom-prep.ps1 + arguments: ${{parameters.manifestDirPath}} + +# Chmodding is a workaround for https://github.com/dotnet/arcade/issues/8461 +- script: | + chmod +x ./eng/common/generate-sbom-prep.sh + ./eng/common/generate-sbom-prep.sh ${{parameters.manifestDirPath}} + displayName: Prep for SBOM generation in (Linux) + condition: eq(variables['Agent.Os'], 'Linux') + continueOnError: ${{ parameters.sbomContinueOnError }} + +- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 + displayName: 'Generate SBOM manifest' + continueOnError: ${{ parameters.sbomContinueOnError }} + inputs: + PackageName: ${{ parameters.packageName }} + BuildDropPath: ${{ parameters.buildDropPath }} + PackageVersion: ${{ parameters.packageVersion }} + ManifestDirPath: ${{ parameters.manifestDirPath }} + +- task: PublishPipelineArtifact@1 + displayName: Publish SBOM manifest + continueOnError: ${{parameters.sbomContinueOnError}} + inputs: + targetPath: '${{parameters.manifestDirPath}}' + artifactName: $(ARTIFACT_NAME) + diff --git a/global.json b/global.json index 1f76265457..d5001a2f67 100644 --- a/global.json +++ b/global.json @@ -6,6 +6,6 @@ "version": "6.0.101" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22114.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22116.15" } } From 570440c8b182786dc928ff9991fb0e78330606b3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Feb 2022 13:46:40 +0000 Subject: [PATCH 27/32] Update dependencies from https://github.com/dotnet/arcade build 20220222.7 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.21614.2 -> To Version 6.0.0-beta.22122.7 --- eng/Version.Details.xml | 4 ++-- eng/common/templates/jobs/jobs.yml | 4 ---- global.json | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7b1699b492..2fe3e56209 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,9 +15,9 @@ - + https://github.com/dotnet/arcade - 40eacd2afc9cfd2ba892b5eadb3e728c1008fa38 + 7215d8265a7fbcd022eb72ff7a6e2048444c985f diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 70d44735ac..554e71cfc4 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -8,10 +8,6 @@ parameters: # Optional: Enable publishing using release pipelines enablePublishUsingPipelines: false - # Optional: Disable component governance detection. In general, component governance - # should be on for all jobs. Use only in the event of issues. - disableComponentGovernance: false - # Optional: Enable running the source-build jobs to build repo from source enableSourceBuild: false diff --git a/global.json b/global.json index d5001a2f67..fdeba52c02 100644 --- a/global.json +++ b/global.json @@ -6,6 +6,6 @@ "version": "6.0.101" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22116.15" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22122.7" } } From 51c4f22a9517b9a4e48bc74c669f404c574efe8a Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Wed, 23 Feb 2022 11:13:58 -0800 Subject: [PATCH 28/32] Update NuGet version to match 6.0.101 sdk --- Directory.Packages.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index f4be043aed..f75448bfb3 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -3,7 +3,7 @@ - 6.0.0-rc.278 + 6.0.0 @@ -36,4 +36,4 @@ - \ No newline at end of file + From 418ad582e8698f26f076fdcacbc20e87de153716 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 28 Feb 2022 23:12:08 +0000 Subject: [PATCH 29/32] Update dependencies from https://github.com/dotnet/roslyn build 20220216.13 Microsoft.NETCore.Compilers From Version 4.0.1-1.22116.5 -> To Version 4.1.0-5.22116.13 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 44f7e4e948..87d0e33ecf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/roslyn - ff289c438fabbdb4755f3c92c976763705140bd9 + dbffaa4a4e4507b8e8dcf0cae6e3209d32113391 https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index 8f57201046..8ef20f6c0d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ 3.3.2 5.0.0 - 4.0.1-1.22116.5 + 4.1.0-5.22116.13 2.0.0-beta1.21473.1 0.3.0-alpha.21473.1 From 5c0a6851731244498831ae3ad578eedb21b6cba7 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Mon, 28 Feb 2022 15:15:04 -0800 Subject: [PATCH 30/32] Update Microsoft.CodeAnalysis.Analyzers version to 3.3.3 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8ef20f6c0d..ef57566257 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -14,7 +14,7 @@ 16.11.0 - 3.3.2 + 3.3.3 5.0.0 4.1.0-5.22116.13 From 801b92cbe0b3753ff3ed189a7e31b3097ad96cf1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 28 Feb 2022 23:54:45 +0000 Subject: [PATCH 31/32] Update dependencies from https://github.com/dotnet/roslyn build 20220216.16 Microsoft.NETCore.Compilers From Version 4.1.0-5.22116.13 -> To Version 4.2.0-1.22116.16 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 87d0e33ecf..375fea7cf0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/roslyn - dbffaa4a4e4507b8e8dcf0cae6e3209d32113391 + cb93a990bf3e8e8ae71ac75e9db7e549a3a44221 https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index ef57566257..670aa26919 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ 3.3.3 5.0.0 - 4.1.0-5.22116.13 + 4.2.0-1.22116.16 2.0.0-beta1.21473.1 0.3.0-alpha.21473.1 From 0389cec69461ade1956703faa543eed4ab663308 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Mon, 28 Feb 2022 16:28:10 -0800 Subject: [PATCH 32/32] Ignore diagnostics during MVC project loading test --- tests/MSBuild/MSBuildWorkspaceLoaderTests.cs | 24 ++++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/MSBuild/MSBuildWorkspaceLoaderTests.cs b/tests/MSBuild/MSBuildWorkspaceLoaderTests.cs index 7597b658ba..eb3d2c3391 100644 --- a/tests/MSBuild/MSBuildWorkspaceLoaderTests.cs +++ b/tests/MSBuild/MSBuildWorkspaceLoaderTests.cs @@ -35,9 +35,9 @@ public MSBuildWorkspaceLoaderTests(ITestOutputHelper output) // [InlineData("wpfusercontrollib")] // [InlineData("wpflib")] // [InlineData("wpfcustomcontrollib")] - public async Task CSharpTemplateProject_WindowsOnly_LoadWithNoDiagnostics(string templateName) + public async Task CSharpTemplateProject_WindowsOnly_LoadWithNoDiagnostics(string templateName, string ignoredDiagnostics = "") { - await AssertTemplateProjectLoadsCleanlyAsync(templateName, LanguageNames.CSharp); + await AssertTemplateProjectLoadsCleanlyAsync(templateName, LanguageNames.CSharp, ignoredDiagnostics.Split(";", StringSplitOptions.TrimEntries)); } [MSBuildTheory] @@ -45,7 +45,7 @@ public async Task CSharpTemplateProject_WindowsOnly_LoadWithNoDiagnostics(string [InlineData("grpc")] [InlineData("webapi")] [InlineData("razor")] - [InlineData("mvc")] + [InlineData("mvc", "CS8602")] [InlineData("angular")] [InlineData("react")] // Skip="https://github.com/dotnet/format/issues/1402" @@ -59,20 +59,20 @@ public async Task CSharpTemplateProject_WindowsOnly_LoadWithNoDiagnostics(string [InlineData("razorclasslib")] [InlineData("worker")] [InlineData("xunit")] - public async Task CSharpTemplateProject_LoadWithNoDiagnostics(string templateName) + public async Task CSharpTemplateProject_LoadWithNoDiagnostics(string templateName, string ignoredDiagnostics = "") { - await AssertTemplateProjectLoadsCleanlyAsync(templateName, LanguageNames.CSharp); + await AssertTemplateProjectLoadsCleanlyAsync(templateName, LanguageNames.CSharp, ignoredDiagnostics.Split(";", StringSplitOptions.TrimEntries)); } [MSBuildTheory] - [InlineData("classlib")] - [InlineData("console")] - [InlineData("mstest")] - [InlineData("nunit")] - [InlineData("xunit")] - public async Task VisualBasicTemplateProject_LoadWithNoDiagnostics(string templateName) + [InlineData("classlib", "BC30002")] + [InlineData("console", "BC30002")] + [InlineData("mstest", "BC30002")] + [InlineData("nunit", "BC30002")] + [InlineData("xunit", "BC30002")] + public async Task VisualBasicTemplateProject_LoadWithNoDiagnostics(string templateName, string ignoredDiagnostics) { - await AssertTemplateProjectLoadsCleanlyAsync(templateName, LanguageNames.VisualBasic, ignoredDiagnostics: new[] { "BC30002" }); + await AssertTemplateProjectLoadsCleanlyAsync(templateName, LanguageNames.VisualBasic, ignoredDiagnostics.Split(";", StringSplitOptions.TrimEntries)); } private async Task AssertTemplateProjectLoadsCleanlyAsync(string templateName, string languageName, string[] ignoredDiagnostics = null)