Merge branch 'gulow/broombridge-0.3' of https://github.com/microsoft/…

…QuantumLibraries into gulow/broombridge-0.3
microsoft · Sep 7, 2023 · 2e640d1 · 2e640d1
2 parents b3977b4 + 90098eb
commit 2e640d1
Show file tree

Hide file tree

Showing 27 changed files with 60 additions and 83 deletions.
diff --git a/Build/manifest.ps1 b/Build/manifest.ps1
@@ -31,13 +31,13 @@ $artifacts = @{
     ) | ForEach-Object { Join-Path $Env:NUGET_OUTDIR "$_.$Env:NUGET_VERSION.nupkg" };
 
     Assemblies = @(
-        ".\Standard\src\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Quantum.Standard.dll",
-        ".\Visualization\src\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Quantum.Standard.Visualization.dll",
-        ".\Numerics\src\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Quantum.Numerics.dll",
-        ".\MachineLearning\src\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Quantum.MachineLearning.dll",
-        ".\Chemistry\src\DataModel\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Quantum.Chemistry.DataModel.dll",
-        ".\Chemistry\src\Jupyter\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Quantum.Chemistry.Jupyter.dll",
-        ".\Chemistry\src\Runtime\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Quantum.Chemistry.Runtime.dll",
+        ".\Standard\src\bin\$Env:BUILD_CONFIGURATION\net6.0\Microsoft.Quantum.Standard.dll",
+        ".\Visualization\src\bin\$Env:BUILD_CONFIGURATION\net6.0\Microsoft.Quantum.Standard.Visualization.dll",
+        ".\Numerics\src\bin\$Env:BUILD_CONFIGURATION\net6.0\Microsoft.Quantum.Numerics.dll",
+        ".\MachineLearning\src\bin\$Env:BUILD_CONFIGURATION\net6.0\Microsoft.Quantum.MachineLearning.dll",
+        ".\Chemistry\src\DataModel\bin\$Env:BUILD_CONFIGURATION\net6.0\Microsoft.Quantum.Chemistry.DataModel.dll",
+        ".\Chemistry\src\Jupyter\bin\$Env:BUILD_CONFIGURATION\net6.0\Microsoft.Quantum.Chemistry.Jupyter.dll",
+        ".\Chemistry\src\Runtime\bin\$Env:BUILD_CONFIGURATION\net6.0\Microsoft.Quantum.Chemistry.Runtime.dll",
         ".\Chemistry\src\Tools\bin\$Env:BUILD_CONFIGURATION\net6.0\qdk-chem.dll"
     ) | ForEach-Object { Join-Path $PSScriptRoot (Join-Path ".." $_) };
 } 

diff --git a/Build/props/tests.props b/Build/props/tests.props
@@ -7,10 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Quantum.Xunit" Version="0.26.233415" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="Microsoft.Quantum.Xunit" Version="0.28.291394" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 

diff --git a/Chemistry/src/DataModel/DataModel.csproj b/Chemistry/src/DataModel/DataModel.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <PlatformTarget>x64</PlatformTarget>
     <AssemblyName>Microsoft.Quantum.Chemistry.DataModel</AssemblyName>
     <DocumentationFile>bin\$(BuildConfiguration)\$(PlatformTarget)\$(AssemblyName).xml</DocumentationFile>

diff --git a/Chemistry/src/Jupyter/Jupyter.csproj b/Chemistry/src/Jupyter/Jupyter.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <PlatformTarget>x64</PlatformTarget>
     <AssemblyName>Microsoft.Quantum.Chemistry.Jupyter</AssemblyName>
   </PropertyGroup>

diff --git a/Chemistry/src/Metapackage/Metapackage.csproj b/Chemistry/src/Metapackage/Metapackage.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <PlatformTarget>x64</PlatformTarget>
     <AssemblyName>Microsoft.Quantum.Chemistry.Metapackage</AssemblyName>
   </PropertyGroup>

