Update scripts

dotnet · Jan 2, 2021 · d880e64 · d880e64
1 parent 6e58697
commit d880e64
Show file tree

Hide file tree

Showing 24 changed files with 94 additions and 37 deletions.
diff --git a/tools/CodeGenerator.cmd b/tools/CodeGenerator.cmd
@@ -1,6 +1,9 @@
 @echo off
 
-"C:\Program Files\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild" "..\src\Tools\Tools.sln" ^
+set _programFiles=%ProgramFiles(x86)%
+if not defined _programFiles set _programFiles=%ProgramFiles%
+
+"%_programFiles%\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild" "..\src\Tools\Tools.sln" ^
  /t:Build ^
  /p:Configuration=Debug,RunCodeAnalysis=false ^
  /v:minimal ^

diff --git a/tools/GenerateDocumentation.cmd b/tools/GenerateDocumentation.cmd
@@ -1,7 +1,10 @@
 @echo off
 
+set _programFiles=%ProgramFiles(x86)%
+if not defined _programFiles set _programFiles=%ProgramFiles%
+
 set _roslynatorExe="..\src\CommandLine\bin\Debug\net48\roslynator"
-set _msbuildPath="C:\Program Files\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin"
+set _msbuildPath="%_programFiles%\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin"
 set _msbuildProperties="Configuration=Release"
 set _rootDirectoryUrl="../../docs/api/"
 

diff --git a/tools/MetadataGenerator.cmd b/tools/MetadataGenerator.cmd
@@ -1,6 +1,9 @@
 @echo off
 
-"C:\Program Files\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild" "..\src\Tools\Tools.sln" ^
+set _programFiles=%ProgramFiles(x86)%
+if not defined _programFiles set _programFiles=%ProgramFiles%
+
+"%_programFiles%\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild" "..\src\Tools\Tools.sln" ^
  /t:Build ^
  /p:Configuration=Debug,RunCodeAnalysis=false ^
  /v:minimal ^

diff --git a/tools/PublishVsix.cmd b/tools/PublishVsix.cmd
@@ -1,6 +1,9 @@
 @echo off
 
-set _vsixPublisherExe="C:\Program Files\Microsoft Visual Studio\2019\Community\VSSDK\VisualStudioIntegration\Tools\Bin\VsixPublisher.exe"
+set _programFiles=%ProgramFiles(x86)%
+if not defined _programFiles set _programFiles=%ProgramFiles%
+
+set _vsixPublisherExe="%_programFiles%\Microsoft Visual Studio\2019\Community\VSSDK\VisualStudioIntegration\Tools\Bin\VsixPublisher.exe"
 
 set /p _version=Enter version:
 

diff --git a/tools/ReportAnalyzers.cmd b/tools/ReportAnalyzers.cmd
@@ -1,6 +1,9 @@
 @echo off
 
-"C:\Program Files\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild" "..\src\Roslynator.sln" ^
+set _programFiles=%ProgramFiles(x86)%
+if not defined _programFiles set _programFiles=%ProgramFiles%
+
+"%_programFiles%\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild" "..\src\Roslynator.sln" ^
  /t:Clean,Build ^
  /p:Configuration=Release,ReportAnalyzer=True ^
  /v:normal ^
@@ -13,7 +16,7 @@ if errorlevel 1 (
  exit
 )
 
-"C:\Program Files\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild" "..\src\Tools\LogParser\LogParser.csproj" ^
+"%_programFiles%\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild" "..\src\Tools\LogParser\LogParser.csproj" ^
  /t:Clean,Build ^
  /p:Configuration=Release ^
  /v:minimal ^

diff --git a/tools/_analyze.cmd b/tools/_analyze.cmd
@@ -1,6 +1,9 @@
 @echo off
 
-set _msbuildPath="C:\Program Files\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin"
+set _programFiles=%ProgramFiles(x86)%
+if not defined _programFiles set _programFiles=%ProgramFiles%
+
+set _msbuildPath="%_programFiles%\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin"
 
 %_msbuildPath%\msbuild "..\src\CommandLine.sln" /t:Build /p:Configuration=Debug /v:m /m
 

diff --git a/tools/_fix.cmd b/tools/_fix.cmd
@@ -1,6 +1,9 @@
 @echo off
 
-set _visualStudioPath=C:\Program Files\Microsoft Visual Studio\2019\Community
+set _programFiles=%ProgramFiles(x86)%
+if not defined _programFiles set _programFiles=%ProgramFiles%
+
+set _visualStudioPath=%_programFiles%\Microsoft Visual Studio\2019\Community
 set _msbuildPath="%_visualStudioPath%\MSBuild\Current\Bin"
 
 %_msbuildPath%\msbuild "..\src\CommandLine.sln" /t:Build /p:Configuration=Debug /v:m /m

diff --git a/tools/_format.cmd b/tools/_format.cmd
@@ -1,6 +1,9 @@
 @echo off
 
