Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 6 additions & 18 deletions build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -771,8 +771,8 @@ if "%BUILD_NET40%" == "1" (
echo ---------------- Done with assembly version checks, starting assembly signing ---------------

if not "%SIGN_TYPE%" == "" (
echo build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -ConfigFile build\config\AssemblySignToolData.json
call build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -ConfigFile build\config\AssemblySignToolData.json
echo build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -Configuration %BUILD_CONFIG% -ConfigFile build\config\AssemblySignToolData.json
call build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -Configuration %BUILD_CONFIG% -ConfigFile build\config\AssemblySignToolData.json
if ERRORLEVEL 1 echo Error running sign tool && goto :failure
)

Expand All @@ -783,20 +783,8 @@ echo %_msbuildexe% %msbuildflags% build-nuget-packages.proj /p:Configuration=%BU
if ERRORLEVEL 1 echo Error building NuGet packages && goto :failure

if not "%SIGN_TYPE%" == "" (
echo build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -ConfigFile build\config\PackageSignToolData.json
call build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -ConfigFile build\config\PackageSignToolData.json
if ERRORLEVEL 1 echo Error running sign tool && goto :failure
)

if "%BUILD_SETUP%" == "1" (
echo %_msbuildexe% %msbuildflags% setup\build-msi.proj /p:Configuration=%BUILD_CONFIG%
%_msbuildexe% %msbuildflags% setup\build-msi.proj /p:Configuration=%BUILD_CONFIG%
if ERRORLEVEL 1 echo Error building MSI && goto :failure
)

if not "%SIGN_TYPE%" == "" (
echo build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -ConfigFile build\config\MsiSignToolData.json
call build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -ConfigFile build\config\MsiSignToolData.json
echo build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -Configuration %BUILD_CONFIG% -ConfigFile build\config\PackageSignToolData.json
call build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -Configuration %BUILD_CONFIG% -ConfigFile build\config\PackageSignToolData.json
if ERRORLEVEL 1 echo Error running sign tool && goto :failure
)

Expand All @@ -807,8 +795,8 @@ if "%BUILD_SETUP%" == "1" (
)

if not "%SIGN_TYPE%" == "" (
echo build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -ConfigFile build\config\InsertionSignToolData.json
call build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -ConfigFile build\config\InsertionSignToolData.json
echo build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -Configuration %BUILD_CONFIG% -ConfigFile build\config\InsertionSignToolData.json
call build\scripts\run-signtool.cmd -MSBuild %_msbuildexe% -SignType %SIGN_TYPE% -Configuration %BUILD_CONFIG% -ConfigFile build\config\InsertionSignToolData.json
if ERRORLEVEL 1 echo Error running sign tool && goto :failure
)

Expand Down
49 changes: 36 additions & 13 deletions build/config/InsertionSignToolData.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,37 @@
{
"sign": [
{
"certificate": "VsixSHA2",
"strongName": null,
"values": [
"insertion\\Microsoft.FSharp.SDK.Resources.ENU.vsix"
]
}
],
"exclude": [
]
}

"sign": [
{
"certificate": "VsixSHA2",
"strongName": null,
"values": [
"insertion\\Microsoft.FSharp.Compiler.vsix",
"insertion\\Microsoft.FSharp.Compiler.Resources.*.vsix",
"insertion\\Microsoft.FSharp.SDK.vsix"
]
}
],
"exclude": [
"fsc.exe",
"FSharp.Build.dll",
"FSharp.Build.resources.dll",
"FSharp.Core.dll",
"FSharp.Core.resources.dll",
"FSharp.Compiler.Private.dll",
"FSharp.Compiler.Private.resources.dll",
"FSharp.Compiler.Server.Shared.dll",
"FSharp.Compiler.Interactive.Settings.dll",
"FSharp.Compiler.Interactive.Settings.resources.dll",
"fsi.exe",
"fsiAnyCpu.exe",
"FSharp.Data.TypeProviders.dll",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are the above excluded - that doesn't seem right.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The listed files have either already been signed during this build (fsi, etc.) or come from a nuget package (microsoft.build.*).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can it be commented somehow so that people know why these are excluded?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sadly, no. The JSON file format specification doesn't allow comments as per RFC 7159.

"Microsoft.Build.dll",
"Microsoft.Build.Conversion.Core.dll",
"Microsoft.Build.Engine.dll",
"Microsoft.Build.Framework.dll",
"Microsoft.Build.Tasks.Core.dll",
"Microsoft.Build.Utilities.Core.dll",
"System.Collections.Immutable.dll",
"System.Reflection.Metadata.dll",
"System.ValueTuple.dll"
]
}
15 changes: 0 additions & 15 deletions build/config/MsiSignToolData.json

This file was deleted.

6 changes: 5 additions & 1 deletion build/scripts/run-signtool.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ if /i "%arg%" == "-SignType" (
set SignType=%argv%
shift
)
if /i "%arg%" == "-Configuration" (
set Configuration=%argv%
shift
)
if /i "%arg%" == "-ConfigFile" (
set ConfigFile=%argv%
shift
Expand All @@ -50,7 +54,7 @@ set SignToolArgs=%SignToolArgs% -test
:runsigntool

if not exist "%_signtoolexe%" echo The signing tool could not be found at location '%_signtoolexe%' && goto error
set SignToolArgs=%SignToolArgs% "%scriptdir%..\..\release"
set SignToolArgs=%SignToolArgs% "%scriptdir%..\..\%Configuration%"
echo "%_signtoolexe%" %SignToolArgs%
"%_signtoolexe%" %SignToolArgs%
if errorlevel 1 goto error
Expand Down
2 changes: 2 additions & 0 deletions fcs/FSharp.Compiler.Service/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
net4*/
netstandard*/
100 changes: 0 additions & 100 deletions setup/FSharp.SDK/Common.Wix.Properties.wxs

This file was deleted.

77 changes: 0 additions & 77 deletions setup/FSharp.SDK/FSharp.SDK.wixproj

This file was deleted.

41 changes: 0 additions & 41 deletions setup/FSharp.SDK/FSharp.SDK.wxs

This file was deleted.

Loading