Add reference to private feed hosting ARM64 sdk (microsoft#470)

* Add reference to private feed hosting ARM64 sdk, update build script

* Update build.ps1

Co-authored-by: Joe Schmitt <[email protected]>

* Update build.ps1

Co-authored-by: Joe Schmitt <[email protected]>

* Update package step

* nit quotes

Co-authored-by: Joe Schmitt <[email protected]>

Author: WilliamXieMSFT

.gitignore

@@ -164,6 +164,7 @@ OperationTracking/Msbuild.OperationTracking.Mixed Platforms.*
 *.err
 *.prf
 *.wrn
+*.binlog
 
 *_i.h
 *_h.h

NuGet.config

@@ -5,6 +5,7 @@
     <packageSources>
         <clear />
         <add key="DNCENG-CoreClrPal" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/CoreClrPal/nuget/v3/index.json" />
+        <add key="privateDependency" value="https://pkgs.dev.azure.com/devdiv/DevDiv/_packaging/ClrInstrumentationEngine-PrivateDependency/nuget/v3/index.json" />
     </packageSources>
     <activePackageSource>
         <add key="All" value="(Aggregate source)" />

build.ps1

@@ -57,7 +57,11 @@ param(
 
     [Parameter(Mandatory=$false)]
     [switch]
-    $VerboseMsbuild
+    $VerboseMsbuild,
+
+    [Parameter(Mandatory=$false)]
+    [switch]
+    $ARM64
 )
 
 $ErrorActionPreference = 'Stop'
@@ -210,24 +214,33 @@ if (!$SkipBuild)
             Remove-Item -Force -Recurse "$repoPath\obj\"
         }
 
-        # NuGet restore disregards platform/configuration
         # dotnet restore defaults to Debug|Any CPU, which requires the /p:platform specification in order to replicate NuGet restore behavior.
-        $restoreArgsInit = "restore $repoPath\InstrumentationEngine.sln --configfile $repoPath\NuGet.config"
-        $restoreArgs = @(
-            "$restoreArgsInit /p:platform=`"x86`""
-            "$restoreArgsInit /p:platform=`"x64`""
-            "$restoreArgsInit /p:platform=`"Any CPU`""
-        )
-        Invoke-ExpressionHelper -Executable "dotnet" -Arguments $restoreArgs -Activity 'dotnet Restore Solutions'
+        $dotnetRestoreArgs = "restore `"$repoPath\InstrumentationEngine.sln`" --configfile `"$repoPath\NuGet.config`" /p:platform=`"Any CPU`""
+        if ($ARM64)
+        {
+            $dotnetRestoreArgs = "$dotnetRestoreArgs /p:IncludeARM64='True'"
+        }
+
+        Invoke-ExpressionHelper -Executable "dotnet" -Arguments $dotnetRestoreArgs -Activity 'dotnet Restore Solutions'
+
+        # NuGet restore disregards platform/configuration
+        $nugetRestoreArgs = "restore `"$repoPath\NativeNugetRestore.sln`" -configfile `"$repoPath\NuGet.config`""
+        Invoke-ExpressionHelper -Executable "nuget" -Arguments $nugetRestoreArgs -Activity 'nuget Restore Solutions'
     }
 
     # Build InstrumentationEngine.sln
     $buildArgsInit = "$repoPath\InstrumentationEngine.sln /p:configuration=`"$configuration`" /p:SignType=$SignType /p:BuildVersion=$BuildVersion /clp:$($clParams)"
-    $buildArgs = @(
+    $buildArgs = [System.Collections.ArrayList]@(
         "$buildArgsInit /p:platform=`"x86`""
         "$buildArgsInit /p:platform=`"x64`""
         "$buildArgsInit /p:platform=`"Any CPU`" /m"
     )
