Skip to content

Commit 80e860c

Browse files
committed
move redistributable SDK out of MSI and into a VSIX
1 parent 10abc13 commit 80e860c

File tree

21 files changed

+160
-812
lines changed

21 files changed

+160
-812
lines changed

build.cmd

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -788,18 +788,6 @@ if not "%SIGN_TYPE%" == "" (
788788
if ERRORLEVEL 1 echo Error running sign tool && goto :failure
789789
)
790790

791-
if "%BUILD_SETUP%" == "1" (
792-
echo %_msbuildexe% %msbuildflags% setup\build-msi.proj /p:Configuration=%BUILD_CONFIG%
793-
%_msbuildexe% %msbuildflags% setup\build-msi.proj /p:Configuration=%BUILD_CONFIG%
794-
if ERRORLEVEL 1 echo Error building MSI && goto :failure
795-
)
796-
797-
if not "%SIGN_TYPE%" == "" (
798-
echo build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -Configuration %BUILD_CONFIG% -ConfigFile build\config\MsiSignToolData.json
799-
call build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -Configuration %BUILD_CONFIG% -ConfigFile build\config\MsiSignToolData.json
800-
if ERRORLEVEL 1 echo Error running sign tool && goto :failure
801-
)
802-
803791
if "%BUILD_SETUP%" == "1" (
804792
echo %_msbuildexe% %msbuildflags% setup\build-insertion.proj /p:Configuration=%BUILD_CONFIG%
805793
%_msbuildexe% %msbuildflags% setup\build-insertion.proj /p:Configuration=%BUILD_CONFIG%

build/config/InsertionSignToolData.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"values": [
77
"insertion\\Microsoft.FSharp.Compiler.vsix",
88
"insertion\\Microsoft.FSharp.Compiler.Resources.*.vsix",
9+
"insertion\\Microsoft.FSharp.SDK.Core.vsix",
910
"insertion\\Microsoft.FSharp.SDK.Resources.*.vsix"
1011
]
1112
}

build/config/MsiSignToolData.json

Lines changed: 0 additions & 15 deletions
This file was deleted.

setup/FSharp.SDK/Common.Wix.Properties.wxs

Lines changed: 0 additions & 84 deletions
This file was deleted.

setup/FSharp.SDK/FSharp.SDK.wixproj

Lines changed: 0 additions & 74 deletions
This file was deleted.

setup/FSharp.SDK/FSharp.SDK.wxs

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)