Merge pull request #164 from AArnott/libtemplate

Merge Library.Template

Author: AArnott

.gitignore

@@ -349,3 +349,6 @@ MigrationBackup/
 
 # dotnet tool local install directory
 .store/
+
+# mac-created file to track user view preferences for a directory
+.DS_Store

Directory.Packages.props

@@ -7,7 +7,7 @@
     <MicroBuildVersion>2.0.93</MicroBuildVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Microsoft.CodeCoverage" Version="17.5.0-release-20221220-01" />
+    <PackageVersion Include="Microsoft.CodeCoverage" Version="17.5.0-release-20230105-01" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
     <PackageVersion Include="Microsoft.VisualStudio.Internal.MicroBuild.NonShipping" Version="$(MicroBuildVersion)" />
     <PackageVersion Include="Moq" Version="4.18.4" />

azure-pipelines/Archive-SourceCode.ps1

@@ -116,11 +116,10 @@ if (!$OwnerAlias) {
     if ($env:BUILD_REQUESTEDFOREMAIL) {
         Write-Verbose 'Using $env:BUILD_REQUESTEDFOREMAIL and slicing to just the alias for OwnerAlias.'
         $OwnerAlias = ($env:BUILD_REQUESTEDFOREMAIL -split '@')[0]
+    } else {
+        $OwnerAlias = $TeamAlias
     }
-    else {
-        Write-Verbose 'Using $env:USERNAME for OwnerAlias.'
-        $OwnerAlias = $env:USERNAME
-    }
+
     if (!$OwnerAlias) {
         Write-Error "Unable to determine default value for -OwnerAlias."
     }

azure-pipelines/Merge-CodeCoverage.ps1

@@ -41,7 +41,7 @@ if ($reports) {
 
     $Inputs = $reports |% { Resolve-Path -relative $_.FullName }
 
-    if (Split-Path $OutputFile) {
+    if ((Split-Path $OutputFile) -and -not (Test-Path (Split-Path $OutputFile))) {
         New-Item -Type Directory -Path (Split-Path $OutputFile) | Out-Null
     }
 

azure-pipelines/official.yml

@@ -50,7 +50,7 @@ stages:
 
 - stage: Build
   variables:
-    TreatWarningsAsErrors: true
+    MSBuildTreatWarningsAsErrors: true
     DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
     BuildConfiguration: Release
     NUGET_PACKAGES: $(Agent.TempDirectory)/.nuget/packages

test/Microsoft.VisualStudio.Validation.Tests/Microsoft.VisualStudio.Validation.Tests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeCoverage" />

version.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "17.0",
+  "version": "17.6-alpha",
   "publicReleaseRefSpec": [
     "^refs/heads/main$",
     "^refs/heads/v\\d+(?:\\.\\d+)?$"