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

Update operation overrides in StateDisplayOperations.cs #293

Merged
bamarsha merged 9 commits into from
Aug 28, 2020
Merged

Update operation overrides in StateDisplayOperations.cs #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
44c1cad
Build 0.12.2008.24002.
Aug 24, 2020
6244479
Update callable overrides
Aug 24, 2020
0cc4a22
Build 0.12.2008.24010.
Aug 24, 2020
02c3a5e
Update providers package version
Aug 25, 2020
3163dae
Build 0.12.2008.2515.
Aug 25, 2020
39128fe
Merge branch 'master' into samarsha/csharp-naming
bamarsha Aug 25, 2020
341c57b
Merge branch 'samarsha/csharp-naming' of https://github.com/microsoft…
Aug 25, 2020
acf543d
Merge branch 'master' into samarsha/csharp-naming
bamarsha Aug 28, 2020
b15d423
Merge branch 'master' into samarsha/csharp-naming
Aug 28, 2020
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 images/iqsharp-base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ ENV PATH=$PATH:${HOME}/dotnet:${HOME}/.dotnet/tools \
# Install IQ# and the project templates, using the NuGet packages from the
# build context.
ARG IQSHARP_VERSION
RUN dotnet new -i "Microsoft.Quantum.ProjectTemplates::0.12.20081729-beta" && \
RUN dotnet new -i "Microsoft.Quantum.ProjectTemplates::0.12.20082515-beta" && \
dotnet tool install \
--global \
Microsoft.Quantum.IQSharp \
Expand Down
2 changes: 1 addition & 1 deletion src/AzureClient/AzureClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Quantum.Client" Version="0.12.20081940-beta" />
<PackageReference Include="Microsoft.Azure.Quantum.Client" Version="0.12.20082515-beta" />
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.21" />
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.3.19" />
<PackageReference Include="System.Reactive" Version="4.3.2" />
Expand Down
4 changes: 2 additions & 2 deletions src/AzureClient/Mocks/MockAzureExecutionTarget.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ namespace Microsoft.Quantum.IQSharp.AzureClient
{
internal class MockAzureExecutionTarget : AzureExecutionTarget
{
public override string PackageName => $"Microsoft.Quantum.Providers.{GetProvider(TargetId)}::0.12.20072031";
public override string PackageName => $"Microsoft.Quantum.Providers.{GetProvider(TargetId)}::0.12.20082414-beta";

public static MockAzureExecutionTarget? CreateMock(string targetId) =>
IsValid(targetId)
? new MockAzureExecutionTarget() { TargetId = targetId }
: null;
}
}
}
6 changes: 3 additions & 3 deletions src/Core/Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
<PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.0.0" />
<PackageReference Include="Microsoft.Quantum.Compiler" Version="0.12.20081940-beta" />
<PackageReference Include="Microsoft.Quantum.CsharpGeneration" Version="0.12.20081940-beta" />
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.12.20081940-beta" />
<PackageReference Include="Microsoft.Quantum.Compiler" Version="0.12.20082515-beta" />
<PackageReference Include="Microsoft.Quantum.CsharpGeneration" Version="0.12.20082515-beta" />
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.12.20082515-beta" />
<PackageReference Include="NuGet.Resolver" Version="5.1.0" />
<PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ExecutionPathTracer/ExecutionPathTracer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.12.20081940-beta" />
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.12.20082515-beta" />
</ItemGroup>

</Project>
8 changes: 4 additions & 4 deletions src/Jupyter/Visualization/StateDisplayOperations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,15 +139,15 @@ public JupyterDumpMachine(QuantumSimulator m) : base(m)
}