+
+    if ($ARM64)
+    {
+        $buildArgs.Add("$buildArgsInit /p:platform=`"ARM64`" /m")
+    }
+
     Invoke-ExpressionHelper -Executable "$msbuild" -Arguments $buildArgs -Activity 'Build InstrumentationEngine.sln'
 }
 
@@ -247,21 +260,33 @@ if (!$SkipPackaging)
 
     # NuGet restore disregards platform/configuration
     # dotnet restore defaults to Debug|Any CPU, which requires the /p:platform specification in order to replicate NuGet restore behavior.
-    $restoreArgsInit = "restore $repoPath\src\InstrumentationEngine.Packages.sln --configfile $repoPath\NuGet.config"
-    $restoreArgs = @(
+    $restoreArgsInit = "restore `"$repoPath\src\InstrumentationEngine.Packages.sln`" --configfile $repoPath\NuGet.config"
+    $restoreArgs = [System.Collections.ArrayList]@(
         "$restoreArgsInit /p:platform=`"x86`""
         "$restoreArgsInit /p:platform=`"x64`""
         "$restoreArgsInit /p:platform=`"Any CPU`""
     )
+
+    if ($ARM64)
+    {
+        $restoreArgs.Add("$restoreArgsInit /p:platform=`"ARM64`"")
+    }
+
     Invoke-ExpressionHelper -Executable "dotnet" -Arguments $restoreArgs -Activity 'dotnet Restore Solutions'
 
     # Build InstrumentationEngine.Packages.sln
-    $buildArgsInit = "$repoPath\src\InstrumentationEngine.Packages.sln /p:configuration=`"$configuration`" /p:SignType=$SignType /p:BuildVersion=$BuildVersion /clp:$($clParams) /m"
-    $buildArgs = @(
+    $buildArgsInit = "`"$repoPath\src\InstrumentationEngine.Packages.sln`" /p:configuration=`"$configuration`" /p:SignType=$SignType /p:BuildVersion=$BuildVersion /clp:$($clParams) /m"
+    $buildArgs = [System.Collections.ArrayList]@(
         "$buildArgsInit /p:platform=`"x86`""
         "$buildArgsInit /p:platform=`"x64`""
         "$buildArgsInit /p:platform=`"Any CPU`""
     )
+
+    if ($ARM64)
+    {
+        $buildArgs.Add("$buildArgsInit /p:platform=`"ARM64`"")
+    }
+
     Invoke-ExpressionHelper -Executable "$msbuild" -Arguments $buildArgs -Activity 'Build InstrumentationEngine.Packages.sln'
 }
 

src/Dependencies/NativeDependencies.csproj

@@ -43,6 +43,11 @@
           <PrivateAssets>All</PrivateAssets>
         </PackageReference>
       </ItemGroup>
+      <ItemGroup Condition="'$(IncludeARM64)'=='True'">
+        <PackageReference Include="Microsoft.VisualStudio.ARM64.SDK" Version="17.0.0">
+          <ExcludeAssets>All</ExcludeAssets>
+        </PackageReference>
+      </ItemGroup>
     </Otherwise>
   </Choose>
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />

src/InstrumentationEngine/InstrumentationEngine.vcxproj

@@ -81,7 +81,7 @@
       <AdditionalLibraryDirectories Condition="'$(Platform)'=='ARM64'">$(WindowsSDK_LibraryPath_arm64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>InstrumentationEngine.Lib.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;msxml6.lib;version.lib;Faultrep.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalDependencies Condition="'$(Platform)'!='ARM64'">mscoree.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalDependencies Condition="'$(Platform)'=='ARM64'">C:\Users\willxie\Downloads\microsoft.visualstudio.arm64.sdk.17.0.0.nupkg\lib\mscoree.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies Condition="'$(Platform)'=='ARM64'">$(PackagesDir)\microsoft.visualstudio.arm64.sdk\17.0.0\lib\mscoree.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalOptions Condition="'$(Platform)'=='Win32'">/SafeSEH %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>