diff --git a/.pipelines/OneBranch.Official.yml b/.pipelines/OneBranch.Official.yml
index cf2928151..64f762d81 100644
--- a/.pipelines/OneBranch.Official.yml
+++ b/.pipelines/OneBranch.Official.yml
@@ -6,6 +6,8 @@ parameters: # parameters are shown up in ADO UI in a build queue time
 
 variables:
 - template: variables/version.yml
+  parameters:
+    OfficialBuild: true
 - template: variables/OneBranchVariables.yml
   parameters:
     debug: ${{ parameters.debug }}
@@ -132,8 +134,7 @@ extends:
       jobs:
       - template: .pipelines/jobs/OneBranchNuGet.yml@self
         parameters:
-          BuildConfiguration: $(BuildConfiguration)
-          BuildVersion: $(BuildVersion)
+          NugetPackageVersion: $(NugetPackageVersion)
           OfficialBuild: true
 
     - stage: Test
@@ -151,4 +152,5 @@ extends:
         parameters:
           BuildConfiguration: $(BuildConfiguration)
           BuildVersion: $(BuildVersion)
+          NugetPackageVersion: $(NugetPackageVersion)
           OfficialBuild: true
diff --git a/.pipelines/OneBranch.PullRequest.yml b/.pipelines/OneBranch.PullRequest.yml
index ea4884329..9e18821b4 100644
--- a/.pipelines/OneBranch.PullRequest.yml
+++ b/.pipelines/OneBranch.PullRequest.yml
@@ -56,7 +56,7 @@ extends:
       - template: .pipelines/jobs/OneBranchNuGet.yml@self
         parameters:
           BuildConfiguration: $(BuildConfiguration)
-          BuildVersion: $(BuildVersion)
+          NugetPackageVersion: $(NugetPackageVersion)
 
     - stage: Test
       dependsOn: build
@@ -73,3 +73,4 @@ extends:
         parameters:
           BuildConfiguration: $(BuildConfiguration)
           BuildVersion: $(BuildVersion)
+          NugetPackageVersion: $(NugetPackageVersion)
diff --git a/.pipelines/jobs/OneBranchNuGet.yml b/.pipelines/jobs/OneBranchNuGet.yml
index 867202891..36ec3144b 100644
--- a/.pipelines/jobs/OneBranchNuGet.yml
+++ b/.pipelines/jobs/OneBranchNuGet.yml
@@ -2,7 +2,7 @@
 parameters:
   - name: BuildConfiguration
     type: string
-  - name: BuildVersion
+  - name: NugetPackageVersion
     type: string
   - name: OfficialBuild
     type: boolean
@@ -15,10 +15,7 @@ jobs:
     
     variables:
       ob_outputDirectory: '$(Build.SourcesDirectory)\out'
-      ${{ if eq(parameters.OfficialBuild, true) }}:
-        PackageVersion: ${{ parameters.BuildVersion }}
-      ${{ else }}:
-        PackageVersion: ${{ parameters.BuildVersion }}-unofficial
+      PackageVersion: ${{ parameters.NugetPackageVersion }}
 
       ob_sdl_prefast_enabled: true
       ob_sdl_prefast_runDuring: 'Guardian'
diff --git a/.pipelines/jobs/OneBranchVsix.yml b/.pipelines/jobs/OneBranchVsix.yml
index 1b03f71d0..6b1e7af3a 100644
--- a/.pipelines/jobs/OneBranchVsix.yml
+++ b/.pipelines/jobs/OneBranchVsix.yml
@@ -3,6 +3,8 @@ parameters:
     type: string
   - name: BuildVersion
     type: string
+  - name: NugetPackageVersion
+    type: string
   - name: OfficialBuild
     type: boolean
     default: false
@@ -27,11 +29,6 @@ jobs:
         VsixFilename: Microsoft.Windows.CppWinRT
   
   variables:
-    ${{ if eq(parameters.OfficialBuild, true) }}:
-      PackageVersion: ${{ parameters.BuildVersion }}
-    ${{ else }}:
-      PackageVersion: ${{ parameters.BuildVersion }}-unofficial
-
     ob_outputDirectory: $(Build.SourcesDirectory)\out
     ob_artifactSuffix: $(VsVersion)_$(Deployment)
 
