microsoft · michaelcfanning · Nov 12, 2020 · Nov 10, 2020 · Nov 10, 2020 · Nov 11, 2020
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@
 *.user
 *.userosscache
 *.sln.docstates
+*.binlog
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs

diff --git a/scripts/BuildAndTest.ps1 b/scripts/BuildAndTest.ps1
@@ -65,29 +65,6 @@ Import-Module -Force $PSScriptRoot\Projects.psm1
 $SolutionFile = "$SourceRoot\Sarif.Viewer.VisualStudio.sln"
 $BuildTarget = "Rebuild"
 
-function Update-VersionConstantsFiles {
-    foreach ($project in $Projects.All) {
-        & $PSScriptRoot\New-VersionConstantsFile.ps1 -OutputDirectory $SourceRoot\$project -Namespace "Microsoft.CodeAnalysis.$project"
-    }
-}
-
-function Update-VsixManifest($project) {
-    $versionPrefix, $versionSuffix = & "$PSScriptRoot\Get-VersionConstants.ps1"
-
-    $vsixManifestPath = "$SourceRoot\$project\source.extension.vsixmanifest"
-    $vsixManifest = [xml](Get-Content $vsixManifestPath)
-
-    $vsixManifest.PackageManifest.Metadata.Identity.Version = $versionPrefix
-
-    $vsixManifest.Save($vsixManifestPath)
-}
-
-function Update-VsixManifests {
-    foreach ($project in $Projects.Vsix) {
-        Update-VsixManifest $project
-    }
-}
-
 function Invoke-Build {
     Write-Information "Building $SolutionFile..."
     msbuild /verbosity:minimal /target:$BuildTarget /property:Configuration=$Configuration /fileloggerparameters:Verbosity=detailed $SolutionFile
@@ -167,8 +144,6 @@ if (-not $NoRestore) {
 }
 
 if (-not $NoBuild) {
-    Update-VersionConstantsFiles
-    Update-VsixManifests
     Invoke-Build
 }
 

diff --git a/scripts/Get-VersionConstants.ps1 b/scripts/Get-VersionConstants.ps1
diff --git a/scripts/New-VersionConstantsFile.ps1 b/scripts/New-VersionConstantsFile.ps1
diff --git a/scripts/ScriptUtilities.psm1 b/scripts/ScriptUtilities.psm1
@@ -61,15 +61,10 @@ function New-NuGetPackageFromNuspecFile($configuration, $project, $version, $fra
 }
 
 function New-NuGetPackages($configuration, $projects, $frameworks) {
-    $versionPrefix, $versionSuffix = & $PSScriptRoot\Get-VersionConstants.ps1
-    if ($versionSuffix)
-    {
-        $version = "$versionPrefix-$versionSuffix"
-    } else {
-        $version = $versionPrefix
-    }
-
+    dotnet tool install --global nbgv --version 3.3.37
+    $version = nbgv get-version --project src --variable Version
     foreach ($project in $Projects.NuGet) {
+        Write-Information $project
         foreach ($framework in $frameworks) {
             New-NuGetPackageFromNuSpecFile $configuration $project $version $framework
         }

diff --git a/src/Sarif.Sarifer/Properties/AssemblyInfo.cs b/src/Sarif.Sarifer/Properties/AssemblyInfo.cs
@@ -4,12 +4,7 @@
 using System.Reflection;
 using System.Resources;
 
-using Microsoft.CodeAnalysis.Sarif.Sarifer;
-
 [assembly: AssemblyTitle("Sarifer test data producer extension for Visual Studio")]
 [assembly: AssemblyDescription("Generates test data in SARIF format and provides it to the SARIF viewer extension, upon which it depends.")]
 
 [assembly: NeutralResourcesLanguage("en")]
-
-[assembly: AssemblyVersion(VersionConstants.FileVersion)]
-[assembly: AssemblyFileVersion(VersionConstants.FileVersion)]
diff --git a/src/Sarif.Sarifer/Properties/VersionConstants.cs b/src/Sarif.Sarifer/Properties/VersionConstants.cs
diff --git a/src/Sarif.Sarifer/Sarif.Sarifer.csproj b/src/Sarif.Sarifer/Sarif.Sarifer.csproj
@@ -31,11 +31,15 @@
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.SDK" Version="15.0.1" />
     <PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="15.7.27703" />
+    <PackageReference Include="Nerdbank.GitVersioning">
+      <Version>3.3.37</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="GenerateTestDataCommand.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\VersionConstants.cs" />
     <Compile Include="Guids.cs" />
     <Compile Include="FileAndForgetEventName.cs" />
     <Compile Include="SariferPackageCommandIds.cs" />

diff --git a/src/Sarif.Sarifer/SariferPackage.cs b/src/Sarif.Sarifer/SariferPackage.cs
@@ -20,7 +20,7 @@ namespace Microsoft.CodeAnalysis.Sarif.Sarifer
     /// provided by the Managed Package Framework (MPF).
     /// </summary>
     [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
-    [InstalledProductRegistration("#110", "#112", VersionConstants.AssemblyVersion, IconResourceID = 400)]
+    [InstalledProductRegistration("#110", "#112", ThisAssembly.AssemblyFileVersion, IconResourceID = 400)]
     [Guid(PackageGuidString)]
     [ProvideMenuResource("Menus.ctmenu", 1)]
     [ComVisible(true)]

diff --git a/src/Sarif.Sarifer/source.extension.vsixmanifest b/src/Sarif.Sarifer/source.extension.vsixmanifest
@@ -5,7 +5,7 @@ Licensed under the MIT license. See LICENSE file in the project root for full li
 -->
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="2ec87711-16c7-4a58-8e1d-453f805ce112" Version="2.1.20" Language="en-US" Publisher="Microsoft Corporation" />
+    <Identity Id="2ec87711-16c7-4a58-8e1d-453f805ce112" Version="|%CurrentProject%;GetBuildVersion|" Language="en-US" Publisher="Microsoft Corporation" />
     <DisplayName>Sarifer</DisplayName>
     <Description xml:space="preserve">Sends test SARIF data to the SARIF Viewer extension.</Description>
     <Icon>Resources\Package.ico</Icon>

diff --git a/src/Sarif.Viewer.VisualStudio.Interop/Properties/AssemblyInfo.cs b/src/Sarif.Viewer.VisualStudio.Interop/Properties/AssemblyInfo.cs
@@ -4,8 +4,6 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-using Microsoft.CodeAnalysis.Sarif.Viewer.VisualStudio.Interop;
-
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
@@ -20,16 +18,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("9d407555-d268-461e-bfaf-4251b0fbf7c9")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion(VersionConstants.FileVersion)]
-[assembly: AssemblyFileVersion(VersionConstants.FileVersion)]
diff --git a/src/Sarif.Viewer.VisualStudio.Interop/Properties/VersionConstants.cs b/src/Sarif.Viewer.VisualStudio.Interop/Properties/VersionConstants.cs
diff --git a/src/Sarif.Viewer.VisualStudio.Interop/Sarif.Viewer.VisualStudio.Interop.csproj b/src/Sarif.Viewer.VisualStudio.Interop/Sarif.Viewer.VisualStudio.Interop.csproj
@@ -23,6 +23,11 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.SDK" Version="15.0.1" />
+    <PackageReference Include="Nerdbank.GitVersioning">
+      <Version>3.3.37</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
     <!-- Necessary to resolve version conflict on Newtonsoft.Json: -->
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
   </ItemGroup>
@@ -40,7 +45,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\VersionConstants.cs" />
     <Compile Include="SarifViewerInterop.cs" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/Sarif.Viewer.VisualStudio.UnitTests/Properties/AssemblyInfo.cs b/src/Sarif.Viewer.VisualStudio.UnitTests/Properties/AssemblyInfo.cs
@@ -3,9 +3,4 @@
 
 using System.Reflection;
 
-using Microsoft.CodeAnalysis.Sarif.Viewer.VisualStudio.UnitTests;
-
 [assembly: AssemblyTitle("Unit Tests for Microsoft SARIF Viewer for Visual Studio")]
-
-[assembly: AssemblyVersion(VersionConstants.FileVersion)]
-[assembly: AssemblyFileVersion(VersionConstants.FileVersion)]
diff --git a/src/Sarif.Viewer.VisualStudio.UnitTests/Sarif.Viewer.VisualStudio.UnitTests.csproj b/src/Sarif.Viewer.VisualStudio.UnitTests/Sarif.Viewer.VisualStudio.UnitTests.csproj
@@ -63,7 +63,6 @@
     <Compile Include="ThreadFlowToTreeConverterTests.cs" />
     <Compile Include="Models\CallTreeNodeTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\VersionConstants.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

diff --git a/src/Sarif.Viewer.VisualStudio.sln b/src/Sarif.Viewer.VisualStudio.sln
@@ -13,7 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		..\BuildAndTest.cmd = ..\BuildAndTest.cmd
 		..\scripts\BuildAndTest.ps1 = ..\scripts\BuildAndTest.ps1
 		..\scripts\BuildPackagesFromSigningDirectory.ps1 = ..\scripts\BuildPackagesFromSigningDirectory.ps1
-		..\scripts\Get-VersionConstants.ps1 = ..\scripts\Get-VersionConstants.ps1
 		..\scripts\New-AtomXml.ps1 = ..\scripts\New-AtomXml.ps1
 		..\scripts\New-VersionConstantsFile.ps1 = ..\scripts\New-VersionConstantsFile.ps1
 		..\scripts\Projects.psm1 = ..\scripts\Projects.psm1
@@ -22,6 +21,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		..\scripts\Run-Tests.ps1 = ..\scripts\Run-Tests.ps1
 		..\scripts\ScriptUtilities.psm1 = ..\scripts\ScriptUtilities.psm1
 		..\scripts\Unzip.ps1 = ..\scripts\Unzip.ps1
+		version.json = version.json
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sarif.Viewer.VisualStudio.Interop", "Sarif.Viewer.VisualStudio.Interop\Sarif.Viewer.VisualStudio.Interop.csproj", "{9D407555-D268-461E-BFAF-4251B0FBF7C9}"

diff --git a/src/Sarif.Viewer.VisualStudio/Properties/AssemblyInfo.cs b/src/Sarif.Viewer.VisualStudio/Properties/AssemblyInfo.cs
@@ -5,15 +5,10 @@
 using System.Resources;
 using System.Runtime.CompilerServices;
 
-using Microsoft.CodeAnalysis.Sarif.Viewer.VisualStudio;
-
 [assembly: AssemblyTitle("Microsoft SARIF Viewer for Visual Studio")]
 [assembly: AssemblyDescription("Visual Studio Extension for viewing SARIF log files")]
 
 [assembly: NeutralResourcesLanguage("en")]
 
-[assembly: AssemblyVersion(VersionConstants.FileVersion)]
-[assembly: AssemblyFileVersion(VersionConstants.FileVersion)]
-
 [assembly: InternalsVisibleTo("Sarif.Viewer.VisualStudio.Tests.Apex, PublicKey=0024000004800000940000000602000000240000525341310004000001000100433fbf156abe9718142bdbd48a440e779a1b708fd21486ee0ae536f4c548edf8a7185c1e3ac89ceef76c15b8cc2497906798779a59402f9b9e27281fb15e7111566cdc9a9f8326301d45320623c5222089cf4d0013f365ae729fb0a9c9d15138042825cd511a0f3d4887a7b92f4c2749f81b410813d297b73244cf64995effb1")]
 [assembly: InternalsVisibleTo("Sarif.Viewer.VisualStudio.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100433fbf156abe9718142bdbd48a440e779a1b708fd21486ee0ae536f4c548edf8a7185c1e3ac89ceef76c15b8cc2497906798779a59402f9b9e27281fb15e7111566cdc9a9f8326301d45320623c5222089cf4d0013f365ae729fb0a9c9d15138042825cd511a0f3d4887a7b92f4c2749f81b410813d297b73244cf64995effb1")]
diff --git a/src/Sarif.Viewer.VisualStudio/Properties/VersionConstants.cs b/src/Sarif.Viewer.VisualStudio/Properties/VersionConstants.cs
diff --git a/src/Sarif.Viewer.VisualStudio/Sarif.Viewer.VisualStudio.csproj b/src/Sarif.Viewer.VisualStudio/Sarif.Viewer.VisualStudio.csproj
@@ -5,6 +5,9 @@
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <!-- Hack: https://github.com/dotnet/Nerdbank.GitVersioning/issues/404, since its a vsix with pages -->
+  <Import Project="$(MSBuildProjectExtensionsPath)$(_TargetAssemblyProjectName)$(MSBuildProjectExtension).nuget.g.props"
+    Condition=" '$(_TargetAssemblyProjectName)' != '' and '$(ImportProjectExtensionProps)' != 'false' and exists('$(MSBuildProjectExtensionsPath)$(_TargetAssemblyProjectName)$(MSBuildProjectExtension).nuget.g.props')" />
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -34,6 +37,11 @@
     <!-- Necessary to provide TaskStatusCenter and ITextViewCreationListener: -->
     <PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="15.7.27703" />
     <PackageReference Include="Microsoft.VisualStudio.Text.UI" Version="15.8.525" />
+    <PackageReference Include="Nerdbank.GitVersioning">
+      <Version>3.3.37</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
     <PackageReference Include="Sarif.Sdk" Version="2.3.6" />
     <PackageReference Include="Sarif.Converters" Version="2.3.6" />
     <!-- Necessary to resolve version conflict on Newtonsoft.Json: -->
@@ -48,7 +56,6 @@
     <Compile Include="Fixes\ProjectionBufferFactoryServiceExtensions.cs" />
     <Compile Include="Fixes\ReplacementEdit.cs" />
     <Compile Include="Fixes\SizeToFitHelper.cs" />
-    <Compile Include="Properties\VersionConstants.cs" />
     <Compile Include="CodeAnalysisResultManager.cs" />
     <Compile Include="CodeFlowToTreeConverter.cs" />
     <Compile Include="CodeLocationObjectTypeDescriptor.cs" />
@@ -330,4 +337,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
+  <!-- Hack: https://github.com/dotnet/Nerdbank.GitVersioning/issues/404, since its a vsix with pages -->
+  <Import Project="$(MSBuildProjectExtensionsPath)$(_TargetAssemblyProjectName)$(MSBuildProjectExtension).nuget.g.targets"
+    Condition=" '$(_TargetAssemblyProjectName)' != '' and '$(ImportProjectExtensionProps)' != 'false' and exists('$(MSBuildProjectExtensionsPath)$(_TargetAssemblyProjectName)$(MSBuildProjectExtension).nuget.g.targets')" />
 </Project>
diff --git a/src/Sarif.Viewer.VisualStudio/SarifViewerPackage.cs b/src/Sarif.Viewer.VisualStudio/SarifViewerPackage.cs
@@ -8,7 +8,6 @@
 using System.Runtime.InteropServices;
 using System.Threading;
 
-using Microsoft.CodeAnalysis.Sarif.Viewer.VisualStudio;
 using Microsoft.Sarif.Viewer.ErrorList;
 using Microsoft.Sarif.Viewer.Services;
 using Microsoft.Sarif.Viewer.Tags;
@@ -23,7 +22,7 @@ namespace Microsoft.Sarif.Viewer
     /// This is the class that implements the package exposed by this assembly.
     /// </summary>
     [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
-    [InstalledProductRegistration("#110", "#112", VersionConstants.AssemblyVersion, IconResourceID = 400)] // Info on this package for Help/About
+    [InstalledProductRegistration("#110", "#112", ThisAssembly.AssemblyFileVersion, IconResourceID = 400)] // Info on this package for Help/About
     [Guid(PackageGuidString)]
     [ProvideMenuResource("Menus.ctmenu", 1)]
     [ProvideToolWindow(typeof(SarifExplorerWindow), Style = VsDockStyle.Tabbed, Window = "3ae79031-e1bc-11d0-8f78-00a0c9110057", Transient = true)]

diff --git a/src/Sarif.Viewer.VisualStudio/source.extension.vsixmanifest b/src/Sarif.Viewer.VisualStudio/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="Microsoft.Sarif.Viewer.Michael C. Fanning.f17e897a-fd38-4e1f-99db-19fa34a4e184" Version="2.1.20" Language="en-US" Publisher="Microsoft DevLabs" />
+    <Identity Id="Microsoft.Sarif.Viewer.Michael C. Fanning.f17e897a-fd38-4e1f-99db-19fa34a4e184" Version="|%CurrentProject%;GetBuildVersion|" Language="en-US" Publisher="Microsoft DevLabs" />
     <DisplayName>Microsoft SARIF Viewer</DisplayName>
     <Description xml:space="preserve">Visual Studio Static Analysis Results Interchange Format (SARIF) log file viewer</Description>
     <License>License.txt</License>

diff --git a/src/build.props b/src/build.props
@@ -37,11 +37,6 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
-  <PropertyGroup Label="AssemblyAttributes">
-    <VersionPrefix Condition=" '$(VersionPrefix)' == ''">2.1.20</VersionPrefix>
-    <VersionSuffix Condition=" '$(VersionSuffix)' == ''"></VersionSuffix>
-  </PropertyGroup>
-
   <!-- Configuration specific properties -->
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' " Label="Debug build">
     <DebugType>full</DebugType>