Skip to content
This repository was archived by the owner on Jan 12, 2024. It is now read-only.

Switching to using the new Sdk #194

Merged
bettinaheim merged 16 commits into from
Jan 4, 2020
Merged

Switching to using the new Sdk #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4d72f94
Standard.sln builds - updating packages included by the Sdk doesn't s…
Dec 22, 2019
0fa7967
updating chemistry solution
Dec 22, 2019
a1d4f22
that should be all
Dec 23, 2019
d0d993c
updating script
Dec 23, 2019
4d11413
forgot CsharpGeneration package
Dec 23, 2019
4e711a5
we can just ignore the warnings because the Sdk already imports the p…
Dec 23, 2019
93203ed
updating sdk version and removing unecessary references to the runtim…
Dec 23, 2019
d3807a8
keeping the delay sign for tests
Dec 23, 2019
f15d518
undoing a change that accidentally got in
Dec 25, 2019
b9cd83c
using newest dotnet for build
Dec 26, 2019
071161c
updating to the latest version
Dec 26, 2019
d25bb82
right sdk verison
Dec 26, 2019
270f084
renaming Tests.Dev.props to tests.props
Dec 31, 2019
3ccbb1a
update script
Dec 31, 2019
ab2172f
Merge branch 'master' into beheim/sdk
bettinaheim Dec 31, 2019
49b961f
Merge branch 'master' into beheim/sdk
bettinaheim Jan 3, 2020
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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" />
</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
View file
Open in desktop
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" />

<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>

2 changes: 1 addition & 1 deletion Chemistry/tests/ChemistryTests/UnitaryCoupledClusterTests.qs
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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>

13 changes: 7 additions & 6 deletions Numerics/src/Numerics.csproj
View file
Open in desktop
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
View file
Open in desktop
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>
13 changes: 7 additions & 6 deletions Standard/src/Standard.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.Quantum.Sdk/0.10.1912.2605-alpha">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<AssemblyName>Microsoft.Quantum.Standard</AssemblyName>
<PlatformTarget>x64</PlatformTarget>
<QsharpDocsGeneration>true</QsharpDocsGeneration>
<IncludeQsharpCorePackages>false</IncludeQsharpCorePackages> <!-- otherwise the standard library is included by the Sdk -->
<NoWarn>1591</NoWarn> <!-- warning regarding missing C# doc comments -->
</PropertyGroup>

<PropertyGroup>
<NoWarn>0162</NoWarn>
<NoWarn>1591</NoWarn>
<RunQDocGen>True</RunQDocGen>
<Authors>Microsoft</Authors>
<Description>Microsoft's Quantum standard libraries.</Description>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
Expand All @@ -30,7 +30,8 @@
</ItemGroup>

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

</Project>
25 changes: 7 additions & 18 deletions Standard/tests/Standard.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,19 @@
<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>
<LangVersion>latest</LangVersion>
<AssemblyName>Microsoft.Quantum.Standard.Tests</AssemblyName>
</PropertyGroup>

<PropertyGroup>
<NoWarn>0162</NoWarn>
<IncludeQsharpCorePackages>false</IncludeQsharpCorePackages>
</PropertyGroup>

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

</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\src\Standard.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" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
</ItemGroup>
</Project>
7 changes: 6 additions & 1 deletion updateQDKVersion.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,21 @@ else
fi

: ${ver:="$NUGET_VERSION"}
: ${pkgs:="Microsoft.Quantum.Development.Kit;Microsoft.Quantum.IQSharp.Core;Microsoft.Quantum.Simulators;Microsoft.Quantum.Compiler;Microsoft.Quantum.Canon;Microsoft.Quantum.Xunit;Microsoft.Quantum.Chemistry;Microsoft.Quantum.Research"}
: ${pkgs:="Microsoft.Quantum.CsharpGeneration;Microsoft.Quantum.Runtime.Core;Microsoft.Quantum.QSharp.Core;Microsoft.Quantum.Development.Kit;Microsoft.Quantum.IQSharp.Core;Microsoft.Quantum.Simulators;Microsoft.Quantum.Compiler;Microsoft.Quantum.Xunit;Microsoft.Quantum.Chemistry;Microsoft.Quantum.Research"}


for pkg in `echo $pkgs | tr ";" "\n"`; do
echo Will update package $pkg with version $ver...

grep --include=\packages.config -lri -e "package *id=\"$pkg\" *version=" * | xargs sed -i $backup "s/package *id=\"$pkg\" *version=\"\([^\"]*\)\"/package id=\"$pkg\" version=\"$ver\"/i"
grep --include=\*proj -lri -e "PackageReference *Include=\"$pkg\" *Version=" * | xargs sed -i $backup "s/PackageReference *Include=\"$pkg\" *Version=\"\([^\"]*\)\"/PackageReference Include=\"$pkg\" Version=\"$ver\"/i"
grep --include=*props -lri -e "PackageReference *Include=\"$pkg\" *Version=" * | xargs sed -i $backup "s/PackageReference *Include=\"$pkg\" *Version=\"\([^\"]*\)\"/PackageReference Include=\"$pkg\" Version=\"$ver\"/i"
done

# Update the version number of the Quantum Sdk:
grep --include=*proj -lri -e "Sdk=\"Microsoft.Quantum.Sdk\/" * | xargs sed -i $backup "s/Sdk=\"Microsoft.Quantum.Sdk\/\([^\"]*\)\"/Sdk=\"Microsoft.Quantum.Sdk\/$ver\"/i"
grep --include=*Template.xml -lri -e "Sdk=\"Microsoft.Quantum.Sdk\/" * | xargs sed -i $backup "s/Sdk=\"Microsoft.Quantum.Sdk\/\([^\"]*\)\"/Sdk=\"Microsoft.Quantum.Sdk\/$ver\"/i"

echo done!
echo

Expand Down