Merge pull request #10714 from NuGet/main

Merge branch main into dev

Author: joelverhagen

build/common.ps1

@@ -200,19 +200,24 @@ Function Sign-Binaries {
         [int]$BuildNumber = (Get-BuildNumber),
         [string]$MSBuildVersion = $DefaultMSBuildVersion,
         [string[]]$ProjectsToSign = $null,
-        [switch]$BinLog
+        [switch]$BinLog,
+        [string]$RepositoryRootDirectory = $null
     )
 
-    if ($ProjectsToSign -eq $null) {
+    if ($null -eq $ProjectsToSign) {
         $repositoryDir = [IO.Path]::GetDirectoryName($PSScriptRoot)
         $defaultProjectsToSign = Join-Path $repositoryDir "src\**\*.csproj"
         $ProjectsToSign = @($defaultProjectsToSign)
     }
 
     $projectsToSignProperty = $ProjectsToSign -join ';'
+    $msbuildProperties = "/p:ProjectsToSign=`"$projectsToSignProperty`""
+    if ($RepositoryRootDirectory) {
+        $msbuildProperties += ";RepositoryRootDirectory=`"$RepositoryRootDirectory`""
+    }
 
     $ProjectPath = Join-Path $PSScriptRoot "sign-binaries.proj"
-    Build-Solution $Configuration $BuildNumber -MSBuildVersion "$MSBuildVersion" $ProjectPath -MSBuildProperties "/p:ProjectsToSign=`"$projectsToSignProperty`"" -BinLog:$BinLog
+    Build-Solution $Configuration $BuildNumber -MSBuildVersion "$MSBuildVersion" $ProjectPath -MSBuildProperties $msbuildProperties -BinLog:$BinLog
 }
 
 Function Sign-Packages {

build/sign-binaries.proj

@@ -3,7 +3,7 @@
   <Import Project="..\packages\MicroBuild.Core\build\MicroBuild.Core.props" Condition="Exists('..\packages\MicroBuild.Core\build\MicroBuild.Core.props')" />
 
   <PropertyGroup>
-    <RepositoryRootDirectory>$([System.IO.Path]::GetDirectoryName($(MSBuildProjectDirectory)))\</RepositoryRootDirectory>
+    <RepositoryRootDirectory Condition="'$(RepositoryRootDirectory)' == ''">$([System.IO.Path]::GetDirectoryName($(MSBuildProjectDirectory)))\</RepositoryRootDirectory>
     <IntermediateOutputPath>$(RepositoryRootDirectory)artifacts\sign\obj\</IntermediateOutputPath>
     <OutDir>$(RepositoryRootDirectory)</OutDir>
     <SignTargetsDependOn>BatchSign</SignTargetsDependOn>