-set _msbuildPath="C:\Program Files\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin"
+set _programFiles=%ProgramFiles(x86)%
+if not defined _programFiles set _programFiles=%ProgramFiles%
+
+set _msbuildPath="%_programFiles%\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin"
 
 %_msbuildPath%\msbuild "..\src\CommandLine.sln" /t:Build /p:Configuration=Debug /v:m /m
 

diff --git a/tools/_lloc.cmd b/tools/_lloc.cmd
@@ -1,6 +1,9 @@
 @echo off
 
-set _msbuildPath="C:\Program Files\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin"
+set _programFiles=%ProgramFiles(x86)%
+if not defined _programFiles set _programFiles=%ProgramFiles%
+
+set _msbuildPath="%_programFiles%\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin"
 
 %_msbuildPath%\msbuild "..\src\CommandLine.sln" /t:Build /p:Configuration=Debug /v:m /m
 

diff --git a/tools/_loc.cmd b/tools/_loc.cmd
@@ -1,6 +1,9 @@
 @echo off
 
-set _msbuildPath="C:\Program Files\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin"
+set _programFiles=%ProgramFiles(x86)%
+if not defined _programFiles set _programFiles=%ProgramFiles%
+
+set _msbuildPath="%_programFiles%\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin"
 
 %_msbuildPath%\msbuild "..\src\CommandLine.sln" /t:Build /p:Configuration=Debug /v:m /m
 

diff --git a/tools/analyze_all.cmd b/tools/analyze_all.cmd
@@ -1,6 +1,9 @@
 @echo off
 
-set _msbuildPath="C:\Program Files\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin"
+set _programFiles=%ProgramFiles(x86)%
+if not defined _programFiles set _programFiles=%ProgramFiles%
+
+set _msbuildPath="%_programFiles%\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin"
 
 %_msbuildPath%\msbuild "..\src\CommandLine.sln" /t:Build /p:Configuration=Debug /v:m /m
 

diff --git a/tools/build.cmd b/tools/build.cmd
@@ -1,6 +1,9 @@
 @echo off
 
-set _msbuildPath="C:\Program Files\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild"
+set _programFiles=%ProgramFiles(x86)%
+if not defined _programFiles set _programFiles=%ProgramFiles%
+
+set _msbuildPath="%_programFiles%\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild"
 set _properties=Configuration=Release,Deterministic=true,TreatWarningsAsErrors=true,WarningsNotAsErrors=1591
 set _outDir=..\out\Release
 set _version=3.0.1

diff --git a/tools/build.commandline.cmd b/tools/build.commandline.cmd
@@ -1,10 +1,13 @@
 @echo off
 
+set _programFiles=%ProgramFiles(x86)%
+if not defined _programFiles set _programFiles=%ProgramFiles%
+
 dotnet restore --force "..\src\CommandLine.sln"
 
 rd /S /Q "..\src\CommandLine\bin\Release\publish"
 
-"C:\Program Files\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild" "..\src\CommandLine.sln" ^
+"%_programFiles%\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild" "..\src\CommandLine.sln" ^
  /t:Clean,Publish ^
  /p:Configuration=Release,RoslynatorCommandLine=true,Deterministic=true,TreatWarningsAsErrors=true,WarningsNotAsErrors="1591" ^
  /v:normal ^

diff --git a/tools/build.debug.cmd b/tools/build.debug.cmd
@@ -1,8 +1,11 @@
 @echo off
 
+set _programFiles=%ProgramFiles(x86)%
+if not defined _programFiles set _programFiles=%ProgramFiles%
+
 set _outDir=..\out\Debug
 
-"C:\Program Files\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild" "..\src\VisualStudio.sln" ^
+"%_programFiles%\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild" "..\src\VisualStudio.sln" ^
  /t:Clean,Build ^
  /p:Configuration=Debug,RunCodeAnalysis=false,DeployExtension=false ^
  /nr:false ^

diff --git a/tools/build.debug.commandline.cmd b/tools/build.debug.commandline.cmd
@@ -1,8 +1,11 @@
 @echo off
 
+set _programFiles=%ProgramFiles(x86)%
+if not defined _programFiles set _programFiles=%ProgramFiles%
+
 rem dotnet restore "..\src\CommandLine.sln"
 
-"C:\Program Files\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild" "..\src\CommandLine.sln" ^
+"%_programFiles%\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild" "..\src\CommandLine.sln" ^
  /t:Clean,Build ^
  /p:Configuration=Debug,TreatWarningsAsErrors=true,WarningsNotAsErrors="1591" ^
  /v:minimal ^

diff --git a/tools/build.visualstudiocode.cmd b/tools/build.visualstudiocode.cmd
@@ -1,6 +1,9 @@
 @echo off
 
