From 1e387fafa23ad1d619cd4608ad9aab23e7580d1b Mon Sep 17 00:00:00 2001 From: Ricardo Espinoza Date: Thu, 17 Mar 2022 15:28:38 -0700 Subject: [PATCH] Adopt .NET6 + VS2022 in Quantum Development Kit (#966) With this change, we're migrating the main release train of the QDK to the most recent Long Time Support version of the .NET framework. For details about this change, refer to the original issue microsoft/qsharp-compiler#1224. As part of this change, we're: - Re-targeting all .NetCoreApp3.1 binaries to .NET6.0 - Updating Docker images, samples and templates. - Libraries using .NetStandard2.1 are not affected by this change. - The minimum supported .NET version in the QDK will also be updated from 3.1 to 6.0 - The Visual Studio extension will now target Visual Studio 2022. --- AdvantageBenchmark/privateBuild/host.csproj | 2 +- AdvantageBenchmark/privateBuild/runTest.ps1 | 2 +- AdvantageBenchmark/privateBuild/runTest.sh | 2 +- AdvantageBenchmark/readme.md | 2 +- .../releasedBuild/host/host.csproj | 2 +- bootstrap.ps1 | 11 +----- build/pack.ps1 | 2 +- build/steps-init.yml | 4 +- global.json | 2 +- .../TokenFileCredentialTests.cs | 2 +- ...ests.Microsoft.Azure.Quantum.Client.csproj | 2 +- .../Utility/FileSystem.cs | 2 +- ...crosoft.Quantum.Qir.CommandLineTool.csproj | 2 +- .../qir-standalone-input-reference.csproj | 2 +- .../qsharp/qir-test-simulator.csproj | 2 +- .../QIR-dynamic/qsharp/qir-test-random.csproj | 2 +- .../Tests/QIR-static/qsharp/qir-gen.csproj | 2 +- .../Tests/QIR-tracer/qsharp/tracer-qir.csproj | 2 +- ...Microsoft.Quantum.Qir.Runtime.Tools.csproj | 2 +- ...Microsoft.Quantum.Qir.Runtime.Tools.csproj | 2 +- ...uantum.AutoSubstitution.Integration.csproj | 2 +- ....Microsoft.Quantum.AutoSubstitution.csproj | 2 +- .../Microsoft.Quantum.AutoSubstitution.csproj | 2 +- src/Simulation/Common/Simulators.Test.props | 2 +- .../Microsoft.Quantum.Runtime.Core.csproj | 2 +- ....Microsoft.Quantum.EntryPointDriver.fsproj | 4 +- ....Simulation.QCTraceSimulatorRuntime.csproj | 2 +- .../HoneywellExe/HoneywellExe.csproj | 2 +- .../IntrinsicTests/IntrinsicTests.csproj | 2 +- .../TestProjects/IonQExe/IonQExe.csproj | 2 +- .../MicrosoftSimulatorExe.csproj | 2 +- .../TestProjects/QCIExe/QCIExe.csproj | 2 +- .../TestProjects/QSharpExe/QSharpExe.csproj | 2 +- .../TestProjects/QirExe/QirExe.csproj | 2 +- .../TargetedExe/TargetedExe.csproj | 2 +- .../TestProjects/UnitTests/UnitTests.csproj | 2 +- .../qdk_sim_rs/.config/dotnet-tools.json | 12 ------ src/Simulation/qdk_sim_rs/.gitignore | 2 - .../{Cargo.toml.template => Cargo.toml} | 2 +- src/Simulation/qdk_sim_rs/inject-version.csx | 39 ------------------- src/Xunit/Microsoft.Quantum.Xunit.nuspec | 2 +- 41 files changed, 41 insertions(+), 101 deletions(-) delete mode 100644 src/Simulation/qdk_sim_rs/.config/dotnet-tools.json rename src/Simulation/qdk_sim_rs/{Cargo.toml.template => Cargo.toml} (99%) delete mode 100644 src/Simulation/qdk_sim_rs/inject-version.csx diff --git a/AdvantageBenchmark/privateBuild/host.csproj b/AdvantageBenchmark/privateBuild/host.csproj index 7abf2e91bcc..ee51caa5bd8 100644 --- a/AdvantageBenchmark/privateBuild/host.csproj +++ b/AdvantageBenchmark/privateBuild/host.csproj @@ -4,7 +4,7 @@ Exe - netcoreapp3.1 + net6.0 false diff --git a/AdvantageBenchmark/privateBuild/runTest.ps1 b/AdvantageBenchmark/privateBuild/runTest.ps1 index 12fe3870497..7f4bc003581 100644 --- a/AdvantageBenchmark/privateBuild/runTest.ps1 +++ b/AdvantageBenchmark/privateBuild/runTest.ps1 @@ -3,7 +3,7 @@ for ($tst=1; $tst -le 2; $tst++) { for ($span=4; $span -ge 0; $span--) { $env:OMP_NUM_THREADS = $thrd $env:QDK_SIM_FUSESPAN = $span - .\bin\Release\netcoreapp3.1\host.exe $tst $tst 5 + .\bin\Release\net6.0\host.exe $tst $tst 5 } } } diff --git a/AdvantageBenchmark/privateBuild/runTest.sh b/AdvantageBenchmark/privateBuild/runTest.sh index c8dc2155faa..6d25553c88d 100755 --- a/AdvantageBenchmark/privateBuild/runTest.sh +++ b/AdvantageBenchmark/privateBuild/runTest.sh @@ -8,7 +8,7 @@ do do export OMP_NUM_THREADS=$thrd export QDK_SIM_FUSESPAN=$span - ./bin/Release/netcoreapp3.1/host $tst $tst 5 + ./bin/Release/net6.0/host $tst $tst 5 done done done diff --git a/AdvantageBenchmark/readme.md b/AdvantageBenchmark/readme.md index 33242bd4fec..df6017ab1bf 100644 --- a/AdvantageBenchmark/readme.md +++ b/AdvantageBenchmark/readme.md @@ -6,7 +6,7 @@ This benchmark is intended to provide an easy way to verify the performance char ## Executing the benchmark -To execute the benchmark, compile each version of advantage.sln using `dotnet build .\advantage.sln -c Release` from their respective folders. Then the executable to run will be either `bin\Release\netcoreapp3.1\host.exe` in the privateBuild folder or `host\bin\Release\netcoreapp3.1\host.exe` in the releaseBuild folder. This executable takes parameters describing which test circuits to execute and how many loops to perform as integer arguments, such that `host.exe 1 1 5` will run 5 loops of test 1 and `host.exe 0 3 100` will run 100 loops of tests 0 through 3. Check the contents of `privateBuild\Program.cs` to see the tests that correspond to each identifier; for most machines, test 1 aka advantage 4x4 circuit is the best choice for benchmarking. +To execute the benchmark, compile each version of advantage.sln using `dotnet build .\advantage.sln -c Release` from their respective folders. Then the executable to run will be either `bin\Release\net6.0\host.exe` in the privateBuild folder or `host\bin\Release\net6.0\host.exe` in the releaseBuild folder. This executable takes parameters describing which test circuits to execute and how many loops to perform as integer arguments, such that `host.exe 1 1 5` will run 5 loops of test 1 and `host.exe 0 3 100` will run 100 loops of tests 0 through 3. Check the contents of `privateBuild\Program.cs` to see the tests that correspond to each identifier; for most machines, test 1 aka advantage 4x4 circuit is the best choice for benchmarking. The benchmark can also be run via runTest.ps1 or runTest.sh, which performs a sweep across configured environment variables that adjust the number of threads used and gates fused in simulating the circuit. See the definition of the script used on your platform to understand how it configures the `OMP_NUM_THREADS` and `QDK_SIM_FUSESPAN` environment variables. diff --git a/AdvantageBenchmark/releasedBuild/host/host.csproj b/AdvantageBenchmark/releasedBuild/host/host.csproj index 8b145ec5eef..54fddb1b9be 100644 --- a/AdvantageBenchmark/releasedBuild/host/host.csproj +++ b/AdvantageBenchmark/releasedBuild/host/host.csproj @@ -10,7 +10,7 @@ Exe - netcoreapp3.1 + net6.0 diff --git a/bootstrap.ps1 b/bootstrap.ps1 index 7c4ff8880ec..302106c3be3 100644 --- a/bootstrap.ps1 +++ b/bootstrap.ps1 @@ -7,16 +7,9 @@ Push-Location (Join-Path $PSScriptRoot "build") .\prerequisites.ps1 Pop-Location +cargo install cargo-edit Push-Location (Join-Path $PSScriptRoot "./src/Simulation/qdk_sim_rs") - # We use dotnet-script to inject the version number into Cargo.toml, - # so we go on ahead here and restore any missing tools. - # Since that Cargo.toml is referenced by CMake lists in the QIR - # runtime, this injection has to be the first thing we do. - dotnet tool restore - dotnet script inject-version.csx -- ` - --template Cargo.toml.template ` - --out-path Cargo.toml ` - --version $Env:NUGET_VERSION; + cargo set-version $Env:NUGET_VERSION; Pop-Location if (-not (Test-Path Env:/AGENT_OS)) { # If not CI build, i.e. local build (if AGENT_OS envvar is not defined) diff --git a/build/pack.ps1 b/build/pack.ps1 index 83b73074b3b..7b8df946aad 100644 --- a/build/pack.ps1 +++ b/build/pack.ps1 @@ -140,7 +140,7 @@ function Pack-Crate() { $OutPath = Resolve-Path (Join-Path $PSScriptRoot $OutPath); } Push-Location (Join-Path $PSScriptRoot $PackageDirectory) - cargo package; + cargo package --allow-dirty; # Copy only the .crate file, since we don't need all the intermediate # artifacts brought in by the full folder under target/package. Copy-Item -Force (Join-Path $PSScriptRoot .. "target" "package" "*.crate") $OutPath; diff --git a/build/steps-init.yml b/build/steps-init.yml index 42d9df112aa..feb3e4cc351 100644 --- a/build/steps-init.yml +++ b/build/steps-init.yml @@ -9,10 +9,10 @@ steps: versionSpec: '5.6.0' - task: UseDotNet@2 - displayName: 'Use .NET Core SDK 3.1.300' + displayName: 'Use .NET Core SDK 6.0.x' inputs: packageType: sdk - version: '3.1.300' + version: '6.0.x' - script: | curl https://sh.rustup.rs -sSf | sh -s -- -y diff --git a/global.json b/global.json index ea24115c50e..80aaf11cf69 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "msbuild-sdks": { - "Microsoft.Quantum.Sdk": "0.23.195983" + "Microsoft.Quantum.Sdk": "0.23.198514-beta" } } diff --git a/src/Azure/Azure.Quantum.Client.Test/Authentication/TokenFileCredentialTests.cs b/src/Azure/Azure.Quantum.Client.Test/Authentication/TokenFileCredentialTests.cs index 8a3d8a95a6c..6d2e5ae8976 100644 --- a/src/Azure/Azure.Quantum.Client.Test/Authentication/TokenFileCredentialTests.cs +++ b/src/Azure/Azure.Quantum.Client.Test/Authentication/TokenFileCredentialTests.cs @@ -36,7 +36,7 @@ public T GetFileContent(string path) public async Task GetFileContentAsync(string path, CancellationToken cancellationToken) { using var stream = new MemoryStream(Encoding.UTF8.GetBytes(_fileContent)); - return await JsonSerializer.DeserializeAsync(stream, null, cancellationToken); + return await JsonSerializer.DeserializeAsync(stream, options: null, cancellationToken); } } diff --git a/src/Azure/Azure.Quantum.Client.Test/Tests.Microsoft.Azure.Quantum.Client.csproj b/src/Azure/Azure.Quantum.Client.Test/Tests.Microsoft.Azure.Quantum.Client.csproj index 7ff14f03a27..ff8ffac582e 100644 --- a/src/Azure/Azure.Quantum.Client.Test/Tests.Microsoft.Azure.Quantum.Client.csproj +++ b/src/Azure/Azure.Quantum.Client.Test/Tests.Microsoft.Azure.Quantum.Client.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net6.0 x64 false diff --git a/src/Azure/Azure.Quantum.Client/Utility/FileSystem.cs b/src/Azure/Azure.Quantum.Client/Utility/FileSystem.cs index 7cb16b3a772..78ad50eb711 100644 --- a/src/Azure/Azure.Quantum.Client/Utility/FileSystem.cs +++ b/src/Azure/Azure.Quantum.Client/Utility/FileSystem.cs @@ -26,7 +26,7 @@ public T GetFileContent(string path) public async Task GetFileContentAsync(string path, CancellationToken cancellationToken) { using FileStream stream = File.OpenRead(path); - return await JsonSerializer.DeserializeAsync(stream, null, cancellationToken); + return await JsonSerializer.DeserializeAsync(stream, options: null, cancellationToken); } } } diff --git a/src/Qir/CommandLineTool/Microsoft.Quantum.Qir.CommandLineTool.csproj b/src/Qir/CommandLineTool/Microsoft.Quantum.Qir.CommandLineTool.csproj index af69227323b..99fe6c63943 100644 --- a/src/Qir/CommandLineTool/Microsoft.Quantum.Qir.CommandLineTool.csproj +++ b/src/Qir/CommandLineTool/Microsoft.Quantum.Qir.CommandLineTool.csproj @@ -3,7 +3,7 @@ Exe x64 - netcoreapp3.1 + net6.0 diff --git a/src/Qir/Samples/StandaloneInputReference/qsharp/qir-standalone-input-reference.csproj b/src/Qir/Samples/StandaloneInputReference/qsharp/qir-standalone-input-reference.csproj index 07baf1044f1..69284631606 100644 --- a/src/Qir/Samples/StandaloneInputReference/qsharp/qir-standalone-input-reference.csproj +++ b/src/Qir/Samples/StandaloneInputReference/qsharp/qir-standalone-input-reference.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net6.0 True false diff --git a/src/Qir/Tests/FullstateSimulator/qsharp/qir-test-simulator.csproj b/src/Qir/Tests/FullstateSimulator/qsharp/qir-test-simulator.csproj index 0ac37846280..689f0f2fa22 100644 --- a/src/Qir/Tests/FullstateSimulator/qsharp/qir-test-simulator.csproj +++ b/src/Qir/Tests/FullstateSimulator/qsharp/qir-test-simulator.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net6.0 True false false diff --git a/src/Qir/Tests/QIR-dynamic/qsharp/qir-test-random.csproj b/src/Qir/Tests/QIR-dynamic/qsharp/qir-test-random.csproj index 0ac37846280..689f0f2fa22 100644 --- a/src/Qir/Tests/QIR-dynamic/qsharp/qir-test-random.csproj +++ b/src/Qir/Tests/QIR-dynamic/qsharp/qir-test-random.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net6.0 True false false diff --git a/src/Qir/Tests/QIR-static/qsharp/qir-gen.csproj b/src/Qir/Tests/QIR-static/qsharp/qir-gen.csproj index 0ac37846280..689f0f2fa22 100644 --- a/src/Qir/Tests/QIR-static/qsharp/qir-gen.csproj +++ b/src/Qir/Tests/QIR-static/qsharp/qir-gen.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net6.0 True false false diff --git a/src/Qir/Tests/QIR-tracer/qsharp/tracer-qir.csproj b/src/Qir/Tests/QIR-tracer/qsharp/tracer-qir.csproj index 0daacfeede4..f8677e7b9a4 100644 --- a/src/Qir/Tests/QIR-tracer/qsharp/tracer-qir.csproj +++ b/src/Qir/Tests/QIR-tracer/qsharp/tracer-qir.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net6.0 True false false diff --git a/src/Qir/Tests/Tools/Tests.Microsoft.Quantum.Qir.Runtime.Tools.csproj b/src/Qir/Tests/Tools/Tests.Microsoft.Quantum.Qir.Runtime.Tools.csproj index 23f2d9c6982..b920292cdd9 100644 --- a/src/Qir/Tests/Tools/Tests.Microsoft.Quantum.Qir.Runtime.Tools.csproj +++ b/src/Qir/Tests/Tools/Tests.Microsoft.Quantum.Qir.Runtime.Tools.csproj @@ -2,7 +2,7 @@ x64 - netcoreapp3.1 + net6.0 false diff --git a/src/Qir/Tools/Microsoft.Quantum.Qir.Runtime.Tools.csproj b/src/Qir/Tools/Microsoft.Quantum.Qir.Runtime.Tools.csproj index 5020b35f1bf..bad81735b38 100644 --- a/src/Qir/Tools/Microsoft.Quantum.Qir.Runtime.Tools.csproj +++ b/src/Qir/Tools/Microsoft.Quantum.Qir.Runtime.Tools.csproj @@ -36,7 +36,7 @@ - + diff --git a/src/Simulation/AutoSubstitution.Integration.Tests/Tests.Microsoft.Quantum.AutoSubstitution.Integration.csproj b/src/Simulation/AutoSubstitution.Integration.Tests/Tests.Microsoft.Quantum.AutoSubstitution.Integration.csproj index 2dbeb310c32..b6dc129a612 100644 --- a/src/Simulation/AutoSubstitution.Integration.Tests/Tests.Microsoft.Quantum.AutoSubstitution.Integration.csproj +++ b/src/Simulation/AutoSubstitution.Integration.Tests/Tests.Microsoft.Quantum.AutoSubstitution.Integration.csproj @@ -2,7 +2,7 @@ Library - netcoreapp3.1 + net6.0 x64 d diff --git a/src/Simulation/AutoSubstitution.Tests/Tests.Microsoft.Quantum.AutoSubstitution.csproj b/src/Simulation/AutoSubstitution.Tests/Tests.Microsoft.Quantum.AutoSubstitution.csproj index c0638219bd4..c43ac4f0c01 100644 --- a/src/Simulation/AutoSubstitution.Tests/Tests.Microsoft.Quantum.AutoSubstitution.csproj +++ b/src/Simulation/AutoSubstitution.Tests/Tests.Microsoft.Quantum.AutoSubstitution.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net6.0 Tests.Microsoft.Quantum.AutoSubstitution false x64 diff --git a/src/Simulation/AutoSubstitution/Microsoft.Quantum.AutoSubstitution.csproj b/src/Simulation/AutoSubstitution/Microsoft.Quantum.AutoSubstitution.csproj index fb104ed685b..7a0aba0ae1e 100644 --- a/src/Simulation/AutoSubstitution/Microsoft.Quantum.AutoSubstitution.csproj +++ b/src/Simulation/AutoSubstitution/Microsoft.Quantum.AutoSubstitution.csproj @@ -19,7 +19,7 @@ - + diff --git a/src/Simulation/Common/Simulators.Test.props b/src/Simulation/Common/Simulators.Test.props index ae912fb2f8d..e88da105f7b 100644 --- a/src/Simulation/Common/Simulators.Test.props +++ b/src/Simulation/Common/Simulators.Test.props @@ -10,7 +10,7 @@ - netcoreapp3.1 + net6.0 false false diff --git a/src/Simulation/Core/Microsoft.Quantum.Runtime.Core.csproj b/src/Simulation/Core/Microsoft.Quantum.Runtime.Core.csproj index 3256cf8bf56..0156e6f8c64 100644 --- a/src/Simulation/Core/Microsoft.Quantum.Runtime.Core.csproj +++ b/src/Simulation/Core/Microsoft.Quantum.Runtime.Core.csproj @@ -18,7 +18,7 @@ - + diff --git a/src/Simulation/EntryPointDriver.Tests/Tests.Microsoft.Quantum.EntryPointDriver.fsproj b/src/Simulation/EntryPointDriver.Tests/Tests.Microsoft.Quantum.EntryPointDriver.fsproj index 474f9c2c35b..7b539cf775a 100644 --- a/src/Simulation/EntryPointDriver.Tests/Tests.Microsoft.Quantum.EntryPointDriver.fsproj +++ b/src/Simulation/EntryPointDriver.Tests/Tests.Microsoft.Quantum.EntryPointDriver.fsproj @@ -1,6 +1,6 @@  - netcoreapp3.1 + net6.0 false Microsoft.Quantum.EntryPointDriver.Tests x64 @@ -23,7 +23,7 @@ - + diff --git a/src/Simulation/QCTraceSimulator.Tests/Tests.Microsoft.Quantum.Simulation.QCTraceSimulatorRuntime.csproj b/src/Simulation/QCTraceSimulator.Tests/Tests.Microsoft.Quantum.Simulation.QCTraceSimulatorRuntime.csproj index 1758c237de4..fc50851f28d 100644 --- a/src/Simulation/QCTraceSimulator.Tests/Tests.Microsoft.Quantum.Simulation.QCTraceSimulatorRuntime.csproj +++ b/src/Simulation/QCTraceSimulator.Tests/Tests.Microsoft.Quantum.Simulation.QCTraceSimulatorRuntime.csproj @@ -4,7 +4,7 @@ - netcoreapp3.1 + net6.0 false false false diff --git a/src/Simulation/Simulators.Tests/TestProjects/HoneywellExe/HoneywellExe.csproj b/src/Simulation/Simulators.Tests/TestProjects/HoneywellExe/HoneywellExe.csproj index 0f398b00f5b..f8341701491 100644 --- a/src/Simulation/Simulators.Tests/TestProjects/HoneywellExe/HoneywellExe.csproj +++ b/src/Simulation/Simulators.Tests/TestProjects/HoneywellExe/HoneywellExe.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net6.0 false false diff --git a/src/Simulation/Simulators.Tests/TestProjects/IntrinsicTests/IntrinsicTests.csproj b/src/Simulation/Simulators.Tests/TestProjects/IntrinsicTests/IntrinsicTests.csproj index f1f41173fbc..9b0a01262cb 100644 --- a/src/Simulation/Simulators.Tests/TestProjects/IntrinsicTests/IntrinsicTests.csproj +++ b/src/Simulation/Simulators.Tests/TestProjects/IntrinsicTests/IntrinsicTests.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net6.0 false false diff --git a/src/Simulation/Simulators.Tests/TestProjects/IonQExe/IonQExe.csproj b/src/Simulation/Simulators.Tests/TestProjects/IonQExe/IonQExe.csproj index 09f2810e6f2..8f31d2f0139 100644 --- a/src/Simulation/Simulators.Tests/TestProjects/IonQExe/IonQExe.csproj +++ b/src/Simulation/Simulators.Tests/TestProjects/IonQExe/IonQExe.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net6.0 false false diff --git a/src/Simulation/Simulators.Tests/TestProjects/MicrosoftSimulatorExe/MicrosoftSimulatorExe.csproj b/src/Simulation/Simulators.Tests/TestProjects/MicrosoftSimulatorExe/MicrosoftSimulatorExe.csproj index a784cdb95d2..376b1bf8327 100644 --- a/src/Simulation/Simulators.Tests/TestProjects/MicrosoftSimulatorExe/MicrosoftSimulatorExe.csproj +++ b/src/Simulation/Simulators.Tests/TestProjects/MicrosoftSimulatorExe/MicrosoftSimulatorExe.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net6.0 microsoft.simulator diff --git a/src/Simulation/Simulators.Tests/TestProjects/QCIExe/QCIExe.csproj b/src/Simulation/Simulators.Tests/TestProjects/QCIExe/QCIExe.csproj index 578b29c890a..1db0baf4488 100644 --- a/src/Simulation/Simulators.Tests/TestProjects/QCIExe/QCIExe.csproj +++ b/src/Simulation/Simulators.Tests/TestProjects/QCIExe/QCIExe.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net6.0 false false diff --git a/src/Simulation/Simulators.Tests/TestProjects/QSharpExe/QSharpExe.csproj b/src/Simulation/Simulators.Tests/TestProjects/QSharpExe/QSharpExe.csproj index 6e39a0df1c6..40b100c89da 100644 --- a/src/Simulation/Simulators.Tests/TestProjects/QSharpExe/QSharpExe.csproj +++ b/src/Simulation/Simulators.Tests/TestProjects/QSharpExe/QSharpExe.csproj @@ -1,7 +1,7 @@ Exe - netcoreapp3.1 + net6.0 false false diff --git a/src/Simulation/Simulators.Tests/TestProjects/QirExe/QirExe.csproj b/src/Simulation/Simulators.Tests/TestProjects/QirExe/QirExe.csproj index 307a706b6d5..68eba7502c1 100644 --- a/src/Simulation/Simulators.Tests/TestProjects/QirExe/QirExe.csproj +++ b/src/Simulation/Simulators.Tests/TestProjects/QirExe/QirExe.csproj @@ -1,7 +1,7 @@ Exe - netcoreapp3.1 + net6.0 false false false diff --git a/src/Simulation/Simulators.Tests/TestProjects/TargetedExe/TargetedExe.csproj b/src/Simulation/Simulators.Tests/TestProjects/TargetedExe/TargetedExe.csproj index 18c8591760c..a6e5eaad9c5 100644 --- a/src/Simulation/Simulators.Tests/TestProjects/TargetedExe/TargetedExe.csproj +++ b/src/Simulation/Simulators.Tests/TestProjects/TargetedExe/TargetedExe.csproj @@ -1,7 +1,7 @@ Exe - netcoreapp3.1 + net6.0 false false diff --git a/src/Simulation/Simulators.Tests/TestProjects/UnitTests/UnitTests.csproj b/src/Simulation/Simulators.Tests/TestProjects/UnitTests/UnitTests.csproj index 1a3eeecd2d0..2883976e647 100644 --- a/src/Simulation/Simulators.Tests/TestProjects/UnitTests/UnitTests.csproj +++ b/src/Simulation/Simulators.Tests/TestProjects/UnitTests/UnitTests.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net6.0 false true diff --git a/src/Simulation/qdk_sim_rs/.config/dotnet-tools.json b/src/Simulation/qdk_sim_rs/.config/dotnet-tools.json deleted file mode 100644 index 8e180ea3016..00000000000 --- a/src/Simulation/qdk_sim_rs/.config/dotnet-tools.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "version": 1, - "isRoot": true, - "tools": { - "dotnet-script": { - "version": "1.1.0", - "commands": [ - "dotnet-script" - ] - } - } -} \ No newline at end of file diff --git a/src/Simulation/qdk_sim_rs/.gitignore b/src/Simulation/qdk_sim_rs/.gitignore index a740f3ce698..0af728fc99f 100644 --- a/src/Simulation/qdk_sim_rs/.gitignore +++ b/src/Simulation/qdk_sim_rs/.gitignore @@ -4,8 +4,6 @@ win10 target drop -# We inject version numbers into Cargo.toml, so don't want them stored in repo. -Cargo.toml # In the future, it would be good to enable reproducible builds by committing # the lockfile and using --locked in calls to cargo. Cargo.lock diff --git a/src/Simulation/qdk_sim_rs/Cargo.toml.template b/src/Simulation/qdk_sim_rs/Cargo.toml similarity index 99% rename from src/Simulation/qdk_sim_rs/Cargo.toml.template rename to src/Simulation/qdk_sim_rs/Cargo.toml index f589d6d411b..3855ffe6a13 100644 --- a/src/Simulation/qdk_sim_rs/Cargo.toml.template +++ b/src/Simulation/qdk_sim_rs/Cargo.toml @@ -3,7 +3,7 @@ [package] name = "qdk_sim_experimental" -version = "0.1.0" +version = "0.0.1-alpha" authors = ["Microsoft"] edition = "2018" license = "MIT" diff --git a/src/Simulation/qdk_sim_rs/inject-version.csx b/src/Simulation/qdk_sim_rs/inject-version.csx deleted file mode 100644 index ec71338f066..00000000000 --- a/src/Simulation/qdk_sim_rs/inject-version.csx +++ /dev/null @@ -1,39 +0,0 @@ -#r "nuget: System.CommandLine, 2.0.0-beta1.21216.1" -#r "nuget: Tommy, 2.0.0" - -using System.CommandLine; -using System.Linq; -using System.CommandLine.Invocation; -using Tommy; - -// Create a root command with some options -var rootCommand = new RootCommand -{ - new Option( - "--template", - description: "A file to use as the template for cargo manifest."), - new Option( - "--out-path", - description: "Path to write the generated manifest to."), - new Option( - "--version", - description: "The version number to inject.") -}; - -// Note that the parameters of the handler method are matched according to the names of the options -rootCommand.Handler = CommandHandler.Create((template, outPath, version) => -{ - Console.Out.WriteLine($"Injecting version {version} into {template} and writing to {outPath}."); - using var reader = new StreamReader(File.OpenRead(template.FullName)); - var table = TOML.Parse(reader); - - // Set the version number in the table. - table["package"]["version"] = version; - - using var writer = new StreamWriter(File.OpenWrite(outPath)); - table.WriteTo(writer); - // Remember to flush the data if needed! - writer.Flush(); -}); - -await rootCommand.InvokeAsync(Args.ToArray()); diff --git a/src/Xunit/Microsoft.Quantum.Xunit.nuspec b/src/Xunit/Microsoft.Quantum.Xunit.nuspec index a16f5d932c5..746d9757795 100644 --- a/src/Xunit/Microsoft.Quantum.Xunit.nuspec +++ b/src/Xunit/Microsoft.Quantum.Xunit.nuspec @@ -22,7 +22,7 @@ - +