Merge master into feature/position-cleanup

.gitignore

@@ -336,3 +336,4 @@ ASALocalRun/
 # MFractors (Xamarin productivity tool) working folder 
 .mfractor/
 /src/Simulation/Simulators.Tests/TestProjects/QsharpExe/built
+/src/Simulation/Simulators.Tests/TestProjects/TargetedExe/built

Simulation.sln

@@ -63,6 +63,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IonQExe", "src\Simulation\S
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QCIExe", "src\Simulation\Simulators.Tests\TestProjects\QCIExe\QCIExe.csproj", "{C015FF41-9A51-4AF0-AEFC-2547D596B10A}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TargetedExe", "src\Simulation\Simulators.Tests\TestProjects\TargetedExe\TargetedExe.csproj", "{D292BF18-3956-4827-820E-254C3F81EF09}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -459,6 +461,22 @@ Global
 		{C015FF41-9A51-4AF0-AEFC-2547D596B10A}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
 		{C015FF41-9A51-4AF0-AEFC-2547D596B10A}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
 		{C015FF41-9A51-4AF0-AEFC-2547D596B10A}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
+		{D292BF18-3956-4827-820E-254C3F81EF09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D292BF18-3956-4827-820E-254C3F81EF09}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D292BF18-3956-4827-820E-254C3F81EF09}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D292BF18-3956-4827-820E-254C3F81EF09}.Debug|x64.Build.0 = Debug|Any CPU
+		{D292BF18-3956-4827-820E-254C3F81EF09}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
+		{D292BF18-3956-4827-820E-254C3F81EF09}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
+		{D292BF18-3956-4827-820E-254C3F81EF09}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
+		{D292BF18-3956-4827-820E-254C3F81EF09}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+		{D292BF18-3956-4827-820E-254C3F81EF09}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D292BF18-3956-4827-820E-254C3F81EF09}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D292BF18-3956-4827-820E-254C3F81EF09}.Release|x64.ActiveCfg = Release|Any CPU
+		{D292BF18-3956-4827-820E-254C3F81EF09}.Release|x64.Build.0 = Release|Any CPU
+		{D292BF18-3956-4827-820E-254C3F81EF09}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
+		{D292BF18-3956-4827-820E-254C3F81EF09}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
+		{D292BF18-3956-4827-820E-254C3F81EF09}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
+		{D292BF18-3956-4827-820E-254C3F81EF09}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -489,6 +507,7 @@ Global
 		{1448512E-132F-4DA8-BCBA-D98F16B31600} = {09C842CB-930C-4C7D-AD5F-E30DE4A55820}
 		{55833C6C-6E91-4413-9F77-96B3A09666B8} = {09C842CB-930C-4C7D-AD5F-E30DE4A55820}
 		{C015FF41-9A51-4AF0-AEFC-2547D596B10A} = {09C842CB-930C-4C7D-AD5F-E30DE4A55820}
+		{D292BF18-3956-4827-820E-254C3F81EF09} = {09C842CB-930C-4C7D-AD5F-E30DE4A55820}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {929C0464-86D8-4F70-8835-0A5EAF930821}

bootstrap.cmd

@@ -12,9 +12,6 @@ git --version  || GOTO missingGit
 :: Initialize C++ runtime project
 CALL :runtimeBootstrap  || EXIT /B 1
 
-:: Initialize the compiler's nuspec file
-CALL :nuspecBootstrap   || EXIT /B 1
-
 :: Next steps are only needed for developers environment, they are skipped for cloud builds.
 IF NOT "%AGENT_ID%" == "" GOTO EOF
 
@@ -33,17 +30,6 @@ popd
 EXIT /B
 
 
-:: Bootstrap the compiler nuspec
-:nuspecBootstrap
-pushd src\Simulation\CsharpGeneration
-CALL powershell -NoProfile .\FindNuspecReferences.ps1 || EXIT /B 1
-popd
-
-pushd src\Simulation\Simulators
-CALL powershell -NoProfile .\FindNuspecReferences.ps1 || EXIT /B 1
-popd
-EXIT /B
-
 :missingGit
 echo.
 echo This script depends on git.

bootstrap.ps1