/// <inheritdoc />
public override Func<T, QVoid> Body => (location) =>
public override Func<T, QVoid> __Body__ => (location) =>
{
if (location == null) { throw new ArgumentNullException(nameof(location)); }
// Check if we're supposed to be writing to a file. In that case,
// we call the superclass version.
if (!(location is QVoid) && location.ToString().Length != 0)
{
Console.Out.WriteLine("Falling back to base DumpMachine.");
return base.Body.Invoke(location);
return base.__Body__.Invoke(location);
}

Debug.Assert(
Expand Down Expand Up @@ -182,7 +182,7 @@ public JupyterDumpRegister(QuantumSimulator m) : base(m)
}

/// <inheritdoc />
public override Func<(T, IQArray<Qubit>), QVoid> Body => (input) =>
public override Func<(T, IQArray<Qubit>), QVoid> __Body__ => (input) =>
{
var (location, qubits) = input;
if (location == null) { throw new ArgumentNullException(nameof(location)); }
Expand All @@ -191,7 +191,7 @@ public JupyterDumpRegister(QuantumSimulator m) : base(m)
if (!(location is QVoid) && location.ToString().Length != 0)
{
Console.Out.WriteLine("Falling back to base DumpRegister.");
return base.Body.Invoke(input);
return base.__Body__.Invoke(input);
}

Debug.Assert(
Expand Down
4 changes: 2 additions & 2 deletions src/MockLibraries/Mock.Chemistry/Mock.Chemistry.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.12.20081940-beta">
<Project Sdk="Microsoft.Quantum.Sdk/0.12.20082515-beta">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<IncludeQsharpCorePackages>false</IncludeQsharpCorePackages> <!-- otherwise the standard library is included by the Sdk -->
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.12.20081940-beta" />
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.12.20082515-beta" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions src/MockLibraries/Mock.Standard/Mock.Standard.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.12.20081940-beta">
<Project Sdk="Microsoft.Quantum.Sdk/0.12.20082515-beta">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<IncludeQsharpCorePackages>false</IncludeQsharpCorePackages> <!-- otherwise the standard library is included by the Sdk -->
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.12.20081940-beta" />
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.12.20082515-beta" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/Tests/Workspace.ProjectReferences.ProjectA/ProjectA.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.12.20072031">
<Project Sdk="Microsoft.Quantum.Sdk/0.12.20082515-beta">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
Expand Down
2 changes: 1 addition & 1 deletion src/Tests/Workspace.ProjectReferences.ProjectB/ProjectB.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.12.20072031">
<Project Sdk="Microsoft.Quantum.Sdk/0.12.20082515-beta">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
Expand Down
4 changes: 2 additions & 2 deletions src/Tests/Workspace.ProjectReferences/Workspace.ProjectReferences.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.12.20072031">
<Project Sdk="Microsoft.Quantum.Sdk/0.12.20082515-beta">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
Expand All @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Quantum.Xunit" Version="0.12.20072031" />
<PackageReference Include="Microsoft.Quantum.Xunit" Version="0.12.20082515-beta" />
</ItemGroup>

<ItemGroup>
Expand Down
32 changes: 16 additions & 16 deletions src/Tool/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,26 @@
},
"AllowedHosts": "*",
"DefaultPackageVersions": [
"Microsoft.Quantum.Compiler::0.12.20081940-beta",
"Microsoft.Quantum.Compiler::0.12.20082515-beta",

"Microsoft.Quantum.CsharpGeneration::0.12.20081940-beta",
"Microsoft.Quantum.Development.Kit::0.12.20081940-beta",
"Microsoft.Quantum.Simulators::0.12.20081940-beta",
"Microsoft.Quantum.Xunit::0.12.20081940-beta",
"Microsoft.Quantum.CsharpGeneration::0.12.20082515-beta",
"Microsoft.Quantum.Development.Kit::0.12.20082515-beta",
"Microsoft.Quantum.Simulators::0.12.20082515-beta",
"Microsoft.Quantum.Xunit::0.12.20082515-beta",

"Microsoft.Quantum.Standard::0.12.20081940-beta",
"Microsoft.Quantum.Standard.Visualization::0.12.20081940-beta",
"Microsoft.Quantum.Chemistry::0.12.20081940-beta",
"Microsoft.Quantum.Chemistry.Jupyter::0.12.20081940-beta",
"Microsoft.Quantum.MachineLearning::0.12.20081940-beta",
"Microsoft.Quantum.Numerics::0.12.20081940-beta",
"Microsoft.Quantum.Standard::0.12.20082515-beta",
"Microsoft.Quantum.Standard.Visualization::0.12.20082515-beta",
"Microsoft.Quantum.Chemistry::0.12.20082515-beta",
"Microsoft.Quantum.Chemistry.Jupyter::0.12.20082515-beta",
"Microsoft.Quantum.MachineLearning::0.12.20082515-beta",
"Microsoft.Quantum.Numerics::0.12.20082515-beta",

"Microsoft.Quantum.Katas::0.12.20081940-beta",
"Microsoft.Quantum.Katas::0.12.20082515-beta",

"Microsoft.Quantum.Research::0.12.20081940-beta",
"Microsoft.Quantum.Research::0.12.20082515-beta",

"Microsoft.Quantum.Providers.IonQ::0.12.20081940-beta",
"Microsoft.Quantum.Providers.Honeywell::0.12.20081940-beta",
"Microsoft.Quantum.Providers.QCI::0.12.20081940-beta"
"Microsoft.Quantum.Providers.IonQ::0.12.20082515-beta",
"Microsoft.Quantum.Providers.Honeywell::0.12.20082515-beta",
"Microsoft.Quantum.Providers.QCI::0.12.20082515-beta"
]
}