microsoft · cesarzc · Apr 11, 2021 · Apr 6, 2021 · Apr 7, 2021 · Apr 7, 2021
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
diff --git a/AdvantageBenchmark/privateBuild/host.csproj b/AdvantageBenchmark/privateBuild/host.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.15.210324735-alpha">
+<Project Sdk="Microsoft.Quantum.Sdk">
   <!-- Add project references to Simulator and other required packages: -->
   <Import Project="..\..\src\Simulation\Common\Simulators.Dev.props" />
 

diff --git a/AdvantageBenchmark/releasedBuild/quantum/quantum.csproj b/AdvantageBenchmark/releasedBuild/quantum/quantum.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.15.210324735-alpha">
+<Project Sdk="Microsoft.Quantum.Sdk">
 
   <ItemGroup>
     <QSharpCompile Include="..\..\privateBuild\quantum.qs" />

diff --git a/global.json b/global.json
@@ -0,0 +1,5 @@
+{
+    "msbuild-sdks": {
+        "Microsoft.Quantum.Sdk": "0.15.210324735-alpha"
+    }
+}
diff --git a/src/Qir/Runtime/build-qir-runtime.ps1 b/src/Qir/Runtime/build-qir-runtime.ps1
@@ -6,3 +6,18 @@
 if (-not (Build-CMakeProject $PSScriptRoot "QIR Runtime")) {
     throw "At least one project failed to compile. Check the logs."
 }
+
+# Copy the results of runtime compilation and the corresponding headers to the drops folder so
+# they can be included in pipeline artifacts.
+$qirDropsFolder = (Join-Path $Env:DROPS_DIR QIR)
+$qirDropsBin = (Join-Path $qirDropsFolder bin)
+$qirDropsInclude = (Join-Path $qirDropsFolder include)
+if (-not (Test-Path $qirDropsFolder)) {
+    New-Item -Path $qirDropsFolder -ItemType "directory"
+    New-Item -Path $qirDropsBin -ItemType "directory"
+    New-Item -Path $qirDropsInclude -ItemType "directory"
+}
+$qirBinaries = (Join-Path $PSScriptRoot build $Env:BUILD_CONFIGURATION bin *)
+$qirIncludes = (Join-Path $PSScriptRoot public *)
+Copy-Item $qirBinaries $qirDropsBin
+Copy-Item $qirIncludes $qirDropsInclude
diff --git a/src/Qir/Samples/StandaloneInputReference/qsharp/qir-standalone-input-reference.csproj b/src/Qir/Samples/StandaloneInputReference/qsharp/qir-standalone-input-reference.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.15.210324735-alpha">
+<Project Sdk="Microsoft.Quantum.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>

diff --git a/src/Qir/Tests/FullstateSimulator/qsharp/qir-test-simulator.csproj b/src/Qir/Tests/FullstateSimulator/qsharp/qir-test-simulator.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.15.210324735-alpha">
+<Project Sdk="Microsoft.Quantum.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>

diff --git a/src/Qir/Tests/QIR-dynamic/qsharp/qir-test-random.csproj b/src/Qir/Tests/QIR-dynamic/qsharp/qir-test-random.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.15.210324735-alpha">
+<Project Sdk="Microsoft.Quantum.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>

diff --git a/src/Qir/Tests/QIR-static/qir-test-math.cpp b/src/Qir/Tests/QIR-static/qir-test-math.cpp
@@ -116,6 +116,12 @@ TEST_CASE("QIR: Math.DrawRandomInt", "[qir.math][qir.Math.DrawRandomInt]")
         REQUIRE(0 == strcmp(exc.what(), Quantum::Qis::Internal::excStrDrawRandomVal));
     }
 
+    // Test equal minimum and maximum:
+    for(uint64_t num: { -5, 0, 3 } )
+    {
+        REQUIRE(Microsoft__Quantum__Testing__QIR__Math__TestDrawRandomInt__body(num, num) == num);
+    }
+
     // There is a strong difference in the opinions about how the random number generator must be tested.
     // More or less agreed-upon items are:
     //  * The test must be 100% deterministic, i.e. must not fail, even with a very low probability. 

diff --git a/src/Qir/Tests/QIR-static/qsharp/qir-gen.csproj b/src/Qir/Tests/QIR-static/qsharp/qir-gen.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.15.210324735-alpha">
+<Project Sdk="Microsoft.Quantum.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>

diff --git a/src/Qir/Tests/QIR-tracer/qsharp/tracer-qir.csproj b/src/Qir/Tests/QIR-tracer/qsharp/tracer-qir.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.15.210324735-alpha">
+<Project Sdk="Microsoft.Quantum.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>

