Skip to content
This repository was archived by the owner on Jan 12, 2024. It is now read-only.

Adapt runtime to latest LSP package. #547

Merged
ricardo-espinoza merged 10 commits into from
Mar 12, 2021
Merged

Adapt runtime to latest LSP package. #547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
50f088e
Update simulation code tests to use latest LSP API.
cgranade Mar 5, 2021
e8daa10
Update entry point generator tests as well.
cgranade Mar 5, 2021
767c8bb
Update to latest compiler beta.
cgranade Mar 5, 2021
55cbf5a
Merge branch 'main' into cgranade/fix-885
Mar 6, 2021
9bddf66
Update ci.yml
Mar 10, 2021
02c883b
Merge branch 'main' into cgranade/fix-885
ricardo-espinoza Mar 10, 2021
0ebc85c
Update SDK version across repository to 0.15.2103130749-beta
ricardo-espinoza Mar 10, 2021
29b426d
Fixing remaining file for SDK version
ricardo-espinoza Mar 10, 2021
e9abc15
Merge branch 'main' into cgranade/fix-885
ricardo-espinoza Mar 12, 2021
ee70879
Merge branch 'main' into cgranade/fix-885
ricardo-espinoza Mar 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion AdvantageBenchmark/privateBuild/host.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2102129527-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2103130749-beta">
<!-- Add project references to Simulator and other required packages: -->
<Import Project="..\..\src\Simulation\Common\Simulators.Dev.props" />

Expand Down
2 changes: 1 addition & 1 deletion AdvantageBenchmark/releasedBuild/quantum/quantum.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2102129527-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2103130749-beta">

<ItemGroup>
<QSharpCompile Include="..\..\privateBuild\quantum.qs" />
Expand Down
2 changes: 1 addition & 1 deletion build/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ variables:
Drops.Dir: $(Build.ArtifactStagingDirectory)/drops
Drop.Native: $(System.DefaultWorkingDirectory)/xplat
CI: "true"
ENABLE_QIRRUNTIME: "true"
ENABLE_QIRRUNTIME: "false"

jobs:
- job: build
Expand Down
2 changes: 1 addition & 1 deletion src/QirRuntime/samples/StandaloneInputReference/qsharp/qir-standalone-input-reference.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2102129527-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2103130749-beta">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand Down
2 changes: 1 addition & 1 deletion src/QirRuntime/test/QIR-static/qsharp/qir-gen.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2102129527-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2103130749-beta">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand Down
7 changes: 4 additions & 3 deletions src/Simulation/CSharpGeneration.Tests/SimulationCodeTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,10 @@ namespace N1
let parse files =
let mutable errors = [] : Diagnostic list
let addError (diag : Diagnostic) =
match diag.Severity with
| DiagnosticSeverity.Error -> errors <- diag :: errors
| _ -> ()
if diag.Severity.HasValue then
match diag.Severity.Value with
| DiagnosticSeverity.Error -> errors <- diag :: errors
| _ -> ()
let addSourceFile (mgr:CompilationUnitManager) fileName =
let fileId = new Uri(Path.GetFullPath fileName)
let file = CompilationUnitManager.InitializeFileManager(fileId, File.ReadAllText fileName)
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/CSharpGeneration/Microsoft.Quantum.CSharpGeneration.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<ItemGroup>
<PackageReference Update="FSharp.Core" Version="4.7.0" />
<PackageReference Include="Microsoft.Quantum.Compiler" Version="0.15.2102129527-alpha" />
<PackageReference Include="Microsoft.Quantum.Compiler" Version="0.15.2103130749-beta" />
Copy link
Collaborator

@swernli swernli Mar 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To update this version, you need to also update every QDK version through the whole repo. However, because there are changes in qsharp-runtime main that aren't yet in qsharp-compiler main, doing so to a beta package that is missing those dependent changes means it will fail the build. We are working in getting out of this bad state, but for now our best bet is to merge compiler main into one of our working branches, do an alpha build, and and then have you update to that package version across this repo.

