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.
microsoft · Mar 17, 2022 · 1e387fa · 1e387fa
1 parent 5be21f5
commit 1e387fa
Show file tree

Hide file tree

Showing 41 changed files with 41 additions and 101 deletions.
diff --git a/AdvantageBenchmark/privateBuild/host.csproj b/AdvantageBenchmark/privateBuild/host.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IncludeQSharpCorePackages>false</IncludeQSharpCorePackages> <!-- otherwise the standard library is included by the Sdk -->
   </PropertyGroup>
 

diff --git 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
@@ -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
@@ -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
@@ -10,7 +10,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -36,7 +36,7 @@ public T GetFileContent<T>(string path)
         public async Task<T> GetFileContentAsync<T>(string path, CancellationToken cancellationToken)
         {
             using var stream = new MemoryStream(Encoding.UTF8.GetBytes(_fileContent));
-            return await JsonSerializer.DeserializeAsync<T>(stream, null, cancellationToken);
+            return await JsonSerializer.DeserializeAsync<T>(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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <PlatformTarget>x64</PlatformTarget>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git 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<T>(string path)
         public async Task<T> GetFileContentAsync<T>(string path, CancellationToken cancellationToken)
         {
             using FileStream stream = File.OpenRead(path);
-            return await JsonSerializer.DeserializeAsync<T>(stream, null, cancellationToken);
+            return await JsonSerializer.DeserializeAsync<T>(stream, options: null, cancellationToken);
         }
     }
 }
diff --git a/src/Qir/CommandLineTool/Microsoft.Quantum.Qir.CommandLineTool.csproj b/src/Qir/CommandLineTool/Microsoft.Quantum.Qir.CommandLineTool.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <PlatformTarget>x64</PlatformTarget>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git 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 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <QirGeneration>True</QirGeneration>
     <QSharpDocsGeneration>false</QSharpDocsGeneration>
   </PropertyGroup>

diff --git a/src/Qir/Tests/FullstateSimulator/qsharp/qir-test-simulator.csproj b/src/Qir/Tests/FullstateSimulator/qsharp/qir-test-simulator.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <QirGeneration>True</QirGeneration>
     <IncludeQSharpCorePackages>false</IncludeQSharpCorePackages>
     <QSharpDocsGeneration>false</QSharpDocsGeneration>

diff --git 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 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <QirGeneration>True</QirGeneration>
     <IncludeQSharpCorePackages>false</IncludeQSharpCorePackages>
     <QSharpDocsGeneration>false</QSharpDocsGeneration>

diff --git a/src/Qir/Tests/QIR-static/qsharp/qir-gen.csproj b/src/Qir/Tests/QIR-static/qsharp/qir-gen.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <QirGeneration>True</QirGeneration>
     <IncludeQSharpCorePackages>false</IncludeQSharpCorePackages>
     <QSharpDocsGeneration>false</QSharpDocsGeneration>

diff --git a/src/Qir/Tests/QIR-tracer/qsharp/tracer-qir.csproj b/src/Qir/Tests/QIR-tracer/qsharp/tracer-qir.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <QirGeneration>True</QirGeneration>
     <IncludeQSharpCorePackages>false</IncludeQSharpCorePackages>
     <QSharpDocsGeneration>false</QSharpDocsGeneration>

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
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <PlatformTarget>x64</PlatformTarget>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/src/Qir/Tools/Microsoft.Quantum.Qir.Runtime.Tools.csproj b/src/Qir/Tools/Microsoft.Quantum.Qir.Runtime.Tools.csproj
@@ -36,7 +36,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Quantum.QirGeneration" Version="0.23.195983" />
+    <PackageReference Include="Microsoft.Quantum.QirGeneration" Version="0.23.198514-beta" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...ubstitution.Integration.Tests/Tests.Microsoft.Quantum.AutoSubstitution.Integration.csproj b/...ubstitution.Integration.Tests/Tests.Microsoft.Quantum.AutoSubstitution.Integration.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <PlatformTarget>x64</PlatformTarget>
     <QscVerbosity>d</QscVerbosity>
   </PropertyGroup>

diff --git a/src/Simulation/AutoSubstitution.Tests/Tests.Microsoft.Quantum.AutoSubstitution.csproj b/src/Simulation/AutoSubstitution.Tests/Tests.Microsoft.Quantum.AutoSubstitution.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>Tests.Microsoft.Quantum.AutoSubstitution</AssemblyName>
     <IsPackable>false</IsPackable>
     <PlatformTarget>x64</PlatformTarget>

diff --git a/src/Simulation/AutoSubstitution/Microsoft.Quantum.AutoSubstitution.csproj b/src/Simulation/AutoSubstitution/Microsoft.Quantum.AutoSubstitution.csproj
@@ -19,7 +19,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Quantum.Compiler" Version="0.23.195983" />
+    <PackageReference Include="Microsoft.Quantum.Compiler" Version="0.23.198514-beta" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.6.0" />
   </ItemGroup>
 

diff --git a/src/Simulation/Common/Simulators.Test.props b/src/Simulation/Common/Simulators.Test.props
@@ -10,7 +10,7 @@
   <Import Project="Simulators.Dev.props" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IncludeQSharpCorePackages>false</IncludeQSharpCorePackages>
     <IncludeCSharpRuntime>false</IncludeCSharpRuntime>
     <!-- Don't generate API docs for test cases. -->