@@ -0,0 +1,24 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+$ErrorActionPreference = 'Stop'
+
+Push-Location (Join-Path $PSScriptRoot "src/Simulation/CsharpGeneration")
+    .\FindNuspecReferences.ps1
+Pop-Location
+
+Push-Location (Join-Path $PSScriptRoot "src/Simulation/Simulators")
+    .\FindNuspecReferences.ps1
+Pop-Location
+
+# bootstrap native folder
+if ($Env:ENABLE_NATIVE -ne "false") {
+    ## Run the right script based on the OS.
+    if (-not (Test-Path Env:AGENT_OS) -or ($Env:AGENT_OS.StartsWith("Win"))) {
+        .\bootstrap.cmd
+    } else {
+        .\bootstrap.sh
+    }
+} else {
+    Write-Host "Skipping native. ENABLE_NATIVE variable set to: $Env:ENABLE_NATIVE."
+}

build/build.ps1

@@ -6,14 +6,18 @@ $ErrorActionPreference = 'Stop'
 & "$PSScriptRoot/set-env.ps1"
 $all_ok = $True
 
-Write-Host "##[info]Build Native simulator"
-cmake --build (Join-Path $PSScriptRoot "../src/Simulation/Native/build") --config $Env:BUILD_CONFIGURATION
-if ($LastExitCode -ne 0) {
-    Write-Host "##vso[task.logissue type=error;]Failed to build Native simulator."
-    $script:all_ok = $False
+if ($Env:ENABLE_NATIVE -ne "false") {
+    Write-Host "##[info]Build Native simulator"
+    $nativeBuild = (Join-Path $PSScriptRoot "../src/Simulation/Native/build") 
+    cmake --build $nativeBuild --config $Env:BUILD_CONFIGURATION
+    if ($LastExitCode -ne 0) {
+        Write-Host "##vso[task.logissue type=error;]Failed to build Native simulator."
+        $script:all_ok = $False
+    }
+} else {
+    Write-Host "Skipping native. ENABLE_NATIVE variable set to: $Env:ENABLE_NATIVE."
 }
 
-
 function Build-One {
     param(
         [string]$action,

build/ci.yml

@@ -9,34 +9,22 @@ variables:
   Drop.Native: $(System.DefaultWorkingDirectory)/xplat
 
 jobs:
-- job: macOS
-  pool:
-    vmImage: 'macOS-latest'
-  steps:
-  - template: steps-xplat.yml
-
+- job: build
+  displayName: Build
+  strategy:
+    matrix:
+      linux:
+        imageName: 'ubuntu-latest'
+      mac:
+        imageName: 'macOS-latest'
+      windows:
+        imageName: 'windows-latest'
+  pool: 
+    vmImage: $(imageName)
 
-- job: Linux
-  pool:
-    vmImage: 'ubuntu-latest'
   steps:
-  - template: steps-xplat.yml
-
-
-- job: Windows
-  pool:
-    vmImage: 'windows-2019'
-  dependsOn:
-  - macOS
-  - Linux
-  condition: succeeded()
-  steps:
-  - task: DownloadBuildArtifacts@0
-    displayName: 'Download xplat native binaries'
-    inputs:
-      artifactName: xplat
-      downloadPath: $(System.DefaultWorkingDirectory)
   - template: steps.yml
+
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
     displayName: 'Component Detection'
     inputs:

build/manifest.ps1

@@ -16,15 +16,15 @@
     );
     Assemblies = @(
         ".\src\Azure\Azure.Quantum.Client\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Azure.Quantum.Client.dll",
-        ".\src\simulation\CsharpGeneration\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Quantum.CsharpGeneration.dll",
-        ".\src\simulation\CsharpGeneration.App\bin\$Env:BUILD_CONFIGURATION\netcoreapp3.1\Microsoft.Quantum.CsharpGeneration.App.dll",
-        ".\src\simulation\CsharpGeneration.App\bin\$Env:BUILD_CONFIGURATION\netcoreapp3.1\Microsoft.Quantum.RoslynWrapper.dll",
-        ".\src\simulation\Core\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Quantum.Runtime.Core.dll",
-        ".\src\simulation\EntryPointDriver\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Quantum.EntryPointDriver.dll",
-        ".\src\simulation\QsharpCore\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Quantum.QSharp.Core.dll",
-        ".\src\simulation\Simulators\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Quantum.Simulation.Common.dll",
-        ".\src\simulation\Simulators\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Quantum.Simulation.QCTraceSimulatorRuntime.dll",
-        ".\src\simulation\Simulators\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Quantum.Simulators.dll",
+        ".\src\Simulation\CsharpGeneration\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Quantum.CsharpGeneration.dll",
+        ".\src\Simulation\CsharpGeneration.App\bin\$Env:BUILD_CONFIGURATION\netcoreapp3.1\Microsoft.Quantum.CsharpGeneration.App.dll",
+        ".\src\Simulation\CsharpGeneration.App\bin\$Env:BUILD_CONFIGURATION\netcoreapp3.1\Microsoft.Quantum.RoslynWrapper.dll",
+        ".\src\Simulation\Core\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Quantum.Runtime.Core.dll",
+        ".\src\Simulation\EntryPointDriver\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Quantum.EntryPointDriver.dll",
+        ".\src\Simulation\QsharpCore\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Quantum.QSharp.Core.dll",
+        ".\src\Simulation\Simulators\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Quantum.Simulation.Common.dll",
+        ".\src\Simulation\Simulators\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Quantum.Simulation.QCTraceSimulatorRuntime.dll",
+        ".\src\Simulation\Simulators\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Quantum.Simulators.dll",
         ".\src\Xunit\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Quantum.Xunit.dll"
     ) | ForEach-Object { Get-Item (Join-Path $PSScriptRoot (Join-Path ".." $_)) };
 } | Write-Output;

build/steps-init.yml

@@ -18,8 +18,6 @@ steps:
 ##
 # Bootstrap
 ##
-- task: BatchScript@1
-  displayName: 'Prepare build'
-  inputs:
-    filename: bootstrap.cmd
-    modifyEnvironment: true
+- pwsh: ./bootstrap.ps1
+  displayName: "Bootstrap repository"
+  workingDirectory: $(System.DefaultWorkingDirectory)

build/steps-wrap-up.yml

@@ -12,7 +12,8 @@ steps:
     testRunTitle: 'Q# runtime tests'
 
 - task: PublishSymbols@1
-  displayName: 'Publish symbols'
+  displayName: 'Publish symbols (Windows only)'
+  condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
   continueOnError: true
   inputs:
     SearchPattern: '$(System.DefaultWorkingDirectory)/src/**/*.pdb'

build/steps.yml

@@ -23,7 +23,8 @@ steps:
 
 
 - powershell: ./pack.ps1
-  displayName: "Pack Q# runtime"
+  displayName: "Pack Q# runtime (Windows only)"
+  condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
   workingDirectory: $(System.DefaultWorkingDirectory)/build
 
 

build/test.ps1

@@ -4,16 +4,19 @@
 & "$PSScriptRoot/set-env.ps1"
 $all_ok = $True
 
-Write-Host "##[info]Test Native simulator"
-pushd (Join-Path $PSScriptRoot "../src/Simulation/Native/build")
-cmake --build . --config $Env:BUILD_CONFIGURATION
-ctest -C $Env:BUILD_CONFIGURATION
-if ($LastExitCode -ne 0) {
-    Write-Host "##vso[task.logissue type=error;]Failed to test Native Simulator"
-    $script:all_ok = $False
+if ($Env:ENABLE_NATIVE -ne "false") {
+    Write-Host "##[info]Test Native simulator"
+    pushd (Join-Path $PSScriptRoot "../src/Simulation/Native/build")
+    cmake --build . --config $Env:BUILD_CONFIGURATION
+    ctest -C $Env:BUILD_CONFIGURATION
+    if ($LastExitCode -ne 0) {
+        Write-Host "##vso[task.logissue type=error;]Failed to test Native Simulator"
+        $script:all_ok = $False
+    }
+    popd
+} else {
+    Write-Host "Skipping native. ENABLE_NATIVE variable set to: $Env:ENABLE_NATIVE."
 }
-popd
-
 
 function Test-One {
     Param($project)