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

Don't throw exceptions on reference loops in JSON serialization. #463

Merged
cgranade merged 1 commit into from
Jul 7, 2021
Merged

Don't throw exceptions on reference loops in JSON serialization. #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 4 additions & 8 deletions src/Core/Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,10 @@
<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.18.2106148499-beta" />
<PackageReference Include="Microsoft.Quantum.CSharpGeneration" Version="0.18.2106148499-beta" />
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.18.2106148499-beta" />
<PackageReference Include="Microsoft.Quantum.QSharp.Core" Version="0.18.2106148499-beta" />
<PackageReference Include="Microsoft.Quantum.Compiler" Version="0.18.2106148499-beta" />
<PackageReference Include="Microsoft.Quantum.CSharpGeneration" Version="0.18.2106148499-beta" />
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.18.2106148499-beta" />
<PackageReference Include="Microsoft.Quantum.QSharp.Core" Version="0.18.2106148499-beta" />
<PackageReference Include="Microsoft.Quantum.Compiler" Version="0.18.210728727-alpha" />
<PackageReference Include="Microsoft.Quantum.CSharpGeneration" Version="0.18.210728727-alpha" />
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.18.210728727-alpha" />
<PackageReference Include="Microsoft.Quantum.QSharp.Core" Version="0.18.210728727-alpha" />
<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.18.2106148499-beta" />
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.18.210728727-alpha" />
</ItemGroup>

</Project>
6 changes: 6 additions & 0 deletions src/Kernel/IQSharpEngine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,12 @@ public override void Start()
: "application/json"
: "application/x-qsharp-data";

// Register JSON encoders, and make sure that Newtonsoft.Json
// doesn't throw exceptions on reference loops.
JsonConvert.DefaultSettings = () => new JsonSerializerSettings
{
ReferenceLoopHandling = ReferenceLoopHandling.Ignore
};
RegisterJsonEncoder(jsonMimeType,
JsonConverters.AllConverters
.Concat(AzureClient.JsonConverters.AllConverters)
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.18.2106148499-beta">
<Project Sdk="Microsoft.Quantum.Sdk/0.18.210728727-alpha">

<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.18.2106148499-beta" />
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.18.210728727-alpha" />
</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.18.2106148499-beta">
<Project Sdk="Microsoft.Quantum.Sdk/0.18.210728727-alpha">

<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.18.2106148499-beta" />
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.18.210728727-alpha" />
</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.18.2106148499-beta">
<Project Sdk="Microsoft.Quantum.Sdk/0.18.210728727-alpha">

<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.18.2106148499-beta">
<Project Sdk="Microsoft.Quantum.Sdk/0.18.210728727-alpha">

<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.18.2106148499-beta">
<Project Sdk="Microsoft.Quantum.Sdk/0.18.210728727-alpha">

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

<ItemGroup>
<PackageReference Include="Microsoft.Quantum.Xunit" Version="0.18.2106148499-beta" />
<PackageReference Include="Microsoft.Quantum.Xunit" Version="0.18.210728727-alpha" />
</ItemGroup>

<ItemGroup>
Expand Down
43 changes: 19 additions & 24 deletions src/Tool/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,22 @@
}
},
"AllowedHosts": "*",
"DefaultPackageVersions": [
"Microsoft.Quantum.Compiler::0.18.2106148499-beta",

"Microsoft.Quantum.CSharpGeneration::0.18.2106148499-beta",
"Microsoft.Quantum.Development.Kit::0.18.2106148499-beta",
"Microsoft.Quantum.Simulators::0.18.2106148499-beta",
"Microsoft.Quantum.Xunit::0.18.2106148499-beta",

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

"Microsoft.Quantum.Katas::0.18.2106148499-beta",

"Microsoft.Quantum.Research::0.18.2106148499-beta",

"Microsoft.Quantum.Providers.IonQ::0.18.2106148499-beta",
"Microsoft.Quantum.Providers.Honeywell::0.18.2106148499-beta",
"Microsoft.Quantum.Providers.QCI::0.18.2106148499-beta"
]
}
"DefaultPackageVersions": [
"Microsoft.Quantum.Compiler::0.18.210728727-alpha",
"Microsoft.Quantum.CSharpGeneration::0.18.210728727-alpha",
"Microsoft.Quantum.Development.Kit::0.18.210728727-alpha",
"Microsoft.Quantum.Simulators::0.18.210728727-alpha",
"Microsoft.Quantum.Xunit::0.18.210728727-alpha",
"Microsoft.Quantum.Standard::0.18.210728727-alpha",
"Microsoft.Quantum.Standard.Visualization::0.18.210728727-alpha",
"Microsoft.Quantum.Chemistry::0.18.210728727-alpha",
"Microsoft.Quantum.Chemistry.Jupyter::0.18.210728727-alpha",
"Microsoft.Quantum.MachineLearning::0.18.210728727-alpha",
"Microsoft.Quantum.Numerics::0.18.210728727-alpha",
"Microsoft.Quantum.Katas::0.18.210728727-alpha",
"Microsoft.Quantum.Research::0.18.210728727-alpha",
"Microsoft.Quantum.Providers.IonQ::0.18.210728727-alpha",
"Microsoft.Quantum.Providers.Honeywell::0.18.210728727-alpha",
"Microsoft.Quantum.Providers.QCI::0.18.210728727-alpha"
]
}