Skip to content

Commit

Permalink
Bump SonarLint for VS to 3.4.0 (#227)
Browse files Browse the repository at this point in the history
  • Loading branch information
Amaury Levé authored Jul 19, 2017
1 parent 467d495 commit 62ed187
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 8 deletions.
4 changes: 2 additions & 2 deletions build/Version.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MainVersion>3.3.0</MainVersion>
<MainVersion>3.4.0</MainVersion>
<BuildNumber>0</BuildNumber>
<Sha1>not-set</Sha1>
<BranchName>not-set</BranchName>
Expand All @@ -10,4 +10,4 @@
<AssemblyInformationalVersion>Version:$(FullVersion) Branch:$(BranchName) Sha1:$(Sha1)</AssemblyInformationalVersion>
<VsixVersion>$(FullVersion)</VsixVersion>
</PropertyGroup>
</Project>
</Project>
30 changes: 30 additions & 0 deletions set-version.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
[CmdletBinding()]
Param(
[Parameter(Mandatory = $True, Position = 1)]
[ValidatePattern("^\d{1,3}\.\d{1,3}\.\d{1,3}$")]
[string]$version
)

function Write-Header([string]$message) {
Write-Host "================================================"
Write-Host $message
Write-Host "================================================"
}

function Set-VersionForDotNet {
Write-Header "Updating version in .Net files"

try {
Push-Location ".\build"
$versionPropsFile = Resolve-Path "Version.props"
$xml = [xml](Get-Content $versionPropsFile)
$xml.Project.PropertyGroup.MainVersion = ${version}
$xml.Save($versionPropsFile)
msbuild "ChangeVersion.proj"
}
finally {
Pop-Location
}
}

Set-VersionForDotNet
6 changes: 3 additions & 3 deletions src/AssemblyInfo.Shared.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
using System.Runtime.InteropServices;

// Note: keep the version numbers in sync with the VSIX (source.extension.manifest)
[assembly: AssemblyVersion("3.3.0")]
[assembly: AssemblyFileVersion("3.3.0.0")] // This should exactly match the VSIX version
[assembly: AssemblyInformationalVersion("Version:3.3.0.0 Branch:not-set Sha1:not-set")]
[assembly: AssemblyVersion("3.4.0")]
[assembly: AssemblyFileVersion("3.4.0.0")] // This should exactly match the VSIX version
[assembly: AssemblyInformationalVersion("Version:3.4.0.0 Branch:not-set Sha1:not-set")]
[assembly: AssemblyConfiguration("")]
[assembly: ComVisible(false)]
[assembly: AssemblyProduct("SonarLint for Visual Studio")]
Expand Down
2 changes: 1 addition & 1 deletion src/Integration.Vsix/SonarLintIntegrationPackage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ namespace SonarLint.VisualStudio.Integration.Vsix
[ProvideAutoLoad(CommonGuids.PackageActivation)]
// Register the information needed to show the package in the Help/About dialog of VS.
// NB: The version is automatically updated by the ChangeVersion.proj
[InstalledProductRegistration("#110", "#112", "3.3.0.0", IconResourceID = 400)]
[InstalledProductRegistration("#110", "#112", "3.4.0.0", IconResourceID = 400)]
[ProvideOptionPage(typeof(GeneralOptionsDialogPage), "SonarLint", GeneralOptionsDialogPage.PageName, 901, 902, false, 903)]
[ProvideOptionPage(typeof(OtherOptionsDialogPage), "SonarLint", OtherOptionsDialogPage.PageName, 901, 904, true)]
[ProvideUIContextRule(CommonGuids.PackageActivation, "SonarLintIntegrationPackageActivation",
Expand Down
2 changes: 1 addition & 1 deletion src/Integration.Vsix/source.extension.vsixmanifest
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<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>
<!-- Note: keep the version number in sync with AssemblyInfo.Shared.cs -->
<Identity Id="SonarLint.8c442ec8-0208-4840-b83f-acd24f41acf7" Version="3.3.0.0" Language="en-US" Publisher="SonarSource SA" />
<Identity Id="SonarLint.8c442ec8-0208-4840-b83f-acd24f41acf7" Version="3.4.0.0" Language="en-US" Publisher="SonarSource SA" />
<DisplayName>SonarLint for Visual Studio 2015</DisplayName>
<Description xml:space="preserve">SonarLint provides on-the-fly feedback to developers on new bugs and quality issues injected into C#, VB.Net and JavaScript code. In addition the connected mode allows to enforce governance policies by reporting the same issues in Visual Studio and in SonarQube server.</Description>
<MoreInfo>http://vs.sonarlint.org</MoreInfo>
Expand Down
2 changes: 1 addition & 1 deletion src/Integration.Vsix_2017/source.extension.vsixmanifest
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<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>
<!-- Note: keep the version number in sync with AssemblyInfo.Shared.cs -->
<Identity Id="SonarLint.36871a7b-4853-481f-bb52-1835a874e81b" Version="3.3.0.0" Language="en-US" Publisher="SonarSource SA" />
<Identity Id="SonarLint.36871a7b-4853-481f-bb52-1835a874e81b" Version="3.4.0.0" Language="en-US" Publisher="SonarSource SA" />
<DisplayName>SonarLint for Visual Studio 2017</DisplayName>
<Description xml:space="preserve">SonarLint provides on-the-fly feedback to developers on new bugs and quality issues injected into C#, VB.Net and JavaScript code. In addition the connected mode allows to enforce governance policies by reporting the same issues in Visual Studio and in SonarQube server.</Description>
<MoreInfo>http://vs.sonarlint.org</MoreInfo>
Expand Down

0 comments on commit 62ed187

Please sign in to comment.