@@ -96,7 +93,7 @@ jobs:
       displayName: Build VSIX
       inputs:
         solution: $(Build.SourcesDirectory)\vsix\vsix.sln
-        msbuildArgs: /t:vsix_$(VsVersion) /m /p:CppWinRTVersion=$(PackageVersion),clean_intermediate_files=true,Deployment=$(Deployment),NatvisDirx86=$(Build.SourcesDirectory)\x86\$(Deployment)\,NatvisDirx64=$(Build.SourcesDirectory)\x64\$(Deployment)\,NatvisDirarm64=$(Build.SourcesDirectory)\arm64\$(Deployment)\,NupkgDir=$(Pipeline.Workspace)\nuget\packages /bl:$(ob_outputDirectory)\output.binlog
+        msbuildArgs: /t:vsix_$(VsVersion) /m /p:CppWinRTVersion=${{ parameters.BuildVersion }},NugetPackageVersion=${{ parameters.NugetPackageVersion }},clean_intermediate_files=true,Deployment=$(Deployment),NatvisDirx86=$(Build.SourcesDirectory)\x86\$(Deployment)\,NatvisDirx64=$(Build.SourcesDirectory)\x64\$(Deployment)\,NatvisDirarm64=$(Build.SourcesDirectory)\arm64\$(Deployment)\,NupkgDir=$(Pipeline.Workspace)\nuget\packages /bl:$(ob_outputDirectory)\output.binlog
         platform: 'Any CPU'
         configuration: ${{ parameters.BuildConfiguration }}
 
diff --git a/.pipelines/variables/version.yml b/.pipelines/variables/version.yml
index 576d896eb..15382e7df 100644
--- a/.pipelines/variables/version.yml
+++ b/.pipelines/variables/version.yml
@@ -1,7 +1,17 @@
+parameters:
+  - name: OfficialBuild
+    type: boolean
+    default: false
+    
 variables:
   MajorVersion: "2"
   MinorVersion: "0"
   VersionDate: $[format('{0:yyMMdd}', pipeline.startTime)]
   VersionCounter: $[counter(variables['VersionDate'], 1)]
   BuildVersion: $(MajorVersion).$(MinorVersion).$(VersionDate).$(VersionCounter)
-  PatchVersion: $(VersionDate)$(VersionCounter)
\ No newline at end of file
+  PatchVersion: $(VersionDate)$(VersionCounter)
+
+  ${{ if eq(parameters.OfficialBuild, true) }}:
+    NugetPackageVersion: $(BuildVersion)
+  ${{ else }}:
+    NugetPackageVersion: $(BuildVersion)-unofficial
diff --git a/build_vsix.cmd b/build_vsix.cmd
index 9908462ef..aefc84df1 100644
--- a/build_vsix.cmd
+++ b/build_vsix.cmd
@@ -30,7 +30,7 @@ call msbuild /p:Configuration=%target_configuration%,Platform=x86,Deployment=%ta
 call msbuild /p:Configuration=%target_configuration%,Platform=arm64,Deployment=%target_deployment%,CppWinRTBuildVersion=%target_version% natvis\cppwinrtvisualizer.sln
 
 rem Build nuget 
-.nuget\nuget.exe pack nuget\Microsoft.Windows.CppWinRT.nuspec -NonInteractive -OutputDirectory %this_dir%_build -Properties Configuration=%target_configuration%;cppwinrt_exe=%this_dir%_build\x86\%target_configuration%\cppwinrt.exe;cppwinrt_fast_fwd_x86=%this_dir%_build\x86\%target_configuration%\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_x64=%this_dir%_build\x64\%target_configuration%\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm64=%this_dir%_build\arm64\%target_configuration%\cppwinrt_fast_forwarder.lib  -version %target_version% -Verbosity Detailed
+.nuget\nuget.exe pack nuget\Microsoft.Windows.CppWinRT.nuspec -NonInteractive -OutputDirectory %this_dir%_build -Properties Configuration=%target_configuration%;cppwinrt_exe=%this_dir%_build\x86\%target_configuration%\cppwinrt.exe;cppwinrt_fast_fwd_x86=%this_dir%_build\x86\%target_configuration%\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_x64=%this_dir%_build\x64\%target_configuration%\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm64=%this_dir%_build\arm64\%target_configuration%\cppwinrt_fast_forwarder.lib;target_version=%target_version%  -version %target_version% -Verbosity Detailed
 
 rem Build vsix
