MessagePack-CSharp · AArnott · Jun 12, 2023 · Feb 27, 2023 · Mar 13, 2023 · Mar 13, 2023
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "powershell": {
+      "version": "7.3.4",
+      "commands": [
+        "pwsh"
+      ]
+    },
+    "dotnet-format": {
+      "version": "5.1.250801",
+      "commands": [
+        "dotnet-format"
+      ]
+    },
+    "dotnet-coverage": {
+      "version": "17.7.1",
+      "commands": [
+        "dotnet-coverage"
+      ]
+    },
+    "nbgv": {
+      "version": "3.6.133",
+      "commands": [
+        "nbgv"
+      ]
+    }
+  }
+}
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,5 +1,5 @@
 # Refer to https://hub.docker.com/_/microsoft-dotnet-sdk for available versions
-FROM mcr.microsoft.com/dotnet/sdk:7.0.101-jammy
+FROM mcr.microsoft.com/dotnet/sdk:7.0.302-jammy
 
 # Installing mono makes `dotnet test` work without errors even for net472.
 # But installing it takes a long time, so it's excluded by default.

diff --git a/.editorconfig b/.editorconfig
@@ -186,6 +186,9 @@ dotnet_diagnostic.DOC108.severity = warning
 dotnet_diagnostic.DOC200.severity = warning
 dotnet_diagnostic.DOC202.severity = warning
 
+# CA1062: Validate arguments of public methods
+dotnet_diagnostic.CA1062.severity = suggestion
+
 # CS1591: Missing XML comment for publicly visible type or member
 dotnet_diagnostic.CS1591.severity = suggestion
 

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,9 +1,9 @@
 # Please see the documentation for all configuration options:
-# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
 
 version: 2
 updates:
 - package-ecosystem: nuget
   directory: /
   schedule:
