From d23cae151fd46b13f8d8ccb811f112ffb9085fbf Mon Sep 17 00:00:00 2001 From: Ryan Shaffer Date: Wed, 13 May 2020 10:32:08 -0400 Subject: [PATCH 1/6] Add manifest with assemblies requiring signing --- build/manifest.ps1 | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 build/manifest.ps1 diff --git a/build/manifest.ps1 b/build/manifest.ps1 new file mode 100644 index 00000000000..99fe5841bbe --- /dev/null +++ b/build/manifest.ps1 @@ -0,0 +1,26 @@ +#!/usr/bin/env pwsh +#Requires -PSEdition Core + +& "$PSScriptRoot/set-env.ps1" + +@{ + Packages = @( + "Microsoft.Quantum.CsharpGeneration", + "Microsoft.Quantum.Development.Kit", + "Microsoft.Quantum.QSharp.Core", + "Microsoft.Quantum.Runtime.Core", + "Microsoft.Quantum.Simulators", + "Microsoft.Quantum.Xunit" + ); + Assemblies = @( + ".\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\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.Simulation.Simulators.dll", + ".\src\Xunit\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Quantum.Xunit.dll" + ) | ForEach-Object { Get-Item (Join-Path $PSScriptRoot ".." $_) }; +} | Write-Output; \ No newline at end of file From 23c210ed610eea8a9aa07b025ef009c8d3743864 Mon Sep 17 00:00:00 2001 From: Ryan Shaffer Date: Wed, 13 May 2020 13:18:28 -0400 Subject: [PATCH 2/6] Add manifest.ps1 to build steps --- build/steps.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build/steps.yml b/build/steps.yml index eb5f5d6e800..a2f54a2639a 100644 --- a/build/steps.yml +++ b/build/steps.yml @@ -5,6 +5,12 @@ steps: - template: steps-init.yml +- powershell: ./manifest.ps1 + displayName: "List built assemblies" + workingDirectory: $(System.DefaultWorkingDirectory)/build + condition: succeededOrFailed() + + - powershell: ./build.ps1 displayName: "Building Q# runtime" workingDirectory: $(System.DefaultWorkingDirectory)/build From 04a118259866a22d4cf7a850e642f918834f5d26 Mon Sep 17 00:00:00 2001 From: Ryan Shaffer Date: Wed, 13 May 2020 13:24:33 -0400 Subject: [PATCH 3/6] Run manifest after build completes --- build/steps.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/steps.yml b/build/steps.yml index a2f54a2639a..3b45dddd9eb 100644 --- a/build/steps.yml +++ b/build/steps.yml @@ -5,15 +5,15 @@ steps: - template: steps-init.yml -- powershell: ./manifest.ps1 - displayName: "List built assemblies" +- powershell: ./build.ps1 + displayName: "Building Q# runtime" workingDirectory: $(System.DefaultWorkingDirectory)/build - condition: succeededOrFailed() -- powershell: ./build.ps1 - displayName: "Building Q# runtime" +- powershell: ./manifest.ps1 + displayName: "List built assemblies" workingDirectory: $(System.DefaultWorkingDirectory)/build + condition: succeededOrFailed() - powershell: ./test.ps1 From 9cc063976fb66157a09254fc4d59f456b16dcbc6 Mon Sep 17 00:00:00 2001 From: Ryan Shaffer Date: Wed, 13 May 2020 13:55:32 -0400 Subject: [PATCH 4/6] Fix manifest.ps1 script error --- build/manifest.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/manifest.ps1 b/build/manifest.ps1 index 99fe5841bbe..cf7afbc72b4 100644 --- a/build/manifest.ps1 +++ b/build/manifest.ps1 @@ -1,5 +1,5 @@ -#!/usr/bin/env pwsh -#Requires -PSEdition Core +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. & "$PSScriptRoot/set-env.ps1" @@ -22,5 +22,5 @@ ".\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.Simulation.Simulators.dll", ".\src\Xunit\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Quantum.Xunit.dll" - ) | ForEach-Object { Get-Item (Join-Path $PSScriptRoot ".." $_) }; + ) | ForEach-Object { Get-Item (Join-Path $PSScriptRoot (Join-Path ".." $_)) }; } | Write-Output; \ No newline at end of file From 466dc8c82b8b860a40ce56ed61a26d8c1586320c Mon Sep 17 00:00:00 2001 From: Ryan Shaffer Date: Wed, 13 May 2020 15:10:25 -0400 Subject: [PATCH 5/6] Fix to manifest.ps1 --- build/manifest.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/manifest.ps1 b/build/manifest.ps1 index cf7afbc72b4..6482a368032 100644 --- a/build/manifest.ps1 +++ b/build/manifest.ps1 @@ -22,5 +22,5 @@ ".\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.Simulation.Simulators.dll", ".\src\Xunit\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Quantum.Xunit.dll" - ) | ForEach-Object { Get-Item (Join-Path $PSScriptRoot (Join-Path ".." $_)) }; + ) | ForEach-Object { Join-Path $PSScriptRoot (Join-Path ".." $_) }; } | Write-Output; \ No newline at end of file From 95243ec45a5ff8dee1556be1b1a59096e860beb7 Mon Sep 17 00:00:00 2001 From: Ryan Shaffer Date: Wed, 13 May 2020 15:48:22 -0400 Subject: [PATCH 6/6] Revert unnecessary commit 466dc8c82b8b860a40ce56ed61a26d8c1586320c --- build/manifest.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/manifest.ps1 b/build/manifest.ps1 index 6482a368032..cf7afbc72b4 100644 --- a/build/manifest.ps1 +++ b/build/manifest.ps1 @@ -22,5 +22,5 @@ ".\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.Simulation.Simulators.dll", ".\src\Xunit\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Quantum.Xunit.dll" - ) | ForEach-Object { Join-Path $PSScriptRoot (Join-Path ".." $_) }; + ) | ForEach-Object { Get-Item (Join-Path $PSScriptRoot (Join-Path ".." $_)) }; } | Write-Output; \ No newline at end of file