From 71160b0759259f76e73856e22116b1dc71b5c1be Mon Sep 17 00:00:00 2001 From: Scott Carda Date: Mon, 14 Dec 2020 13:17:19 -0800 Subject: [PATCH 1/3] Adds ConcreteIntrinsicGenProperty as an assembly constant and Q# project property. --- .../DataStructures/ReservedKeywords.fs | 1 + .../DefaultItems/DefaultItems.props.v.template | 16 ++++++++-------- src/QuantumSdk/Sdk/Sdk.targets | 1 + 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/QsCompiler/DataStructures/ReservedKeywords.fs b/src/QsCompiler/DataStructures/ReservedKeywords.fs index 230b1448c4..6a103f0ebf 100644 --- a/src/QsCompiler/DataStructures/ReservedKeywords.fs +++ b/src/QsCompiler/DataStructures/ReservedKeywords.fs @@ -246,6 +246,7 @@ module AssemblyConstants = let ToffoliSimulator = "ToffoliSimulator" let ResourcesEstimator = "ResourcesEstimator" let ExposeReferencesViaTestNames = "ExposeReferencesViaTestNames" + let ConcreteIntrinsicGen = "ConcreteIntrinsicGen" /// The runtime capabilities supported by an execution target. The names of the capabilities here match the ones /// defined by the SDK. diff --git a/src/QuantumSdk/DefaultItems/DefaultItems.props.v.template b/src/QuantumSdk/DefaultItems/DefaultItems.props.v.template index 6a5a926646..e6b8ef5edb 100644 --- a/src/QuantumSdk/DefaultItems/DefaultItems.props.v.template +++ b/src/QuantumSdk/DefaultItems/DefaultItems.props.v.template @@ -28,18 +28,18 @@ - + Normal true - true - true + true + true false false - dotnet "$(MSBuildThisFileDirectory)../tools/utils/Microsoft.Quantum.Sdk.BuildConfiguration.dll" - $(DefaultQscBuildConfigExe) - dotnet "$(MSBuildThisFileDirectory)../tools/qsc/qsc.dll" - $(DefaultQscExe) + dotnet "$(MSBuildThisFileDirectory)../tools/utils/Microsoft.Quantum.Sdk.BuildConfiguration.dll" + $(DefaultQscBuildConfigExe) + dotnet "$(MSBuildThisFileDirectory)../tools/qsc/qsc.dll" + $(DefaultQscExe) + false - \ No newline at end of file diff --git a/src/QuantumSdk/Sdk/Sdk.targets b/src/QuantumSdk/Sdk/Sdk.targets index 671dd7fd4a..40320a7b28 100644 --- a/src/QuantumSdk/Sdk/Sdk.targets +++ b/src/QuantumSdk/Sdk/Sdk.targets @@ -93,6 +93,7 @@ <_QscCommandPredefinedAssemblyProperties Condition="'$(ExposeReferencesViaTestNames)'">$(_QscCommandPredefinedAssemblyProperties)$(_NewLineIndent)ExposeReferencesViaTestNames:true <_QscCommandPredefinedAssemblyProperties Condition="'$(_QscDocsPackageId)' != ''">$(_QscCommandPredefinedAssemblyProperties)$(_NewLineIndent)DocsPackageId:$(_QscDocsPackageId) <_QscCommandPredefinedAssemblyProperties Condition="'$(QsharpDocsGeneration)'">$(_QscCommandPredefinedAssemblyProperties)$(_NewLineIndent)DocsOutputPath:"$(QsharpDocsOutputPath)" + <_QscCommandPredefinedAssemblyProperties Condition="'$(ConcreteIntrinsicGen)'">$(_QscCommandPredefinedAssemblyProperties)$(_NewLineIndent)ConcreteIntrinsicGen:$(ConcreteIntrinsicGen) <_QscCommandAssemblyPropertiesFlag>$(_NewLine)--assembly-properties$(_QscCommandPredefinedAssemblyProperties) <_QscCommandAssemblyPropertiesFlag Condition="'$(QscCommandAssemblyProperties)' != ''">$(_QscCommandAssemblyPropertiesFlag)$(_NewLineIndent)$(QscCommandAssemblyProperties) $(_NewLine)$(AdditionalQscArguments) From 58530a3b8bc7714d6599ef7f68f641c3631f95f2 Mon Sep 17 00:00:00 2001 From: Scott Carda Date: Mon, 14 Dec 2020 16:24:12 -0800 Subject: [PATCH 2/3] Changed ConcreteIntrinsicGen to GenerateConcreteIntrinsic. --- src/QsCompiler/DataStructures/ReservedKeywords.fs | 2 +- src/QuantumSdk/DefaultItems/DefaultItems.props.v.template | 2 +- src/QuantumSdk/Sdk/Sdk.targets | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/QsCompiler/DataStructures/ReservedKeywords.fs b/src/QsCompiler/DataStructures/ReservedKeywords.fs index 6a103f0ebf..cb43ddf15a 100644 --- a/src/QsCompiler/DataStructures/ReservedKeywords.fs +++ b/src/QsCompiler/DataStructures/ReservedKeywords.fs @@ -246,7 +246,7 @@ module AssemblyConstants = let ToffoliSimulator = "ToffoliSimulator" let ResourcesEstimator = "ResourcesEstimator" let ExposeReferencesViaTestNames = "ExposeReferencesViaTestNames" - let ConcreteIntrinsicGen = "ConcreteIntrinsicGen" + let GenerateConcreteIntrinsic = "GenerateConcreteIntrinsic" /// The runtime capabilities supported by an execution target. The names of the capabilities here match the ones /// defined by the SDK. diff --git a/src/QuantumSdk/DefaultItems/DefaultItems.props.v.template b/src/QuantumSdk/DefaultItems/DefaultItems.props.v.template index e6b8ef5edb..9def193b31 100644 --- a/src/QuantumSdk/DefaultItems/DefaultItems.props.v.template +++ b/src/QuantumSdk/DefaultItems/DefaultItems.props.v.template @@ -39,7 +39,7 @@ $(DefaultQscBuildConfigExe) dotnet "$(MSBuildThisFileDirectory)../tools/qsc/qsc.dll" $(DefaultQscExe) - false + false diff --git a/src/QuantumSdk/Sdk/Sdk.targets b/src/QuantumSdk/Sdk/Sdk.targets index 40320a7b28..6cf35cdfac 100644 --- a/src/QuantumSdk/Sdk/Sdk.targets +++ b/src/QuantumSdk/Sdk/Sdk.targets @@ -93,7 +93,7 @@ <_QscCommandPredefinedAssemblyProperties Condition="'$(ExposeReferencesViaTestNames)'">$(_QscCommandPredefinedAssemblyProperties)$(_NewLineIndent)ExposeReferencesViaTestNames:true <_QscCommandPredefinedAssemblyProperties Condition="'$(_QscDocsPackageId)' != ''">$(_QscCommandPredefinedAssemblyProperties)$(_NewLineIndent)DocsPackageId:$(_QscDocsPackageId) <_QscCommandPredefinedAssemblyProperties Condition="'$(QsharpDocsGeneration)'">$(_QscCommandPredefinedAssemblyProperties)$(_NewLineIndent)DocsOutputPath:"$(QsharpDocsOutputPath)" - <_QscCommandPredefinedAssemblyProperties Condition="'$(ConcreteIntrinsicGen)'">$(_QscCommandPredefinedAssemblyProperties)$(_NewLineIndent)ConcreteIntrinsicGen:$(ConcreteIntrinsicGen) + <_QscCommandPredefinedAssemblyProperties Condition="'$(GenerateConcreteIntrinsic)'">$(_QscCommandPredefinedAssemblyProperties)$(_NewLineIndent)GenerateConcreteIntrinsic:$(GenerateConcreteIntrinsic) <_QscCommandAssemblyPropertiesFlag>$(_NewLine)--assembly-properties$(_QscCommandPredefinedAssemblyProperties) <_QscCommandAssemblyPropertiesFlag Condition="'$(QscCommandAssemblyProperties)' != ''">$(_QscCommandAssemblyPropertiesFlag)$(_NewLineIndent)$(QscCommandAssemblyProperties) $(_NewLine)$(AdditionalQscArguments) From 815fe542165b2570c85219c7bfa30b018b5e34e7 Mon Sep 17 00:00:00 2001 From: Scott Carda Date: Mon, 14 Dec 2020 19:33:35 -0800 Subject: [PATCH 3/3] Trigger Build