-    interval: monthly
+    interval: weekly
diff --git 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": "MessagePack.sln"
 }
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -42,7 +42,7 @@
     <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" version="$(MicrosoftCodeAnalysisVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(MicrosoftCodeAnalysisVersion)" />
     <PackageVersion Include="Microsoft.NET.StringTools" Version="17.4.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
     <PackageVersion Include="Microsoft.NETCore.Portable.Compatibility" Version="1.0.1" />
     <PackageVersion Include="Moq" Version="4.18.4" />
     <PackageVersion Include="MsgPack.Cli" Version="1.0.1" />
@@ -80,9 +80,9 @@
     <PackageVersion Update="System.Text.Json" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <GlobalPackageReference Include="CSharpIsNullAnalyzer" Version="0.1.329" />
+    <GlobalPackageReference Include="CSharpIsNullAnalyzer" Version="0.1.495" />
     <GlobalPackageReference Include="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" />
-    <GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.128" />
+    <GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" />
     <GlobalPackageReference Include="Nullable" Version="1.3.1" />
     <GlobalPackageReference Include="StyleCop.Analyzers.Unstable" Version="1.2.0.435" />
   </ItemGroup>

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -25,7 +25,6 @@ parameters:
   default: true
 
 variables:
-  MSBuildTreatWarningsAsErrors: true
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   BuildConfiguration: Release
   ci_feed: https://pkgs.dev.azure.com/ils0086/MessagePack-CSharp/_packaging/MessagePack-CI/nuget/v3/index.json

diff --git a/azure-pipelines/Get-nbgv.ps1 b/azure-pipelines/Get-nbgv.ps1
diff --git a/azure-pipelines/Merge-CodeCoverage.ps1 b/azure-pipelines/Merge-CodeCoverage.ps1
@@ -20,32 +20,32 @@ Param(
 )
 
 $RepoRoot = [string](Resolve-Path $PSScriptRoot/..)
-
-if (!(Test-Path $RepoRoot/obj/dotnet-coverage*)) {
-    dotnet tool install --tool-path $RepoRoot/obj dotnet-coverage --version 17.4.3 --configfile $PSScriptRoot/justnugetorg.nuget.config
-}
-
-Write-Verbose "Searching $Path for *.cobertura.xml files"
-$reports = Get-ChildItem -Recurse $Path -Filter *.cobertura.xml
-
-if ($reports) {
-    $reports |% { $_.FullName } |% {
-        # In addition to replacing {reporoot}, we also normalize on one kind of slash so that the report aggregates data for a file whether data was collected on Windows or not.
-        $xml = [xml](Get-Content -Path $_)
-        $xml.coverage.packages.package.classes.class |? { $_.filename} |% {
-            $_.filename = $_.filename.Replace('{reporoot}', $RepoRoot).Replace([IO.Path]::AltDirectorySeparatorChar, [IO.Path]::DirectorySeparatorChar)
+Push-Location $RepoRoot
+try {
+    Write-Verbose "Searching $Path for *.cobertura.xml files"
+    $reports = Get-ChildItem -Recurse $Path -Filter *.cobertura.xml
+
+    if ($reports) {
+        $reports |% { $_.FullName } |% {
+            # In addition to replacing {reporoot}, we also normalize on one kind of slash so that the report aggregates data for a file whether data was collected on Windows or not.
+            $xml = [xml](Get-Content -Path $_)
+            $xml.coverage.packages.package.classes.class |? { $_.filename} |% {
+                $_.filename = $_.filename.Replace('{reporoot}', $RepoRoot).Replace([IO.Path]::AltDirectorySeparatorChar, [IO.Path]::DirectorySeparatorChar)
+            }
+
+            $xml.Save($_)
         }
 
-        $xml.Save($_)
-    }
+        $Inputs = $reports |% { Resolve-Path -relative $_.FullName }
 
-    $Inputs = $reports |% { Resolve-Path -relative $_.FullName }
+        if ((Split-Path $OutputFile) -and -not (Test-Path (Split-Path $OutputFile))) {
+            New-Item -Type Directory -Path (Split-Path $OutputFile) | Out-Null
+        }
 
-    if ((Split-Path $OutputFile) -and -not (Test-Path (Split-Path $OutputFile))) {
-        New-Item -Type Directory -Path (Split-Path $OutputFile) | Out-Null
+        & dotnet tool run dotnet-coverage merge $Inputs -o $OutputFile -f cobertura
+    } else {
+        Write-Error "No reports found to merge."
     }
-
-    & "$RepoRoot/obj/dotnet-coverage" merge $Inputs -o $OutputFile -f cobertura
-} else {
-    Write-Error "No reports found to merge."
+} finally {
+    Pop-Location
 }
diff --git a/azure-pipelines/build.yml b/azure-pipelines/build.yml
@@ -17,7 +17,7 @@ jobs:
     clean: true
   - template: install-dependencies.yml
 
-  - powershell: '& (./azure-pipelines/Get-nbgv.ps1) cloud -c'
+  - script: dotnet tool run nbgv cloud -c
     displayName: ⚙ Set build number
 
   - template: dotnet.yml

diff --git a/azure-pipelines/dotnet.yml b/azure-pipelines/dotnet.yml
@@ -3,7 +3,7 @@ parameters:
 
 steps:
 
-- script: dotnet build -t:build,pack --no-restore -c $(BuildConfiguration) /bl:"$(Build.ArtifactStagingDirectory)/build_logs/build.binlog"
+- script: dotnet build -t:build,pack --no-restore -c $(BuildConfiguration) -warnaserror /bl:"$(Build.ArtifactStagingDirectory)/build_logs/build.binlog"
   displayName: 🛠 dotnet build
 
 - powershell: azure-pipelines/dotnet-test-cloud.ps1 -Configuration $(BuildConfiguration) -Agent $(Agent.JobName) -PublishResults

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.101",
+    "version": "7.0.302",
     "rollForward": "patch",
     "allowPrerelease": false
   }

diff --git a/init.ps1 b/init.ps1
@@ -28,6 +28,8 @@
     No effect if -NoPrerequisites is specified.
 .PARAMETER NoRestore
     Skips the package restore step.
+.PARAMETER NoToolRestore
+    Skips the dotnet tool restore step.
 .PARAMETER AccessToken
     An optional access token for authenticating to Azure Artifacts authenticated feeds.
 .PARAMETER Interactive
@@ -46,6 +48,8 @@ Param (
     [Parameter()]
     [switch]$NoRestore,
     [Parameter()]
+    [switch]$NoToolRestore,
+    [Parameter()]
     [string]$AccessToken,
     [Parameter()]
     [switch]$Interactive
@@ -79,20 +83,27 @@ Push-Location $PSScriptRoot
 try {
     $HeaderColor = 'Green'
 
-    if (!$NoRestore -and $PSCmdlet.ShouldProcess("NuGet packages", "Restore")) {
-        $RestoreArguments = @()
-        if ($Interactive)
-        {
-            $RestoreArguments += '--interactive'
-        }
+    $RestoreArguments = @()
+    if ($Interactive)
+    {
+        $RestoreArguments += '--interactive'
+    }
 
+    if (!$NoRestore -and $PSCmdlet.ShouldProcess("NuGet packages", "Restore")) {
         Write-Host "Restoring NuGet packages" -ForegroundColor $HeaderColor
         dotnet restore @RestoreArguments
         if ($lastexitcode -ne 0) {
             throw "Failure while restoring packages."
         }
     }
 
+    if (!$NoToolRestore -and $PSCmdlet.ShouldProcess("dotnet tool", "restore")) {
+      dotnet tool restore @RestoreArguments
+      if ($lastexitcode -ne 0) {
+          throw "Failure while restoring dotnet CLI tools."
+      }
+    }
+
     & "$PSScriptRoot/tools/Set-EnvVars.ps1" -Variables $EnvVars -PrependPath $PrependPath | Out-Null
 }
 catch {

diff --git a/sandbox/.editorconfig b/sandbox/.editorconfig
@@ -0,0 +1,4 @@
+[*.cs]
+
+# CA1062: Validate arguments of public methods
+dotnet_diagnostic.CA1062.severity = silent
diff --git a/src/MessagePack.Analyzers/.editorconfig b/src/MessagePack.Analyzers/.editorconfig
@@ -0,0 +1,4 @@
+[*.cs]
+
+# CA1062: Validate arguments of public methods
+dotnet_diagnostic.CA1062.severity = silent
diff --git a/src/MessagePack.SourceGenerator/.editorconfig b/src/MessagePack.SourceGenerator/.editorconfig
@@ -2,3 +2,6 @@
 
 # VSTHRD111: Use ConfigureAwait(bool)
 dotnet_diagnostic.VSTHRD111.severity = none
+
+# CA1062: Validate arguments of public methods
+dotnet_diagnostic.CA1062.severity = silent
diff --git a/tools/Install-DotNetSdk.ps1 b/tools/Install-DotNetSdk.ps1
@@ -49,6 +49,7 @@ $arch = [System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture
 if (!$arch) { # Windows Powershell leaves this blank
     $arch = 'x64'
     if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64') { $arch = 'ARM64' }
+    if (${env:ProgramFiles(Arm)}) { $arch = 'ARM64' }
 }
 
 # Search for all .NET runtime versions referenced from MSBuild projects and arrange to install them.
@@ -143,6 +144,14 @@ Function Get-InstallerExe(
         if ($release.$sku.version -eq $Version) {
             $filesElement = $release.$sku.files
         }
+        if (!$filesElement -and ($sku -eq 'sdk') -and $release.sdks) {
+            foreach ($sdk in $release.sdks) {
+                if ($sdk.version -eq $Version) {
+                    $filesElement = $sdk.files
+                    break
+                }
+            }
+        }
 
         if ($filesElement) {
             foreach ($file in $filesElement) {
@@ -161,7 +170,7 @@ Function Get-InstallerExe(
     if ($url) {
         Get-FileFromWeb -Uri $url -OutDir $DotNetInstallScriptRoot
     } else {
-        Write-Error "Unable to find release of $sku v$Version"
+        throw "Unable to find release of $sku v$Version"
     }
 }