diff --git a/DEVGUIDE.md b/DEVGUIDE.md
index 73d3ef08f49..041ce4a3391 100644
--- a/DEVGUIDE.md
+++ b/DEVGUIDE.md
@@ -192,7 +192,7 @@ For **Release**:
#### Notes on the Windows .NET Framework build
-1. The `update.cmd` script adds required strong name validation skips, and NGens the compiler and libraries. This requires admin privileges.
+1. The `update.cmd` script NGens the compiler and libraries. This requires admin privileges.
1. The compiler binaries produced are "private" and strong-named signed with a test key.
1. Some additional tools are required to build the compiler, notably `fslex.exe`, `fsyacc.exe`, `FSharp.PowerPack.Build.Tasks.dll`, `FsSrGen.exe`, `FSharp.SRGen.Build.Tasks.dll`, and the other tools found in the `lkg` directory.
1. The overall bootstrapping process executes as follows
diff --git a/build.cmd b/build.cmd
index 4a45c333df6..e608ae0273e 100644
--- a/build.cmd
+++ b/build.cmd
@@ -497,8 +497,6 @@ if "%RestorePackages%"=="" (
@echo VSSDKToolsPath: %VSSDKToolsPath%
@echo VSSDKIncludes: %VSSDKIncludes%
-@call src\update.cmd signonly
-
:: Check prerequisites
if not "%VisualStudioVersion%" == "" goto vsversionset
if exist "%VS150COMNTOOLS%\..\ide\devenv.exe" set VisualStudioVersion=15.0
@@ -704,16 +702,12 @@ set PATH=%PATH%;%CORDIR%
set REGEXE32BIT=reg.exe
-IF NOT DEFINED SNEXE32 IF EXIST "%WINSDKNETFXTOOLS%\sn.exe" set SNEXE32=%WINSDKNETFXTOOLS%sn.exe
-IF NOT DEFINED SNEXE64 IF EXIST "%WINSDKNETFXTOOLS%x64\sn.exe" set SNEXE64=%WINSDKNETFXTOOLS%x64\sn.exe
IF NOT DEFINED ildasm IF EXIST "%WINSDKNETFXTOOLS%\ildasm.exe" set ildasm=%WINSDKNETFXTOOLS%ildasm.exe
echo.
echo SDK environment vars
echo =======================
echo WINSDKNETFXTOOLS: %WINSDKNETFXTOOLS%
-echo SNEXE32: %SNEXE32%
-echo SNEXE64: %SNEXE64%
echo ILDASM: %ILDASM%
echo
diff --git a/fcs/FSharp.Compiler.Service.Tests.netcore/FSharp.Compiler.Service.Tests.netcore.fsproj b/fcs/FSharp.Compiler.Service.Tests.netcore/FSharp.Compiler.Service.Tests.netcore.fsproj
index 71f5341bb71..9ec065c1c2b 100644
--- a/fcs/FSharp.Compiler.Service.Tests.netcore/FSharp.Compiler.Service.Tests.netcore.fsproj
+++ b/fcs/FSharp.Compiler.Service.Tests.netcore/FSharp.Compiler.Service.Tests.netcore.fsproj
@@ -4,7 +4,7 @@
$(DefineConstants);DOTNETCORE;FX_ATLEAST_45;FX_ATLEAST_PORTABLE;FX_NO_RUNTIMEENVIRONMENT;FX_RESHAPED_REFLECTION;TODO_REWORK_ASSEMBLY_LOAD;
$(NoWarn);44;
true
- true
+ true
true
false
diff --git a/fcs/FSharp.Compiler.Service.netstandard/FSharp.Compiler.Service.netstandard.fsproj b/fcs/FSharp.Compiler.Service.netstandard/FSharp.Compiler.Service.netstandard.fsproj
index 253080552f3..6423180680a 100644
--- a/fcs/FSharp.Compiler.Service.netstandard/FSharp.Compiler.Service.netstandard.fsproj
+++ b/fcs/FSharp.Compiler.Service.netstandard/FSharp.Compiler.Service.netstandard.fsproj
@@ -63,12 +63,11 @@
$(DefineConstants);NO_LOGGING_GUI
$(DefineConstants);FX_RESHAPED_MSBUILD
$(DefineConstants);SIGNED
- $(DefineConstants);STRONG_NAME_AND_DELAY_SIGN_FSHARP_COMPILER_WITH_MSFT_KEY
$(DefineConstants);TODO_REWORK_ASSEMBLY_LOAD
$(DefineConstants);TODO_REWORK_SERVER
$(NoWarn);44;69;65;54;61;75;62;9;2003;
true
- true
+ true
true
diff --git a/src/FSharpSource.Profiles.targets b/src/FSharpSource.Profiles.targets
index adafba0eae3..f5725f270ff 100644
--- a/src/FSharpSource.Profiles.targets
+++ b/src/FSharpSource.Profiles.targets
@@ -3,7 +3,6 @@
- $(DefineConstants);CROSS_PLATFORM_COMPILER
$(DefineConstants);PREFERRED_UI_LANG
$(DefineConstants);ENABLE_MONO_SUPPORT
$(DefineConstants);BE_SECURITY_TRANSPARENT
diff --git a/src/FSharpSource.Settings.targets b/src/FSharpSource.Settings.targets
index 6a8c8ecbe4e..feb2626741c 100644
--- a/src/FSharpSource.Settings.targets
+++ b/src/FSharpSource.Settings.targets
@@ -56,7 +56,14 @@
$(FSharpSourcesRoot)\..\packages\NUnit.ConsoleRunner\$(NUnitVersion)\tools\
-
+
+ true
+ $(FSharpSourcesRoot)\fsharp\msft.pubkey
+ true
+ true
+
+
+
true
false
true
@@ -139,11 +146,6 @@
fslex.exe
fsyacc.exe
-
-
- v12.0
- 12.0.0.0
-
$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools
diff --git a/src/FSharpSource.targets b/src/FSharpSource.targets
index 3ad08c6922b..52fcb8bb2cf 100644
--- a/src/FSharpSource.targets
+++ b/src/FSharpSource.targets
@@ -25,25 +25,13 @@
fs
-
-
-
- $(OtherFlags) --keyfile:"$(FSharpSourcesRoot)\fsharp\test.snk"
- STRONG_NAME_FSHARP_COMPILER_WITH_TEST_KEY;$(DefineConstants)
- true
- $(FSCoreVersion)
- fs
-
-
- $(OtherFlags) --delaysign+
- $(OtherFlags) --publicsign+
- $(OtherFlags) --keyfile:"$(FSharpSourcesRoot)\fsharp\msft.pubkey"
- STRONG_NAME_AND_DELAY_SIGN_FSHARP_COMPILER_WITH_MSFT_KEY;$(DefineConstants)
+ $(OtherFlags) --publicsign+
true
+ true
$(FSCoreVersion)
15.4.1.0
@@ -57,9 +45,9 @@
true
$(FSharpSourcesRoot)\fsharp\msft.pubkey
- STRONG_NAME_AND_DELAY_SIGN_FSHARP_COMPILER_WITH_MSFT_KEY;$(DefineConstants)
true
- true
+ true
+ true
$(FSCoreVersion)
fs
@@ -88,7 +76,7 @@
NO_STRONG_NAMES;$(DefineConstants)
-
+
MSBUILD_AT_LEAST_14;$(DefineConstants)
diff --git a/src/assemblyinfo/assemblyinfo.FSharp.Compiler.Service.dll.fs b/src/assemblyinfo/assemblyinfo.FSharp.Compiler.Service.dll.fs
index 2ff140f9a17..19ad354e749 100644
--- a/src/assemblyinfo/assemblyinfo.FSharp.Compiler.Service.dll.fs
+++ b/src/assemblyinfo/assemblyinfo.FSharp.Compiler.Service.dll.fs
@@ -36,25 +36,7 @@ open System.Runtime.InteropServices
[]
[]
#endif
-#if STRONG_NAME_AND_DELAY_SIGN_FSHARP_COMPILER_WITH_MSFT_KEY
-[]
-[]
-[]
-[]
-[]
-[]
-[]
-[]
-[]
-[]
-[]
-[]
-[]
-[]
-[]
-#endif
-#if STRONG_NAME_FSHARP_COMPILER_WITH_TEST_KEY
[]
[]
[]
@@ -69,7 +51,6 @@ open System.Runtime.InteropServices
[]
[]
[]
-#endif
// Until dotnet sdk can version assemblies, use this
#if BUILD_FROM_SOURCE
diff --git a/src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj b/src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj
index e7ccc386e61..8aba433807d 100644
--- a/src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj
+++ b/src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj
@@ -72,7 +72,7 @@
-
+
$(FSharpSourcesRoot)\..\packages\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Framework.dll
@@ -90,22 +90,5 @@
FSharp.Core
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
diff --git a/src/fsharp/FSharp.Build/FSharp.Build.fsproj b/src/fsharp/FSharp.Build/FSharp.Build.fsproj
index 5bc7c9f75bc..405deb589ad 100644
--- a/src/fsharp/FSharp.Build/FSharp.Build.fsproj
+++ b/src/fsharp/FSharp.Build/FSharp.Build.fsproj
@@ -59,7 +59,7 @@
-
+
$(FSharpSourcesRoot)\..\packages\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Framework.dll
@@ -73,23 +73,6 @@
$(FSharpSourcesRoot)\..\packages\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Tasks.Core.dll
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
{DED3BBD7-53F4-428A-8C9F-27968E768605}
diff --git a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
index 528a5649fed..214f60cdc9f 100644
--- a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
+++ b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
@@ -703,44 +703,19 @@
..\..\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll
true
+
+ $(FSharpSourcesRoot)\..\packages\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Framework.dll
+
+
+ $(FSharpSourcesRoot)\..\packages\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.dll
+
+
+ $(FSharpSourcesRoot)\..\packages\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Utilities.Core.dll
+
+
+ $(FSharpSourcesRoot)\..\packages\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Tasks.Core.dll
+
-
-
-
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Framework.dll
-
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.dll
-
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Utilities.Core.dll
-
-
- $(FSharpSourcesRoot)\..\packages\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Tasks.Core.dll
-
-
-
-
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
-
-
{DED3BBD7-53F4-428A-8C9F-27968E768605}
diff --git a/src/fsharp/Fsc-proto/Fsc-proto.fsproj b/src/fsharp/Fsc-proto/Fsc-proto.fsproj
index 43c8de3df64..fd3d209e512 100644
--- a/src/fsharp/Fsc-proto/Fsc-proto.fsproj
+++ b/src/fsharp/Fsc-proto/Fsc-proto.fsproj
@@ -473,7 +473,7 @@
FSharp.Core
-
+
$(FSharpSourcesRoot)\..\packages\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Framework.dll
@@ -487,23 +487,6 @@
$(FSharpSourcesRoot)\..\packages\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Tasks.Core.dll
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
diff --git a/src/fsharp/test.snk b/src/fsharp/test.snk
deleted file mode 100644
index c16543bdc48..00000000000
Binary files a/src/fsharp/test.snk and /dev/null differ
diff --git a/src/update.cmd b/src/update.cmd
index 89ed51b267a..af18a82b560 100644
--- a/src/update.cmd
+++ b/src/update.cmd
@@ -6,9 +6,8 @@
if /i "%1" == "debug" goto :ok
if /i "%1" == "release" goto :ok
-if /i "%1" == "signonly" goto :ok
-echo adding required strong name verification skipping, and NGening built binaries
+echo NGening built binaries
echo Usage:
echo update.cmd debug [-ngen]
echo update.cmd release [-ngen]
@@ -38,20 +37,9 @@ if "%WINSDKNETFXTOOLS_x86%"=="" FOR /F "tokens=2* delims= " %%A IN ('%REGEXE32B
set WINSDKNETFXTOOLS_x64=%WINSDKNETFXTOOLS_x86%x64\
:havesdk
-set SN32="%WINSDKNETFXTOOLS_x86%sn.exe"
-set SN64="%WINSDKNETFXTOOLS_x64%sn.exe"
-
set NGEN32=%windir%\Microsoft.NET\Framework\v4.0.30319\ngen.exe
set NGEN64=%windir%\Microsoft.NET\Framework64\v4.0.30319\ngen.exe
-rem Disable strong-name validation for binaries that are delay-signed with the microsoft key
-%SN32% -q -Vr *,b03f5f7f11d50a3a
-
-if /i "%PROCESSOR_ARCHITECTURE%"=="AMD64" (
- %SN64% -q -Vr *,b03f5f7f11d50a3a
-)
-
-if /i "%1" == "signonly" goto :eof
if /i "%1" == "debug" set NGEN_FLAGS=/Debug
rem NGen fsc, fsi, fsiAnyCpu, and FSharp.Build.dll
diff --git a/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj b/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj
index bdcd0d08161..9ac64755ac8 100644
--- a/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj
+++ b/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj
@@ -40,13 +40,6 @@
false
-
- true
- $(FSharpSourcesRoot)\fsharp\msft.pubkey
- STRONG_NAME_AND_DELAY_SIGN_FSHARP_COMPILER_WITH_MSFT_KEY;$(DefineConstants)
- true
- true
-
diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj
index 218b9584a9a..6a57d667913 100644
--- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj
+++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj
@@ -45,13 +45,6 @@
-
- true
- $(FSharpSourcesRoot)\fsharp\msft.pubkey
- STRONG_NAME_AND_DELAY_SIGN_FSHARP_COMPILER_WITH_MSFT_KEY;$(DefineConstants)
- true
- true
-
diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj
index c7ee9a0d29c..d087da45a13 100644
--- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj
+++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj
@@ -49,13 +49,6 @@
false
-
- true
- $(FSharpSourcesRoot)\fsharp\msft.pubkey
- STRONG_NAME_AND_DELAY_SIGN_FSHARP_COMPILER_WITH_MSFT_KEY=True,$(DefineConstants)
- true
- true
-
diff --git a/vsintegration/src/FSharp.UIResources/FSharp.UIResources.csproj b/vsintegration/src/FSharp.UIResources/FSharp.UIResources.csproj
index abe9503fa24..58e5ef5a823 100644
--- a/vsintegration/src/FSharp.UIResources/FSharp.UIResources.csproj
+++ b/vsintegration/src/FSharp.UIResources/FSharp.UIResources.csproj
@@ -31,13 +31,6 @@
false
-
- true
- $(FSharpSourcesRoot)\fsharp\msft.pubkey
- STRONG_NAME_AND_DELAY_SIGN_FSHARP_COMPILER_WITH_MSFT_KEY;$(DefineConstants)
- true
- true
-
diff --git a/vsintegration/update-vsintegration.cmd b/vsintegration/update-vsintegration.cmd
index 9dcb36f92d5..022b288c0ab 100644
--- a/vsintegration/update-vsintegration.cmd
+++ b/vsintegration/update-vsintegration.cmd
@@ -153,8 +153,6 @@ if "%WINSDKNETFXTOOLS%"=="" FOR /F "tokens=2* delims= " %%A IN ('%REGEXE32BIT%
if "%WINSDKNETFXTOOLS%"=="" FOR /F "tokens=2* delims= " %%A IN ('%REGEXE32BIT% QUERY "HKLM\Software\Microsoft\Microsoft SDKs\Windows\v7.1\WinSDK-NetFx40Tools" /v InstallationFolder 2^>NUL') DO SET WINSDKNETFXTOOLS=%%B
if "%WINSDKNETFXTOOLS%"=="" FOR /F "tokens=2* delims= " %%A IN ('%REGEXE32BIT% QUERY "HKLM\Software\Microsoft\Microsoft SDKs\Windows\v7.0A\WinSDK-NetFx40Tools" /v InstallationFolder 2^>NUL') DO SET WINSDKNETFXTOOLS=%%B
-set SN32="%WINSDKNETFXTOOLS%sn.exe"
-set SN64="%WINSDKNETFXTOOLS%x64\sn.exe"
set NGEN32=%windir%\Microsoft.NET\Framework\v4.0.30319\ngen.exe
set NGEN64=%windir%\Microsoft.NET\Framework64\v4.0.30319\ngen.exe
@@ -327,47 +325,7 @@ if "%DEPLOY%" == "yes" if "!ISADMIN!" == "yes" (
)
REG ADD "HKLM\SOFTWARE\Microsoft\.NETFramework\v4.0.30319\AssemblyFoldersEx\F# !FSHARPVERSION! Core Assemblies (Open Source)" /ve /t REG_SZ /f /d "!X86_PROGRAMFILES!\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\4.!FSHARPVERSION!.0\
REG ADD "HKLM\SOFTWARE\Microsoft\.NETFramework\v4.0.50709\AssemblyFoldersEx\F# !FSHARPVERSION! Core Assemblies (Open Source)" /ve /t REG_SZ /f /d "!X86_PROGRAMFILES!\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\4.!FSHARPVERSION!.0\
-
- rem Disable strong-name validation for F# binaries built from open source that are signed with the microsoft key
- echo.
- CALL :colorEcho 02 "[!ACTION!] Removing strong-name validation of F# binaries" & echo.
- !SN32! -Vr FSharp.Core,b03f5f7f11d50a3a 1>NUL 2>NUL
- !SN32! -Vr FSharp.Build,b03f5f7f11d50a3a 1>NUL 2>NUL
- !SN32! -Vr FSharp.Compiler.Interactive.Settings,b03f5f7f11d50a3a 1>NUL 2>NUL
- !SN32! -Vr HostedCompilerServer,b03f5f7f11d50a3a 1>NUL 2>NUL
-
- !SN32! -Vr FSharp.Compiler,b03f5f7f11d50a3a 1>NUL 2>NUL
- !SN32! -Vr FSharp.Compiler.Server.Shared,b03f5f7f11d50a3a 1>NUL 2>NUL
- !SN32! -Vr FSharp.Editor,b03f5f7f11d50a3a 1>NUL 2>NUL
- !SN32! -Vr FSharp.LanguageService,b03f5f7f11d50a3a 1>NUL 2>NUL
- !SN32! -Vr FSharp.LanguageService.Base,b03f5f7f11d50a3a 1>NUL 2>NUL
- !SN32! -Vr FSharp.ProjectSystem.Base,b03f5f7f11d50a3a 1>NUL 2>NUL
- !SN32! -Vr FSharp.ProjectSystem.FSharp,b03f5f7f11d50a3a 1>NUL 2>NUL
- !SN32! -Vr FSharp.ProjectSystem.PropertyPages,b03f5f7f11d50a3a 1>NUL 2>NUL
- !SN32! -Vr FSharp.VS.FSI,b03f5f7f11d50a3a 1>NUL 2>NUL
- !SN32! -Vr VisualFSharp.Unittests,b03f5f7f11d50a3a 1>NUL 2>NUL
- !SN32! -Vr VisualFSharp.Salsa,b03f5f7f11d50a3a 1>NUL 2>NUL
-
- REM Do this *in addition* to the above for x64 systems
- if /i "!PROCESSOR_ARCHITECTURE!"=="AMD64" (
- !SN64! -Vr FSharp.Core,b03f5f7f11d50a3a 1>NUL 2>NUL
- !SN64! -Vr FSharp.Build,b03f5f7f11d50a3a 1>NUL 2>NUL
- !SN64! -Vr FSharp.Compiler.Interactive.Settings,b03f5f7f11d50a3a 1>NUL 2>NUL
- !SN64! -Vr HostedCompilerServer,b03f5f7f11d50a3a 1>NUL 2>NUL
-
- !SN64! -Vr FSharp.Compiler,b03f5f7f11d50a3a 1>NUL 2>NUL
- !SN64! -Vr FSharp.Compiler.Server.Shared,b03f5f7f11d50a3a 1>NUL 2>NUL
- !SN64! -Vr FSharp.Editor,b03f5f7f11d50a3a 1>NUL 2>NUL
- !SN64! -Vr FSharp.LanguageService,b03f5f7f11d50a3a 1>NUL 2>NUL
- !SN64! -Vr FSharp.LanguageService.Base,b03f5f7f11d50a3a 1>NUL 2>NUL
- !SN64! -Vr FSharp.ProjectSystem.Base,b03f5f7f11d50a3a 1>NUL 2>NUL
- !SN64! -Vr FSharp.ProjectSystem.FSharp,b03f5f7f11d50a3a 1>NUL 2>NUL
- !SN64! -Vr FSharp.ProjectSystem.PropertyPages,b03f5f7f11d50a3a 1>NUL 2>NUL
- !SN64! -Vr FSharp.VS.FSI,b03f5f7f11d50a3a 1>NUL 2>NUL
- !SN64! -Vr VisualFSharp.Unittests,b03f5f7f11d50a3a 1>NUL 2>NUL
- !SN64! -Vr VisualFSharp.Salsa,b03f5f7f11d50a3a 1>NUL 2>NUL
- )
-
+
rem NGen fsc, fsi, fsiAnyCpu, and FSharp.Build.dll
echo.
@@ -399,47 +357,7 @@ if "%DEPLOY%" == "yes" if "!ISADMIN!" == "no" (
rem Re-enable certain settings when restoring, NGEN the original files again, requires admin rights
if "%ACTION%" == "restore" if "!ISADMIN!" == "yes" (
-
- rem Re-enable strong-name validation for F# binaries that were previously installed
- echo.
- CALL :colorEcho 02 "[!ACTION!] Re-enabling strong-name validation of original F# binaries" & echo.
- !SN32! -Vu FSharp.Core,b03f5f7f11d50a3a 2>NUL 1>NUL
- !SN32! -Vu FSharp.Build,b03f5f7f11d50a3a 2>NUL 1>NUL
- !SN32! -Vu FSharp.Compiler.Interactive.Settings,b03f5f7f11d50a3a 2>NUL 1>NUL
- !SN32! -Vu HostedCompilerServer,b03f5f7f11d50a3a 2>NUL 1>NUL
-
- !SN32! -Vu FSharp.Compiler,b03f5f7f11d50a3a 2>NUL 1>NUL
- !SN32! -Vu FSharp.Compiler.Server.Shared,b03f5f7f11d50a3a 2>NUL 1>NUL
- !SN32! -Vu FSharp.Editor,b03f5f7f11d50a3a 2>NUL 1>NUL
- !SN32! -Vu FSharp.LanguageService,b03f5f7f11d50a3a 2>NUL 1>NUL
- !SN32! -Vu FSharp.LanguageService.Base,b03f5f7f11d50a3a 2>NUL 1>NUL
- !SN32! -Vu FSharp.ProjectSystem.Base,b03f5f7f11d50a3a 2>NUL 1>NUL
- !SN32! -Vu FSharp.ProjectSystem.FSharp,b03f5f7f11d50a3a 2>NUL 1>NUL
- !SN32! -Vu FSharp.ProjectSystem.PropertyPages,b03f5f7f11d50a3a 2>NUL 1>NUL
- !SN32! -Vu FSharp.VS.FSI,b03f5f7f11d50a3a 2>NUL 1>NUL
- !SN32! -Vu VisualFSharp.Unittests,b03f5f7f11d50a3a 2>NUL 1>NUL
- !SN32! -Vu VisualFSharp.Salsa,b03f5f7f11d50a3a 2>NUL 1>NUL
-
- REM Do this *in addition* to the above for x64 systems
- if /i "!PROCESSOR_ARCHITECTURE!"=="AMD64" (
- !SN64! -Vu FSharp.Core,b03f5f7f11d50a3a 2>NUL 1>NUL
- !SN64! -Vu FSharp.Build,b03f5f7f11d50a3a 2>NUL 1>NUL
- !SN64! -Vu FSharp.Compiler.Interactive.Settings,b03f5f7f11d50a3a 2>NUL 1>NUL
- !SN64! -Vu HostedCompilerServer,b03f5f7f11d50a3a 2>NUL 1>NUL
-
- !SN64! -Vu FSharp.Compiler,b03f5f7f11d50a3a 2>NUL 1>NUL
- !SN64! -Vu FSharp.Compiler.Server.Shared,b03f5f7f11d50a3a 2>NUL 1>NUL
- !SN64! -Vu FSharp.Editor,b03f5f7f11d50a3a 2>NUL 1>NUL
- !SN64! -Vu FSharp.LanguageService,b03f5f7f11d50a3a 2>NUL 1>NUL
- !SN64! -Vu FSharp.LanguageService.Base,b03f5f7f11d50a3a 2>NUL 1>NUL
- !SN64! -Vu FSharp.ProjectSystem.Base,b03f5f7f11d50a3a 2>NUL 1>NUL
- !SN64! -Vu FSharp.ProjectSystem.FSharp,b03f5f7f11d50a3a 2>NUL 1>NUL
- !SN64! -Vu FSharp.ProjectSystem.PropertyPages,b03f5f7f11d50a3a 2>NUL 1>NUL
- !SN64! -Vu FSharp.VS.FSI,b03f5f7f11d50a3a 2>NUL 1>NUL
- !SN64! -Vu VisualFSharp.Unittests,b03f5f7f11d50a3a 2>NUL 1>NUL
- !SN64! -Vu VisualFSharp.Salsa,b03f5f7f11d50a3a 2>NUL 1>NUL
- )
-
+
rem NGen fsc, fsi, fsiAnyCpu, and FSharp.Build.dll
echo.