From 4194b71da75cf0e0c8acaf1d518f28ea24e188ea Mon Sep 17 00:00:00 2001 From: Ryan Shaffer Date: Wed, 13 May 2020 13:10:36 -0400 Subject: [PATCH 1/8] Add AzureClient assembly to manifest --- build/manifest.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/build/manifest.ps1 b/build/manifest.ps1 index d767d026f6..9aaeea1fb1 100644 --- a/build/manifest.ps1 +++ b/build/manifest.ps1 @@ -11,6 +11,7 @@ ); Assemblies = @( ".\src\tool\bin\$Env:BUILD_CONFIGURATION\netcoreapp3.1\Microsoft.Quantum.IQSharp.dll", + ".\src\tool\bin\$Env:BUILD_CONFIGURATION\netcoreapp3.1\Microsoft.Quantum.IQSharp.AzureClient.dll", ".\src\tool\bin\$Env:BUILD_CONFIGURATION\netcoreapp3.1\Microsoft.Quantum.IQSharp.Core.dll", ".\src\tool\bin\$Env:BUILD_CONFIGURATION\netcoreapp3.1\Microsoft.Quantum.IQSharp.Jupyter.dll", ".\src\tool\bin\$Env:BUILD_CONFIGURATION\netcoreapp3.1\Microsoft.Quantum.IQSharp.Kernel.dll", From cf20c5f1b8297fb89e8faa2772fea984bd65ca2b Mon Sep 17 00:00:00 2001 From: Ryan Shaffer Date: Wed, 13 May 2020 13:14:40 -0400 Subject: [PATCH 2/8] Add manifest.ps1 to build steps --- build/steps.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build/steps.yml b/build/steps.yml index 1649ffc7ac..45d80eccc2 100644 --- a/build/steps.yml +++ b/build/steps.yml @@ -21,6 +21,11 @@ steps: ## # Build, test & pack ## +- pwsh: .\manifest.ps1 + displayName: "List built assemblies" + workingDirectory: '$(System.DefaultWorkingDirectory)/build' + condition: succeededOrFailed() + - pwsh: .\build.ps1 displayName: "Building IQ#" workingDirectory: '$(System.DefaultWorkingDirectory)/build' From 967432be51ab41db42f374f24f10dfaf6745ad10 Mon Sep 17 00:00:00 2001 From: Ryan Shaffer Date: Wed, 13 May 2020 13:24:08 -0400 Subject: [PATCH 3/8] Run manifest after build completes --- build/steps.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/steps.yml b/build/steps.yml index 45d80eccc2..16cb7f94e0 100644 --- a/build/steps.yml +++ b/build/steps.yml @@ -21,15 +21,15 @@ steps: ## # Build, test & pack ## +- pwsh: .\build.ps1 + displayName: "Building IQ#" + workingDirectory: '$(System.DefaultWorkingDirectory)/build' + - pwsh: .\manifest.ps1 displayName: "List built assemblies" workingDirectory: '$(System.DefaultWorkingDirectory)/build' condition: succeededOrFailed() -- pwsh: .\build.ps1 - displayName: "Building IQ#" - workingDirectory: '$(System.DefaultWorkingDirectory)/build' - - pwsh: .\test.ps1 displayName: "Testing IQ#" workingDirectory: '$(System.DefaultWorkingDirectory)/build' From 9801912f41ba9688b92110d6f91df28657c14418 Mon Sep 17 00:00:00 2001 From: Ryan Shaffer Date: Wed, 13 May 2020 13:55:21 -0400 Subject: [PATCH 4/8] 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 9aaeea1fb1..df3ada9fd0 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" @@ -16,5 +16,5 @@ ".\src\tool\bin\$Env:BUILD_CONFIGURATION\netcoreapp3.1\Microsoft.Quantum.IQSharp.Jupyter.dll", ".\src\tool\bin\$Env:BUILD_CONFIGURATION\netcoreapp3.1\Microsoft.Quantum.IQSharp.Kernel.dll", ".\src\tool\bin\$Env:BUILD_CONFIGURATION\netcoreapp3.1\Microsoft.Quantum.IQSharp.Web.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 2a30172781b60d14272e0c886813737f9378c823 Mon Sep 17 00:00:00 2001 From: Ryan Shaffer Date: Wed, 13 May 2020 15:08:39 -0400 Subject: [PATCH 5/8] 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 df3ada9fd0..0672824baf 100644 --- a/build/manifest.ps1 +++ b/build/manifest.ps1 @@ -16,5 +16,5 @@ ".\src\tool\bin\$Env:BUILD_CONFIGURATION\netcoreapp3.1\Microsoft.Quantum.IQSharp.Jupyter.dll", ".\src\tool\bin\$Env:BUILD_CONFIGURATION\netcoreapp3.1\Microsoft.Quantum.IQSharp.Kernel.dll", ".\src\tool\bin\$Env:BUILD_CONFIGURATION\netcoreapp3.1\Microsoft.Quantum.IQSharp.Web.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 192a631314a8b74f4755f6cacd00e7892640018a Mon Sep 17 00:00:00 2001 From: Ryan Shaffer Date: Wed, 13 May 2020 16:07:16 -0400 Subject: [PATCH 6/8] Run manifest.ps1 from inside build.ps1 --- build/build.ps1 | 2 ++ build/manifest.ps1 | 2 +- build/steps.yml | 5 ----- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/build/build.ps1 b/build/build.ps1 index 75408114ee..57ec8dc3a5 100644 --- a/build/build.ps1 +++ b/build/build.ps1 @@ -39,3 +39,5 @@ if (-not $all_ok) throw "At least one project failed to compile. Check the logs." } +& "$PSScriptRoot/manifest.ps1" + diff --git a/build/manifest.ps1 b/build/manifest.ps1 index 0672824baf..df3ada9fd0 100644 --- a/build/manifest.ps1 +++ b/build/manifest.ps1 @@ -16,5 +16,5 @@ ".\src\tool\bin\$Env:BUILD_CONFIGURATION\netcoreapp3.1\Microsoft.Quantum.IQSharp.Jupyter.dll", ".\src\tool\bin\$Env:BUILD_CONFIGURATION\netcoreapp3.1\Microsoft.Quantum.IQSharp.Kernel.dll", ".\src\tool\bin\$Env:BUILD_CONFIGURATION\netcoreapp3.1\Microsoft.Quantum.IQSharp.Web.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 diff --git a/build/steps.yml b/build/steps.yml index 16cb7f94e0..1649ffc7ac 100644 --- a/build/steps.yml +++ b/build/steps.yml @@ -24,11 +24,6 @@ steps: - pwsh: .\build.ps1 displayName: "Building IQ#" workingDirectory: '$(System.DefaultWorkingDirectory)/build' - -- pwsh: .\manifest.ps1 - displayName: "List built assemblies" - workingDirectory: '$(System.DefaultWorkingDirectory)/build' - condition: succeededOrFailed() - pwsh: .\test.ps1 displayName: "Testing IQ#" From b8cc9b003d908a83ddec17e02fcc7ad94273a776 Mon Sep 17 00:00:00 2001 From: Ryan Shaffer Date: Wed, 13 May 2020 16:20:11 -0400 Subject: [PATCH 7/8] Fix case error in manifest.ps1, undo 192a631314a8b74f4755f6cacd00e7892640018a --- build/build.ps1 | 2 -- build/manifest.ps1 | 12 ++++++------ build/steps.yml | 5 +++++ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/build/build.ps1 b/build/build.ps1 index 57ec8dc3a5..75408114ee 100644 --- a/build/build.ps1 +++ b/build/build.ps1 @@ -39,5 +39,3 @@ if (-not $all_ok) throw "At least one project failed to compile. Check the logs." } -& "$PSScriptRoot/manifest.ps1" - diff --git a/build/manifest.ps1 b/build/manifest.ps1 index df3ada9fd0..cef887214a 100644 --- a/build/manifest.ps1 +++ b/build/manifest.ps1 @@ -10,11 +10,11 @@ "Microsoft.Quantum.IQSharp" ); Assemblies = @( - ".\src\tool\bin\$Env:BUILD_CONFIGURATION\netcoreapp3.1\Microsoft.Quantum.IQSharp.dll", - ".\src\tool\bin\$Env:BUILD_CONFIGURATION\netcoreapp3.1\Microsoft.Quantum.IQSharp.AzureClient.dll", - ".\src\tool\bin\$Env:BUILD_CONFIGURATION\netcoreapp3.1\Microsoft.Quantum.IQSharp.Core.dll", - ".\src\tool\bin\$Env:BUILD_CONFIGURATION\netcoreapp3.1\Microsoft.Quantum.IQSharp.Jupyter.dll", - ".\src\tool\bin\$Env:BUILD_CONFIGURATION\netcoreapp3.1\Microsoft.Quantum.IQSharp.Kernel.dll", - ".\src\tool\bin\$Env:BUILD_CONFIGURATION\netcoreapp3.1\Microsoft.Quantum.IQSharp.Web.dll" + ".\src\Tool\bin\$Env:BUILD_CONFIGURATION\netcoreapp3.1\Microsoft.Quantum.IQSharp.dll", + ".\src\Tool\bin\$Env:BUILD_CONFIGURATION\netcoreapp3.1\Microsoft.Quantum.IQSharp.AzureClient.dll", + ".\src\Tool\bin\$Env:BUILD_CONFIGURATION\netcoreapp3.1\Microsoft.Quantum.IQSharp.Core.dll", + ".\src\Tool\bin\$Env:BUILD_CONFIGURATION\netcoreapp3.1\Microsoft.Quantum.IQSharp.Jupyter.dll", + ".\src\Tool\bin\$Env:BUILD_CONFIGURATION\netcoreapp3.1\Microsoft.Quantum.IQSharp.Kernel.dll", + ".\src\Tool\bin\$Env:BUILD_CONFIGURATION\netcoreapp3.1\Microsoft.Quantum.IQSharp.Web.dll" ) | ForEach-Object { Get-Item (Join-Path $PSScriptRoot (Join-Path ".." $_)) }; } | Write-Output; \ No newline at end of file diff --git a/build/steps.yml b/build/steps.yml index 1649ffc7ac..16cb7f94e0 100644 --- a/build/steps.yml +++ b/build/steps.yml @@ -24,6 +24,11 @@ steps: - pwsh: .\build.ps1 displayName: "Building IQ#" workingDirectory: '$(System.DefaultWorkingDirectory)/build' + +- pwsh: .\manifest.ps1 + displayName: "List built assemblies" + workingDirectory: '$(System.DefaultWorkingDirectory)/build' + condition: succeededOrFailed() - pwsh: .\test.ps1 displayName: "Testing IQ#" From fad03b841d519bc0c2956808a04e1a54465b91af Mon Sep 17 00:00:00 2001 From: Ryan Shaffer Date: Wed, 13 May 2020 17:36:04 -0400 Subject: [PATCH 8/8] Move back to using pwsh in manifest.ps1 --- build/manifest.ps1 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build/manifest.ps1 b/build/manifest.ps1 index cef887214a..4dbf01ac04 100644 --- a/build/manifest.ps1 +++ b/build/manifest.ps1 @@ -1,6 +1,9 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. +#!/usr/bin/env pwsh +#Requires -PSEdition Core + & "$PSScriptRoot/set-env.ps1" @{ @@ -16,5 +19,5 @@ ".\src\Tool\bin\$Env:BUILD_CONFIGURATION\netcoreapp3.1\Microsoft.Quantum.IQSharp.Jupyter.dll", ".\src\Tool\bin\$Env:BUILD_CONFIGURATION\netcoreapp3.1\Microsoft.Quantum.IQSharp.Kernel.dll", ".\src\Tool\bin\$Env:BUILD_CONFIGURATION\netcoreapp3.1\Microsoft.Quantum.IQSharp.Web.dll" - ) | ForEach-Object { Get-Item (Join-Path $PSScriptRoot (Join-Path ".." $_)) }; + ) | ForEach-Object { Get-Item (Join-Path $PSScriptRoot ".." $_) }; } | Write-Output; \ No newline at end of file