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 5a1e585bb..151037381 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -3,10 +3,11 @@
"files.insertFinalNewline": true,
"files.trimFinalNewlines": true,
"omnisharp.enableEditorConfigSupport": true,
- "omnisharp.enableImportCompletion": true,
"omnisharp.enableRoslynAnalyzers": true,
"cSpell.words": [
"dgml",
"vsmefx"
- ]
+ ],
+ "dotnet.completion.showCompletionItemsFromUnimportedNamespaces": true,
+ "dotnet.defaultSolution": "Microsoft.VisualStudio.Composition.sln"
}
diff --git a/Directory.Packages.props b/Directory.Packages.props
index b62da89bb..c062fae03 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -4,7 +4,7 @@
true
true
- 2.0.125
+ 2.0.130
3.11.0
4.6.0
1.1.1
@@ -20,7 +20,7 @@
-
+
@@ -54,7 +54,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 a9be41833..111a07108 100644
--- a/azure-pipelines/build.yml
+++ b/azure-pipelines/build.yml
@@ -9,7 +9,7 @@ parameters:
default: true
- name: EnableCompliance
type: boolean
- default: true
+ default: false
- name: EnableAPIScan
type: boolean
default: false
diff --git a/azure-pipelines/variables/InsertVersionsValues.ps1 b/azure-pipelines/variables/InsertVersionsValues.ps1
index ec0e04c46..e58c0ab9a 100644
--- a/azure-pipelines/variables/InsertVersionsValues.ps1
+++ b/azure-pipelines/variables/InsertVersionsValues.ps1
@@ -1,5 +1,5 @@
$MacroName = 'MicrosoftVisualStudioCompositionVersion'
$SampleProject = "$PSScriptRoot\..\..\src\Microsoft.VisualStudio.Composition"
[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 052fe3ef0..5be1dd441 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,3 +1,11 @@
+
+
+ README.md
+
+
+
+
+