diff --git a/.azuredevops/dependabot.yml b/.azuredevops/dependabot.yml new file mode 100644 index 000000000..4d848fb58 --- /dev/null +++ b/.azuredevops/dependabot.yml @@ -0,0 +1,9 @@ +# Please see the documentation for all configuration options: +# https://eng.ms/docs/products/dependabot/configuration/version_updates + +version: 2 +updates: +- package-ecosystem: nuget + directory: / + schedule: + interval: monthly diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index fa4ceb59c..e344d8b0d 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "powershell": { - "version": "7.3.4", + "version": "7.3.5", "commands": [ "pwsh" ] @@ -15,7 +15,7 @@ ] }, "dotnet-coverage": { - "version": "17.7.1", + "version": "17.7.3", "commands": [ "dotnet-coverage" ] diff --git a/.vscode/settings.json b/.vscode/settings.json index 3ae1371c6..92408eb68 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,6 +3,7 @@ "files.insertFinalNewline": true, "files.trimFinalNewlines": true, "omnisharp.enableEditorConfigSupport": true, - "omnisharp.enableImportCompletion": true, - "omnisharp.enableRoslynAnalyzers": true + "omnisharp.enableRoslynAnalyzers": true, + "dotnet.completion.showCompletionItemsFromUnimportedNamespaces": true, + "dotnet.defaultSolution": "Microsoft.VisualStudio.Threading.sln" } diff --git a/Directory.Packages.props b/Directory.Packages.props index c9e884294..1fe648602 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -3,7 +3,7 @@ true true - 2.0.127 + 2.0.130 3.11.0 4.4.0 1.1.1 @@ -22,7 +22,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/azure-pipelines/Archive-SourceCode.ps1 b/azure-pipelines/Archive-SourceCode.ps1 index 9158c9b34..e44dad008 100644 --- a/azure-pipelines/Archive-SourceCode.ps1 +++ b/azure-pipelines/Archive-SourceCode.ps1 @@ -155,7 +155,7 @@ if (!$RepoUrl) { } Push-Location $PSScriptRoot -$versionsObj = dotnet tool run nbgv get-version -f json | ConvertFrom-Json +$versionsObj = dotnet nbgv get-version -f json | ConvertFrom-Json Pop-Location $ReleaseDateString = $ReleaseDate.ToShortDateString() diff --git a/azure-pipelines/Get-SymbolFiles.ps1 b/azure-pipelines/Get-SymbolFiles.ps1 index 0ce229fc2..b5063cec6 100644 --- a/azure-pipelines/Get-SymbolFiles.ps1 +++ b/azure-pipelines/Get-SymbolFiles.ps1 @@ -43,8 +43,13 @@ $PDBs |% { } } |% { # Collect the DLLs/EXEs as well. - $dllPath = "$($_.Directory)/$($_.BaseName).dll" - $exePath = "$($_.Directory)/$($_.BaseName).exe" + $rootName = "$($_.Directory)/$($_.BaseName)" + if ($rootName.EndsWith('.ni')) { + $rootName = $rootName.Substring(0, $rootName.Length - 3) + } + + $dllPath = "$rootName.dll" + $exePath = "$rootName.exe" if (Test-Path $dllPath) { $BinaryImagePath = $dllPath } elseif (Test-Path $exePath) { diff --git a/azure-pipelines/Merge-CodeCoverage.ps1 b/azure-pipelines/Merge-CodeCoverage.ps1 index 5ecabbc9b..b126268ca 100644 --- a/azure-pipelines/Merge-CodeCoverage.ps1 +++ b/azure-pipelines/Merge-CodeCoverage.ps1 @@ -42,7 +42,7 @@ try { New-Item -Type Directory -Path (Split-Path $OutputFile) | Out-Null } - & dotnet tool run dotnet-coverage merge $Inputs -o $OutputFile -f cobertura + & dotnet dotnet-coverage merge $Inputs -o $OutputFile -f cobertura } else { Write-Error "No reports found to merge." } diff --git a/azure-pipelines/build.yml b/azure-pipelines/build.yml index 9157c37fe..63aa4046e 100644 --- a/azure-pipelines/build.yml +++ b/azure-pipelines/build.yml @@ -10,10 +10,10 @@ parameters: default: true - name: EnableCompliance type: boolean - default: true + default: false - name: EnableAPIScan type: boolean - default: true + default: false jobs: - job: Windows diff --git a/azure-pipelines/secure-development-tools.yml b/azure-pipelines/secure-development-tools.yml index ce8ac94cf..73be82db4 100644 --- a/azure-pipelines/secure-development-tools.yml +++ b/azure-pipelines/secure-development-tools.yml @@ -72,6 +72,7 @@ steps: GdnBreakSuppressionSets: falsepositives GdnBreakOutputSuppressionFile: $(Build.ArtifactStagingDirectory)/guardian_failures_as_suppressions/ GdnBreakOutputSuppressionSet: falsepositives + condition: and(succeeded(), ne(variables['OptProf'], 'true')) # This is useful when false positives appear so we can copy some of the output into the suppressions file. - publish: $(Build.ArtifactStagingDirectory)/guardian_failures_as_suppressions diff --git a/azure-pipelines/variables/InsertVersionsValues.ps1 b/azure-pipelines/variables/InsertVersionsValues.ps1 index bb679e417..05b4c9feb 100644 --- a/azure-pipelines/variables/InsertVersionsValues.ps1 +++ b/azure-pipelines/variables/InsertVersionsValues.ps1 @@ -1,5 +1,5 @@ $MacroName = 'MicrosoftVisualStudioThreadingVersion' $SampleProject = "$PSScriptRoot\..\..\src\Microsoft.VisualStudio.Threading" [string]::join(',',(@{ - ($MacroName) = & { (dotnet tool run nbgv -- get-version --project $SampleProject --format json | ConvertFrom-Json).AssemblyVersion }; + ($MacroName) = & { (dotnet nbgv get-version --project $SampleProject --format json | ConvertFrom-Json).AssemblyVersion }; }.GetEnumerator() |% { "$($_.key)=$($_.value)" })) diff --git a/azure-pipelines/vs-validation.yml b/azure-pipelines/vs-validation.yml index d32634c70..cb9a2072e 100644 --- a/azure-pipelines/vs-validation.yml +++ b/azure-pipelines/vs-validation.yml @@ -17,8 +17,6 @@ stages: jobs: - template: build.yml parameters: - EnableCompliance: false - EnableAPIScan: false windowsPool: VSEngSS-MicroBuild2022-1ES includeMacOS: false RunTests: false diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 0199ff695..72064db60 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,4 +1,12 @@ + + + README.md + + + + +