Merge pull request #2606 from sharwell/release/1.1.0-beta005

Release/1.1.0 beta005

Author: sharwell

StyleCop.Analyzers/Directory.Build.props

@@ -8,8 +8,8 @@
     <Copyright>Copyright © Tunnel Vision Laboratories, LLC 2015</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
 
-    <Version>1.1.0.35</Version>
-    <FileVersion>1.1.0.35</FileVersion>
+    <Version>1.1.0.36</Version>
+    <FileVersion>1.1.0.36</FileVersion>
     <InformationalVersion>1.1.0-dev</InformationalVersion>
   </PropertyGroup>
 

build/build.ps1

@@ -1,6 +1,6 @@
 param (
 	[switch]$Debug,
-	[string]$VisualStudioVersion = '14.0',
+	[string]$VisualStudioVersion = '15.0',
 	[switch]$SkipKeyCheck,
 	[string]$Verbosity = 'minimal',
 	[string]$Logger,
@@ -46,7 +46,8 @@ If (-not (Test-Path $nuget)) {
 }
 
 # build the main project
-$msbuild = "${env:ProgramFiles(x86)}\MSBuild\$VisualStudioVersion\Bin\MSBuild.exe"
+$visualStudio = (Get-ItemProperty 'HKLM:\SOFTWARE\WOW6432Node\Microsoft\VisualStudio\SxS\VS7')."$VisualStudioVersion"
+$msbuild = "$visualStudio\MSBuild\$VisualStudioVersion\Bin\MSBuild.exe"
 If (-not (Test-Path $msbuild)) {
 	$host.UI.WriteErrorLine("Couldn't find MSBuild.exe")
 	exit 1
@@ -90,15 +91,15 @@ if (-not $SkipKeyCheck) {
 	. .\keys.ps1
 
 	foreach ($pair in $Keys.GetEnumerator()) {
-		$assembly = Resolve-FullPath -Path "..\StyleCop.Analyzers\StyleCop.Analyzers.CodeFixes\bin\$BuildConfig\StyleCop.Analyzers.dll"
+		$assembly = Resolve-FullPath -Path "..\StyleCop.Analyzers\StyleCop.Analyzers.CodeFixes\bin\$BuildConfig\$($pair.Key)\StyleCop.Analyzers.dll"
 		# Run the actual check in a separate process or the current process will keep the assembly file locked
 		powershell -Command ".\check-key.ps1 -Assembly '$assembly' -ExpectedKey '$($pair.Value)' -Build '$($pair.Key)'"
 		If (-not $?) {
 			$host.ui.WriteErrorLine('Failed to verify strong name key for build, aborting!')
 			exit $LASTEXITCODE
 		}
 
-		$assembly = Resolve-FullPath -Path "..\StyleCop.Analyzers\StyleCop.Analyzers.CodeFixes\bin\$BuildConfig\StyleCop.Analyzers.CodeFixes.dll"
+		$assembly = Resolve-FullPath -Path "..\StyleCop.Analyzers\StyleCop.Analyzers.CodeFixes\bin\$BuildConfig\$($pair.Key)\StyleCop.Analyzers.CodeFixes.dll"
 		# Run the actual check in a separate process or the current process will keep the assembly file locked
 		powershell -Command ".\check-key.ps1 -Assembly '$assembly' -ExpectedKey '$($pair.Value)' -Build '$($pair.Key)'"
 		If (-not $?) {

build/keys.ps1

@@ -4,14 +4,16 @@ If ($Version.Contains('-')) {
 
 	# Use the development keys
 	$Keys = @{
-		'portable-net45' = '97d9e3aa481481c8'
+	    'netstandard1.1' = '97d9e3aa481481c8'
+		'net452' = '97d9e3aa481481c8'
 	}
 
 } Else {
 
 	# Use the final release keys
 	$Keys = @{
-		'portable-net45' = 'cfeb5dbada5e1c25'
+		'netstandard1.1' = 'cfeb5dbada5e1c25'
+		'net452' = 'cfeb5dbada5e1c25'
 	}
 
 }