diff --git a/.../QCTraceSimulator.Tests/Tests.Microsoft.Quantum.Simulation.QCTraceSimulatorRuntime.csproj b/.../QCTraceSimulator.Tests/Tests.Microsoft.Quantum.Simulation.QCTraceSimulatorRuntime.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.15.210324735-alpha">
+<Project Sdk="Microsoft.Quantum.Sdk">
 
   <Import Project="..\Common\AssemblyCommon.props" />
   <Import Project="..\Common\Simulators.Dev.props" />

diff --git a/src/Simulation/QSharpCore/Microsoft.Quantum.QSharp.Core.csproj b/src/Simulation/QSharpCore/Microsoft.Quantum.QSharp.Core.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.15.210324735-alpha">
+<Project Sdk="Microsoft.Quantum.Sdk">
   <Import Project="..\TargetDefinitions\TargetPackages\QSharpCore.Package.props" />
 
   <PropertyGroup>

diff --git a/src/Simulation/QSharpFoundation/Microsoft.Quantum.QSharp.Foundation.csproj b/src/Simulation/QSharpFoundation/Microsoft.Quantum.QSharp.Foundation.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.15.210324735-alpha">
+<Project Sdk="Microsoft.Quantum.Sdk">
 
   <Import Project="..\Common\AssemblyCommon.props" />
   <Import Project="..\Common\DebugSymbols.props" />