diff --git a/Chemistry/src/Runtime/Runtime.csproj b/Chemistry/src/Runtime/Runtime.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.26.233415">
+<Project Sdk="Microsoft.Quantum.Sdk/0.28.291394">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>Microsoft.Quantum.Chemistry.Runtime</AssemblyName>
     <QsharpDocsGeneration>true</QsharpDocsGeneration>
     <IncludeQsharpCorePackages>false</IncludeQsharpCorePackages>
@@ -40,7 +40,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Quantum.Simulators" Version="0.26.233415" />
+    <PackageReference Include="Microsoft.Quantum.Simulators" Version="0.28.291394" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Chemistry/tests/ChemistryTests/QSharpTests.csproj b/Chemistry/tests/ChemistryTests/QSharpTests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.26.233415">
+<Project Sdk="Microsoft.Quantum.Sdk/0.28.291394">
 
   <Import Project="..\..\..\Build\props\tests.props" />
 

diff --git a/Chemistry/tests/DataModelTests/DataModelTests.csproj b/Chemistry/tests/DataModelTests/DataModelTests.csproj
@@ -20,10 +20,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/Chemistry/tests/JupyterTests/JupyterTests.csproj b/Chemistry/tests/JupyterTests/JupyterTests.csproj
@@ -17,10 +17,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
     <PackageReference Include="NETStandard.Library" Version="2.0.3" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/Chemistry/tests/SamplesTests/SamplesTests.csproj b/Chemistry/tests/SamplesTests/SamplesTests.csproj
@@ -13,10 +13,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/Chemistry/tests/SystemTests/SystemTests.csproj b/Chemistry/tests/SystemTests/SystemTests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.26.233415">
+<Project Sdk="Microsoft.Quantum.Sdk/0.28.291394">
 
   <Import Project="..\..\..\Build\props\tests.props" />
 

diff --git a/MachineLearning/src/MachineLearning.csproj b/MachineLearning/src/MachineLearning.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.26.233415">
+<Project Sdk="Microsoft.Quantum.Sdk/0.28.291394">
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>Microsoft.Quantum.MachineLearning</AssemblyName>
     <QsharpDocsGeneration>true</QsharpDocsGeneration>
     <QsharpDocsPackageId>Microsoft.Quantum.MachineLearning</QsharpDocsPackageId>

