diff --git a/src/AzureClient/AzureClient.csproj b/src/AzureClient/AzureClient.csproj index 488051cc3c..1c92bb2d8c 100644 --- a/src/AzureClient/AzureClient.csproj +++ b/src/AzureClient/AzureClient.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Core/Compiler/CompilerService.cs b/src/Core/Compiler/CompilerService.cs index 61fe1f6a0b..f8a3c37ef9 100644 --- a/src/Core/Compiler/CompilerService.cs +++ b/src/Core/Compiler/CompilerService.cs @@ -304,9 +304,17 @@ public IEnumerable IdentifyElements(string source, ITaskRepo ? TargetPackageAssemblyPaths(executionTarget, capability?.Name) : Enumerable.Empty(); Logger.LogDebug("Using target package assemblies:\n{TargetAssemblies}", string.Join("\n", targetPackages)); + + var processorArchitecture = executionTarget ?? string.Empty; + if (string.Compare(executionTarget, "microsoft.simulator.fullstate", StringComparison.InvariantCultureIgnoreCase) == 0) + { + processorArchitecture = AssemblyConstants.MicrosoftSimulator; + } + var assemblyConstants = new Dictionary { - [AssemblyConstants.ProcessorArchitecture] = executionTarget ?? string.Empty, + [AssemblyConstants.ProcessorArchitecture] = processorArchitecture, + [AssemblyConstants.TargetCapability] = capability?.Name ?? string.Empty, [AssemblyConstants.TargetPackageAssemblies] = string.Join(";", targetPackages.Where(s => !string.IsNullOrWhiteSpace(s))) }; @@ -454,7 +462,7 @@ string WrapInNamespace(Snippet s) => var tempPath = Path.GetTempFileName(); var bcFile = CompilationLoader.GeneratedFile(tempPath, Path.GetDirectoryName(tempPath), ".bc", ""); var diagnostics = new List(); - CompilationSteps.GenerateBitcode(qsCompilation, capability, bcFile, diagnostics: diagnostics); + CompilationSteps.GenerateBitcode(qsCompilation, (IDictionary)assemblyConstants, bcFile, diagnostics: diagnostics); foreach (var diagnostic in diagnostics) { Logger?.Log( diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj index ad41df1fc9..28d25410d9 100644 --- a/src/Core/Core.csproj +++ b/src/Core/Core.csproj @@ -40,11 +40,11 @@ - - - - - + + + + + diff --git a/src/ExecutionPathTracer/ExecutionPathTracer.csproj b/src/ExecutionPathTracer/ExecutionPathTracer.csproj index d94aa9e468..03c1edcb2f 100644 --- a/src/ExecutionPathTracer/ExecutionPathTracer.csproj +++ b/src/ExecutionPathTracer/ExecutionPathTracer.csproj @@ -32,7 +32,7 @@ - + diff --git a/src/Kernel/Kernel.csproj b/src/Kernel/Kernel.csproj index 6536971c0d..a83d99aebc 100644 --- a/src/Kernel/Kernel.csproj +++ b/src/Kernel/Kernel.csproj @@ -26,7 +26,7 @@ - + diff --git a/src/MockLibraries/Mock.Chemistry/Mock.Chemistry.csproj b/src/MockLibraries/Mock.Chemistry/Mock.Chemistry.csproj index 71715316ff..48b55b5242 100644 --- a/src/MockLibraries/Mock.Chemistry/Mock.Chemistry.csproj +++ b/src/MockLibraries/Mock.Chemistry/Mock.Chemistry.csproj @@ -1,4 +1,4 @@ - + netstandard2.1 @@ -6,6 +6,6 @@ - + diff --git a/src/MockLibraries/Mock.Standard/Mock.Standard.csproj b/src/MockLibraries/Mock.Standard/Mock.Standard.csproj index 71715316ff..48b55b5242 100644 --- a/src/MockLibraries/Mock.Standard/Mock.Standard.csproj +++ b/src/MockLibraries/Mock.Standard/Mock.Standard.csproj @@ -1,4 +1,4 @@ - + netstandard2.1 @@ -6,6 +6,6 @@ - + diff --git a/src/Tests/NugetPackagesTests.cs b/src/Tests/NugetPackagesTests.cs index 9dcc79bf74..8212234e56 100644 --- a/src/Tests/NugetPackagesTests.cs +++ b/src/Tests/NugetPackagesTests.cs @@ -20,7 +20,7 @@ public class NugetPackagesTests /// We use a known-good version to avoid breaking IQ# tests due to changes in Libraries /// also, to make sure an end-to-end QDK build does not have circular build dependencies /// between Libraries and IQ#. - public static readonly NuGetVersion QDK_LIBRARIES_VERSION = NuGetVersion.Parse("0.25.228311"); + public static readonly NuGetVersion QDK_LIBRARIES_VERSION = NuGetVersion.Parse("0.26.230521-beta"); public NugetPackages Init() { diff --git a/src/Tests/Workspace.ProjectReferences.ProjectA/ProjectA.csproj b/src/Tests/Workspace.ProjectReferences.ProjectA/ProjectA.csproj index fc6b368125..5e32036553 100644 --- a/src/Tests/Workspace.ProjectReferences.ProjectA/ProjectA.csproj +++ b/src/Tests/Workspace.ProjectReferences.ProjectA/ProjectA.csproj @@ -1,4 +1,4 @@ - + netstandard2.1 diff --git a/src/Tests/Workspace.ProjectReferences.ProjectB/ProjectB.csproj b/src/Tests/Workspace.ProjectReferences.ProjectB/ProjectB.csproj index 0ca6a578cc..54a6277b6f 100644 --- a/src/Tests/Workspace.ProjectReferences.ProjectB/ProjectB.csproj +++ b/src/Tests/Workspace.ProjectReferences.ProjectB/ProjectB.csproj @@ -1,4 +1,4 @@ - + netstandard2.1 diff --git a/src/Tests/Workspace.ProjectReferences/Workspace.ProjectReferences.csproj b/src/Tests/Workspace.ProjectReferences/Workspace.ProjectReferences.csproj index d61ce37f6b..678268c915 100644 --- a/src/Tests/Workspace.ProjectReferences/Workspace.ProjectReferences.csproj +++ b/src/Tests/Workspace.ProjectReferences/Workspace.ProjectReferences.csproj @@ -1,4 +1,4 @@ - + netstandard2.1 @@ -7,7 +7,7 @@ - + diff --git a/src/Tool/appsettings.json b/src/Tool/appsettings.json index 211b812aca..5e822ba1cd 100644 --- a/src/Tool/appsettings.json +++ b/src/Tool/appsettings.json @@ -6,23 +6,23 @@ }, "AllowedHosts": "*", "DefaultPackageVersions": [ - "Microsoft.Quantum.Compiler::0.25.228311", - "Microsoft.Quantum.CSharpGeneration::0.25.228311", - "Microsoft.Quantum.QirGeneration::0.25.228311", + "Microsoft.Quantum.Compiler::0.26.230521-beta", + "Microsoft.Quantum.CSharpGeneration::0.26.230521-beta", + "Microsoft.Quantum.QirGeneration::0.26.230521-beta", "Microsoft.Quantum.Development.Kit::0.25.228311", - "Microsoft.Quantum.Simulators::0.25.228311", - "Microsoft.Quantum.Xunit::0.25.228311", - "Microsoft.Quantum.Standard::0.25.228311", - "Microsoft.Quantum.Standard.Visualization::0.25.228311", - "Microsoft.Quantum.Chemistry::0.25.228311", - "Microsoft.Quantum.Chemistry.Jupyter::0.25.228311", - "Microsoft.Quantum.MachineLearning::0.25.228311", - "Microsoft.Quantum.Numerics::0.25.228311", - "Microsoft.Quantum.Katas::0.25.228311", - "Microsoft.Quantum.Research::0.25.228311", - "Microsoft.Quantum.Providers.IonQ::0.25.228311", - "Microsoft.Quantum.Providers.Honeywell::0.25.228311", - "Microsoft.Quantum.Providers.QCI::0.25.228311", - "Microsoft.Quantum.Providers.Rigetti::0.25.228311" + "Microsoft.Quantum.Simulators::0.26.230521-beta", + "Microsoft.Quantum.Xunit::0.26.230521-beta", + "Microsoft.Quantum.Standard::0.26.230521-beta", + "Microsoft.Quantum.Standard.Visualization::0.26.230521-beta", + "Microsoft.Quantum.Chemistry::0.26.230521-beta", + "Microsoft.Quantum.Chemistry.Jupyter::0.26.230521-beta", + "Microsoft.Quantum.MachineLearning::0.26.230521-beta", + "Microsoft.Quantum.Numerics::0.26.230521-beta", + "Microsoft.Quantum.Katas::0.26.230521-beta", + "Microsoft.Quantum.Research::0.26.230521-beta", + "Microsoft.Quantum.Providers.IonQ::0.26.230521-beta", + "Microsoft.Quantum.Providers.Honeywell::0.26.230521-beta", + "Microsoft.Quantum.Providers.QCI::0.26.230521-beta", + "Microsoft.Quantum.Providers.Rigetti::0.26.230521-beta" ] }