diff --git a/Build/props/tests.props b/Build/props/tests.props new file mode 100644 index 00000000000..3a231bc74cc --- /dev/null +++ b/Build/props/tests.props @@ -0,0 +1,17 @@ + + + + + false + + + + + + + + + + + + diff --git a/Build/steps.yml b/Build/steps.yml index 2c03754cc15..3f76297789e 100644 --- a/Build/steps.yml +++ b/Build/steps.yml @@ -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 diff --git a/Chemistry/src/DataModel/DataModel.csproj b/Chemistry/src/DataModel/DataModel.csproj index 6c787137998..35bc8eb6b02 100644 --- a/Chemistry/src/DataModel/DataModel.csproj +++ b/Chemistry/src/DataModel/DataModel.csproj @@ -35,7 +35,6 @@ - diff --git a/Chemistry/src/Jupyter/Jupyter.csproj b/Chemistry/src/Jupyter/Jupyter.csproj index da3e74cc8e6..8b0a2728c89 100644 --- a/Chemistry/src/Jupyter/Jupyter.csproj +++ b/Chemistry/src/Jupyter/Jupyter.csproj @@ -26,8 +26,6 @@ - - diff --git a/Chemistry/src/Runtime/Runtime.csproj b/Chemistry/src/Runtime/Runtime.csproj index 2dfbcf8f9c0..48eedf31a98 100644 --- a/Chemistry/src/Runtime/Runtime.csproj +++ b/Chemistry/src/Runtime/Runtime.csproj @@ -1,13 +1,10 @@ - + + netstandard2.1 Microsoft.Quantum.Chemistry.Runtime - bin\$(BuildConfiguration)\$(PlatformTarget)\$(AssemblyName).xml - x64 - - - - True + true + false @@ -15,11 +12,12 @@ - + - + + diff --git a/Chemistry/tests/ChemistryTests/QSharpTests.csproj b/Chemistry/tests/ChemistryTests/QSharpTests.csproj index 573b654a2b9..343d8467fd8 100644 --- a/Chemistry/tests/ChemistryTests/QSharpTests.csproj +++ b/Chemistry/tests/ChemistryTests/QSharpTests.csproj @@ -1,28 +1,15 @@ - + + + + netcoreapp3.0 - x64 - false + false - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - + + diff --git a/Chemistry/tests/ChemistryTests/UnitaryCoupledClusterTests.qs b/Chemistry/tests/ChemistryTests/UnitaryCoupledClusterTests.qs index 753ed7b85d8..b9bcc85c262 100644 --- a/Chemistry/tests/ChemistryTests/UnitaryCoupledClusterTests.qs +++ b/Chemistry/tests/ChemistryTests/UnitaryCoupledClusterTests.qs @@ -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; } diff --git a/Chemistry/tests/DataModelTests/CSharpTests.csproj b/Chemistry/tests/DataModelTests/CSharpTests.csproj index f8af284a8e0..75148d7d6e3 100644 --- a/Chemistry/tests/DataModelTests/CSharpTests.csproj +++ b/Chemistry/tests/DataModelTests/CSharpTests.csproj @@ -18,14 +18,8 @@ - - - - - - @@ -44,6 +38,10 @@ + + + + diff --git a/Chemistry/tests/SamplesTests/SamplesTests.csproj b/Chemistry/tests/SamplesTests/SamplesTests.csproj index cdbfc4688ae..97269f13845 100644 --- a/Chemistry/tests/SamplesTests/SamplesTests.csproj +++ b/Chemistry/tests/SamplesTests/SamplesTests.csproj @@ -12,14 +12,8 @@ - - - - - - @@ -38,6 +32,10 @@ + + + + PreserveNewest diff --git a/Chemistry/tests/SystemTests/SystemTests.csproj b/Chemistry/tests/SystemTests/SystemTests.csproj index f5970bf9457..dea64485fc9 100644 --- a/Chemistry/tests/SystemTests/SystemTests.csproj +++ b/Chemistry/tests/SystemTests/SystemTests.csproj @@ -1,9 +1,10 @@ - + + + netcoreapp3.0 - x64 - false + false @@ -11,23 +12,7 @@ PreserveNewest - - - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + PreserveNewest @@ -43,6 +28,10 @@ + + + + @@ -50,3 +39,4 @@ + diff --git a/Numerics/src/Numerics.csproj b/Numerics/src/Numerics.csproj index 53c33d5ee9c..5ab73d11b8c 100644 --- a/Numerics/src/Numerics.csproj +++ b/Numerics/src/Numerics.csproj @@ -1,8 +1,10 @@ - + + netstandard2.1 Microsoft.Quantum.Numerics - x64 + true + false @@ -30,10 +32,9 @@ - - - - + + + diff --git a/Numerics/tests/NumericsTests.csproj b/Numerics/tests/NumericsTests.csproj index e8c9b86e785..815adfdd7e6 100644 --- a/Numerics/tests/NumericsTests.csproj +++ b/Numerics/tests/NumericsTests.csproj @@ -1,28 +1,14 @@ - - - netcoreapp3.0 - x64 - false - latest - + + + - 0162 + netcoreapp3.0 + false - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - diff --git a/Standard/src/Standard.csproj b/Standard/src/Standard.csproj index 5a44aad43cb..c755fa64823 100644 --- a/Standard/src/Standard.csproj +++ b/Standard/src/Standard.csproj @@ -1,14 +1,14 @@ - + + netstandard2.1 Microsoft.Quantum.Standard - x64 + true + false + 1591 - 0162 - 1591 - True Microsoft Microsoft's Quantum standard libraries. © Microsoft Corporation. All rights reserved. @@ -30,7 +30,8 @@ - + + diff --git a/Standard/tests/Standard.Tests.csproj b/Standard/tests/Standard.Tests.csproj index 0be3d1c80a1..616a30db2d4 100644 --- a/Standard/tests/Standard.Tests.csproj +++ b/Standard/tests/Standard.Tests.csproj @@ -1,30 +1,19 @@ - + + + + netcoreapp3.0 - x64 - false - latest Microsoft.Quantum.Standard.Tests - - - - 0162 + false - - + + - - - - - - - - diff --git a/updateQDKVersion.sh b/updateQDKVersion.sh index 9f6b10b1eb2..425337a6cb6 100644 --- a/updateQDKVersion.sh +++ b/updateQDKVersion.sh @@ -15,7 +15,7 @@ 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 @@ -23,8 +23,13 @@ for pkg in `echo $pkgs | tr ";" "\n"`; do 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