Skip to content
This repository was archived by the owner on Jan 12, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 17 additions & 0 deletions Build/props/tests.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Quantum.Xunit" Version="0.10.1912.2614-alpha" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
</ItemGroup>

</Project>

4 changes: 2 additions & 2 deletions Build/steps.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
steps:

- task: UseDotNet@2
displayName: 'Use .NET Core SDK 3.0.100'
displayName: 'Use .NET Core SDK 3.1.100'
inputs:
packageType: sdk
version: '3.0.100'
version: '3.1.100'


- powershell: ./build.ps1
Expand Down
1 change: 0 additions & 1 deletion Chemistry/src/DataModel/DataModel.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.1.1" />
<PackageReference Include="Microsoft.Quantum.Development.Kit" Version="0.10.1912.501" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="YamlDotNet" Version="8.0.0" />
<PackageReference Include="Serilog.Extensions.Logging.File" Version="1.1.0" />
Expand Down
2 changes: 0 additions & 2 deletions Chemistry/src/Jupyter/Jupyter.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@

<ItemGroup>
<PackageReference Include="Microsoft.Jupyter.Core" Version="1.2.20112" />
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.10.1912.501" />
<PackageReference Include="Microsoft.Quantum.IQSharp.Core" Version="0.10.1912.501" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
</ItemGroup>

Expand Down
16 changes: 7 additions & 9 deletions Chemistry/src/Runtime/Runtime.csproj
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.Quantum.Sdk/0.10.1912.2605-alpha">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<AssemblyName>Microsoft.Quantum.Chemistry.Runtime</AssemblyName>
<DocumentationFile>bin\$(BuildConfiguration)\$(PlatformTarget)\$(AssemblyName).xml</DocumentationFile>
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>

<PropertyGroup>
<RunQDocGen>True</RunQDocGen>
<QsharpDocsGeneration>true</QsharpDocsGeneration>
<IncludeQsharpCorePackages>false</IncludeQsharpCorePackages>
</PropertyGroup>

<ItemGroup>
<Compile Include="..\..\Common\DelaySign.cs" Link="Properties\DelaySign.cs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Quantum.Development.Kit" Version="0.10.1912.501" />
<ProjectReference Include="..\..\..\Standard\src\Standard.csproj" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this correct? I'm always suspicious of far-away upward relative paths.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The path format followed throughout most of the libraries has been {library}/{src-or-tests}/{project}, such that going up three levels is unfortunately necessary for anything that crosses between libraries (e.g.: chemistry → standard).

</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\Standard\src\Standard.csproj" />
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.10.1912.2614-alpha" />
</ItemGroup>

</Project>

27 changes: 7 additions & 20 deletions Chemistry/tests/ChemistryTests/QSharpTests.csproj
Original file line number Diff line number Diff line change
@@ -1,28 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.Quantum.Sdk/0.10.1912.2605-alpha">

<Import Project="..\..\..\Build\props\tests.props" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, I'm always suspicious of far-away upward relative paths in project files.


<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<PlatformTarget>x64</PlatformTarget>
<IsPackable>false</IsPackable>
<IncludeQsharpCorePackages>false</IncludeQsharpCorePackages>
</PropertyGroup>

<ItemGroup>
<Compile Include="..\..\Common\DelaySign.cs" Link="Properties\DelaySign.cs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
<PackageReference Include="Microsoft.Quantum.Development.Kit" Version="0.10.1912.501" />
<PackageReference Include="Microsoft.Quantum.Xunit" Version="0.10.1912.501" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\Standard\src\Standard.csproj" />
<ProjectReference Include="..\..\src\Runtime\Runtime.csproj" />
</ItemGroup>