diff --git a/MachineLearning/src/Training.qs b/MachineLearning/src/Training.qs
@@ -60,8 +60,8 @@ namespace Microsoft.Quantum.MachineLearning {
     /// A set of labeled training data that will be used to perform training.
     /// ## options
     /// Configuration to be used when training; see
-    /// @"microsoft.quantum.machinelearning.trainingoptions" and
-    /// @"microsoft.quantum.machinelearning.defaulttrainingoptions" for more
+    /// @"Microsoft.Quantum.MachineLearning.TrainingOptions" and
+    /// @"Microsoft.Quantum.MachineLearning.DefaultTrainingOptions" for more
     /// details.
     /// ## trainingSchedule
     /// A sampling schedule to use when selecting samples from the training
@@ -273,8 +273,8 @@ namespace Microsoft.Quantum.MachineLearning {
     /// A set of labeled training data that will be used to perform training.
     /// ## options
     /// Configuration to be used when training; see
-    /// @"microsoft.quantum.machinelearning.trainingoptions" and
-    /// @"microsoft.quantum.machinelearning.defaulttrainingoptions" for more
+    /// @"Microsoft.Quantum.MachineLearning.TrainingOptions" and
+    /// @"Microsoft.Quantum.MachineLearning.DefaultTrainingOptions" for more
     /// details.
     /// ## trainingSchedule
     /// A sampling schedule to use when selecting samples from the training

diff --git a/MachineLearning/src/Types.qs b/MachineLearning/src/Types.qs
@@ -190,7 +190,7 @@ namespace Microsoft.Quantum.MachineLearning {
     ///
     /// # Remarks
     /// This UDT should not be created directly, but rather should be specified
-    /// by calling @"microsoft.quantum.machinelearning.defaulttrainingoptions"
+    /// by calling @"Microsoft.Quantum.MachineLearning.DefaultTrainingOptions"
     /// and then using the `w/` operator to override different defaults.
     ///
     /// For example, to use 100,000 measurements and at most 8 training

diff --git a/MachineLearning/tests/MachineLearningTests.csproj b/MachineLearning/tests/MachineLearningTests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.26.233415">
+<Project Sdk="Microsoft.Quantum.Sdk/0.28.291394">
 
   <Import Project="..\..\Build\props\tests.props" />
 

diff --git a/NuGet.Config b/NuGet.Config
@@ -15,6 +15,6 @@
 -->
 <configuration>
   <packageSources>
-    <add key="qdk-alpha" value="https://pkgs.dev.azure.com/ms-quantum-public/Microsoft Quantum (public)/_packaging/alpha/nuget/v3/index.json" protocolVersion="3" />
+    <add key="qdk-alpha" value="https://pkgs.dev.azure.com/ms-quantum-public/9af4e09e-a436-4aca-9559-2094cfe8d80c/_packaging/alpha/nuget/v3/index.json" protocolVersion="3" />
   </packageSources>
 </configuration>
diff --git a/Numerics/src/FixedPoint/Facts.qs b/Numerics/src/FixedPoint/Facts.qs
@@ -31,7 +31,7 @@ namespace Microsoft.Quantum.Arithmetic {
         let (position, register) = fixedPoints[0]!;
         Fact(position > 0, "Point position must be greater than zero.");
         let n = Length(register);
-        for fp in Most(fixedPoints) {
+        for fp in Rest(fixedPoints) {
             EqualityFactI(fp::IntegerBits, position,
                 "FixedPoint numbers must have identical binary point position.");
             EqualityFactI(Length(fp::Register), n,
@@ -56,7 +56,7 @@ namespace Microsoft.Quantum.Arithmetic {
         let (position, register) = fixedPoints[0]!;
         Fact(position > 0, "Point position must be greater than zero.");
         let n = Length(register);
-        for fp in Most(fixedPoints) {
+        for fp in Rest(fixedPoints) {
             EqualityFactI(Length(fp::Register) - fp::IntegerBits, n - position,
                 "FixedPoint numbers must have identical point alignment.");
         }

diff --git a/Numerics/src/Numerics.csproj b/Numerics/src/Numerics.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.26.233415">
+<Project Sdk="Microsoft.Quantum.Sdk/0.28.291394">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>Microsoft.Quantum.Numerics</AssemblyName>
     <QsharpDocsGeneration>true</QsharpDocsGeneration>
     <QsharpDocsPackageId>Microsoft.Quantum.Numerics</QsharpDocsPackageId>
@@ -41,7 +41,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Quantum.Simulators" Version="0.26.233415" />
+    <PackageReference Include="Microsoft.Quantum.Simulators" Version="0.28.291394" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>
 

diff --git a/Numerics/tests/NumericsTests.csproj b/Numerics/tests/NumericsTests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.26.233415">
+<Project Sdk="Microsoft.Quantum.Sdk/0.28.291394">
 
   <Import Project="..\..\Build\props\tests.props" />
 

diff --git a/Standard/src/Convert/Convert.qs b/Standard/src/Convert/Convert.qs
@@ -119,6 +119,15 @@ namespace Microsoft.Quantum.Convert {
     /// # Input
     /// ## results
     /// Results in binary representation of number.
+    ///
+    /// # Output
+    /// A non-negative integer
+    ///
+    /// # Example
+    /// ```qsharp
+    /// // The following returns 1
+    /// let int1 = ResultArrayAsInt([One,Zero])
+    /// ```
     function ResultArrayAsInt(results : Result[]) : Int {
         return BoolArrayAsInt(ResultArrayAsBoolArray(results));
     }

diff --git a/Standard/src/Preparation/Mixed.qs b/Standard/src/Preparation/Mixed.qs
@@ -66,7 +66,7 @@ namespace Microsoft.Quantum.Preparation {
     /// in the maximally mixed state instead (see <xref:Microsoft.Quantum.Preparation.PrepareSingleQubitIdentity>).
     ///
     /// If the qubit was in a state other than $\ket{0}$, this operation applies the following gates:
-    /// $H$ for `PauliX`, $HS$ for `PauliY`, $I$ for `PauliZ` and
+    /// $H$ for `PauliX`, $SH$ for `PauliY`, $I$ for `PauliZ` and
     /// <xref:Microsoft.Quantum.Preparation.PrepareSingleQubitIdentity> for `PauliI`.
     ///
     /// # Input

diff --git a/Standard/src/Standard.csproj b/Standard/src/Standard.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.26.233415">
+<Project Sdk="Microsoft.Quantum.Sdk/0.28.291394">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>Microsoft.Quantum.Standard</AssemblyName>
     <IncludeQsharpCorePackages>false</IncludeQsharpCorePackages> <!-- otherwise the standard library is included by the Sdk -->
     <NoWarn>1591</NoWarn> <!-- warning regarding missing C# doc comments -->
@@ -38,8 +38,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Quantum.Simulators" Version="0.26.233415" />
-    <PackageReference Include="Microsoft.Quantum.QSharp.Core" Version="0.26.233415" />
+    <PackageReference Include="Microsoft.Quantum.Simulators" Version="0.28.291394" />
+    <PackageReference Include="Microsoft.Quantum.QSharp.Core" Version="0.28.291394" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
     <PackageReference Include="NumSharp" Version="0.20.5" />
   </ItemGroup>

diff --git a/Standard/src/Synthesis/ControlledOnTruthTable.qs b/Standard/src/Synthesis/ControlledOnTruthTable.qs
@@ -141,7 +141,7 @@ namespace Microsoft.Quantum.Synthesis {
     /// in decimal notation.  The `L` suffix indicates that the constant is of type `BigInt`.
     /// More details on this representation can also be found in the [truth tables kata](https://github.com/microsoft/QuantumKatas/tree/main/TruthTables).
     ///
-    /// The implementation makes use of @"Microsoft.Quantum.Intrinsic.Cnot"
+    /// The implementation makes use of @"Microsoft.Quantum.Intrinsic.CNOT"
     /// and @"Microsoft.Quantum.Intrinsic.R1" gates.
     ///
     /// # Input
@@ -205,7 +205,7 @@ namespace Microsoft.Quantum.Synthesis {
     /// This operation implements a special case of @"Microsoft.Quantum.Synthesis.ApplyXControlledOnTruthTable",
     /// in which the target qubit is known to be in the $\ket{0}$ state.
     ///
-    /// The implementation makes use of @"Microsoft.Quantum.Intrinsic.Cnot"
+    /// The implementation makes use of @"Microsoft.Quantum.Intrinsic.CNOT"
     /// and @"Microsoft.Quantum.Intrinsic.R1" gates.  The implementation of the
     /// adjoint operation is optimized and uses measurement-based uncomputation.
     ///

diff --git a/Standard/tests/Canon/Utils/MultiplexerTests.cs b/Standard/tests/Canon/Utils/MultiplexerTests.cs
diff --git a/Standard/tests/Standard.Tests.csproj b/Standard/tests/Standard.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.26.233415">
+<Project Sdk="Microsoft.Quantum.Sdk/0.28.291394">
 
   <Import Project="..\..\Build\props\tests.props" />
 

diff --git a/Visualization/src/Visualization.csproj b/Visualization/src/Visualization.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>Microsoft.Quantum.Standard.Visualization</AssemblyName>
     <NoWarn>1591</NoWarn> <!-- warning regarding missing C# doc comments -->
   </PropertyGroup>
@@ -32,9 +32,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Quantum.Simulators" Version="0.26.233415" />
+    <PackageReference Include="Microsoft.Quantum.Simulators" Version="0.28.291394" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Quantum.IQSharp.Jupyter" Version="0.26.233415" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Quantum.IQSharp.Jupyter" Version="0.28.291394" PrivateAssets="All" />
     <PackageReference Include="NumSharp" Version="0.20.5" />
   </ItemGroup>
 

diff --git a/global.json b/global.json
@@ -4,6 +4,6 @@
         "rollForward": "latestMinor"
     },
     "msbuild-sdks": {
-        "Microsoft.Quantum.Sdk": "0.26.233415"
+        "Microsoft.Quantum.Sdk": "0.28.291394"
     }
 }