-call msbuild /restore /p:Configuration=%target_configuration%,Platform="Any CPU",Deployment=%target_deployment%,CppWinRTVersion=%target_version%,NatvisDirx86=%this_dir%natvis\x86\%target_configuration%\%target_deployment%,NatvisDirx64=%this_dir%natvis\x64\%target_configuration%\%target_deployment%,NatvisDirarm64=%this_dir%natvis\arm64\%target_configuration%\%target_deployment%,NupkgDir=%this_dir%_build vsix\vsix.sln
+call msbuild /restore /p:Configuration=%target_configuration%,Platform="Any CPU",Deployment=%target_deployment%,CppWinRTVersion=%target_version%,NugetPackageVersion=%target_version%,NatvisDirx86=%this_dir%natvis\x86\%target_configuration%\%target_deployment%,NatvisDirx64=%this_dir%natvis\x64\%target_configuration%\%target_deployment%,NatvisDirarm64=%this_dir%natvis\arm64\%target_configuration%\%target_deployment%,NupkgDir=%this_dir%_build vsix\vsix.sln
diff --git a/vsix/Dev16/Component/source.extension.vsixmanifest b/vsix/Dev16/Component/source.extension.vsixmanifest
index afd96cf1f..a7ab21972 100644
--- a/vsix/Dev16/Component/source.extension.vsixmanifest
+++ b/vsix/Dev16/Component/source.extension.vsixmanifest
@@ -29,7 +29,7 @@
     <Asset Type="DebuggerEngineExtension" Path="CppWinrtVisualizer.vsdconfig" />
     <Asset Type="Microsoft.VisualStudio.ItemTemplate" Path="ItemTemplates" />
     <Asset Type="Microsoft.VisualStudio.ProjectTemplate" Path="ProjectTemplates" />
-    <Asset Type="Microsoft.Windows.CppWinRT.|%CurrentProject%;GetCppWinRTVersion|.nupkg" Source="File" Path="Microsoft.Windows.CppWinRT.|%CurrentProject%;GetCppWinRTVersion|.nupkg" VsixSubPath="Packages" />
+    <Asset Type="Microsoft.Windows.CppWinRT.|%CurrentProject%;GetNugetPackageVersion|.nupkg" Source="File" Path="Microsoft.Windows.CppWinRT.|%CurrentProject%;GetNugetPackageVersion|.nupkg" VsixSubPath="Packages" />
   </Assets>
   <Prerequisites>
     <Prerequisite Id="Microsoft.VisualStudio.Component.VC.CoreBuildTools" Version="[16.0,18.0)" DisplayName="CppWinRT" />
diff --git a/vsix/Dev16/Standalone/source.extension.vsixmanifest b/vsix/Dev16/Standalone/source.extension.vsixmanifest
index e3c2ac995..b38c06cf8 100644
--- a/vsix/Dev16/Standalone/source.extension.vsixmanifest
+++ b/vsix/Dev16/Standalone/source.extension.vsixmanifest
@@ -29,7 +29,7 @@
     <Asset Type="DebuggerEngineExtension" Path="CppWinrtVisualizer.vsdconfig" />
     <Asset Type="Microsoft.VisualStudio.ItemTemplate" Path="ItemTemplates" />
     <Asset Type="Microsoft.VisualStudio.ProjectTemplate" Path="ProjectTemplates" />