</Project>

Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ namespace Microsoft.Quantum.Chemistry.Tests {
function _DoublesToComplexPolar(input: Double[]) : ComplexPolar[]{
mutable arr = new ComplexPolar[Length(input)];
for(idx in 0..Length(input)-1){
set arr w/= idx <- ComplexToComplexPolar(Complex((input[idx],0.)));
set arr w/= idx <- ComplexAsComplexPolar(Complex((input[idx],0.)));
}
return arr;
}
Expand Down
10 changes: 4 additions & 6 deletions Chemistry/tests/DataModelTests/CSharpTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,8 @@
</Content>
</ItemGroup>

<ItemGroup>
<Compile Include="..\..\Common\DelaySign.cs" Link="Properties\DelaySign.cs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
<PackageReference Include="Microsoft.Quantum.Development.Kit" Version="0.10.1912.501" />
<PackageReference Include="Microsoft.Quantum.Xunit" Version="0.10.1912.501" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
Expand All @@ -44,6 +38,10 @@
</None>
</ItemGroup>

<ItemGroup>
<Compile Include="..\..\Common\DelaySign.cs" Link="Properties\DelaySign.cs" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Runtime\Runtime.csproj" />
<ProjectReference Include="..\..\src\DataModel\DataModel.csproj" />
Expand Down
10 changes: 4 additions & 6 deletions Chemistry/tests/SamplesTests/SamplesTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,8 @@
</Content>
</ItemGroup>

<ItemGroup>
<Compile Include="..\..\Common\DelaySign.cs" Link="Properties\DelaySign.cs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
<PackageReference Include="Microsoft.Quantum.Development.Kit" Version="0.10.1912.501" />
<PackageReference Include="Microsoft.Quantum.Xunit" Version="0.10.1912.501" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
Expand All @@ -38,6 +32,10 @@
<Folder Include="Molecules\" />
</ItemGroup>

<ItemGroup>
<Compile Include="..\..\Common\DelaySign.cs" Link="Properties\DelaySign.cs" />
</ItemGroup>

<ItemGroup>
<None Include="..\BroombridgeExamples\LiH_0.2.yaml" Link="Molecules\LiH_0.2.yaml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand Down
30 changes: 10 additions & 20 deletions Chemistry/tests/SystemTests/SystemTests.csproj
Original file line number Diff line number Diff line change
@@ -1,33 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.Quantum.Sdk/0.10.1912.2605-alpha">

<Import Project="..\..\..\Build\props\tests.props" />

<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<PlatformTarget>x64</PlatformTarget>
<IsPackable>false</IsPackable>
<IncludeQsharpCorePackages>false</IncludeQsharpCorePackages>
</PropertyGroup>

<ItemGroup>
<Content Include="xunit.runner.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>

<ItemGroup>
<Compile Include="..\..\Common\DelaySign.cs" Link="Properties\DelaySign.cs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
<PackageReference Include="Microsoft.Quantum.Development.Kit" Version="0.10.1912.501" />
<PackageReference Include="Microsoft.Quantum.Xunit" Version="0.10.1912.501" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
</ItemGroup>


<ItemGroup>
<None Include="..\BroombridgeExamples\hydrogen_0.1.yaml" Link="Molecules\MolecularHydrogen\hydrogen_0.1.yaml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand All @@ -43,10 +28,15 @@
</None>
</ItemGroup>

<ItemGroup>
<Compile Include="..\..\Common\DelaySign.cs" Link="Properties\DelaySign.cs" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\Standard\src\Standard.csproj" />
<ProjectReference Include="..\..\src\Runtime\Runtime.csproj" />
<ProjectReference Include="..\..\src\DataModel\DataModel.csproj" />
</ItemGroup>

</Project>

6 changes: 1 addition & 5 deletions MachineLearning/src/DataModel/DataModel.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<PlatformTarget>x64</PlatformTarget>
<AssemblyName>Microsoft.Quantum.MachineLearning.DataModel</AssemblyName>
<DocumentationFile>bin\$(BuildConfiguration)\$(PlatformTarget)\$(AssemblyName).xml</DocumentationFile>
<QsharpDocsGeneration>true</QsharpDocsGeneration>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -31,11 +32,6 @@
<Compile Include="..\..\Common\DelaySign.cs" Link="Properties\DelaySign.cs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Quantum.Development.Kit" Version="0.10.1912.501" />
</ItemGroup>


<ItemGroup>
<ProjectReference Include="..\Runtime\Runtime.csproj" PrivateAssets="all" />
<BuildOutputInPackage Include="..\Runtime\bin\$(Configuration)\netstandard2.1\Microsoft.Quantum.MachineLearning.*" />
Expand Down
16 changes: 7 additions & 9 deletions MachineLearning/src/Runtime/Runtime.csproj
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.Quantum.Sdk/0.10.1912.2605-alpha">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<PlatformTarget>x64</PlatformTarget>
<AssemblyName>Microsoft.Quantum.MachineLearning.Runtime</AssemblyName>
<QsharpDocsGeneration>true</QsharpDocsGeneration>
<!--
Include core packages using project references instead, since they get
built at the same time as this project.
-->
<IncludeQsharpCorePackages>false</IncludeQsharpCorePackages>
</PropertyGroup>

<PropertyGroup>
<RunQDocGen>True</RunQDocGen>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Quantum.Development.Kit" Version="0.10.1912.501" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\Standard\src\Standard.csproj" />
</ItemGroup>
Expand Down
18 changes: 6 additions & 12 deletions MachineLearning/tests/MachineLearningTests.csproj
Original file line number Diff line number Diff line change
@@ -1,23 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.Quantum.Sdk/0.10.1912.2605-alpha">

<Import Project="..\..\Build\props\tests.props" />

<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<PlatformTarget>x64</PlatformTarget>
<IsPackable>false</IsPackable>
<AssemblyName>Microsoft.Quantum.Standard.Tests</AssemblyName>
<IncludeQsharpCorePackages>false</IncludeQsharpCorePackages>
</PropertyGroup>

<ItemGroup>
<Compile Include="..\Common\DelaySign.cs" Link="Properties\DelaySign.cs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
<PackageReference Include="Microsoft.Quantum.Development.Kit" Version="0.10.1912.501" />
<PackageReference Include="Microsoft.Quantum.Xunit" Version="0.10.1912.501" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\Standard\src\Standard.csproj" />
<ProjectReference Include="..\src\Runtime\Runtime.csproj" />
Expand Down
13 changes: 7 additions & 6 deletions Numerics/src/Numerics.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.Quantum.Sdk/0.10.1912.2605-alpha">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<AssemblyName>Microsoft.Quantum.Numerics</AssemblyName>
<PlatformTarget>x64</PlatformTarget>
<QsharpDocsGeneration>true</QsharpDocsGeneration>
<IncludeQsharpCorePackages>false</IncludeQsharpCorePackages>
</PropertyGroup>

<PropertyGroup>
Expand Down Expand Up @@ -30,10 +32,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Quantum.Development.Kit" Version="0.10.1912.501" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.10.1912.2614-alpha" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
</ItemGroup>

</Project>

24 changes: 5 additions & 19 deletions Numerics/tests/NumericsTests.csproj
Original file line number Diff line number Diff line change
@@ -1,28 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<PlatformTarget>x64</PlatformTarget>
<IsPackable>false</IsPackable>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<Project Sdk="Microsoft.Quantum.Sdk/0.10.1912.2605-alpha">

<Import Project="..\..\Build\props\tests.props" />

<PropertyGroup>
<NoWarn>0162</NoWarn>
<TargetFramework>netcoreapp3.0</TargetFramework>
<IncludeQsharpCorePackages>false</IncludeQsharpCorePackages>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\src\Numerics.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Quantum.Development.Kit" Version="0.10.1912.501" />
<PackageReference Include="Microsoft.Quantum.Xunit" Version="0.10.1912.501" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
</ItemGroup>
</Project>
Loading