From 89169a3380e48fc834c72e38355867881d030e94 Mon Sep 17 00:00:00 2001 From: Pilchie Date: Wed, 2 Apr 2014 16:58:13 -0700 Subject: [PATCH] Merge change 1221395 back from the preview branch: Fix strong name verification disabling 1. Explicitly specify assembly name and key, instead of looking for it. (changeset 1221567) --- .../Scripts/Prepare.bat | 41 ++++++++----------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/Src/Tools/Microsoft.CodeAnalysis.Toolset.Open/Scripts/Prepare.bat b/Src/Tools/Microsoft.CodeAnalysis.Toolset.Open/Scripts/Prepare.bat index 36f2d75ce75..9af7a26cb64 100644 --- a/Src/Tools/Microsoft.CodeAnalysis.Toolset.Open/Scripts/Prepare.bat +++ b/Src/Tools/Microsoft.CodeAnalysis.Toolset.Open/Scripts/Prepare.bat @@ -49,24 +49,24 @@ if not "%unconfigure%" == "true" ( if not "%unconfigure%" == "true" ( "%VSSDK120Install%\VisualStudioIntegration\Tools\Bin\CreateExpInstance.exe" /Reset /VSInstance=%targetVS% /RootSuffix=%TargetHive% 2> nul - msbuild %~dp0\prepare.msbuild + msbuild %~dp0\prepare.msbuild ) -call :DisableVerificationFor Microsoft.CodeAnalysis.dll -call :DisableVerificationFor Microsoft.CodeAnalysis.CSharp.dll -call :DisableVerificationFor Microsoft.CodeAnalysis.VisualBasic.dll -call :DisableVerificationFor Microsoft.CodeAnalysis.Workspaces.dll -call :DisableVerificationFor Microsoft.CodeAnalysis.CSharp.Workspaces.dll -call :DisableVerificationFor Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll -call :DisableVerificationFor Microsoft.CodeAnalysis.FxCopAnalyzers.dll -call :DisableVerificationFor Microsoft.CodeAnalysis.CSharp.FxCopAnalyzers.dll -call :DisableVerificationFor Microsoft.CodeAnalysis.VisualBasic.FxCopAnalyzers.dll -call :DisableVerificationFor CompilerPackage.dll -call :DisableVerificationFor FxCopRulesSetup.dll -call :DisableVerificationFor Roslyn.Compilers.BuildTasks.dll -call :DisableVerificationFor rcsc.exe -call :DisableVerificationFor rvbc.exe -call :DisableVerificationFor VBCSCompiler.exe +call :DisableVerificationFor "Microsoft.CodeAnalysis,31BF3856AD364E35" +call :DisableVerificationFor "Microsoft.CodeAnalysis.CSharp,31BF3856AD364E35" +call :DisableVerificationFor "Microsoft.CodeAnalysis.VisualBasic,31BF3856AD364E35" +call :DisableVerificationFor "Microsoft.CodeAnalysis.Workspaces,31BF3856AD364E35" +call :DisableVerificationFor "Microsoft.CodeAnalysis.CSharp.Workspaces,31BF3856AD364E35" +call :DisableVerificationFor "Microsoft.CodeAnalysis.VisualBasic.Workspaces,31BF3856AD364E35" +call :DisableVerificationFor "Microsoft.CodeAnalysis.FxCopAnalyzers,31BF3856AD364E35" +call :DisableVerificationFor "Microsoft.CodeAnalysis.CSharp.FxCopAnalyzers,31BF3856AD364E35" +call :DisableVerificationFor "Microsoft.CodeAnalysis.VisualBasic.FxCopAnalyzers,31BF3856AD364E35" +call :DisableVerificationFor "CompilerPackage,31BF3856AD364E35" +call :DisableVerificationFor "FxCopRulesSetup,31BF3856AD364E35" +call :DisableVerificationFor "Roslyn.Compilers.BuildTasks,31BF3856AD364E35" +call :DisableVerificationFor "rcsc,31BF3856AD364E35" +call :DisableVerificationFor "rvbc,31BF3856AD364E35" +call :DisableVerificationFor "VBCSCompiler,31BF3856AD364E35" rem List skip verification entries echo. @@ -85,10 +85,5 @@ goto :eof :DisableVerificationFor %1 @echo %label% verification for %1 -for /F %%f in ('dir /s /b "%LOCALAPPDATA%\Microsoft\VisualStudio\%targetVS%%TargetHive%\%1"') do call :CallSn %verification% "%%f" && goto :eof -goto :eof - -:CallSn %1 %2 -if exist "%WindowsSDK_ExecutablePath_x86%"sn.exe "%WindowsSDK_ExecutablePath_x86%sn.exe" -q %1 %2 -if exist "%WindowsSDK_ExecutablePath_x64%"sn.exe "%WindowsSDK_ExecutablePath_x64%sn.exe" -q %1 %2 -goto :eof +if exist "%WindowsSDK_ExecutablePath_x86%"sn.exe "%WindowsSDK_ExecutablePath_x86%sn.exe" -q %verification% %1 +if exist "%WindowsSDK_ExecutablePath_x64%"sn.exe "%WindowsSDK_ExecutablePath_x64%sn.exe" -q %verification% %1 \ No newline at end of file -- GitLab