-    <Asset Type="Microsoft.Windows.CppWinRT.|%CurrentProject%;GetCppWinRTVersion|.nupkg" Source="File" Path="Microsoft.Windows.CppWinRT.|%CurrentProject%;GetCppWinRTVersion|.nupkg" VsixSubPath="Packages" />
+    <Asset Type="Microsoft.Windows.CppWinRT.|%CurrentProject%;GetNugetPackageVersion|.nupkg" Source="File" Path="Microsoft.Windows.CppWinRT.|%CurrentProject%;GetNugetPackageVersion|.nupkg" VsixSubPath="Packages" />
   </Assets>
   <Prerequisites>
     <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[16.0,)" DisplayName="Visual Studio core editor" />
diff --git a/vsix/Dev16/vsix.Dev16.csproj b/vsix/Dev16/vsix.Dev16.csproj
index 72b9b4098..94a6836c3 100644
--- a/vsix/Dev16/vsix.Dev16.csproj
+++ b/vsix/Dev16/vsix.Dev16.csproj
@@ -41,8 +41,8 @@
       <Link>%(Filename)%(Extension)</Link>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="$(NupkgDir)\Microsoft.Windows.CppWinRT.$(CppWinRTVersion).nupkg">
-      <Link>Packages\Microsoft.Windows.CppWinRT.$(CppWinRTVersion).nupkg</Link>
+    <Content Include="$(NupkgDir)\Microsoft.Windows.CppWinRT.$(NugetPackageVersion).nupkg">
+      <Link>Packages\Microsoft.Windows.CppWinRT.$(NugetPackageVersion).nupkg</Link>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     <Content Include="$(VSIXRootDir)..\natvis\cppwinrt.natvis">
diff --git a/vsix/Dev17/Component/source.extension.vsixmanifest b/vsix/Dev17/Component/source.extension.vsixmanifest
index bcbfa9c8b..063dfcbc7 100644
--- a/vsix/Dev17/Component/source.extension.vsixmanifest
+++ b/vsix/Dev17/Component/source.extension.vsixmanifest
@@ -35,7 +35,7 @@
     <Asset Type="DebuggerEngineExtension" Path="CppWinrtVisualizer.vsdconfig" />
     <Asset Type="Microsoft.VisualStudio.ItemTemplate" Path="ItemTemplates" />
     <Asset Type="Microsoft.VisualStudio.ProjectTemplate" Path="ProjectTemplates" />
-    <Asset Type="Microsoft.Windows.CppWinRT.|%CurrentProject%;GetCppWinRTVersion|.nupkg" Source="File" Path="Microsoft.Windows.CppWinRT.|%CurrentProject%;GetCppWinRTVersion|.nupkg" VsixSubPath="Packages" />
+    <Asset Type="Microsoft.Windows.CppWinRT.|%CurrentProject%;GetNugetPackageVersion|.nupkg" Source="File" Path="Microsoft.Windows.CppWinRT.|%CurrentProject%;GetNugetPackageVersion|.nupkg" VsixSubPath="Packages" />
   </Assets>
   <Prerequisites>
     <Prerequisite Id="Microsoft.VisualStudio.Component.VC.CoreBuildTools" Version="[17.0,18.0)" DisplayName="CppWinRT" />
diff --git a/vsix/Dev17/Standalone/source.extension.vsixmanifest b/vsix/Dev17/Standalone/source.extension.vsixmanifest
index 56ea4b86f..89e178c82 100644
--- a/vsix/Dev17/Standalone/source.extension.vsixmanifest
+++ b/vsix/Dev17/Standalone/source.extension.vsixmanifest
@@ -35,7 +35,7 @@
     <Asset Type="DebuggerEngineExtension" Path="CppWinrtVisualizer.vsdconfig" />
     <Asset Type="Microsoft.VisualStudio.ItemTemplate" Path="ItemTemplates" />
     <Asset Type="Microsoft.VisualStudio.ProjectTemplate" Path="ProjectTemplates" />