I'll kick off a build that hopefully will resolve this issue for you.

</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/EntryPointDriver.Tests/Tests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ let private compileQSharp source =
let compilation = compilationManager.Build ()
let errors =
compilation.Diagnostics ()
|> Seq.filter (fun diagnostic -> diagnostic.Severity = DiagnosticSeverity.Error)
|> Seq.filter (fun diagnostic -> diagnostic.Severity = Nullable DiagnosticSeverity.Error)
Assert.Empty errors
compilation.BuiltCompilation

Expand Down
2 changes: 1 addition & 1 deletion .../QCTraceSimulator.Tests/Tests.Microsoft.Quantum.Simulation.QCTraceSimulatorRuntime.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2102129527-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2103130749-beta">

<Import Project="..\Common\AssemblyCommon.props" />
<Import Project="..\Common\Simulators.Dev.props" />
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/QSharpCore/Microsoft.Quantum.QSharp.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2102129527-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2103130749-beta">
<Import Project="..\TargetDefinitions\TargetPackages\QSharpCore.Package.props" />

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/QSharpFoundation/Microsoft.Quantum.QSharp.Foundation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2102129527-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2103130749-beta">

<Import Project="..\Common\AssemblyCommon.props" />
<Import Project="..\Common\DebugSymbols.props" />
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Tests/TestProjects/HoneywellExe/HoneywellExe.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2102129527-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2103130749-beta">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Tests/TestProjects/IntrinsicTests/IntrinsicTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2102129527-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2103130749-beta">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Tests/TestProjects/IonQExe/IonQExe.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2102129527-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2103130749-beta">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Tests/TestProjects/Library with Spaces/Library with Spaces.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2102129527-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2103130749-beta">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<CSharpGeneration>false</CSharpGeneration>
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Tests/TestProjects/Library1/Library1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2102129527-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2103130749-beta">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Tests/TestProjects/Library2/Library2.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2102129527-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2103130749-beta">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Tests/TestProjects/QCIExe/QCIExe.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2102129527-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2103130749-beta">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Tests/TestProjects/QSharpExe/QSharpExe.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2102129527-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2103130749-beta">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Tests/TestProjects/TargetedExe/TargetedExe.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2102129527-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2103130749-beta">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Tests/TestProjects/UnitTests/UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2102129527-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2103130749-beta">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Tests/Tests.Microsoft.Quantum.Simulators.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2102129527-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2103130749-beta">

<Import Project="..\Common\Simulators.Test.props" />

Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Type1.Tests/Tests.Microsoft.Quantum.Simulators.Type1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2102129527-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2103130749-beta">

<Import Project="..\Common\Simulators.Test.props" />

Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Type2.Tests/Tests.Microsoft.Quantum.Simulators.Type2.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2102129527-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2103130749-beta">

<Import Project="..\Common\Simulators.Test.props" />

Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Type3.Tests/Tests.Microsoft.Quantum.Simulators.Type3.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2102129527-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2103130749-beta">

<Import Project="..\Common\Simulators.Test.props" />

Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators/Microsoft.Quantum.Simulators.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2102129527-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2103130749-beta">

<Import Project="..\Common\AssemblyCommon.props" />
<Import Project="..\Common\DebugSymbols.props" />
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Type1Core/Microsoft.Quantum.Type1.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2102129527-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2103130749-beta">

<Import Project="..\TargetDefinitions\TargetPackages\Type1.Package.props" />

Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Type2Core/Microsoft.Quantum.Type2.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2102129527-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2103130749-beta">

<Import Project="..\TargetDefinitions\TargetPackages\Type2.Package.props" />

Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Type3Core/Microsoft.Quantum.Type3.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2102129527-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2103130749-beta">

<Import Project="..\TargetDefinitions\TargetPackages\Type3.Package.props" />

Expand Down