-set _msbuildPath="C:\Program Files\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild"
+set _programFiles=%ProgramFiles(x86)%
+if not defined _programFiles set _programFiles=%ProgramFiles%
+
+set _msbuildPath="%_programFiles%\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild"
 set _properties=Configuration=Release,Deterministic=true,TreatWarningsAsErrors=true,WarningsNotAsErrors=1591,DefineConstants=VSCODE
 
 dotnet restore --force "..\src\VisualStudioCode.sln"

diff --git a/tools/clean.debug.cmd b/tools/clean.debug.cmd
@@ -1,6 +1,9 @@
 @echo off
 
-"C:\Program Files\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild" "..\src\Roslynator.sln" ^
+set _programFiles=%ProgramFiles(x86)%
+if not defined _programFiles set _programFiles=%ProgramFiles%
+
+"%_programFiles%\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild" "..\src\Roslynator.sln" ^
  /t:Clean ^
  /p:Configuration=Debug ^
  /v:minimal ^

diff --git a/tools/clean.release.cmd b/tools/clean.release.cmd
@@ -1,6 +1,9 @@
 @echo off
 
-"C:\Program Files\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild" "..\src\Roslynator.sln" ^
+set _programFiles=%ProgramFiles(x86)%
+if not defined _programFiles set _programFiles=%ProgramFiles%
+
+"%_programFiles%\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild" "..\src\Roslynator.sln" ^
  /t:Clean ^
  /p:Configuration=Release ^
  /v:minimal ^

diff --git a/tools/cleaner.cmd b/tools/cleaner.cmd
diff --git a/tools/list_syntax_node_hierarchy.cmd b/tools/list_syntax_node_hierarchy.cmd
@@ -1,6 +1,9 @@
 @echo off
 
-set _msbuildPath="C:\Program Files\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin"
+set _programFiles=%ProgramFiles(x86)%
+if not defined _programFiles set _programFiles=%ProgramFiles%
+
+set _msbuildPath="%_programFiles%\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin"
 
 %_msbuildPath%\msbuild "..\src\CommandLine.sln" /t:Build /p:Configuration=Debug /v:m /m
 

diff --git a/tools/test.cmd b/tools/test.cmd
@@ -1,6 +1,9 @@
 @echo off
 
-"C:\Program Files\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild" "..\src\Tests\Tests.sln" ^
+set _programFiles=%ProgramFiles(x86)%
+if not defined _programFiles set _programFiles=%ProgramFiles%
+
+"%_programFiles%\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild" "..\src\Tests\Tests.sln" ^
  /t:Clean,Build ^
  /p:Configuration=Debug,RunCodeAnalysis=false ^
  /v:minimal ^

diff --git a/tools/vsix.debug.build.reinstall.cmd b/tools/vsix.debug.build.reinstall.cmd
@@ -1,6 +1,9 @@
 @echo off
 
-"C:\Program Files\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild" "..\src\VisualStudio.sln" ^
+set _programFiles=%ProgramFiles(x86)%
+if not defined _programFiles set _programFiles=%ProgramFiles%
+
+"%_programFiles%\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild" "..\src\VisualStudio.sln" ^
  /t:Clean,Build ^
  /p:Configuration=Debug,RunCodeAnalysis=false,DeployExtension=false ^
  /nr:false ^
@@ -12,7 +15,7 @@ if errorlevel 1 (
  exit
 )
 
-set _vsixInstallerExe="C:\Program Files\Microsoft Visual Studio\2019\Community\Common7\IDE\VSIXInstaller"
+set _vsixInstallerExe="%_programFiles%\Microsoft Visual Studio\2019\Community\Common7\IDE\VSIXInstaller"
 
 echo Uninstalling Roslynator...
 %_vsixInstallerExe% /q /u:d42db039-5432-4399-bb62-67a9b4c3b838

diff --git a/tools/vsix.debug.install.cmd b/tools/vsix.debug.install.cmd
@@ -1,6 +1,9 @@
 @echo off
 
-"C:\Program Files\Microsoft Visual Studio\2019\Community\Common7\IDE\VSIXInstaller" ^
+set _programFiles=%ProgramFiles(x86)%
+if not defined _programFiles set _programFiles=%ProgramFiles%
+
+"%_programFiles%\Microsoft Visual Studio\2019\Community\Common7\IDE\VSIXInstaller" ^
  /q ^
  "..\src\VisualStudio\bin\Debug\Roslynator.VisualStudio.vsix"
 

diff --git a/tools/vsix.debug.uninstall.cmd b/tools/vsix.debug.uninstall.cmd
@@ -1,6 +1,9 @@
 @echo off
 
-"C:\Program Files\Microsoft Visual Studio\2019\Community\Common7\IDE\VSIXInstaller" ^
+set _programFiles=%ProgramFiles(x86)%
+if not defined _programFiles set _programFiles=%ProgramFiles%
+
+"%_programFiles%\Microsoft Visual Studio\2019\Community\Common7\IDE\VSIXInstaller" ^
  /q ^
  /u:d42db039-5432-4399-bb62-67a9b4c3b838