diff --git a/src/Simulation/QSharpFoundation/Random/Intrinsic.qs b/src/Simulation/QSharpFoundation/Random/Intrinsic.qs
@@ -17,7 +17,7 @@ namespace Microsoft.Quantum.Random {
     /// probability.
     ///
     /// # Remarks
-    /// Fails if `max <= min`.
+    /// Fails if `max < min`.
     ///
     /// # Example
     /// The following Q# snippet randomly rolls a six-sided die:
@@ -45,7 +45,7 @@ namespace Microsoft.Quantum.Random {
     /// uniform probability.
     ///
     /// # Remarks
-    /// Fails if `max <= min`.
+    /// Fails if `max < min`.
     ///
     /// # Example
     /// The following Q# snippet randomly draws an angle between $0$ and $2 \pi$:

diff --git a/src/Simulation/QSharpFoundation/Random/Uniform.qs b/src/Simulation/QSharpFoundation/Random/Uniform.qs
@@ -20,7 +20,7 @@ namespace Microsoft.Quantum.Random {
     /// interval from `min` to `max` with uniform probability.
     ///
     /// # Remarks
-    /// Fails if `max <= min`.
+    /// Fails if `max < min`.
     ///
     /// # Example
     /// The following Q# snippet randomly draws an angle between $0$ and $2 \pi$:
@@ -34,7 +34,7 @@ namespace Microsoft.Quantum.Random {
     function ContinuousUniformDistribution(
         min : Double, max : Double
     ) : ContinuousDistribution {
-        Fact(max > min, $"Max must be larger than min, but {max} <= {min}.");
+        Fact(max >= min, $"Max must be greater than or equal to min, but {max} < {min}.");
         return ContinuousDistribution(Delay(DrawRandomDouble, (min, max), _));
     }
 
@@ -52,7 +52,7 @@ namespace Microsoft.Quantum.Random {
     /// range from `min` to `max` with uniform probability.
     ///
     /// # Remarks
-    /// Fails if `max <= min`.
+    /// Fails if `max < min`.
     ///
     /// # Example
     /// The following Q# snippet randomly rolls a six-sided die:
@@ -64,7 +64,7 @@ namespace Microsoft.Quantum.Random {
     /// # See Also
     /// - Microsoft.Quantum.DrawRandomDouble
     function DiscreteUniformDistribution(min : Int, max : Int) : DiscreteDistribution {
-        Fact(max > min, $"Max must be larger than min, but {max} <= {min}.");
+        Fact(max >= min, $"Max must be greater than or equal to min, but {max} < {min}.");
         return DiscreteDistribution(Delay(DrawRandomInt, (min, max), _));
     }
 

diff --git a/src/Simulation/Simulators.Tests/TestProjects/HoneywellExe/HoneywellExe.csproj b/src/Simulation/Simulators.Tests/TestProjects/HoneywellExe/HoneywellExe.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.15.210324735-alpha">
+<Project Sdk="Microsoft.Quantum.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>

diff --git a/src/Simulation/Simulators.Tests/TestProjects/IntrinsicTests/IntrinsicTests.csproj b/src/Simulation/Simulators.Tests/TestProjects/IntrinsicTests/IntrinsicTests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.15.210324735-alpha">
+<Project Sdk="Microsoft.Quantum.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>

diff --git a/src/Simulation/Simulators.Tests/TestProjects/IntrinsicTests/Random/Tests.qs b/src/Simulation/Simulators.Tests/TestProjects/IntrinsicTests/Random/Tests.qs
@@ -74,10 +74,25 @@ namespace Microsoft.Quantum.Tests {
     @Test("QuantumSimulator")
     @Test("ToffoliSimulator")
     operation CheckDrawRandomIntObeysRanges() : Unit {
-        let randomInt = DrawRandomInt(0, 45);
+        mutable randomInt = DrawRandomInt(0, 45);
         if (randomInt > 45 or randomInt < 0) {
             fail $"DrawRandomInt(0, 45) returned {randomInt}, outside the allowed range.";
         }
+
+        set randomInt = DrawRandomInt(0, 0);
+        if (randomInt > 0 or randomInt < 0) {
+            fail $"DrawRandomInt(0, 0) returned {randomInt}, outside the allowed range.";
+        }
+
+        set randomInt = DrawRandomInt(-3, -3);
+        if (randomInt > -3 or randomInt < -3) {
+            fail $"DrawRandomInt(-3, -3) returned {randomInt}, outside the allowed range.";
+        }
+
+        set randomInt = DrawRandomInt(3, 3);
+        if (randomInt > 3 or randomInt < 3) {
+            fail $"DrawRandomInt(3, 3) returned {randomInt}, outside the allowed range.";
+        }
     }
 
     /// # Summary

diff --git a/src/Simulation/Simulators.Tests/TestProjects/IonQExe/IonQExe.csproj b/src/Simulation/Simulators.Tests/TestProjects/IonQExe/IonQExe.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.15.210324735-alpha">
+<Project Sdk="Microsoft.Quantum.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>

diff --git a/src/Simulation/Simulators.Tests/TestProjects/Library with Spaces/Library with Spaces.csproj b/src/Simulation/Simulators.Tests/TestProjects/Library with Spaces/Library with Spaces.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.15.210324735-alpha">
+<Project Sdk="Microsoft.Quantum.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <CSharpGeneration>false</CSharpGeneration>

diff --git a/src/Simulation/Simulators.Tests/TestProjects/Library1/Library1.csproj b/src/Simulation/Simulators.Tests/TestProjects/Library1/Library1.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.15.210324735-alpha">
+<Project Sdk="Microsoft.Quantum.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>

diff --git a/src/Simulation/Simulators.Tests/TestProjects/Library2/Library2.csproj b/src/Simulation/Simulators.Tests/TestProjects/Library2/Library2.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.15.210324735-alpha">
+<Project Sdk="Microsoft.Quantum.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>

diff --git a/src/Simulation/Simulators.Tests/TestProjects/QCIExe/QCIExe.csproj b/src/Simulation/Simulators.Tests/TestProjects/QCIExe/QCIExe.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.15.210324735-alpha">
+<Project Sdk="Microsoft.Quantum.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>

diff --git a/src/Simulation/Simulators.Tests/TestProjects/QSharpExe/QSharpExe.csproj b/src/Simulation/Simulators.Tests/TestProjects/QSharpExe/QSharpExe.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.15.210324735-alpha">
+<Project Sdk="Microsoft.Quantum.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>

diff --git a/src/Simulation/Simulators.Tests/TestProjects/TargetedExe/TargetedExe.csproj b/src/Simulation/Simulators.Tests/TestProjects/TargetedExe/TargetedExe.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.15.210324735-alpha">
+<Project Sdk="Microsoft.Quantum.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>

diff --git a/src/Simulation/Simulators.Tests/TestProjects/UnitTests/UnitTests.csproj b/src/Simulation/Simulators.Tests/TestProjects/UnitTests/UnitTests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.15.210324735-alpha">
+<Project Sdk="Microsoft.Quantum.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>

diff --git a/src/Simulation/Simulators.Tests/Tests.Microsoft.Quantum.Simulators.csproj b/src/Simulation/Simulators.Tests/Tests.Microsoft.Quantum.Simulators.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.15.210324735-alpha">
+<Project Sdk="Microsoft.Quantum.Sdk">
 
   <Import Project="..\Common\Simulators.Test.props" />
 

diff --git a/src/Simulation/Simulators.Type1.Tests/Tests.Microsoft.Quantum.Simulators.Type1.csproj b/src/Simulation/Simulators.Type1.Tests/Tests.Microsoft.Quantum.Simulators.Type1.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.15.210324735-alpha">
+<Project Sdk="Microsoft.Quantum.Sdk">
 
   <Import Project="..\Common\Simulators.Test.props" />
 

diff --git a/src/Simulation/Simulators.Type2.Tests/Tests.Microsoft.Quantum.Simulators.Type2.csproj b/src/Simulation/Simulators.Type2.Tests/Tests.Microsoft.Quantum.Simulators.Type2.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.15.210324735-alpha">
+<Project Sdk="Microsoft.Quantum.Sdk">
 
   <Import Project="..\Common\Simulators.Test.props" />
 

diff --git a/src/Simulation/Simulators.Type3.Tests/Tests.Microsoft.Quantum.Simulators.Type3.csproj b/src/Simulation/Simulators.Type3.Tests/Tests.Microsoft.Quantum.Simulators.Type3.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.15.210324735-alpha">
+<Project Sdk="Microsoft.Quantum.Sdk">
 
   <Import Project="..\Common\Simulators.Test.props" />
 

diff --git a/src/Simulation/Simulators/Microsoft.Quantum.Simulators.csproj b/src/Simulation/Simulators/Microsoft.Quantum.Simulators.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.15.210324735-alpha">
+<Project Sdk="Microsoft.Quantum.Sdk">
 
   <Import Project="..\Common\AssemblyCommon.props" />
   <Import Project="..\Common\DebugSymbols.props" />

diff --git a/src/Simulation/Simulators/QuantumSimulator/SimulatorBase.cs b/src/Simulation/Simulators/QuantumSimulator/SimulatorBase.cs
@@ -469,16 +469,16 @@ public DrawRandomInt(SimulatorBase m) : base(m) =>
             public override Func<(long, long), long> __Body__ => arg =>
             {
                 var (min, max) = arg;
-                if (max <= min)
+                if (max < min)
                 {
-                    throw new ExecutionFailException($"Max must be greater than min, but {max} <= {min}.");
+                    throw new ExecutionFailException($"Max must be greater than or equal to min, but {max} < {min}.");
                 }
                 return sim.RandomGenerator.NextLong(min, max);
             };
         }
 
         /// <summary>
-        ///     Implements the DrawRandomInt operation from the
+        ///     Implements the DrawRandomDouble operation from the
         ///     Microsoft.Quantum.Random namespace.
         /// </summary>
         public class DrawRandomDouble : Random.DrawRandomDouble
@@ -490,9 +490,9 @@ public DrawRandomDouble(SimulatorBase m) : base(m) =>
             public override Func<(double, double), double> __Body__ => arg =>
             {
                 var (min, max) = arg;
-                if (max <= min)
+                if (max < min)
                 {
-                    throw new ExecutionFailException($"Max must be greater than min, but {max} <= {min}.");
+                    throw new ExecutionFailException($"Max must be greater than or equal to min, but {max} < {min}.");
                 }
                 var delta = max - min;
                 return min + delta * sim.RandomGenerator.NextDouble();

diff --git a/src/Simulation/Type1Core/Microsoft.Quantum.Type1.Core.csproj b/src/Simulation/Type1Core/Microsoft.Quantum.Type1.Core.csproj
@@ -1,10 +1,8 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.15.210324735-alpha">
-
+<Project Sdk="Microsoft.Quantum.Sdk">
   <Import Project="..\TargetDefinitions\TargetPackages\Type1.Package.props" />
 
   <PropertyGroup>
     <Description>Type1 Targeting support for the Q# programming language.</Description>
     <GenerateConcreteIntrinsic>true</GenerateConcreteIntrinsic>
   </PropertyGroup>
-
 </Project>
diff --git a/src/Simulation/Type2Core/Microsoft.Quantum.Type2.Core.csproj b/src/Simulation/Type2Core/Microsoft.Quantum.Type2.Core.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.15.210324735-alpha">
+<Project Sdk="Microsoft.Quantum.Sdk">
 
   <Import Project="..\TargetDefinitions\TargetPackages\Type2.Package.props" />
 

diff --git a/src/Simulation/Type3Core/Microsoft.Quantum.Type3.Core.csproj b/src/Simulation/Type3Core/Microsoft.Quantum.Type3.Core.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.15.210324735-alpha">
+<Project Sdk="Microsoft.Quantum.Sdk">
 
   <Import Project="..\TargetDefinitions\TargetPackages\Type3.Package.props" />