diff --git a/eng/Versions.props b/eng/Versions.props
index 2a32198686..2abbcd2c2f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -36,7 +36,6 @@
$(MicrosoftVisualStudioDiagnosticsUtilitiesVersion)
17.3.32622.426
17.4.2116
- 2.0.3
13.0.1
3.3.3
3.3.4-beta1.21554.2
diff --git a/eng/verify-nupkgs.ps1 b/eng/verify-nupkgs.ps1
index a1231a0b37..f992675814 100644
--- a/eng/verify-nupkgs.ps1
+++ b/eng/verify-nupkgs.ps1
@@ -18,7 +18,7 @@ function Verify-Nuget-Packages {
"Microsoft.NET.Test.Sdk" = 16;
"Microsoft.TestPlatform" = 608;
"Microsoft.TestPlatform.Build" = 21;
- "Microsoft.TestPlatform.CLI" = 493;
+ "Microsoft.TestPlatform.CLI" = 472;
"Microsoft.TestPlatform.Extensions.TrxLogger" = 35;
"Microsoft.TestPlatform.ObjectModel" = 93;
"Microsoft.TestPlatform.AdapterUtilities" = 34;
@@ -34,26 +34,26 @@ function Verify-Nuget-Packages {
$pattern = "*.$versionPrefix*.nupkg"
$nugetPackages = @(Get-ChildItem $packageDirectory -Filter $pattern -Recurse -File | Where-Object { $_.Name -notLike "*.symbols.nupkg"})
- if (0 -eq $nugetPackages.Length) {
+ if (0 -eq $nugetPackages.Length) {
throw "No nuget packages matching $pattern were found in '$packageDirectory'."
}
$suffixes = @($nugetPackages -replace ".*?$([regex]::Escape($versionPrefix))(.*)\.nupkg", '$1' | Sort-Object -Unique)
- if (1 -lt $suffixes.Length) {
+ if (1 -lt $suffixes.Length) {
Write-Host "There are two different suffixes matching the same version prefix: '$($suffixes -join "', '")'".
- $latestNuget = $nugetPackages |
- Where-Object { $_.Name -like "Microsoft.TestPlatform.ObjectModel.*" } |
- Sort-Object -Property LastWriteTime -Descending |
+ $latestNuget = $nugetPackages |
+ Where-Object { $_.Name -like "Microsoft.TestPlatform.ObjectModel.*" } |
+ Sort-Object -Property LastWriteTime -Descending |
Select-Object -First 1
-
+
$suffix = $suffixes | Where { $latestNuget.Name.Contains("$versionPrefix$_.nupkg") }
$version = "$versionPrefix$suffix"
Write-Host "The most recently written Microsoft.TestPlatform.ObjectModel.* nuget, is $($latestNuget.Name), which has '$suffix' suffix. Selecting only packages with that suffix."
$nugetPackages = $nugetPackages | Where-Object { $_.Name -like "*$version.nupkg" }
}
- else {
+ else {
$suffix = $suffixes[0]
$version = "$versionPrefix$suffix"
}
diff --git a/src/DataCollectors/DumpMinitool.arm64/DumpMinitool.arm64.csproj b/src/DataCollectors/DumpMinitool.arm64/DumpMinitool.arm64.csproj
index 30310147d7..772550f6a5 100644
--- a/src/DataCollectors/DumpMinitool.arm64/DumpMinitool.arm64.csproj
+++ b/src/DataCollectors/DumpMinitool.arm64/DumpMinitool.arm64.csproj
@@ -16,6 +16,7 @@
or use the -\-self-contained argument.
-->
NETSDK1201
+ $(NoWarn);NETSDK1201
diff --git a/src/DataCollectors/DumpMinitool.x86/DumpMinitool.x86.csproj b/src/DataCollectors/DumpMinitool.x86/DumpMinitool.x86.csproj
index 3632354419..19f665286d 100644
--- a/src/DataCollectors/DumpMinitool.x86/DumpMinitool.x86.csproj
+++ b/src/DataCollectors/DumpMinitool.x86/DumpMinitool.x86.csproj
@@ -16,6 +16,7 @@
or use the -\-self-contained argument.
-->
NETSDK1201
+ $(NoWarn);NETSDK1201
diff --git a/src/DataCollectors/DumpMinitool/DumpMinitool.csproj b/src/DataCollectors/DumpMinitool/DumpMinitool.csproj
index ac54e9c1eb..8ca6c7efe3 100644
--- a/src/DataCollectors/DumpMinitool/DumpMinitool.csproj
+++ b/src/DataCollectors/DumpMinitool/DumpMinitool.csproj
@@ -16,6 +16,7 @@
or use the -\-self-contained argument.
-->
NETSDK1201
+ $(NoWarn);NETSDK1201
diff --git a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj
index 83d1d55445..7654642a99 100644
--- a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj
+++ b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj
@@ -72,11 +72,10 @@
-
-
+
@@ -89,7 +88,6 @@
-
@@ -100,7 +98,6 @@
-
diff --git a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.nuspec b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.nuspec
index 28f988556e..05c7823f3d 100644
--- a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.nuspec
+++ b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.nuspec
@@ -121,11 +121,12 @@
-
-
+
+
-
-
+
+
+