From 4d72f94a14c0f982d42eb0cec7fb15427ca245fc Mon Sep 17 00:00:00 2001 From: Bettina Heim Date: Sun, 22 Dec 2019 14:12:45 -0800 Subject: [PATCH 01/14] Standard.sln builds - updating packages included by the Sdk doesn't seem to work, so manually adding CsharpGeneration for now --- Standard/src/Standard.csproj | 21 +++++++++++++++------ Standard/tests/Standard.Tests.csproj | 28 ++++++++++++++-------------- 2 files changed, 29 insertions(+), 20 deletions(-) diff --git a/Standard/src/Standard.csproj b/Standard/src/Standard.csproj index 5a44aad43cb..12933e29728 100644 --- a/Standard/src/Standard.csproj +++ b/Standard/src/Standard.csproj @@ -1,14 +1,15 @@ - + + netstandard2.1 Microsoft.Quantum.Standard - x64 + true + false + false + 1591 - 0162 - 1591 - True Microsoft Microsoft's Quantum standard libraries. © Microsoft Corporation. All rights reserved. @@ -30,7 +31,15 @@ - + + + + + + + + + diff --git a/Standard/tests/Standard.Tests.csproj b/Standard/tests/Standard.Tests.csproj index 0be3d1c80a1..509e634683e 100644 --- a/Standard/tests/Standard.Tests.csproj +++ b/Standard/tests/Standard.Tests.csproj @@ -1,30 +1,30 @@ - + + netcoreapp3.0 - x64 - false - latest Microsoft.Quantum.Standard.Tests - - - - 0162 + false + false + false - - - - - - + + + + + + + + + From 0fa796783e223ce8a56f438f0965d61cab412efe Mon Sep 17 00:00:00 2001 From: Bettina Heim Date: Sun, 22 Dec 2019 14:41:29 -0800 Subject: [PATCH 02/14] updating chemistry solution --- Build/props/Tests.Dev.props | 25 +++++++++++++++++ Chemistry/src/Runtime/Runtime.csproj | 23 ++++++++++------ .../tests/ChemistryTests/QSharpTests.csproj | 27 +++++-------------- .../UnitaryCoupledClusterTests.qs | 2 +- .../tests/DataModelTests/CSharpTests.csproj | 6 ----- .../tests/SamplesTests/SamplesTests.csproj | 6 ----- .../tests/SystemTests/SystemTests.csproj | 24 ++++------------- Standard/tests/Standard.Tests.csproj | 21 +++------------ 8 files changed, 56 insertions(+), 78 deletions(-) create mode 100644 Build/props/Tests.Dev.props diff --git a/Build/props/Tests.Dev.props b/Build/props/Tests.Dev.props new file mode 100644 index 00000000000..2f7a77c2c3f --- /dev/null +++ b/Build/props/Tests.Dev.props @@ -0,0 +1,25 @@ + + + + + false + false + + + + + + + + + + + + + + + + + + + diff --git a/Chemistry/src/Runtime/Runtime.csproj b/Chemistry/src/Runtime/Runtime.csproj index 2dfbcf8f9c0..fdafd44b2e2 100644 --- a/Chemistry/src/Runtime/Runtime.csproj +++ b/Chemistry/src/Runtime/Runtime.csproj @@ -1,13 +1,12 @@ - + + netstandard2.1 Microsoft.Quantum.Chemistry.Runtime + true bin\$(BuildConfiguration)\$(PlatformTarget)\$(AssemblyName).xml - x64 - - - - True + false + false @@ -15,11 +14,19 @@ - + - + + + + + + + + + diff --git a/Chemistry/tests/ChemistryTests/QSharpTests.csproj b/Chemistry/tests/ChemistryTests/QSharpTests.csproj index 573b654a2b9..93562badd12 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..84c9f4e56b6 100644 --- a/Chemistry/tests/DataModelTests/CSharpTests.csproj +++ b/Chemistry/tests/DataModelTests/CSharpTests.csproj @@ -18,14 +18,8 @@ - - - - - - diff --git a/Chemistry/tests/SamplesTests/SamplesTests.csproj b/Chemistry/tests/SamplesTests/SamplesTests.csproj index cdbfc4688ae..2ed95e45d78 100644 --- a/Chemistry/tests/SamplesTests/SamplesTests.csproj +++ b/Chemistry/tests/SamplesTests/SamplesTests.csproj @@ -12,14 +12,8 @@ - - - - - - diff --git a/Chemistry/tests/SystemTests/SystemTests.csproj b/Chemistry/tests/SystemTests/SystemTests.csproj index f5970bf9457..0bdc2764a85 100644 --- a/Chemistry/tests/SystemTests/SystemTests.csproj +++ b/Chemistry/tests/SystemTests/SystemTests.csproj @@ -1,9 +1,10 @@ - + + + netcoreapp3.0 - x64 - false + false @@ -12,22 +13,6 @@ - - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - PreserveNewest @@ -50,3 +35,4 @@ + diff --git a/Standard/tests/Standard.Tests.csproj b/Standard/tests/Standard.Tests.csproj index 509e634683e..d5ac7279102 100644 --- a/Standard/tests/Standard.Tests.csproj +++ b/Standard/tests/Standard.Tests.csproj @@ -1,30 +1,15 @@  + + netcoreapp3.0 Microsoft.Quantum.Standard.Tests - false - false - false + false - - - - - - - - - - - - - - - From a1d4f22ba29546facfce183130fb081aad392215 Mon Sep 17 00:00:00 2001 From: Bettina Heim Date: Sun, 22 Dec 2019 18:57:33 -0800 Subject: [PATCH 03/14] that should be all --- Chemistry/src/Jupyter/Jupyter.csproj | 2 -- Numerics/src/Numerics.csproj | 21 +++++++++++++++++---- Numerics/tests/NumericsTests.csproj | 24 +++++------------------- 3 files changed, 22 insertions(+), 25 deletions(-) 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/Numerics/src/Numerics.csproj b/Numerics/src/Numerics.csproj index 53c33d5ee9c..0ec254cd602 100644 --- a/Numerics/src/Numerics.csproj +++ b/Numerics/src/Numerics.csproj @@ -1,8 +1,11 @@ - + + netstandard2.1 Microsoft.Quantum.Numerics - x64 + true + false + false @@ -26,14 +29,24 @@ - + - + + + + + + + + + + + diff --git a/Numerics/tests/NumericsTests.csproj b/Numerics/tests/NumericsTests.csproj index e8c9b86e785..5a4edfb65cb 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 - - - From d0d993c3fb593b9fb0a8eb3bbb7edee0af925332 Mon Sep 17 00:00:00 2001 From: Bettina Heim Date: Sun, 22 Dec 2019 19:01:26 -0800 Subject: [PATCH 04/14] updating script --- Chemistry/src/DataModel/DataModel.csproj | 1 - updateQDKVersion.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) 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/updateQDKVersion.sh b/updateQDKVersion.sh index 9f6b10b1eb2..84502c0fe2d 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.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 From 4d114133ece0d6b67334f14cd5f2ccb8d4631f8b Mon Sep 17 00:00:00 2001 From: Bettina Heim Date: Sun, 22 Dec 2019 19:02:58 -0800 Subject: [PATCH 05/14] forgot CsharpGeneration package --- updateQDKVersion.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/updateQDKVersion.sh b/updateQDKVersion.sh index 84502c0fe2d..5a8c3384372 100644 --- a/updateQDKVersion.sh +++ b/updateQDKVersion.sh @@ -15,7 +15,7 @@ else fi : ${ver:="$NUGET_VERSION"} -: ${pkgs:="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"} +: ${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 From 4e711a5ee234672b33412d6f6fb11e3b078830ea Mon Sep 17 00:00:00 2001 From: Bettina Heim Date: Sun, 22 Dec 2019 20:11:30 -0800 Subject: [PATCH 06/14] we can just ignore the warnings because the Sdk already imports the packages --- Build/props/Tests.Dev.props | 9 +-------- Chemistry/src/Runtime/Runtime.csproj | 10 +--------- Numerics/src/Numerics.csproj | 9 +-------- Standard/src/Standard.csproj | 9 +-------- 4 files changed, 4 insertions(+), 33 deletions(-) diff --git a/Build/props/Tests.Dev.props b/Build/props/Tests.Dev.props index 2f7a77c2c3f..5cf7a2dc112 100644 --- a/Build/props/Tests.Dev.props +++ b/Build/props/Tests.Dev.props @@ -2,12 +2,11 @@ - false false - + @@ -15,11 +14,5 @@ - - - - - - diff --git a/Chemistry/src/Runtime/Runtime.csproj b/Chemistry/src/Runtime/Runtime.csproj index fdafd44b2e2..ae3ff3d3d79 100644 --- a/Chemistry/src/Runtime/Runtime.csproj +++ b/Chemistry/src/Runtime/Runtime.csproj @@ -4,8 +4,6 @@ netstandard2.1 Microsoft.Quantum.Chemistry.Runtime true - bin\$(BuildConfiguration)\$(PlatformTarget)\$(AssemblyName).xml - false false @@ -18,15 +16,9 @@ + - - - - - - - diff --git a/Numerics/src/Numerics.csproj b/Numerics/src/Numerics.csproj index 0ec254cd602..1e7853d978b 100644 --- a/Numerics/src/Numerics.csproj +++ b/Numerics/src/Numerics.csproj @@ -4,7 +4,6 @@ netstandard2.1 Microsoft.Quantum.Numerics true - false false @@ -37,16 +36,10 @@ + - - - - - - - diff --git a/Standard/src/Standard.csproj b/Standard/src/Standard.csproj index 12933e29728..da19a14a680 100644 --- a/Standard/src/Standard.csproj +++ b/Standard/src/Standard.csproj @@ -4,7 +4,6 @@ netstandard2.1 Microsoft.Quantum.Standard true - false false 1591 @@ -31,15 +30,9 @@ + - - - - - - - From 93203edfcc7bfa5b0f7365bd8f7949ea982fc898 Mon Sep 17 00:00:00 2001 From: Bettina Heim Date: Sun, 22 Dec 2019 20:45:57 -0800 Subject: [PATCH 07/14] updating sdk version and removing unecessary references to the runtime.core --- Build/props/Tests.Dev.props | 1 - Chemistry/src/Runtime/Runtime.csproj | 3 +-- Chemistry/tests/ChemistryTests/QSharpTests.csproj | 2 +- Chemistry/tests/SystemTests/SystemTests.csproj | 2 +- Numerics/src/Numerics.csproj | 3 +-- Numerics/tests/NumericsTests.csproj | 2 +- Standard/src/Standard.csproj | 3 +-- Standard/tests/Standard.Tests.csproj | 2 +- 8 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Build/props/Tests.Dev.props b/Build/props/Tests.Dev.props index 5cf7a2dc112..9b92e961b83 100644 --- a/Build/props/Tests.Dev.props +++ b/Build/props/Tests.Dev.props @@ -6,7 +6,6 @@ - diff --git a/Chemistry/src/Runtime/Runtime.csproj b/Chemistry/src/Runtime/Runtime.csproj index ae3ff3d3d79..aec5c1c66a4 100644 --- a/Chemistry/src/Runtime/Runtime.csproj +++ b/Chemistry/src/Runtime/Runtime.csproj @@ -1,4 +1,4 @@ - + netstandard2.1 @@ -16,7 +16,6 @@ - diff --git a/Chemistry/tests/ChemistryTests/QSharpTests.csproj b/Chemistry/tests/ChemistryTests/QSharpTests.csproj index 93562badd12..233e14e4f3b 100644 --- a/Chemistry/tests/ChemistryTests/QSharpTests.csproj +++ b/Chemistry/tests/ChemistryTests/QSharpTests.csproj @@ -1,4 +1,4 @@ - + diff --git a/Chemistry/tests/SystemTests/SystemTests.csproj b/Chemistry/tests/SystemTests/SystemTests.csproj index 0bdc2764a85..c16d76b71d2 100644 --- a/Chemistry/tests/SystemTests/SystemTests.csproj +++ b/Chemistry/tests/SystemTests/SystemTests.csproj @@ -1,4 +1,4 @@ - + diff --git a/Numerics/src/Numerics.csproj b/Numerics/src/Numerics.csproj index 1e7853d978b..4f99bba5d0a 100644 --- a/Numerics/src/Numerics.csproj +++ b/Numerics/src/Numerics.csproj @@ -1,4 +1,4 @@ - + netstandard2.1 @@ -36,7 +36,6 @@ - diff --git a/Numerics/tests/NumericsTests.csproj b/Numerics/tests/NumericsTests.csproj index 5a4edfb65cb..fec9f28a3a5 100644 --- a/Numerics/tests/NumericsTests.csproj +++ b/Numerics/tests/NumericsTests.csproj @@ -1,4 +1,4 @@ - + diff --git a/Standard/src/Standard.csproj b/Standard/src/Standard.csproj index da19a14a680..3e79b70cf43 100644 --- a/Standard/src/Standard.csproj +++ b/Standard/src/Standard.csproj @@ -1,4 +1,4 @@ - + netstandard2.1 @@ -30,7 +30,6 @@ - diff --git a/Standard/tests/Standard.Tests.csproj b/Standard/tests/Standard.Tests.csproj index d5ac7279102..b2ae3ca65a1 100644 --- a/Standard/tests/Standard.Tests.csproj +++ b/Standard/tests/Standard.Tests.csproj @@ -1,4 +1,4 @@ - + From d3807a8d75ad59591230bb0cfe941d92e92790a3 Mon Sep 17 00:00:00 2001 From: Bettina Heim Date: Mon, 23 Dec 2019 14:10:14 -0800 Subject: [PATCH 08/14] keeping the delay sign for tests --- Chemistry/tests/DataModelTests/CSharpTests.csproj | 4 ++++ Chemistry/tests/SamplesTests/SamplesTests.csproj | 4 ++++ Chemistry/tests/SystemTests/SystemTests.csproj | 6 +++++- Standard/tests/Standard.Tests.csproj | 4 ++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Chemistry/tests/DataModelTests/CSharpTests.csproj b/Chemistry/tests/DataModelTests/CSharpTests.csproj index 84c9f4e56b6..75148d7d6e3 100644 --- a/Chemistry/tests/DataModelTests/CSharpTests.csproj +++ b/Chemistry/tests/DataModelTests/CSharpTests.csproj @@ -38,6 +38,10 @@ + + + + diff --git a/Chemistry/tests/SamplesTests/SamplesTests.csproj b/Chemistry/tests/SamplesTests/SamplesTests.csproj index 2ed95e45d78..97269f13845 100644 --- a/Chemistry/tests/SamplesTests/SamplesTests.csproj +++ b/Chemistry/tests/SamplesTests/SamplesTests.csproj @@ -32,6 +32,10 @@ + + + + PreserveNewest diff --git a/Chemistry/tests/SystemTests/SystemTests.csproj b/Chemistry/tests/SystemTests/SystemTests.csproj index c16d76b71d2..1fa3d76179c 100644 --- a/Chemistry/tests/SystemTests/SystemTests.csproj +++ b/Chemistry/tests/SystemTests/SystemTests.csproj @@ -12,7 +12,7 @@ PreserveNewest - + PreserveNewest @@ -28,6 +28,10 @@ + + + + diff --git a/Standard/tests/Standard.Tests.csproj b/Standard/tests/Standard.Tests.csproj index b2ae3ca65a1..8f2aed8788f 100644 --- a/Standard/tests/Standard.Tests.csproj +++ b/Standard/tests/Standard.Tests.csproj @@ -8,6 +8,10 @@ false + + + + From f15d518f650945c353cca1e5fe16e99aaa8d223f Mon Sep 17 00:00:00 2001 From: Bettina Heim Date: Wed, 25 Dec 2019 12:36:58 -0800 Subject: [PATCH 09/14] undoing a change that accidentally got in --- Numerics/src/Numerics.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Numerics/src/Numerics.csproj b/Numerics/src/Numerics.csproj index 4f99bba5d0a..79ebea1a684 100644 --- a/Numerics/src/Numerics.csproj +++ b/Numerics/src/Numerics.csproj @@ -27,10 +27,6 @@ $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb;.xml - - - - From b9cd83c0841140795455f5e4af758504d6eaa976 Mon Sep 17 00:00:00 2001 From: Bettina Heim Date: Wed, 25 Dec 2019 16:47:56 -0800 Subject: [PATCH 10/14] using newest dotnet for build --- Build/steps.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 071161c287a2dfba01c6c2615c68c442874e584d Mon Sep 17 00:00:00 2001 From: Bettina Heim Date: Wed, 25 Dec 2019 23:31:56 -0800 Subject: [PATCH 11/14] updating to the latest version --- Build/props/Tests.Dev.props | 2 +- Chemistry/src/Runtime/Runtime.csproj | 4 ++-- Chemistry/tests/ChemistryTests/QSharpTests.csproj | 2 +- Chemistry/tests/SystemTests/SystemTests.csproj | 2 +- Numerics/src/Numerics.csproj | 4 ++-- Numerics/tests/NumericsTests.csproj | 2 +- Standard/src/Standard.csproj | 4 ++-- Standard/tests/Standard.Tests.csproj | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Build/props/Tests.Dev.props b/Build/props/Tests.Dev.props index 9b92e961b83..3a231bc74cc 100644 --- a/Build/props/Tests.Dev.props +++ b/Build/props/Tests.Dev.props @@ -6,7 +6,7 @@ - + diff --git a/Chemistry/src/Runtime/Runtime.csproj b/Chemistry/src/Runtime/Runtime.csproj index aec5c1c66a4..7d912db768d 100644 --- a/Chemistry/src/Runtime/Runtime.csproj +++ b/Chemistry/src/Runtime/Runtime.csproj @@ -1,4 +1,4 @@ - + netstandard2.1 @@ -16,7 +16,7 @@ - + diff --git a/Chemistry/tests/ChemistryTests/QSharpTests.csproj b/Chemistry/tests/ChemistryTests/QSharpTests.csproj index 233e14e4f3b..53c99431a72 100644 --- a/Chemistry/tests/ChemistryTests/QSharpTests.csproj +++ b/Chemistry/tests/ChemistryTests/QSharpTests.csproj @@ -1,4 +1,4 @@ - + diff --git a/Chemistry/tests/SystemTests/SystemTests.csproj b/Chemistry/tests/SystemTests/SystemTests.csproj index 1fa3d76179c..68128ebe867 100644 --- a/Chemistry/tests/SystemTests/SystemTests.csproj +++ b/Chemistry/tests/SystemTests/SystemTests.csproj @@ -1,4 +1,4 @@ - + diff --git a/Numerics/src/Numerics.csproj b/Numerics/src/Numerics.csproj index 79ebea1a684..d26cdaa8bbc 100644 --- a/Numerics/src/Numerics.csproj +++ b/Numerics/src/Numerics.csproj @@ -1,4 +1,4 @@ - + netstandard2.1 @@ -32,7 +32,7 @@ - + diff --git a/Numerics/tests/NumericsTests.csproj b/Numerics/tests/NumericsTests.csproj index fec9f28a3a5..c717d355d2d 100644 --- a/Numerics/tests/NumericsTests.csproj +++ b/Numerics/tests/NumericsTests.csproj @@ -1,4 +1,4 @@ - + diff --git a/Standard/src/Standard.csproj b/Standard/src/Standard.csproj index 3e79b70cf43..14d7168f0a5 100644 --- a/Standard/src/Standard.csproj +++ b/Standard/src/Standard.csproj @@ -1,4 +1,4 @@ - + netstandard2.1 @@ -30,7 +30,7 @@ - + diff --git a/Standard/tests/Standard.Tests.csproj b/Standard/tests/Standard.Tests.csproj index 8f2aed8788f..04543be7bea 100644 --- a/Standard/tests/Standard.Tests.csproj +++ b/Standard/tests/Standard.Tests.csproj @@ -1,4 +1,4 @@ - + From d25bb82156c7fd7bb9b9ca3c4a55c70c38883a35 Mon Sep 17 00:00:00 2001 From: Bettina Heim Date: Wed, 25 Dec 2019 23:55:47 -0800 Subject: [PATCH 12/14] right sdk verison --- Chemistry/src/Runtime/Runtime.csproj | 2 +- Chemistry/tests/ChemistryTests/QSharpTests.csproj | 2 +- Chemistry/tests/SystemTests/SystemTests.csproj | 2 +- Numerics/src/Numerics.csproj | 2 +- Numerics/tests/NumericsTests.csproj | 2 +- Standard/src/Standard.csproj | 2 +- Standard/tests/Standard.Tests.csproj | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Chemistry/src/Runtime/Runtime.csproj b/Chemistry/src/Runtime/Runtime.csproj index 7d912db768d..48eedf31a98 100644 --- a/Chemistry/src/Runtime/Runtime.csproj +++ b/Chemistry/src/Runtime/Runtime.csproj @@ -1,4 +1,4 @@ - + netstandard2.1 diff --git a/Chemistry/tests/ChemistryTests/QSharpTests.csproj b/Chemistry/tests/ChemistryTests/QSharpTests.csproj index 53c99431a72..bf217e188b2 100644 --- a/Chemistry/tests/ChemistryTests/QSharpTests.csproj +++ b/Chemistry/tests/ChemistryTests/QSharpTests.csproj @@ -1,4 +1,4 @@ - + diff --git a/Chemistry/tests/SystemTests/SystemTests.csproj b/Chemistry/tests/SystemTests/SystemTests.csproj index 68128ebe867..82bf19661c0 100644 --- a/Chemistry/tests/SystemTests/SystemTests.csproj +++ b/Chemistry/tests/SystemTests/SystemTests.csproj @@ -1,4 +1,4 @@ - + diff --git a/Numerics/src/Numerics.csproj b/Numerics/src/Numerics.csproj index d26cdaa8bbc..5ab73d11b8c 100644 --- a/Numerics/src/Numerics.csproj +++ b/Numerics/src/Numerics.csproj @@ -1,4 +1,4 @@ - + netstandard2.1 diff --git a/Numerics/tests/NumericsTests.csproj b/Numerics/tests/NumericsTests.csproj index c717d355d2d..71f667986d5 100644 --- a/Numerics/tests/NumericsTests.csproj +++ b/Numerics/tests/NumericsTests.csproj @@ -1,4 +1,4 @@ - + diff --git a/Standard/src/Standard.csproj b/Standard/src/Standard.csproj index 14d7168f0a5..c755fa64823 100644 --- a/Standard/src/Standard.csproj +++ b/Standard/src/Standard.csproj @@ -1,4 +1,4 @@ - + netstandard2.1 diff --git a/Standard/tests/Standard.Tests.csproj b/Standard/tests/Standard.Tests.csproj index 04543be7bea..3a138ffd73a 100644 --- a/Standard/tests/Standard.Tests.csproj +++ b/Standard/tests/Standard.Tests.csproj @@ -1,4 +1,4 @@ - + From 270f084d42d24180a0ff9ac5260219f56b223f07 Mon Sep 17 00:00:00 2001 From: Bettina Heim Date: Mon, 30 Dec 2019 23:32:56 -0800 Subject: [PATCH 13/14] renaming Tests.Dev.props to tests.props --- Build/props/{Tests.Dev.props => tests.props} | 0 Chemistry/tests/ChemistryTests/QSharpTests.csproj | 2 +- Chemistry/tests/SystemTests/SystemTests.csproj | 2 +- Numerics/tests/NumericsTests.csproj | 2 +- Standard/tests/Standard.Tests.csproj | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename Build/props/{Tests.Dev.props => tests.props} (100%) diff --git a/Build/props/Tests.Dev.props b/Build/props/tests.props similarity index 100% rename from Build/props/Tests.Dev.props rename to Build/props/tests.props diff --git a/Chemistry/tests/ChemistryTests/QSharpTests.csproj b/Chemistry/tests/ChemistryTests/QSharpTests.csproj index bf217e188b2..343d8467fd8 100644 --- a/Chemistry/tests/ChemistryTests/QSharpTests.csproj +++ b/Chemistry/tests/ChemistryTests/QSharpTests.csproj @@ -1,6 +1,6 @@  - + netcoreapp3.0 diff --git a/Chemistry/tests/SystemTests/SystemTests.csproj b/Chemistry/tests/SystemTests/SystemTests.csproj index 82bf19661c0..dea64485fc9 100644 --- a/Chemistry/tests/SystemTests/SystemTests.csproj +++ b/Chemistry/tests/SystemTests/SystemTests.csproj @@ -1,6 +1,6 @@  - + netcoreapp3.0 diff --git a/Numerics/tests/NumericsTests.csproj b/Numerics/tests/NumericsTests.csproj index 71f667986d5..815adfdd7e6 100644 --- a/Numerics/tests/NumericsTests.csproj +++ b/Numerics/tests/NumericsTests.csproj @@ -1,6 +1,6 @@  - + netcoreapp3.0 diff --git a/Standard/tests/Standard.Tests.csproj b/Standard/tests/Standard.Tests.csproj index 3a138ffd73a..616a30db2d4 100644 --- a/Standard/tests/Standard.Tests.csproj +++ b/Standard/tests/Standard.Tests.csproj @@ -1,6 +1,6 @@  - + netcoreapp3.0 From 3ccbb1a0df00bdf87f46c5f81afca8dc5230cee8 Mon Sep 17 00:00:00 2001 From: Bettina Heim Date: Mon, 30 Dec 2019 23:35:54 -0800 Subject: [PATCH 14/14] update script --- updateQDKVersion.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/updateQDKVersion.sh b/updateQDKVersion.sh index 5a8c3384372..425337a6cb6 100644 --- a/updateQDKVersion.sh +++ b/updateQDKVersion.sh @@ -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