diff --git a/src/Simulation/Core/Microsoft.Quantum.Runtime.Core.csproj b/src/Simulation/Core/Microsoft.Quantum.Runtime.Core.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="System.Collections.Immutable" Version="1.6.0" />
   </ItemGroup>
 

diff --git a/src/Simulation/EntryPointDriver.Tests/Tests.Microsoft.Quantum.EntryPointDriver.fsproj b/src/Simulation/EntryPointDriver.Tests/Tests.Microsoft.Quantum.EntryPointDriver.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <RootNamespace>Microsoft.Quantum.EntryPointDriver.Tests</RootNamespace>
     <PlatformTarget>x64</PlatformTarget>
@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="xunit" Version="2.4.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
-    <PackageReference Include="Microsoft.Quantum.CSharpGeneration" Version="0.23.195983" />
+    <PackageReference Include="Microsoft.Quantum.CSharpGeneration" Version="0.23.198514-beta" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/.../QCTraceSimulator.Tests/Tests.Microsoft.Quantum.Simulation.QCTraceSimulatorRuntime.csproj b/.../QCTraceSimulator.Tests/Tests.Microsoft.Quantum.Simulation.QCTraceSimulatorRuntime.csproj
@@ -4,7 +4,7 @@
   <Import Project="..\Common\Simulators.Dev.props" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IncludeQSharpCorePackages>false</IncludeQSharpCorePackages>
     <IsPackable>false</IsPackable>
     <QSharpDocsGeneration>false</QSharpDocsGeneration>

diff --git a/src/Simulation/Simulators.Tests/TestProjects/HoneywellExe/HoneywellExe.csproj b/src/Simulation/Simulators.Tests/TestProjects/HoneywellExe/HoneywellExe.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <!-- we will provide our own -->
     <IncludeQSharpCorePackages>false</IncludeQSharpCorePackages>
     <IncludeCSharpRuntime>false</IncludeCSharpRuntime>

diff --git a/src/Simulation/Simulators.Tests/TestProjects/IntrinsicTests/IntrinsicTests.csproj b/src/Simulation/Simulators.Tests/TestProjects/IntrinsicTests/IntrinsicTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.Quantum.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <!-- we will provide our own -->
     <IncludeQSharpCorePackages>false</IncludeQSharpCorePackages>

diff --git a/src/Simulation/Simulators.Tests/TestProjects/IonQExe/IonQExe.csproj b/src/Simulation/Simulators.Tests/TestProjects/IonQExe/IonQExe.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <!-- we will provide our own -->
     <IncludeQSharpCorePackages>false</IncludeQSharpCorePackages>
     <IncludeCSharpRuntime>false</IncludeCSharpRuntime>

diff --git a/...mulation/Simulators.Tests/TestProjects/MicrosoftSimulatorExe/MicrosoftSimulatorExe.csproj b/...mulation/Simulators.Tests/TestProjects/MicrosoftSimulatorExe/MicrosoftSimulatorExe.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ExecutionTarget>microsoft.simulator</ExecutionTarget>
   </PropertyGroup>
 

diff --git a/src/Simulation/Simulators.Tests/TestProjects/QCIExe/QCIExe.csproj b/src/Simulation/Simulators.Tests/TestProjects/QCIExe/QCIExe.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <!-- we will provide our own -->
     <IncludeQSharpCorePackages>false</IncludeQSharpCorePackages>
     <IncludeCSharpRuntime>false</IncludeCSharpRuntime>

diff --git a/src/Simulation/Simulators.Tests/TestProjects/QSharpExe/QSharpExe.csproj b/src/Simulation/Simulators.Tests/TestProjects/QSharpExe/QSharpExe.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.Quantum.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <!-- we will provide our own -->
     <IncludeCSharpRuntime>false</IncludeCSharpRuntime>
     <IncludeQSharpCorePackages>false</IncludeQSharpCorePackages>

diff --git a/src/Simulation/Simulators.Tests/TestProjects/QirExe/QirExe.csproj b/src/Simulation/Simulators.Tests/TestProjects/QirExe/QirExe.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.Quantum.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IncludeQSharpCorePackages>false</IncludeQSharpCorePackages>
     <IncludeCSharpRuntime>false</IncludeCSharpRuntime>
     <IncludeProviderPackages>false</IncludeProviderPackages>

diff --git a/src/Simulation/Simulators.Tests/TestProjects/TargetedExe/TargetedExe.csproj b/src/Simulation/Simulators.Tests/TestProjects/TargetedExe/TargetedExe.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.Quantum.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <!-- we will provide our own -->
     <IncludeCSharpRuntime>false</IncludeCSharpRuntime>
     <IncludeQSharpCorePackages>false</IncludeQSharpCorePackages>

diff --git a/src/Simulation/Simulators.Tests/TestProjects/UnitTests/UnitTests.csproj b/src/Simulation/Simulators.Tests/TestProjects/UnitTests/UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.Quantum.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <ExposeReferencesViaTestNames>true</ExposeReferencesViaTestNames>
     <!-- we will provide our own -->

diff --git a/src/Simulation/qdk_sim_rs/.config/dotnet-tools.json b/src/Simulation/qdk_sim_rs/.config/dotnet-tools.json
diff --git 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/...Simulation/qdk_sim_rs/Cargo.toml.template → src/Simulation/qdk_sim_rs/Cargo.toml b/...Simulation/qdk_sim_rs/Cargo.toml.template → 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"