-    <Asset Type="Microsoft.Windows.CppWinRT.|%CurrentProject%;GetCppWinRTVersion|.nupkg" Source="File" Path="Microsoft.Windows.CppWinRT.|%CurrentProject%;GetCppWinRTVersion|.nupkg" VsixSubPath="Packages" />
+    <Asset Type="Microsoft.Windows.CppWinRT.|%CurrentProject%;GetNugetPackageVersion|.nupkg" Source="File" Path="Microsoft.Windows.CppWinRT.|%CurrentProject%;GetNugetPackageVersion|.nupkg" VsixSubPath="Packages" />
   </Assets>
   <Prerequisites>
     <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[17.0,)" DisplayName="Visual Studio core editor" />
diff --git a/vsix/Dev17/vsix.Dev17.csproj b/vsix/Dev17/vsix.Dev17.csproj
index 3326ce6fa..02f3e0bb8 100644
--- a/vsix/Dev17/vsix.Dev17.csproj
+++ b/vsix/Dev17/vsix.Dev17.csproj
@@ -44,8 +44,8 @@
       <Link>%(Filename)%(Extension)</Link>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="$(NupkgDir)\Microsoft.Windows.CppWinRT.$(CppWinRTVersion).nupkg">
-      <Link>Packages\Microsoft.Windows.CppWinRT.$(CppWinRTVersion).nupkg</Link>
+    <Content Include="$(NupkgDir)\Microsoft.Windows.CppWinRT.$(NugetPackageVersion).nupkg">
+      <Link>Packages\Microsoft.Windows.CppWinRT.$(NugetPackageVersion).nupkg</Link>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     <Content Include="$(VSIXRootDir)..\natvis\cppwinrt.natvis">
diff --git a/vsix/Extension.targets b/vsix/Extension.targets
index 7a7b6c2b8..442f03a53 100644
--- a/vsix/Extension.targets
+++ b/vsix/Extension.targets
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <Target Name="GetCppWinRTVersion" Outputs="$(CppWinRTVersion)" />
+  <Target Name="GetNugetPackageVersion" Outputs="$(NugetPackageVersion)" />
   <Target Name="PrepareBuild" BeforeTargets="PrepareForBuild">
     <Error Condition="'$(CppWinRTVersion)' == ''" Text="The project must be supplied with a CppWinRTVersion property value" />
+    <Error Condition="'$(NugetPackageVersion)' == ''" Text="The project must be supplied with a NugetPackageVersion property value" />
     <Error Condition="'$(NatvisDirx86)' == ''" Text="The project must be supplied with a NatvisDirx86 property value" />
     <Error Condition="'$(NatvisDirx64)' == ''" Text="The project must be supplied with a NatvisDirx64 property value" />
     <Error Condition="'$(NupkgDir)' == ''" Text="The project must be supplied with a NupkgDir property value" />
@@ -27,7 +29,7 @@
     <XmlPoke XmlInputPath="%(StagedTemplates.Identity)" Query="/ns:VSTemplate/ns:WizardData/ns:packages/@repositoryId" Value="$(NugetRepositoryId)" Namespaces="&lt;Namespace Prefix='ns' Uri='http://schemas.microsoft.com/developer/vstemplate/2005' /&gt;" />
 
     <!-- Update Packages section with actual NuGet package version to restore -->
-    <XmlPoke XmlInputPath="%(StagedTemplates.Identity)" Query="/ns:VSTemplate/ns:WizardData/ns:packages/ns:package/@version" Value="$(CppWinRTVersion)" Namespaces="&lt;Namespace Prefix='ns' Uri='http://schemas.microsoft.com/developer/vstemplate/2005' /&gt;" />
+    <XmlPoke XmlInputPath="%(StagedTemplates.Identity)" Query="/ns:VSTemplate/ns:WizardData/ns:packages/ns:package/@version" Value="$(NugetPackageVersion)" Namespaces="&lt;Namespace Prefix='ns' Uri='http://schemas.microsoft.com/developer/vstemplate/2005' /&gt;" />
     
     <!-- Update the Package GUID in the Name and Description metadata -->
     <XmlPoke XmlInputPath="%(StagedTemplates.Identity)" Query="/ns:VSTemplate/ns:TemplateData/ns:Name/@Package" Value="$(PackageGuidString)" Namespaces="&lt;Namespace Prefix='ns' Uri='http://schemas.microsoft.com/developer/vstemplate/2005' /&gt;" />